页面修改

src/components/school/student/student-Assit.vue

@@ -48,7 +48,7 @@
           map-options />
         <q-select filled dense v-if="AssitMsg.AssistType == 2" v-model="AssitMsg.AssistId" :options="RoleListData"
           option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value map-options />
-        <q-select filled dense v-if="AssitMsg.AssistType == 6||AssitMsg.AssistType == 4" v-model="AssitMsg.AssistId"
+        <q-select filled dense v-if="AssitMsg.AssistType == 4" v-model="AssitMsg.AssistId"
           :options="TeacherList" option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value
           map-options />
         <q-select filled dense v-else v-model="AssitMsg.AssistId" @filter="filterEmployee" use-input
@@ -86,12 +86,6 @@
                 <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
                   @click="deleteAssits(item.Id)" />
               </div>
-              <div v-if="isHaveXueManager &&item.AssistType ==6">
-                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="修改"
-                  @click="getEditInfo(item)"></q-btn>
-                <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
-                  @click="deleteAssits(item.Id)" />
-              </div>
             </template>
           </td>
         </tr>
@@ -176,24 +170,7 @@
         }
         return false;
       },
-      //是否有新增班主任权限
-      isHaveXueManager(state) {
-        if (
-          state.user.userInfo &&
-          state.user.userInfo.ActionMenuList &&
-          state.user.userInfo.ActionMenuList.length > 0
-        ) {
-          let action = state.user.userInfo.ActionMenuList.find(x => {
-            if (x.FunctionCode == "Add_TeacherManager") {
-              return x;
-            }
-          });
-          if (action) {
-            return true;
-          }
-        }
-        return false;
-      }
+ 
     }),
     mounted() {
       this.getList();
@@ -220,13 +197,7 @@
                     this.AssistDropList.push(x);
                   }
                 }
-                if (this.isHaveXueManager) {
-                  if (x.Id == 6) {
-                    this.AssistDropList.push(x);
-                  }
-                }
               }
-              1
             });
           }
         });
@@ -243,7 +214,7 @@
             this.RoleListData = res.Data;
           });
         }
-        if (this.AssitMsg.AssistType == 6) {
+        if (this.AssitMsg.AssistType == 4) {
           queryObj.AccountTypeStr = "2"
           queryEmployee(queryObj).then(res => {
             this.TeacherList = res.Data;

src/pages/teacher/dayStatic.vue

@@ -147,7 +147,6 @@
                 分数差距
               </q-th>
             </template>
-
             <template v-else>
               <q-th :key="col.name" :props="props" style="max-width:70px">
                 {{ col.label }}
@@ -155,6 +154,7 @@
             </template>
           </template>
         </q-tr>
+
         <template v-slot:bottom>
         </template>
       </q-table>
@@ -191,6 +191,7 @@
             field: 'StudentCount',
             align: 'left'
           },
+
           {
             name: 'AttendClassHourScore',
             label: '上课时数',

src/pages/teacher/teacherMonth.vue

@@ -42,7 +42,12 @@
         separator="none" :data="dataList" :columns="columns" row-key="">
         <q-tr slot="header" slot-scope="props" :props="props">
           <template v-for="col in props.cols" :props="props">
-            <template v-if="col.label=='线上与学生互动数'">
+            <template v-if="col.label=='班主任学生互动'">
+              <q-th :key="col.name" :props="props" style="max-width:75px;text-align:center;">
+                班主任<br />学生互动
+              </q-th>
+            </template>
+            <template v-else-if="col.label=='线上与学生互动数'">
               <q-th :key="col.name" :props="props" style="max-width:90px;text-align:center;">
                 线上与学生<br />互动数
               </q-th>
@@ -168,14 +173,22 @@
             <span v-else>{{props.row.DateStr}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-FinishTimesPlanCount="props">
+          <q-td :props="props">
+            {{props.row.FinishTimes}} / {{props.row.FollowCount}}
+          </q-td>
+        </template>
         <template v-slot:bottom-row>
-          <q-tr>
+          <q-tr v-if="lastRow">
             <q-td>
               {{lastRow.DateStr}}
             </q-td>
             <q-td>
               {{lastRow.StudentCount}}
             </q-td>
+            <q-td>
+              {{lastRow.FinishTimes}} / {{lastRow.FollowCount}}
+            </q-td>
             <q-td>
               {{lastRow.AttendClassHourScore}}
             </q-td>
@@ -241,7 +254,6 @@
             </q-td>
           </q-tr>
         </template>
-
         <template v-slot:bottom>
         </template>
       </q-table>
@@ -277,6 +289,11 @@
             align: 'left',
             sortable: true
           },
+          {
+            name: 'FinishTimesPlanCount',
+            label: '班主任学生互动',
+            align: 'left'
+          },
           {
             name: 'AttendClassHourScore',
             label: '上课时数',

src/pages/teacher/teacherTrack.vue

@@ -160,7 +160,7 @@
           </div>
 
           <div class="col-3">
-            <q-select filled v-model="msg.HeadTeacherId" dense use-input label="老师" :options="MyTeacherListData"
+            <q-select filled v-model="msg.HeadTeacherId" dense use-input label="班主任" :options="MyTeacherListData"
               option-label="EmployeeName" @input="resetSearch" clearable option-value="Id" emit-value map-options />
           </div>
           <div class="col-3">
@@ -220,7 +220,6 @@
             <th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">学生</th>
             <th width="120" rowspan="2" style="min-width: 110px;">电话</th>
             <th width="120" rowspan="2" style="min-width: 110px;">课程顾问</th>
-            <th width="120" rowspan="2" style="min-width: 110px;">协助老师</th>
             <th width="120" rowspan="2" style="min-width: 110px;">班主任</th>
             <th width="100" rowspan="2" style="min-width: 100px;">合同时间</th>
             <th width="200" rowspan="2" style="min-width: 200px;">所报课程</th>
@@ -259,9 +258,7 @@
             <td>
               <span v-html="getTeacherManager(item)"></span>
             </td>
-            <td>
-              <span v-html="getClassTeacher(item)"></span>
-            </td>
+      
             <td>
               <span>{{ item.ContractSTime }}</span>
             </td>