Merge branch 'master' of http://101.43.129.26:10880/psychological_camera/cpdm_manage into fix-请假leave

src/components/PlanUserStatus.vue

@@ -53,10 +53,10 @@
                 >
                 </el-table-column>
                 
-                <el-table-column prop="userNo" label="编号" align="center" width="" v-if="proDataLin.planType=='1'">
-                </el-table-column>
-                <el-table-column prop="userNo" label="学号" align="center" width=""  v-if="proDataLin.planType=='0'">
+                <el-table-column prop="userNo" label="编号/学号" align="center" width="">
                 </el-table-column>
+                <!-- <el-table-column prop="userNo" label="学号" align="center" width=""  v-if="proDataLin.planType=='0'">
+                </el-table-column> -->
                 <el-table-column
                   prop="isComplete"
                   label="是否已完成"

src/views/manage/channelManagement/channelManagement.vue

@@ -601,6 +601,10 @@ export default {
     }
     this.searchTarget();
   },
+  onUnmounted() {
+    
+    clearInterval(this.timeFlag)
+  },
   methods: {
     fileNameFormatter(val) {
       let nameTmp = val.filePath;