From 8514c6295bbcf42902029e40357e9547b631e4bc Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 30 May 2022 16:52:04 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  |  4 +--
 .../ParameterItemCollectionList.vue           | 32 ++++++++++++-------
 .../components/TaskParameterCollection.vue    |  2 +-
 .../dialog/ProjectCollectionParameters.vue    | 28 ++++++----------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index d4056b84f..46fde66e8 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -64,7 +64,7 @@
       </a-table>
     </div>
     <!--  修改工程接口人--->
-    <a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='750px'  :footer="null">
+    <a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='500px'  :footer="null">
       <a-form-model
         class='tag-module'
         ref='ruleForm'
@@ -74,7 +74,7 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='12'>
+          <a-col :span='24'>
               <a-form-model-item ref='region' :label="$t('engineeringInterfacePerson')" prop='region'>
                 <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')" v-model="Dateline.querySdt">
                   <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 7b43c4294..010377b9f 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -85,6 +85,16 @@
             <a-icon type="bulb"/>
             {{$t('CompulsoryWithdrawal')}}
           </div>
+          <!--      分配填写人-->
+          <div @click="assignedBy" class="operator-text-title">
+            <a-icon type="copy"/>
+            {{$t('Assignedby')}}
+          </div>
+          <!--      引用参数-->
+          <div @click="referenceparameter" class="operator-text-title">
+            <a-icon type="plus"/>
+            {{$t('referenceparameter')}}
+          </div>
           <!--      截止时间-->
           <div @click="TaskCutOffTime" class="operator-text-title">
             <a-icon type="bulb"/>
@@ -100,11 +110,6 @@
         <a-icon type="plus"/>
         {{$t('addTo')}}
       </div>
-      <!--      分配填写人-->
-      <div @click="assignedBy" class="operator-text">
-        <a-icon type="copy"/>
-        {{$t('Assignedby')}}
-      </div>
       <!--      提交-->
       <div @click="handleSubmit" class="operator-text">
         <a-icon type="plus"/>
@@ -115,11 +120,6 @@
         <a-icon type="plus"/>
         {{$t('sendBack')}}
       </div>
-      <!--      引用参数-->
-      <div @click="referenceparameter" class="operator-text">
-        <a-icon type="plus"/>
-        {{$t('referenceparameter')}}
-      </div>
       <!--      批量删除-->
       <div @click="handleDelJurisdiction" class="operator-text" v-has="'document:deleteBatch'">
         <a-icon type="delete"/>
@@ -136,7 +136,7 @@
       <parameter-library-add v-if='areaVisible' :paramsManifest='paramsManifest'/>
     </a-modal>
     <!--  冻结配置--->
-    <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='750px' :footer="null">
+    <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='500px' :footer="null">
       <a-form-model
         class='tag-module'
         ref='ruleForm'
@@ -146,7 +146,7 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='12'>
+          <a-col :span='24'>
             <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
               <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig">
                 <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
@@ -1077,6 +1077,14 @@ export default {
     cursor: pointer;
     border-radius: 4px;
   }
+  .operator-text-title {
+    cursor: pointer;
+    margin-right: 22px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 9a319abd9..118f6d381 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -252,7 +252,7 @@
       },
       // 项目收集参数
       drawerhandleCancel(val) {
-        this.drawerhandleCancel = val
+        this.drawerVisible = val
       },
       searchQuery() {
         this.pageNo = 1
diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
index 35a747103..c21a94af3 100644
--- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
@@ -164,24 +164,16 @@ export default {
       this.loadData()
     },
     loadData() {
-      // this.loading = true
-      // let params = {
-      //   pageNo: this.pageNo,
-      //   pageSize: this.pageSize,
-      //   ...this.form
-      // }
-      // getAction(`params/manifest/getParamsTemplatePage`, params).then(res => {
-      //   if (res.success) {
-      //     this.areaTable = [...res.result.records]
-      //     this.total = res.result.total
-      //   }
-      // }).finally(() => {
-      //   this.loading = false
-      // })
       let _this = this
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        projectName: this.formData.title
+      }
       axios({
-        url: `/jero-boot/params/manifest/getAllManifest?projectName=${this.$route.query.id}`,
-        method: 'get',
+        url: `/jero-boot/params/manifest/getAllManifest`,
+        method: 'post',
+        data: params,
         transformRequest: [function (data) {
           let ret = ''
           for (let it in data) {
@@ -196,9 +188,9 @@ export default {
       })
         .then( (res) =>{
           if (res.data.success) {
-            _this.$message.success(res.data.result)
+            // _this.$message.success(res.data.result)
           }else{
-            _this.$message.warning(res.data.result)
+            // _this.$message.warning(res.data.result)
           }
         })
         .catch( (error) =>{