Merge branch '0601Action' into test

src/layout/components/instructions.vue

@@ -279,7 +279,7 @@ export default {
       } else {
         this.isShowBtn = false;
       }
-      console.log(this.isShowBtn);
+      // console.log(this.isShowBtn);
       this.$emit("checkShow", this.isShowBtn);
     },
     gotoIns() {

src/views/indexErrDataRecord/components/patrol.vue

@@ -156,9 +156,9 @@
               >)
             </template>
           </el-table-column>
-          <el-table-column align="center" label="巡查项目">
+          <el-table-column align="center" label="巡查项目是否异常">
             <template slot-scope="scope">
-              {{ scope.row.conclusionStatus |conclusionStatus }}
+              {{ scope.row.conclusionStatus ?'否':'是'}}
             </template>
           </el-table-column>
           <el-table-column align="center" prop="subject" label="巡查时间" width="103px">

src/views/musicInspection/index.vue

@@ -46,7 +46,7 @@
         <el-form-item prop="cooperationOrganId">
           <el-select
             class="multiple"
-            :disabled='!searchForm.organId'
+            :disabled="!searchForm.organId"
             v-model.trim="searchForm.cooperationOrganId"
             filterable
             clearable
@@ -98,10 +98,10 @@
             class="multiple"
             v-model.trim="searchForm.conclusionStatus"
             clearable
-            placeholder="巡查项目"
+            placeholder="巡查项目是否异常"
           >
-            <el-option :label="item.label" :value="item.value" v-for="item in conclusionList" :key="item.value"></el-option>
-
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="createTimer">
@@ -167,14 +167,21 @@
               >)
             </template>
           </el-table-column>
-          <el-table-column align="center" label="巡查项目">
+          <el-table-column align="center" label="巡查项目是否异常">
             <template slot-scope="scope">
-              {{ scope.row.conclusionStatus | conclusionStatus}}
+              {{ scope.row.conclusionStatus?'是':'否' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="subject" label="巡查时间" width="103px">
+          <el-table-column
+            align="center"
+            prop="subject"
+            label="巡查时间"
+            width="103px"
+          >
             <template slot-scope="scope">
-              {{ dayjs(scope.row.planStart).format("YYYY-MM-DD HH:mm") }}~{{ dayjs(scope.row.planEnd).format("HH:mm") }}
+              {{ dayjs(scope.row.planStart).format("YYYY-MM-DD HH:mm") }}~{{
+                dayjs(scope.row.planEnd).format("HH:mm")
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -289,7 +296,7 @@ import pagination from "@/components/Pagination/index";
 import LookDetail from "./modals/lookDetail";
 import dayjs from "dayjs";
 import { inspectionItemPlan, updateMemo } from "./api";
-import {conclusionList} from "@/utils/searchArray"
+import { conclusionList } from "@/utils/searchArray";
 import { findEducationUsers } from "@/api/buildTeam";
 import { queryByOrganId } from "@/api/systemManage";
 import { getTeamList } from "@/api/teamServer";
@@ -300,7 +307,7 @@ export default {
   components: { pagination, LookDetail, gpsLoction },
   data() {
     return {
-      conclusionList:conclusionList,
+      conclusionList: conclusionList,
       educationList: [],
       cooperationList: [],
       musicGroupList: [],
@@ -333,7 +340,7 @@ export default {
     };
   },
   async mounted() {
-    console.log(this.conclusionList)
+    console.log(this.conclusionList);
     const { query } = this.$route;
     if (query.organId) {
       this.searchForm.organId = query.organId;

src/views/studentManager/studentList.vue

@@ -766,7 +766,6 @@ export default {
     };
   },
   mounted() {
-    console.log(this.$route)
     if(this.$route.params.search){
       this.searchForm.search = this.$route.params.search
     }