Merge branch '0601Action' into dev

src/views/indexErrDataRecord/components/historyError.vue

@@ -26,24 +26,24 @@
       </el-form-item>
       <el-form-item>
         <el-select
-            class="multiple"
-            v-model.trim="searchForm.educationUserId"
-            filterable
-            clearable
-            placeholder="请选择乐团主管"
+          class="multiple"
+          v-model.trim="searchForm.educationUserId"
+          filterable
+          clearable
+          placeholder="请选择乐团主管"
+        >
+          <el-option
+            v-for="(item, index) in educationList"
+            :key="index"
+            :label="item.userName"
+            :value="item.userId"
           >
-            <el-option
-              v-for="(item, index) in educationList"
-              :key="index"
-              :label="item.userName"
-              :value="item.userId"
-            >
-              <span style="float: left">{{ item.userName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{
-                item.userId
-              }}</span>
-            </el-option>
-          </el-select>
+            <span style="float: left">{{ item.userName }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{
+              item.userId
+            }}</span>
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item prop="timer">
         <el-date-picker
@@ -72,46 +72,65 @@
 
     <statistic :col="5" class="statistic" :cols="0">
       <statistic-item>
-        <span>乐团巡查事项异常剩余</span>
-        <span><count-to :endVal="statInfo.musicPatrolItemSurplus" /></span>
-      </statistic-item>
-      <statistic-item>
-        <span>乐团巡查任务未提交剩余</span>
-        <span><count-to :endVal="statInfo.inspectionItemPlanSurplus" /></span>
-      </statistic-item>
-      <statistic-item>
-        <span>回访任务未完成剩余</span>
-        <span><count-to :endVal="statInfo.studentVisitSurplus" /></span>
-      </statistic-item>
-      <statistic-item>
-        <span>课程考情异常剩余</span>
-        <span
-          ><count-to :endVal="statInfo.teacherExceptionAttendanceSurplus"
-        /></span>
-      </statistic-item>
-      <statistic-item>
-        <span>课程异常剩余</span>
-        <span><count-to :endVal="statInfo.teacherNotAClassSurplus" /></span>
-      </statistic-item>
-      <statistic-item>
-        <span>乐团巡查事项异常总数</span>
-        <span><count-to :endVal="statInfo.musicPatrolItem" /></span>
+        <span>乐团巡查事项异常剩余/总数</span>
+        <span>
+          {{
+            statInfo.musicPatrolItemSurplus
+              ? statInfo.musicPatrolItemSurplus
+              : "0"
+          }}
+          /
+          {{ statInfo.musicPatrolItem ? statInfo.musicPatrolItem : "0" }}</span
+        >
       </statistic-item>
       <statistic-item>
-        <span>乐团巡查任务未提交总数</span>
-        <span><count-to :endVal="statInfo.inspectionItemPlan" /></span>
+        <span>乐团巡查任务未提交剩余/总数</span>
+        <span>
+          {{
+            statInfo.inspectionItemPlanSurplus
+              ? statInfo.inspectionItemPlanSurplus
+              : "0"
+          }}
+          /
+          {{
+            statInfo.inspectionItemPlan ? statInfo.inspectionItemPlan : "0"
+          }}</span
+        >
       </statistic-item>
       <statistic-item>
-        <span>回访任务未完成总数</span>
-        <span><count-to :endVal="statInfo.studentVisit" /></span>
+        <span>回访任务未完成剩余/总数</span>
+        <span>
+          {{
+            statInfo.studentVisitSurplus ? statInfo.studentVisitSurplus : "0"
+          }}
+          / {{ statInfo.studentVisit ? statInfo.studentVisit : "0" }}</span
+        >
       </statistic-item>
       <statistic-item>
-        <span>课程考情异常总数</span>
-        <span><count-to :endVal="statInfo.teacherExceptionAttendance" /></span>
+        <span>课程考情异常剩余/总数</span>
+        <span>
+           {{
+              statInfo.teacherExceptionAttendanceSurplus
+                ? statInfo.teacherExceptionAttendanceSurplus
+                : "0"
+            }}
+            /
+            {{
+              statInfo.teacherExceptionAttendance
+                ? statInfo.teacherExceptionAttendance
+                : "0"
+            }}
+        </span>
       </statistic-item>
       <statistic-item>
-        <span>课程异常总数</span>
-        <span><count-to :endVal="statInfo.teacherNotAClassSurplus" /></span>
+        <span>课程异常剩余/总数</span>
+        <span> {{
+              statInfo.teacherNotAClassSurplus
+                ? statInfo.teacherNotAClassSurplus
+                : "0"
+            }}
+            /
+            {{ statInfo.teacherNotAClass ? statInfo.teacherNotAClass : "0" }}</span>
       </statistic-item>
     </statistic>
     <el-table
@@ -133,7 +152,7 @@
           </div>
         </template>
       </el-table-column>
-         <el-table-column align="center" prop="organName" label="乐团主管">
+      <el-table-column align="center" prop="organName" label="乐团主管">
         <template slot-scope="scope">
           <div>
             {{ scope.row.dealUserName }}
@@ -266,7 +285,7 @@ export default {
       searchForm: {
         organIds: "",
         timer: [],
-        educationUserId:''
+        educationUserId: "",
       },
       tableList: [],
       handleVisible: false,
@@ -289,14 +308,14 @@ export default {
         studentVisit: 0,
         studentVisitSurplus: 0,
       },
-      educationList:[]
+      educationList: [],
     };
   },
   async mounted() {
     this.$store.dispatch("setBranchs");
     try {
       const res = await getAllEducationUsers();
-      this.educationList = res.data
+      this.educationList = res.data;
     } catch (e) {}
 
     this.getList();