From 654b2876e776868f61c7aac78e76c4f8ee8d754f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 2 Aug 2022 14:07:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 ++
 jero-web/src/common/lang/zh-cn.js             |  2 ++
 .../commponts/conventionalmodle.vue           | 17 +++++++++++--
 .../commponts/customexportmodle.vue           |  6 +++++
 .../parameter/managementdetails/index.vue     | 24 +++++++++----------
 .../components/ParameterCollectionEchart.vue  | 14 +++++------
 6 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9cfe92ae3..8fb825c0e 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1216,4 +1216,6 @@ module.exports = {
   documentNumber:'Document Number',
   documentTitle:'Document Title',
   bringInDocumentInformation:'Bring in document information',
+  sdt:'sdt',
+  dre:'dre',
 }
\ 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 715a564bf..33dc196e6 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1319,4 +1319,6 @@ module.exports = {
   documentNumber:'文档编号',
   documentTitle:'文档标题',
   bringInDocumentInformation:'带入文档信息',
+  sdt:'工程接口人',
+  dre:'填写人',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index 56a23cacc..8875d7e86 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -242,13 +242,20 @@ export default {
       getAction('sys/dict/getDictItems/cert_category', { }).then((res) => {
         if (res.success) {
           let tt = ''
+          let tten = ''
           res.result.forEach((item) => {
             if(item.value == value){
               tt=item.title
+              tten=item.textEn
             }
           })
-          this.contentListStart = tt
-          console.log(this.contentListStart)
+          let long = localStorage.getItem('language')
+          this.cut = ''
+          if (long && long === 'zh-cn') {
+            this.contentListStart = tt
+          } else if (long && long === 'en-us') {
+            this.contentListStart = tten
+          }
         }
       })
       console.log(value)
@@ -268,6 +275,12 @@ export default {
             query.certCategoryName = this.contentListStart
           }
           query.paramsManifestId = this.$route.query.id
+          let long = localStorage.getItem('language')
+          if (long && long === 'zh-cn') {
+            query.exportName = '常规导出'
+          } else if (long && long === 'en-us') {
+            query.exportName = 'normal'
+          }
           this.confirmLoading = true
           downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query)
           this.confirmLoading = false
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
index c413fbf9e..a102af0ec 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
@@ -243,6 +243,12 @@ export default {
           //   query.certCategoryName = this.contentListStart
           // }
           query.paramsManifestId = this.$route.query.id
+          let long = localStorage.getItem('language')
+          if (long && long === 'zh-cn') {
+            query.exportName = '自定义导出'
+          } else if (long && long === 'en-us') {
+            query.exportName = 'custom'
+          }
           this.confirmLoading = true
           downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query)
           this.confirmLoading = false
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index ac2fd70f2..47bc18363 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -15,11 +15,11 @@
           <a-row :gutter="24" style='margin-left: -90px;'>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('certificationCategory')">
-                  <span>{{$t('certificationCategory')}}</span>
+                <div class="title-text" :title="$t('NcertificationCategory')">
+                  <span>{{$t('NcertificationCategory')}}</span>
                 </div>
                 <j-multi-select-tag class="box-input" v-model="formInline.certCategory"
-                                   :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                   :placeholder="$t('PleaseSelect')+$t('NcertificationCategory')"
                                    :type="'select'"
                                    :triggerChange="false" :dictCode="'cert_category'"/>
               </div>
@@ -35,20 +35,20 @@
             </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('ParameterName')">
-                  <span>{{$t('ParameterName')}}</span>
+                <div class="title-text" :title="$t('NParameterName')">
+                  <span>{{$t('NParameterName')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
                          v-model="formInline.paramsName"></a-input>
               </div>
             </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('completedBy')">
-                  <span>{{$t('completedBy')}}</span>
+                <div class="title-text" :title="$t('dre')">
+                  <span>{{$t('dre')}}</span>
                 </div>
                 <PersonnelSelection
-                  :query="{db_field_name:'completedBy',db_field_txt:$t('completedBy')}"
+                  :query="{db_field_name:'completedBy',db_field_txt:$t('dre')}"
                   :isInput="true"
                   class="box-input"
                   :personneQuery="formInline"
@@ -58,11 +58,11 @@
             </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('engineeringInterfacePerson')">
-                  <span>{{$t('engineeringInterfacePerson')}}</span>
+                <div class="title-text" :title="$t('sdt')">
+                  <span>{{$t('sdt')}}</span>
                 </div>
                 <PersonnelSelection
-                  :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
+                  :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('sdt')}"
                   :isInput="true"
                   class="box-input"
                   :personneQuery="formInline"
diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
index 9c77c4b8e..c2396d44b 100644
--- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
@@ -3,16 +3,16 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="24">
-          <a-col :md="6" :sm="12">
+          <a-col :md="6" :sm="10">
             <a-form-item :label="$t('Collectlist')">
               <a-select  v-model="queryParam.ctype" @change="getonChange">
                 <a-select-option v-for="d in options" :key="d.value" :value="d.value" >{{ d.label }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="12">
+          <a-col :md="6" :sm="14">
             <a-form-model-item :label="$t('Statisticalmodels')" prop="value" class="process-form-item">
-              <a-radio-group v-model="queryParam.value" @change="onChange">
+              <a-radio-group v-model="queryParam.value" @change="onChange" style='width: 253px'>
                 <a-radio :value="1">
                   {{$t('Thepercentage')}}
                 </a-radio>
@@ -90,9 +90,7 @@
               this.submit = res.result.submit ? res.result.submit : []
               this.syncReport = res.result.syncReport ? res.result.syncReport : []
               this.dutyTerritory = res.result.dutyTerritory ? res.result.dutyTerritory : []
-              setTimeout(() => {
                 this.getEcharts()
-              },1000)
 
             }
 
@@ -220,10 +218,11 @@
               for (var i = 0; i < params.length; i++) {
                 html += params[i].marker + params[i].seriesName + ":" + params[i].value;
                 if (_this.queryParam.value == 1) {
-                  html += "%";
+                  html += "%" + "<br>";
                 }
               }
-              return html + "<br>";
+              return html;
+
             }
           },
           xAxis: {
@@ -231,6 +230,7 @@
             // name: 'X Axis',
             axisLabel: {
               interval: 0,
+              rotate:25,
               // formatter: function(value) {
               //   return value.split("").join("\n");
               // }