Merge branch 'developer/yanjiaxu' into develop

src/views/processing/carReview/review-form/index.vue

@@ -196,7 +196,14 @@ export default {
       loading: false
     }
   },
-  async created() {
+  async mounted() {
+    if (this.$route.query.id) {
+      this.taskId = this.$route.query.id
+    }
+    await this.getTask()
+    this.openAll()
+  },
+  async activated() {
     if (this.$route.query.id) {
       this.taskId = this.$route.query.id
     }

src/views/processing/carReview/source-record/index.vue

@@ -361,6 +361,13 @@ export default {
     await this.getTask()
     this.openAll()
   },
+  async activated() {
+    if (this.$route.query.id) {
+      this.taskId = this.$route.query.id
+    }
+    await this.getTask()
+    this.openAll()
+  },
   methods: {
     openAll() {
       this.activeNames = this.model.carReviewTask.standard.map(i => {

src/views/processing/carReview/vehicle-type/index.vue

@@ -369,6 +369,13 @@ export default {
     await this.getTask()
     this.openAll()
   },
+  async activated() {
+    if (this.$route.query.id) {
+      this.taskId = this.$route.query.id
+    }
+    await this.getTask()
+    this.openAll()
+  },
   methods: {
     /**
      * 获取任务详情

src/views/processing/carReview/write-check-form/index.vue

@@ -327,7 +327,10 @@
               </el-form>
             </div>
           </div>
-          <div v-else class="empty-message">-暂无未完成条目-</div>
+          <div v-else class="empty-message">
+            <iconpark-icon name="wutiaomu" size="120px"></iconpark-icon>
+            <span> 无未完成条目 </span>
+          </div>
         </div>
         <div class="bottom-btn">
           <footer-button
@@ -463,6 +466,14 @@ export default {
     await this.getTask()
     this.handleCircle(0)
   },
+  async activated() {
+    this.taskId = this.$route.query.id
+    this.$store.dispatch('processing/getCompanyFiles', {
+      taskId: this.$route.query.taskId
+    })
+    await this.getTask()
+    this.handleCircle(0)
+  },
   methods: {
     /**
      * 企业文件保存回调

src/views/processing/carTest/confirmation-test/index.vue

@@ -260,6 +260,10 @@ export default {
     this.getTest()
     this.getTestDetail()
   },
+  activated() {
+    this.getTest()
+    this.getTestDetail()
+  },
   methods: {
     getRows3,
     /* 返回跳转*/

src/views/processing/carTest/execution-test-plan/index.vue

@@ -48,6 +48,11 @@ export default {
     this.dialogManger.dialogEditId = this.$route.query.taskid
     this.url = `https://10.12.48.78:8090/car/complianceTestingCenter/projectOverView/${id}`
   },
+  activated() {
+    const id = this.$route.query.id
+    this.dialogManger.dialogEditId = this.$route.query.taskid
+    this.url = `https://10.12.48.78:8090/car/complianceTestingCenter/projectOverView/${id}`
+  },
   methods: {
     handlePreview() {
       this.dialogManger.dialogVisible = true

src/views/processing/carTest/review-form/index.vue

@@ -143,6 +143,12 @@ export default {
     }
   },
   mounted() {
+    console.log('mounted')
+    this.getTestDetail()
+    this.getTest()
+  },
+  activated() {
+    console.log('activated')
     this.getTestDetail()
     this.getTest()
   },

src/views/processing/systemReview/confirm-result/index.vue

@@ -332,6 +332,13 @@ export default {
     await this.getTask()
     this.openAll()
   },
+  async activated() {
+    if (this.$route.query.id) {
+      this.taskId = this.$route.query.id
+    }
+    await this.getTask()
+    this.openAll()
+  },
   methods: {
     async getTask() {
       this.loading = true

src/views/processing/systemReview/review-form/index.vue

@@ -214,6 +214,13 @@ export default {
     await this.getTask()
     this.openAll()
   },
+  async activated() {
+    if (this.$route.query.id) {
+      this.taskId = this.$route.query.id
+    }
+    await this.getTask()
+    this.openAll()
+  },
   methods: {
     /**
      * 获取任务详情

src/views/processing/systemReview/source-record/index.vue

@@ -374,6 +374,13 @@ export default {
     await this.getTask()
     this.openAll()
   },
+  async activated() {
+    if (this.$route.query.id) {
+      this.taskId = this.$route.query.id
+    }
+    await this.getTask()
+    this.openAll()
+  },
   methods: {
     /**
      * 获取子任务详情

src/views/processing/systemReview/write-check-form/index.vue

@@ -485,6 +485,14 @@ export default {
     await this.getTask()
     this.handleCircle(0)
   },
+  async activated() {
+    this.taskId = this.$route.query.id
+    this.$store.dispatch('processing/getCompanyFiles', {
+      taskId: this.$route.query.taskId
+    })
+    await this.getTask()
+    this.handleCircle(0)
+  },
   methods: {
     /**
      * 企业文件保存回调

src/views/processing/unprocessed-review/index.vue

@@ -314,7 +314,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.systemReview"
+                    :percentage="item.systemReview || 0"
                   ></el-progress>
                 </div>
 
@@ -325,7 +325,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.carReview"
+                    :percentage="item.carReview || 0"
                   ></el-progress>
                 </div>
                 <div
@@ -335,7 +335,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.test"
+                    :percentage="item.test || 0"
                   ></el-progress>
                 </div>
               </div>

src/views/task/on/index.vue

@@ -307,7 +307,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.systemReview"
+                    :percentage="item.systemReview || 0"
                   ></el-progress>
                 </div>
 
@@ -318,7 +318,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.carReview"
+                    :percentage="item.carReview || 0"
                   ></el-progress>
                 </div>
                 <div
@@ -328,7 +328,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.test"
+                    :percentage="item.test || 0"
                   ></el-progress>
                 </div>
               </div>