From 792a21ffaf774a7f7b14b89cf4355ba1f731df5f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 18 Jul 2022 15:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=AF=BC=E5=87=BA=E4=BC=A0=E5=8F=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue  |  2 +-
 .../projectManagement/dialog/configure.vue      |  3 ++-
 .../regulationsKanban/components/addModel.vue   | 17 ++++++++++++-----
 jero-web/src/views/regulationsKanban/index.vue  |  1 +
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 9b2c21bc9..5a20c86ad 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -3,7 +3,7 @@
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
         <span>
-          {{$t('ParameteItemCollectionList')}}
+          {{$t('ParameteItemCollectionList')}}(Model - year market)——{{$t(this.paramsManifest.title)}}
         </span>
       </div>
     </div>
diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue
index 71e7e0c24..f75ab52eb 100644
--- a/jero-web/src/views/projectManagement/dialog/configure.vue
+++ b/jero-web/src/views/projectManagement/dialog/configure.vue
@@ -226,7 +226,8 @@
           if (res.success) {
             this.conFlag = res.result
             if (this.conFlag == true) {
-              this.paramsConfigEOList.splice(item.displaySeq + 1, 0, {
+              console.log(this.paramsConfigEOList)
+              this.paramsConfigEOList.splice(this.paramsConfigEOList.length + 1, 0, {
                 id: '',
                 configName: '', // 配置名称
                 version: '', // 版本
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index dfb8fca3d..0c3cf5453 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -12,7 +12,7 @@
         <a-row :gutter='24'>
           <a-col :span='9'>
             <a-form-model-item :label="$t('areaOfResponsibility')">
-              <j-dict-select-tag class="box-input" v-model="formData.areaOfResponsibility"
+              <j-dict-select-tag class="box-input" v-model="formData.dutyTerritory"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -20,10 +20,10 @@
           </a-col>
           <a-col :span='9'>
             <a-form-model-item :label="$t('RelatedItems')" prop='ListTitle'>
-              <a-select class="box-input" v-model="formData.RelatedItems"
+              <a-select class="box-input" v-model="formData.projectName"
                         :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                <a-select-option v-for="(element,index) in item.RelatedItemList" :key="element.value" :value="element.value">
-                  {{element.label}}
+                <a-select-option v-for="(element,index) in RelatedItemList" :key="element.id" :value="element.id">
+                  {{element.projectName}}
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -195,9 +195,16 @@ export default {
   },
   mounted() {
     this.loadData()
-    console.log(this.item)
+    this.getRelatedItemList()
   },
   methods: {
+    getRelatedItemList(){
+      getAction('/project/projectNameInfoEO/list', {}).then((res) => {
+        if (res.success) {
+          this.RelatedItemList = res.result
+        }
+      })
+    },
     // 清单列表传出数据
     listVisibleRow(val) {
       this.selectedRowKeys = []
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index 05301cc18..33a4a91ba 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -277,6 +277,7 @@ export default {
     deriveconformanceresults(){
       let query = {
         ...this.queryParam,
+        exportAll:'yes',
         ids: this.selectedRowKeys.join(',')
       }
       downloadFile('/project/lawsComplianceBoard/exportComplianceResult', this.$t('complianceResults')+'.xls', query, this.Deselect)