Browse Source

BUG修复

seimin 3 years ago
parent
commit
487f739882
3 changed files with 12 additions and 16 deletions
  1. 10 4
      src/views/incidentList.vue
  2. 1 6
      src/views/indes.vue
  3. 1 6
      src/views/my.vue

+ 10 - 4
src/views/incidentList.vue

@@ -9,7 +9,6 @@
9
           :options="searchsType"
9
           :options="searchsType"
10
           @change="stateChange()"
10
           @change="stateChange()"
11
         ></cube-select>
11
         ></cube-select>
12
-        <!-- <div class="cont"> -->
13
         <div class="scroll-list-wrap">
12
         <div class="scroll-list-wrap">
14
           <cube-scroll
13
           <cube-scroll
15
             ref="scroll"
14
             ref="scroll"
@@ -22,6 +21,7 @@
22
               <div
21
               <div
23
                 class="conent"
22
                 class="conent"
24
                 v-for="item in items"
23
                 v-for="item in items"
24
+                :key="item.id"
25
                 @click="toIncidentDetails(item)"
25
                 @click="toIncidentDetails(item)"
26
               >
26
               >
27
                 <div class="head">
27
                 <div class="head">
@@ -84,6 +84,9 @@
84
                   >
84
                   >
85
                   <span>{{ item.acceptDate | timeFormat("MM-dd HH:mm") }}</span>
85
                   <span>{{ item.acceptDate | timeFormat("MM-dd HH:mm") }}</span>
86
                 </div>
86
                 </div>
87
+                <cube-form-group class="sub">
88
+                  <cube-button @click="assign(item)">指派</cube-button>
89
+                </cube-form-group>
87
               </div>
90
               </div>
88
               <div class="wushuju" v-show="wushuju">
91
               <div class="wushuju" v-show="wushuju">
89
                 <img src="./../../static/images/wushuju.svg" alt />
92
                 <img src="./../../static/images/wushuju.svg" alt />
@@ -214,9 +217,6 @@ export default {
214
   },
217
   },
215
   methods: {
218
   methods: {
216
     getParamsState() {
219
     getParamsState() {
217
-      if (this.$route.params.searchType) {
218
-        this.searchType = this.$route.params.searchType;
219
-      }
220
       if (this.$route.params.type) {
220
       if (this.$route.params.type) {
221
         this.type = this.$route.params.type;
221
         this.type = this.$route.params.type;
222
         if (this.type === "todo") {
222
         if (this.type === "todo") {
@@ -366,6 +366,12 @@ export default {
366
 };
366
 };
367
 </script>
367
 </script>
368
 <style lang="stylus" rel="stylesheet/stylus" scoped>
368
 <style lang="stylus" rel="stylesheet/stylus" scoped>
369
+.sub {
370
+  background: #ececec;
371
+  .cube-btn {
372
+    background-color: #005395 !important;
373
+  }
374
+}
369
 .scroll-list-wrap {
375
 .scroll-list-wrap {
370
   /* height: 350px */
376
   /* height: 350px */
371
   height: 85vh;
377
   height: 85vh;

+ 1 - 6
src/views/indes.vue

@@ -311,12 +311,7 @@ export default {
311
       this.$router.push({ path: "/noticeList" });
311
       this.$router.push({ path: "/noticeList" });
312
     },
312
     },
313
     toIncidentList(searchType) {
313
     toIncidentList(searchType) {
314
-      this.$router.push({
315
-        name: "IncidentList",
316
-        params: {
317
-          searchType: searchType
318
-        }
319
-      });
314
+      this.$router.push({ path: "/main/incidentList/" + searchType });
320
     },
315
     },
321
     // toKnowList() {
316
     // toKnowList() {
322
     //   this.$router.push({ path: "/knowList" });
317
     //   this.$router.push({ path: "/knowList" });

+ 1 - 6
src/views/my.vue

@@ -209,12 +209,7 @@ export default {
209
     },
209
     },
210
     // 跳转到事件列表
210
     // 跳转到事件列表
211
     toIncidentList(searchType) {
211
     toIncidentList(searchType) {
212
-      this.$router.push({
213
-        name: "IncidentList",
214
-        params: {
215
-          searchType: searchType
216
-        }
217
-      });
212
+      this.$router.push({ path: "/main/incidentList/" + searchType });
218
     },
213
     },
219
     // 巡检列表
214
     // 巡检列表
220
     toinspectionList(state) {
215
     toinspectionList(state) {