Merge branch 'master' of http://git.cc-lotus.info/new_train/train-student

src/layout/index/mainData.vue

@@ -31,45 +31,6 @@
                 <p></p>
               </el-col>
             </el-col>
-            <!-- <el-col :span="24" class="context" v-if="lesson.subname">
-              <el-col :span="12" class="contexttime">
-                <span>11:30—13:30</span>
-              </el-col>
-              <el-col :span="12" class="contextclass">
-                <p></p>
-                <p>午餐+休息</p>
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="context">
-              <el-col :span="12" class="contexttime">
-                <span>11:30—4:30</span>
-              </el-col>
-              <el-col :span="12" class="contextclass">
-                <p>{{ lesson.subname }}</p>
-                <p>{{ lesson.teaname }}</p>
-              </el-col>
-              <el-col :span="24">
-                <p></p>
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="context" v-if="lesson.subname">
-              <el-col :span="12" class="contexttime">
-                <span>16:30—17:30</span>
-              </el-col>
-              <el-col :span="12" class="contextclass">
-                <p></p>
-                <p>晚餐</p>
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="context">
-              <el-col :span="12" class="contexttime">
-                <span>17:30 — 19:45</span>
-              </el-col>
-              <el-col :span="12" class="contextclass">
-                <p></p>
-                <p>{{ lesson.lastLesson }}</p>
-              </el-col>
-            </el-col> -->
           </template>
         </el-col>
       </el-col>
@@ -98,14 +59,12 @@ export default {
     },
 
     click(item) {
-      console.log(item);
       this.$router.push({ path: 'teacherscore/index', query: { teaid: item.teaid, lessonid: item._id } });
     },
   },
   filters: {
     getMD(date) {
       let arr = date.split('-');
-      console.log(arr);
 
       //${arr[1]}-
       return `${arr[1]}-${arr[2]}`;

src/layout/user/clickBtn.vue

@@ -2,31 +2,26 @@
   <div id="clickBtn">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="native" v-if="this.user.type === '1'">
+        <el-col :span="24" class="native">
           <van-cell is-link @click="$router.push({ path: '/user/teaLeave' })">请假管理</van-cell>
         </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '4'">
+        <el-col :span="24" class="native">
           <van-cell is-link @click="$router.push({ path: '/user/leave' })">请假</van-cell>
         </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '4'">
+        <el-col :span="24" class="native">
           <van-cell is-link @click="$router.push({ path: '/user/checkWork' })">考勤</van-cell>
         </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '4'">
+        <el-col :span="24" class="native">
           <van-cell is-link @click="$router.push({ path: '/user/homework' })">作业管理</van-cell>
         </el-col>
 
         <el-col :span="24" class="native">
           <van-cell is-link @click="$router.push({ path: '/user/pingfenindex' })">评分</van-cell>
         </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '4'">
+        <el-col :span="24" class="native">
           <van-cell is-link @click="$router.push({ path: '/user/quit' })">退出</van-cell>
         </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '1'">
-          <van-cell is-link @click="$router.push({ path: '/user/teaquit' })">退出</van-cell>
-        </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '1'">
-          <van-cell is-link @click="$router.push({ path: '/user/teacher' })">查看任课教师</van-cell>
-        </el-col>
+
         <!-- <el-col :span="24" class="native" v-if="this.user.type === '3'">
           <van-cell is-link @click="$router.push({ path: '/user/terstudent' })">查看任课教师</van-cell>
         </el-col> -->

src/layout/user/messageInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="messageInfo">
     <el-row>
-      <el-col :span="24" class="message" @click.native="$router.push({ path: '/user/personalDetail', query: { id: info.id } })" v-if="this.user.type === '4'">
+      <el-col :span="24" class="message" @click.native="$router.push({ path: '/user/personalDetail', query: { id: info.id } })">
         <el-col :span="7" class="name">
           {{ info.name }}
         </el-col>
@@ -11,36 +11,6 @@
           <p>民族:{{ info.nation }}&nbsp;性别:{{ info.gender }}</p>
         </el-col>
       </el-col>
-      <el-col
-        :span="24"
-        class="message"
-        @click.native="$router.push({ path: '/user/personalDetail', query: { id: teainfo.id } })"
-        v-if="this.user.type === '1'"
-      >
-        <el-col :span="7" class="name">
-          {{ teainfo.name }}
-        </el-col>
-        <el-col :span="17" class="mess">
-          <p>年龄：{{ teainfo.age }}&nbsp;&nbsp;性别：{{ teainfo.gender }}</p>
-          <p>手机号：{{ teainfo.phone }}</p>
-          <p>所在部门：{{ teainfo.department }}</p>
-        </el-col>
-      </el-col>
-      <el-col
-        :span="24"
-        class="message"
-        @click.native="$router.push({ path: '/user/personalDetail', query: { id: jiaoshiinfo.id } })"
-        v-if="this.user.type === '3'"
-      >
-        <el-col :span="7" class="name">
-          {{ jiaoshiinfo.name }}
-        </el-col>
-        <el-col :span="17" class="mess">
-          <p>年龄：{{ jiaoshiinfo.age }}&nbsp;&nbsp;性别：{{ jiaoshiinfo.gender }}</p>
-          <p>手机号：{{ jiaoshiinfo.phone }}</p>
-          <p>所在部门：{{ jiaoshiinfo.department }}</p>
-        </el-col>
-      </el-col>
     </el-row>
   </div>
 </template>

src/views/index.vue

@@ -160,6 +160,8 @@ export default {
     },
     //点击日期获取课程
     getLesson(date) {
+      this.$set(this, `today`, date);
+
       var res = this.originLesson.filter(item => item.date === date.date);
       this.$set(this, `lesson`, res);
     },

src/views/user/checkWork.vue

@@ -72,7 +72,6 @@ export default {
     async search() {
       let studentid = this.user.userid;
       const res = await this.query({ studentid });
-      console.log(res.data);
 
       this.$set(this, `checkWorkList`, res.data);
       this.$set(this, `anames`, this.user.name);

src/views/user/chuanzuoye.vue

@@ -67,7 +67,6 @@ export default {
     ...mapUploadtask({ list: 'query', add: 'create', fet: 'fetch', updates: 'update' }),
     //提交上传
     async onsave(form) {
-      console.log(form);
       this.form.termid = this.user.termid;
       this.form.batchid = this.user.batchid;
       this.form.classid = this.user.classid;
@@ -75,7 +74,7 @@ export default {
       this.form.lessonid = this.id;
       this.form.lessonname = this.name;
       let data = this.form;
-      console.log(data);
+
       let res = await this.add(data);
       this.$checkRes(res, '提交成功', res.errmsg);
     },

src/views/user/homework.vue

@@ -68,23 +68,20 @@ export default {
     async search() {
       let classid = this.user.classid;
       const ress = await this.classinfo(classid);
-      console.log(ress.data);
+
       let lessonid = ress.data.lessonid;
       const res = await this.lessonList({ classid });
       const resout = await this.list();
-      console.log(res.data);
+
       let lessons = _.get(res.data[0], `lessons`);
       let r = _.uniqBy(lessons, 'subid');
       r = r.filter(f => f.subid);
-      console.log(r);
 
       var crr = r.filter(item => item.subid);
-      console.log(crr);
 
       this.$set(this, `workLists`, crr);
       for (const val of resout.data) {
         var arr = crr.filter(item => item.subid === val.code);
-        console.log(arr);
       }
 
       for (const att of arr) {

src/views/user/index.vue

@@ -50,7 +50,6 @@ export default {
     navShow: true,
   }),
   created() {
-    console.log(this.user);
     this.searchSite();
   },
   computed: {
@@ -74,7 +73,6 @@ export default {
     // 查询登录用户信息
     async searchSite() {
       // 1:班主任，4：学生
-      console.log(this.user);
 
       const res = await this.studentFetch(this.user.userid);
       this.$set(this, `info`, res.data);