Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/common/lang/en-us.js

@@ -894,6 +894,7 @@ module.exports = {
   designComplianceReview: 'Design Compliance Confirmation',
   preHomeConfirmation: 'Pre-Homo Confirmation',
   verificationComplianceReview: 'Validation Compliance Confirmation',
+  verificationComplianceExamine:'Verification compliance examine',
   Deployment: 'Deploy',
   pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
   pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',

jero-web/src/common/lang/zh-cn.js

@@ -910,6 +910,7 @@ module.exports = {
   designComplianceReview: '设计符合性确认',
   preHomeConfirmation: 'Pre-Homo确认',
   verificationComplianceReview: '验证符合性确认',
+  verificationComplianceExamine:'验证符合性审查',
   pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
   pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据',
   pleaseConformityVerification: '请补全验证符合性确认的数据',

jero-web/src/components/tableCollection/index.vue

@@ -8,7 +8,7 @@
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 330px)'}"
+        :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 330px)'} : {x: '100%'}"
         :data-source="dataSource"
         :loading="loading"
         @change="tableOnChange"

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -14,7 +14,7 @@
       size="middle"
       :loading="loading"
       :pagination="false"
-      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 140px)'} : {x: '100%'}"
       rowKey="id"
       bordered
       :data-source="dataSource"
@@ -366,7 +366,7 @@ import ImportFile from '@/components/ImportFileData/index'
           this.$message.success(this.$t('SavedSuccessfully'))
            this.getData()
         }
-       
+
         })
       },
       last(){

jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

@@ -94,7 +94,29 @@
           'To be tracked': 'trackedClass',
           'NA': 'NAClass'
         },
-        regulatoryCertificationTaskPlanList: [
+        verifyList: [
+          {
+            status: '1',
+            name: this.$t('initiatingProcess')
+          },
+          {
+            status: '1',
+            name: this.$t('Taskresponsibilityrecognition')
+          },
+          {
+            status: '1',
+            name: this.$t('verificationComplianceReview')
+          },
+          {
+            status: '2',
+            name: this.$t('verificationComplianceExamine')
+          },
+          {
+            status: '3',
+            name: this.$t('missionAccomplished')
+          }
+        ],
+        designList: [
           {
             status: '1',
             name: this.$t('initiatingProcess')
@@ -116,6 +138,7 @@
             name: this.$t('missionAccomplished')
           }
         ],
+        regulatoryCertificationTaskPlanList: [],
         columns: [
           {
             title: this.$t('Operator'),
@@ -168,6 +191,7 @@
       }
     },
     mounted() {
+      console.log(this.queryProject)
       this.getList()
     },
     methods: {
@@ -180,6 +204,11 @@
           if (res.success) {
             this.dataSource = res.result || []
             if (this.dataSource.length > 0) {
+              if (this.queryProject.flowType == 4) {
+                this.regulatoryCertificationTaskPlanList = this.verifyList
+              } else {
+                this.regulatoryCertificationTaskPlanList = this.designList
+              }
               let taskData = this.dataSource[this.dataSource.length - 1]
               if (this.queryProject.TaskKey == 'fqlc') {
                 this.regulatoryCertificationTaskPlanList.forEach(val => {
@@ -211,6 +240,8 @@
                     val.status = '1'
                   } else if (val.name == this.$t('designComplianceReview')) {
                     val.status = '2'
+                  } else if (val.name == this.$t('verificationComplianceReview')) {
+                    val.status = '2'
                   } else {
                     val.status = '3'
                   }
@@ -227,6 +258,10 @@
                       val.status = '1'
                     } else if (val.name == this.$t('designComplianceReviewAdmin')) {
                       val.status = '1'
+                    } else if (val.name == this.$t('verificationComplianceReview')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('verificationComplianceExamine')) {
+                      val.status = '1'
                     } else {
                       val.status = '1'
                     }
@@ -239,8 +274,12 @@
                       val.status = '1'
                     } else if (val.name == this.$t('designComplianceReview')) {
                       val.status = '1'
+                    } else if (val.name == this.$t('verificationComplianceReview')) {
+                      val.status = '1'
                     } else if (val.name == this.$t('designComplianceReviewAdmin')) {
                       val.status = '2'
+                    } else if (val.name == this.$t('verificationComplianceExamine')) {
+                      val.status = '2'
                     } else {
                       val.status = '3'
                     }