From 4753586616e2e9510463b20c63d50ea8b7589f33 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 20 Apr 2022 15:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=9B=B4=E6=96=B0log=20=20=20=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/ProjectDetails.vue             | 59 +++++++++++++------
 .../components/listOfRelevantPersonnel.vue    | 22 ++++++-
 4 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index a9bc1cebd..a243eb05f 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -691,4 +691,5 @@ module.exports = {
   historicalVersion:'Historical version',
   versionName:'Version name',
   finalizationTime:'Finalization time',
+  setting:'setting',
 }
\ 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 9646e479b..277462af7 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -695,4 +695,5 @@ module.exports = {
   historicalVersion:'历史版本',
   versionName:'版本名称',
   finalizationTime:'定版时间',
+  setting:'设定',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 5131a0142..3a7f10349 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="box">
-    <div class="header-text">
-      {{$t('basicInformationOfParameters')}}
+    <div class="box-text">
+      <div class="header-text">
+        {{$t('basicInformationOfParameters')}}
+      </div>
+      <div class="header-tight">
+        <a-button class="box-button" style="line-height: 32px" @click="edit">{{$t('edit')}}</a-button>
+      </div>
     </div>
+
     <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
@@ -46,12 +52,12 @@
       </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" @click="urlClick(queryForm.vehicleDevelopmentPlan)"
         >{{queryForm.vehicleDevelopmentPlan}}</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" @click="urlClick(queryForm.attestationPlan)"
         >{{queryForm.attestationPlan}}</span>
       </div>
       <div class="text-field">
@@ -65,8 +71,13 @@
         </span>
       </div>
     </div>
-    <div class="header-text">
-      {{$t('regulatoryCertificationTaskPlan')}}
+    <div class="box-text">
+      <div class="header-text">
+        {{$t('regulatoryCertificationTaskPlan')}}
+      </div>
+      <div class="header-tight">
+        <a-button class="box-button" style="line-height: 32px" @click="searchReset">{{$t('setting')}}</a-button>
+      </div>
     </div>
     <div class="process-content">
 
@@ -157,14 +168,15 @@
 <script>
   import * as echarts from 'echarts'
   import listOfRelevantPersonnel from './listOfRelevantPersonnel'
+
   export default {
     name: 'ProjectDetails',
-    components:{
-      listOfRelevantPersonnel,
+    components: {
+      listOfRelevantPersonnel
     },
     data() {
       return {
-        queryForm: {},
+        queryForm: {}
       }
     },
     mounted() {
@@ -192,13 +204,16 @@
           ]
         })
       },
-      ListOfRelevantPersonnelClick(){
-          this.$refs.listOfRelevantPersonnelRef.getData()
+      ListOfRelevantPersonnelClick() {
+        this.$refs.listOfRelevantPersonnelRef.getData()
       },
-      urlClick(val){
-          if (val){
-            window.open(val)
-          }
+      urlClick(val) {
+        if (val) {
+          window.open(val)
+        }
+      },
+      edit(){
+
       },
     }
   }
@@ -215,9 +230,7 @@
   .header-text {
     font-size: 16px;
     font-weight: 400;
-    height: 80px;
     color: #000F16;
-    line-height: 80px;
   }
 
   .content-text {
@@ -339,8 +352,16 @@
     }
 
   }
-  .text-field-right-color{
-    color: #00B3BE!important;
+
+  .text-field-right-color {
+    color: #00B3BE !important;
     cursor: pointer;
   }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 80px;
+    line-height: 80px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index aa2f7db5c..c768d2a4e 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -27,7 +27,7 @@
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x:1000,y: 400}"
+        :scroll="{x:true,y: 400}"
         :data-source="dataSource"
         :loading="loading"
       >
@@ -154,6 +154,7 @@
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
   import ImportFile from '@/components/ImportFile/index'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'listOfRelevantPersonnel',
@@ -164,7 +165,7 @@
     data() {
       return {
         visible: false,
-        columns: [
+        columnsAll: [
           {
             title: this.$t('areaOfResponsibility'),
             align: 'center',
@@ -248,7 +249,22 @@
         selectedRowKeys: []
       }
     },
+    computed: {
+      columns() {
+        let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
+        if (this.$route.query.studioEngineer != this.userInfo().id) {
+          for (var i = 0; i < columnResult.length; i++) {
+            if (columnResult[i].title === this.$t('operation')) {
+              columnResult.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columnResult
+      }
+    },
     methods: {
+      ...mapGetters(['userInfo']),
       getData() {
         this.visible = true
         this.getList()
@@ -297,7 +313,7 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          projectId:this.$route.query.id
+          projectId: this.$route.query.id
         }
         this.loading = true
         postAction(this.url.page, query).then((res) => {