Merge branch '02/24resetMain' into test

src/views/operateManager/serverIndexList.vue

@@ -17,7 +17,7 @@
     </h2>
     <div class="m-core">
       <save-form
-      ref='searchForm'
+        ref="searchForm"
         :inline="true"
         :model="searchForm"
         @submit="search"
@@ -56,7 +56,7 @@
 
         <el-form-item>
           <el-button
-             :type="isSearch ? 'primary' : 'info'"
+            :type="isSearch ? 'primary' : 'info'"
             icon="el-icon-circle-plus-outline"
             @click="showMove = true"
             >更多选项</el-button
@@ -130,7 +130,7 @@
               <copy-text>{{ scope.row.courseIds || "课外训练" }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="预期安排">
+          <el-table-column align="center" label="预期作业布置">
             <template slot-scope="scope">
               <div>{{ scope.row.expectExercisesNum + "次" }}</div>
             </template>
@@ -138,10 +138,10 @@
           <el-table-column align="center" width="120" prop>
             <template slot="header" slot-scope="scope">
               <p style="position: relative">
-                实际安排
+                实际作业布置
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    以周为单位，每周服务指标指定的课程布置作业记一次实际安排
+                    以周为单位，每周服务指标指定的课程布置作业记一次实际作业布置
                   </div>
                   <!-- <img :src="imageIcon"
                        class="micon el-tooltip"
@@ -155,7 +155,15 @@
               </p>
             </template>
             <template slot-scope="scope">
-              <div>{{ scope.row.actualExercisesNum + "次" }}</div>
+              <div
+                :style="
+                  scope.row.actualExercisesNum < scope.row.expectExercisesNum
+                    ? 'color:red'
+                    : ''
+                "
+              >
+                {{ scope.row.actualExercisesNum + "次" }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column align="center" prop label="提交次数">
@@ -165,7 +173,15 @@
           </el-table-column>
           <el-table-column align="center" prop label="评价次数">
             <template slot-scope="scope">
-              <div>{{ scope.row.exercisesMessageNum + "次" }}</div>
+              <div
+                :style="
+                  scope.row.exercisesMessageNum < scope.row.expectExercisesNum
+                    ? 'color:red'
+                    : ''
+                "
+              >
+                {{ scope.row.exercisesMessageNum + "次" }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column align="center" prop label="及时评价次数">
@@ -306,9 +322,11 @@
           <h4>服务指标解释：</h4>
           <p><span>若本周学员有多次服务指标则生成多条数据</span></p>
           <p>
-            预期安排：本周内服务指标次数（即本周应该给该学员布置的作业次数）
+            预期作业布置：本周内服务指标次数（即本周应该给该学员布置的作业次数）
+          </p>
+          <p>
+            实际作业布置：本周通过服务指标作业布置路径给该学员布置作业的次数
           </p>
-          <p>实际安排：本周通过服务指标作业布置路径给该学员布置作业的次数</p>
           <p>提交次数：本周学员按照作业布置路径提交作业的次数</p>
           <p>评价次数：本周老师评价通过作业布置路径提交的作业的次数</p>
           <p>及时评价次数：学员提交作业后24小时内进行评价的次数</p>
@@ -350,9 +368,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="实际安排">
+        <el-form-item label="实际作业布置">
           <el-select
-            placeholder="实际安排"
+            placeholder="实际作业布置"
             v-model="searchForm.actualExercisesNumIsAchieve"
             clearable
           >
@@ -360,6 +378,15 @@
             <el-option label="不符合预期" value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="服务是否异常">
+          <el-select
+            placeholder="服务是否异常"
+            v-model="searchForm.serviceIsError"
+            clearable
+          >
+            <el-option label="是" value="1"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="提交次数">
           <el-select
             placeholder="提交次数"
@@ -468,6 +495,7 @@ export default {
         existVipCourse: null,
         existPracticeCourse: null,
         workTimer: [],
+        serviceIsError: null,
       },
       organList: [],
       teacherList: [],
@@ -663,7 +691,7 @@ export default {
     },
     search() {
       this.rules.page = 1;
-           this.$refs.searchForm.save(this.searchForm);
+      this.$refs.searchForm.save(this.searchForm);
       this.getList();
     },
     getNowDateAndMonday(time) {
@@ -762,18 +790,21 @@ export default {
       }
     },
   },
-  computed:{
-    isSearch(){
-      return  this.searchForm.organIdList ||
+  computed: {
+    isSearch() {
+      return (
+        this.searchForm.organIdList ||
         this.searchForm.actualExercisesNumIsAchieve ||
         this.searchForm.exercisesReplyNumIsAchieve ||
         this.searchForm.exercisesMessageNumIsAchieve ||
         this.searchForm.exercisesMessageTimelyNumIsAchieve ||
-        this.searchForm.existVipCourse||
-        this.searchForm.existPracticeCourse||
-        this.searchForm.workTimer?.length>0
-    }
-  }
+        this.searchForm.existVipCourse ||
+        this.searchForm.existPracticeCourse ||
+        this.searchForm.workTimer?.length > 0 ||
+        this.searchForm.serviceIsError
+      );
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>

src/views/serverDetail/index.vue

@@ -35,12 +35,22 @@
             ></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item prop="teacherId">
           <remote-search
             :commit="'setTeachers'"
             v-model="searchForm.teacherId"
           />
         </el-form-item>
+         <el-form-item prop="serviceIsError">
+          <el-select
+            placeholder="服务是否异常"
+            v-model="searchForm.serviceIsError"
+            clearable
+          >
+            <el-option label="是" value="1"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="unDone">
           <el-select
             class="multiple"
@@ -86,7 +96,7 @@
         </el-form-item>
          <el-form-item >
           <el-select
-            placeholder="实际安排"
+            placeholder="实际作业布置"
             v-model="searchForm.actualExercisesNumIsAchieve"
             clearable
           >
@@ -193,7 +203,7 @@
             </div>
           </template>
           </el-table-column>
-           <el-table-column align="center" label="预期安排">
+           <el-table-column align="center" label="预期作业布置">
             <template slot-scope="scope">
               <div>{{ scope.row.expectExercisesNum + "次" }}</div>
             </template>
@@ -201,10 +211,10 @@
           <el-table-column align="center" width="120" prop>
             <template slot="header" slot-scope="scope">
               <p style="position: relative">
-                实际安排
+                实际作业布置
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    以周为单位，每周服务指标指定的课程布置作业记一次实际安排
+                    以周为单位，每周服务指标指定的课程布置作业记一次实际作业布置
                   </div>
                   <!-- <img :src="imageIcon"
                        class="micon el-tooltip"
@@ -218,7 +228,11 @@
               </p>
             </template>
             <template slot-scope="scope">
-              <div>{{ scope.row.actualExercisesNum + "次" }}</div>
+              <div :style="
+                  scope.row.actualExercisesNum < scope.row.expectExercisesNum
+                    ? 'color:red'
+                    : ''
+                ">{{ scope.row.actualExercisesNum + "次" }}</div>
             </template>
           </el-table-column>
           <el-table-column align="center" prop label="提交次数">
@@ -228,7 +242,11 @@
           </el-table-column>
           <el-table-column align="center" prop label="评价次数">
             <template slot-scope="scope">
-              <div>{{ scope.row.exercisesMessageNum + "次" }}</div>
+              <div  :style="
+                  scope.row.exercisesMessageNum < scope.row.expectExercisesNum
+                    ? 'color:red'
+                    : ''
+                ">{{ scope.row.exercisesMessageNum + "次" }}</div>
             </template>
           </el-table-column>
           <el-table-column align="center" prop label="及时评价次数">
@@ -343,6 +361,7 @@ export default {
         exercisesMessageNumIsAchieve: null, //评价
         exercisesMessageTimelyNumIsAchieve: null, //及时评价
         exercisesReplyNumIsAchieve: null, // 提交次数
+        serviceIsError:null
       },
       orderDate: [],
       tableList: [],