From 267b5f12dab7b2b3f188f487ed6c407f207d9af4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 25 May 2022 17:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  7 ++--
 jero-web/src/common/lang/zh-cn.js             |  5 +--
 .../components/footerProcess.vue              |  4 +--
 .../components/projectInformation.vue         |  6 +++-
 .../reviewedByThePersonInCharge.vue           |  2 +-
 .../processForm/handshakeProcess/index.vue    |  1 +
 .../processForm/taskListProcess/index.vue     |  1 +
 .../ProjectDetails/index.vue                  | 19 +++++++---
 .../components/ProjectDetails.vue             | 36 ++++++++++++-------
 .../projectManagement/components/TaskList.vue |  4 +--
 .../certificationProgressEchart.vue           |  5 ++-
 .../currentStatusOfTheProjectEcharts.vue      |  6 ++--
 .../components/deliverableStatusEchart.vue    |  5 ++-
 .../components/responsibilityList.vue         | 13 +++++--
 14 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index cdbb79f99..bd6ea6376 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -786,10 +786,10 @@ module.exports = {
   importTemplate: 'Import Template',
   verificationConfirmationDeadline: 'Verification compliance confirmation deadline',
   technicalEvaluationResults: 'Technical Evaluation Results',
-  engineeringConfirmation: 'EngineeringConfirmation',
+  engineeringConfirmation: 'Project Delivery',
   feedbackFromTheEngineer: 'Feedback From The Engineer',
-  completedBy: 'Completed by',
-  completedTime: 'Completed time',
+  completedBy: 'Completed By',
+  completedTime: 'Completed Time',
   replyFromProjectContactPerson: 'Responsible Persons reply',
   answer: 'Answer',
   distributionEngineer: 'Distribution Engineer',
@@ -891,4 +891,5 @@ module.exports = {
   custom:'Custom',
   notSelected:'Not selected',
   ExportReport:'Export Report',
+  basicInformation:'Basic Information',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 0343b852e..6dd6e00ee 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -794,7 +794,7 @@ module.exports = {
   importTemplate: '导入模板',
   verificationConfirmationDeadline: '验证符合性确认截止时间',
   technicalEvaluationResults: '技术评估结果',
-  engineeringConfirmation: '工程确认',
+  engineeringConfirmation: '工程交付',
   feedbackFromTheEngineer: '工程师反馈意见',
   completedBy: '填写人',
   completedTime: '填写时间',
@@ -804,7 +804,7 @@ module.exports = {
   reminderHandling: '提醒办理',
   addFeedback: '添加反馈',
   engineer: '工程师',
-  engineeringConfirmationDetails: '工程确认详情',
+  engineeringConfirmationDetails: '工程交付详情',
   reminder: '提醒',
   adopt: '通过',
   reviewedByThePersonInCharge: '负责人审核',
@@ -896,4 +896,5 @@ module.exports = {
   custom:'自定义',
   notSelected:'未选择',
   ExportReport:'导出报告',
+  basicInformation:'基础信息',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/footerProcess.vue b/jero-web/src/views/processCenter/components/footerProcess.vue
index 090db92d7..48821c688 100644
--- a/jero-web/src/views/processCenter/components/footerProcess.vue
+++ b/jero-web/src/views/processCenter/components/footerProcess.vue
@@ -107,8 +107,8 @@
     box-sizing: border-box;
 
     .process-header-title {
-      height: 68px;
-      line-height: 68px;
+      /*height: 68px;*/
+      /*line-height: 68px;*/
       background: #FFFFFF;
       text-align: right;
 
diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue
index 102b8611d..65e75b9f7 100644
--- a/jero-web/src/views/processCenter/components/projectInformation.vue
+++ b/jero-web/src/views/processCenter/components/projectInformation.vue
@@ -2,7 +2,7 @@
   <div class="box">
     <div class="box-text">
       <div class="header-text">
-        {{$t('essentialInformation')}}
+        {{title}}
       </div>
     </div>
     <div class="content-text">
@@ -49,6 +49,10 @@
       queryProject: {
         type: Object,
         default: {}
+      },
+      title: {
+        type: String,
+        default: ''
       }
     },
     data() {
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 2bbc1a265..e7ebead41 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="box-text">
-      <div class="header-text">
+      <div class="header-text" v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'">
         {{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'
         ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
         <a-icon :title="$route.query.TaskKey == 'zrrclrw'?$t('pleaseConfirmationResults'):$t('pleaseReviewTask')"
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 94434a59d..103403f61 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -7,6 +7,7 @@
       <div class="detail-content">
         <projectInformation
           v-if="isDisplay"
+          :title="$t('essentialInformation')"
           :projectInformationList="projectInformationList"
           :url="url"
           :queryProject="queryProject"
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 7e0b5e7e9..afa3f81cf 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -7,6 +7,7 @@
       <div class="detail-content">
         <projectInformation
           v-if="isDisplay"
+          :title="$t('basicInformation')"
           :projectInformationList="projectInformationList"
           :url="url"
           :projectInformationId="this.queryBy.projectLibraryId"
diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index 027c97496..53d7f9d4c 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -49,9 +49,9 @@
           </div>
         </div>
         <div class="Virtual-detail-right">
-          <ProjectDetailsName v-if="textTitle === '项目详情'"/>
+          <ProjectDetailsName @TaskListChange="TaskListChange" v-if="textTitle === '项目详情'"/>
           <listOfRegulations v-else-if="textTitle === '法规清单'"/>
-          <TaskList :isDisplayNum="isDisplayNum" v-else-if="textTitle === '任务清单'"/>
+          <TaskList :isDisplayNum="isDisplayNum" :areaOfResponsibility="areaOfResponsibility" v-else-if="textTitle === '任务清单'"/>
           <TaskParameterCollection v-else-if="textTitle === '认证参数收集'"/>
           <nonConformance v-else-if="textTitle === '未符合项'"/>
         </div>
@@ -95,7 +95,8 @@
           logList: '/project/projectLawsInventoryLogEO/page',
           historicalVersionUrl: '',
           queryUserPremissionByProjectLibraryId: '/project/projectCertificationDirectoryEO/queryUserPremissionByProjectLibraryId'
-        }
+        },
+        areaOfResponsibility:{},
       }
     },
     mounted() {
@@ -140,7 +141,17 @@
              this.isDisplayNum = res.result
           }
         })
-      }
+      },
+      TaskListChange(item){
+        this.areaOfResponsibility = item
+        this.textTitle = '任务清单'
+        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+        if (textColor && textColor.length > 0) {
+          textColor[0].classList.remove('Virtual-detail-left-text-color')
+        }
+        let text = document.getElementsByClassName('Virtual-detail-left-text')
+        text[2].classList.add('Virtual-detail-left-text-color')
+      },
     }
   }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 2b66f0631..fcba7bd8e 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -12,58 +12,64 @@
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm.projectName"
         >{{queryForm.projectName}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm.targetMarket_dictText"
         >{{queryForm.targetMarket_dictText}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm.projectStatus_dictText"
         >{{queryForm.projectStatus_dictText}}</span>
       </div>
     </div>
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm.digitalPlatform"
         >{{queryForm.digitalPlatform}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm.vehiclePlatform"
         >{{queryForm.vehiclePlatform}}</span>
       </div>
     </div>
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm.studioEngineerName"
         >{{queryForm.studioEngineerName}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
-        <span class="text-field-right"
+        <span class="text-field-right" :title="queryForm.certificationEngineerName"
         >{{queryForm.certificationEngineerName}}</span>
       </div>
     </div>
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
-        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.ipdInfo)"
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.ipdInfo"
+              @click="urlClick(queryForm.ipdInfo)"
         >{{queryForm.ipdInfo}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
-        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.attestationPlan)"
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.attestationPlan"
+              @click="urlClick(queryForm.attestationPlan)"
         >{{queryForm.attestationPlan}}</span>
       </div>
       <div class="text-field">
         <span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
-        <span class="text-field-right text-field-right-color" @click="urlClick(queryForm.vehicleDevelopmentPlan)"
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.vehicleDevelopmentPlan"
+              @click="urlClick(queryForm.vehicleDevelopmentPlan)"
         >{{queryForm.vehicleDevelopmentPlan}}</span>
       </div>
     </div>
@@ -104,13 +110,14 @@
     </div>
     <a-tabs style="margin-top: 20px" v-model="activeKey" class="ant-tabs">
       <a-tab-pane :key="$t('CurrentStatusOfTheProject')" :tab="$t('CurrentStatusOfTheProject')">
-        <currentStatusOfTheProjectEcharts v-if="activeKey == $t('CurrentStatusOfTheProject')"/>
+        <currentStatusOfTheProjectEcharts @currentStatus="currentStatus"
+                                          v-if="activeKey == $t('CurrentStatusOfTheProject')"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('DeliverableStatus')" :tab="$t('DeliverableStatus')">
-        <deliverableStatusEchart v-if="activeKey == $t('DeliverableStatus')"/>
+        <deliverableStatusEchart @currentStatus="currentStatus" v-if="activeKey == $t('DeliverableStatus')"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('CertificationProgress')" :tab="$t('CertificationProgress')">
-        <certificationProgressEchart v-if="activeKey == $t('CertificationProgress')"/>
+        <certificationProgressEchart @currentStatus="currentStatus" v-if="activeKey == $t('CertificationProgress')"/>
       </a-tab-pane>
     </a-tabs>
     <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
@@ -169,6 +176,9 @@
           }
         })
       },
+      currentStatus(item) {
+        this.$emit('TaskListChange', item)
+      },
       getSetting() {
         getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 50c4584c2..51a4d6989 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -141,7 +141,7 @@
       certificationDirectory,
       TaskListModel
     },
-    props:['isDisplayNum'],
+    props: ['isDisplayNum', 'areaOfResponsibility'],
     data() {
       return {
         columns: [
@@ -257,7 +257,7 @@
     mounted() {
       this.getList()
       this.long = localStorage.getItem('language') || 'zh-cn'
-
+      console.log(this.areaOfResponsibility)
     },
     methods: {
       ...mapGetters(['userInfo']),
diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
index bed58d4bd..dfa4961dd 100644
--- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
@@ -19,7 +19,7 @@
         </a-table>
       </div>
     </div>
-    <responsibilityList ref="responsibilityListRef"/>
+    <responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
   </div>
 </template>
 
@@ -75,6 +75,9 @@
       this.getData()
     },
     methods: {
+      responsibility(item) {
+        this.$emit('currentStatus', item)
+      },
       getData() {
         getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
           if (res.success) {
diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
index d83b48662..7c0157783 100644
--- a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
+++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
@@ -26,7 +26,7 @@
         </a-table>
       </div>
     </div>
-    <responsibilityList ref="responsibilityListRef"/>
+    <responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
   </div>
 </template>
 
@@ -174,8 +174,10 @@
           })
         }
         this.getEcharts('main-left', this.$t('CurrentStatusOfTheProject'), color, data)
+      },
+      responsibility(item) {
+        this.$emit('currentStatus', item)
       }
-
     }
   }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
index 6c120bd6a..31a91e2a7 100644
--- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
+++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
@@ -21,7 +21,7 @@
         <div id="main-bottom"></div>
       </div>
     </div>
-    <responsibilityList ref="responsibilityListRef"/>
+    <responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
   </div>
 
 </template>
@@ -250,6 +250,9 @@
       ,
       mainBottomEcharts(data, color) {
         this.getEcharts('main-bottom', this.$t('verificationComplianceConfirmationProgress'), color, data, 5)
+      },
+      responsibility(item) {
+        this.$emit('currentStatus', item)
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue
index cd0f0aea9..7cda45c34 100644
--- a/jero-web/src/views/projectManagement/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue
@@ -26,6 +26,9 @@
       :data-source="dataSource"
       :columns="columns"
     >
+      <a slot="areaOfResponsibility" slot-scope="text,result" @click="areaOfResponsibilityClick(result)">
+        {{text}}
+      </a>
     </a-table>
   </a-modal>
 </template>
@@ -53,15 +56,16 @@
             title: this.$t('areaOfResponsibility'),
             dataIndex: 'dutyTerritory',
             align: 'center',
-            width:400,
-            ellipsis: true
+            width: 400,
+            ellipsis: true,
+            scopedSlots: { customRender: 'areaOfResponsibility' }
           },
           {
             title: this.$t('Quantity'),
             dataIndex: 'amount',
             align: 'center',
             ellipsis: true,
-            width:300,
+            width: 300
           }
         ]
       }
@@ -92,6 +96,9 @@
       },
       handleCancel() {
         this.visible = false
+      },
+      areaOfResponsibilityClick(item) {
+        this.$emit('responsibility', item)
       }
     }
   }