Merge branch '01/21VipReset' into online

src/views/main/abnormal/index.vue

@@ -31,16 +31,7 @@
       </el-badge>
     </div>
     <empty desc="暂无需要处理异常" v-if="!activeList.length"/>
-    <el-button @click="$router.push({
-        path: item[0].url,
-        query: {
-          ...item[0].query,
-          tag: $route.query.tag,
-          filter_type: item[0].errorType,
-          organId: search.organId || undefined,
-          [item[0].resultKey]: item[0].resultKey ? (item[0].result || []).join(',') : undefined
-        }
-      })"
+    <el-button @click="handle(item)"
       style="width: 100%;color: #303133;margin-left: 0;"
       v-else
       v-for="(item, index) in activeList"
@@ -80,6 +71,7 @@
   </div>
 </template>
 <script>
+import { Searchs } from '@/helpers'
 import { getIndexError } from '@/views/main/api'
 import { createNotification } from '@/helpers/notification'
 import { errorType } from '@/views/main/constant'
@@ -152,6 +144,19 @@ export default {
   },
   methods: {
     permission,
+    handle(item) {
+      new Searchs().removeByKey(item[0].url)
+      this.$router.push({
+        path: item[0].url,
+        query: {
+          ...item[0].query,
+          tag: this.$route.query.tag,
+          filter_type: item[0].errorType,
+          organId: this.search.organId || undefined,
+          [item[0].resultKey]: item[0].resultKey ? (item[0].result || []).join(',') : undefined
+        }
+      })
+    },
     changeTag(type) {
       this.$router.replace({
         query: {

src/views/main/constant.js

@@ -42,7 +42,7 @@ export const errorType = {
     always: true,
     query: {
       tabrouter: 'teamSchedule',
-      searchType: 'MUSIC_PATROL_ITEM',
+      conclusionStatus: '1'
     },
   },
   HIGH_CLASS_STUDENT_LESS_THAN_THREE: {
@@ -52,7 +52,6 @@ export const errorType = {
     always: true,
     query: {
       lessThenThreeHighOnline: '1',
-      type: 'HIGH_ONLINE',
     },
   },
   STUDENT_NOT_PAYMENT: {
@@ -156,7 +155,7 @@ export const errorType = {
     always: true,
     query: {
       tabrouter: 'teamSchedule',
-      searchType: 'INSPECTION_ITEM_PLAN',
+      conclusionStatus: '1'
     },
   },
   STUDENT_VISIT: {

src/views/musicInspection/index.vue

@@ -3,7 +3,6 @@
     <div class="m-container">
         <h2>
             <div class="squrt"></div>乐团巡查
-            <filter-search @reload="getList" :keys="['searchType']" />
         </h2>
         <div class="m-core">
             <save-form :inline="true" ref="searchForm" @submit="search" @reset="onReSet" :model="searchForm">
@@ -250,6 +249,9 @@ export default {
         if (query.organId) {
           this.searchForm.organId = query.organId
         }
+        if (query.conclusionStatus) {
+          this.searchForm.conclusionStatus = Number(query.conclusionStatus)
+        }
         this.getList()
         // 分部
         await this.$store.dispatch('setBranchs')
@@ -274,7 +276,6 @@ export default {
             try {
                 let { createTimer, ...rest } = this.searchForm
                 let params = {
-                    searchType: this.$route.query.searchType,
                     ...rest,
                     page: this.pageInfo.page,
                     rows: this.pageInfo.limit,
@@ -290,7 +291,6 @@ export default {
             this.tableStatus = true
         },
         onGPS(row) {
-            console.log(row)
             this.activeRow = {
                 schoolLongitudeLatitude: row.schoolGps,
                 signOutLongitudeLatitude: row.submitedGps,

src/views/operationalEarly/operationalList.vue

@@ -87,6 +87,9 @@
             </template>
           </el-table-column>
           <el-table-column align="center" prop="subjectListStr" label="专业">
+            <template slot-scope="scope">
+              <overflow-text width="100%" :text="scope.row.subjectListStr" />
+            </template>
           </el-table-column>
           <el-table-column
             align="center"