From a5fafde7c2e465c05441c62d335c80a8052de638 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 13 Sep 2022 14:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95=20=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BC=B9=E6=A1=86=20=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E7=82=B9=E5=87=BB=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/TaskCutOffTime/index.vue   | 49 ++++++++++++-----
 .../components/TaskCutOffTime/indexonekey.vue | 49 ++++++++++++-----
 .../src/components/tableCollection/index.vue  | 54 ++++++++++++++++++-
 .../ParameterItemCollectionList.vue           | 21 ++++----
 .../dialog/ProjectCollectionParameters.vue    |  5 +-
 5 files changed, 137 insertions(+), 41 deletions(-)

diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index 69b6313b3..513d2861f 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -1,4 +1,13 @@
 <template>
+  <a-modal
+    :title="listTitle"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
@@ -11,7 +20,7 @@
       >
         <a-row :gutter='24'>
           <a-col :span="12">
-            <div class="box-title-text">
+            <div class="box-title-text" style='margin-top: -33px'>
               <div class="title-text">
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('cutoffTime')">
@@ -36,10 +45,10 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
-      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
-    </div>
+<!--    <div class='drawer-bootom-button'>-->
+<!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+<!--    </div>-->
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -69,6 +78,7 @@
     </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
+  </a-modal>
 </template>
 
 <script>
@@ -85,12 +95,14 @@ export default {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
+      listTitle:this.$t('OneclickCollection'),
       total: 0,
       selectedRowKeysDate: {},
       loading: false,
       editId: '',
       visibleoperationFailed:false,
       newVisible: false,
+      visible:false,
       textLoading:false,
       NotSelectedRowKeysValue:[],
       labelCol: {
@@ -134,6 +146,9 @@ export default {
     }
   },
   methods: {
+    searchData(){
+      this.visible = true
+    },
     loadData() {
       this.loading = true
       let params = {
@@ -158,6 +173,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
+      this.visible = false
       this.$emit('areaVisibleTaskCutOffTimeflag', false)
     },
     handleTableChange(val) {
@@ -289,33 +305,40 @@ export default {
 /deep/.ant-modal-body{
   height: 100% !important;
 }
+/deep/.ant-form-item-control{
+  width: 323%;
+  margin-top: 29px;
+}
 .box-title-text {
   line-height: 1.4;
   display: flex;
-  width: 276px;
-  /*align-items: center;*/
+  align-items: center;
+  /*margin-bottom: 10px;*/
 }
 
 .title-text {
-  width: 90px;
-  text-align: right;
+  width: 100%;
+  color: #000F16;
   display: inline-block;
-  font-weight: bold;
+  font-weight: 500;
   font-size: 14px;
   margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .box-input {
   display: inline-block;
+  width: 70%;
   height: 38px;
-  width: 100%;
+  margin-top: 2px;
 }
 
 .itemModel {
-  width: calc(100% - 130px);
+  width: 100%;
   display: inline-block;
   margin-top: 2px;
 }
diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue
index 51541571b..8a79f9690 100644
--- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue
+++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue
@@ -1,4 +1,13 @@
 <template>
+  <a-modal
+    :title="listTitle"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
@@ -11,7 +20,7 @@
       >
         <a-row :gutter='24'>
           <a-col :span="12">
-            <div class="box-title-text" >
+            <div class="box-title-text" style='margin-top: -33px'>
               <div class="title-text">
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('cutoffTime')">
@@ -36,10 +45,10 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
-      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
-    </div>
+<!--    <div class='drawer-bootom-button'>-->
+<!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+<!--    </div>-->
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -70,6 +79,7 @@
     </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
+  </a-modal>
 </template>
 
 <script>
@@ -86,9 +96,11 @@ export default {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
+      listTitle:this.$t('OneclickCollection'),
       total: 0,
       selectedRowKeysDate: {},
       loading: false,
+      visible:false,
       editId: '',
       visibleoperationFailed:false,
       newVisible: false,
@@ -134,6 +146,9 @@ export default {
     }
   },
   methods: {
+    searchData(){
+      this.visible = true
+    },
     loadData() {
       this.loading = true
       let params = {
@@ -158,6 +173,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
+      this.visible = false
       this.$emit('areaVisibleTaskCutOffTimeAll', false)
     },
     handleTableChange(val) {
@@ -286,33 +302,40 @@ export default {
 
 </style>
 <style scoped>
+/deep/.ant-form-item-control{
+  width: 323%;
+  margin-top: 29px;
+}
 .box-title-text {
   line-height: 1.4;
   display: flex;
-  width: 276px;
-  /*align-items: center;*/
+  align-items: center;
+  /*margin-bottom: 10px;*/
 }
 
 .title-text {
-  width: 90px;
-  text-align: right;
+  width: 100%;
+  color: #000F16;
   display: inline-block;
-  font-weight: bold;
+  font-weight: 500;
   font-size: 14px;
   margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .box-input {
   display: inline-block;
+  width: 70%;
   height: 38px;
-  width: 100%;
+  margin-top: 2px;
 }
 
 .itemModel {
-  width: calc(100% - 130px);
+  width: 100%;
   display: inline-block;
   margin-top: 2px;
 }
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index cc18460e9..9c56825ee 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -25,10 +25,11 @@
           <span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span>
           <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
         </div>
+<!--        {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
         <span slot="ParameterDescription" slot-scope="text,record" :title="text">
-            {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}
-        </span>
 
+          <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
+        </span>
         <span slot="operationbtn" slot-scope="record">
            <span v-if='currentPersonRole === "homo"'>
 <!--           认证工程师  -->
@@ -192,6 +193,18 @@
         </div>
       </div>
     </a-modal>
+    <!--  参数说明--->
+    <a-modal v-model="seeVisibleView" :title="$t('ParameterDescription')" width='550px' :footer="null">
+      <div class="content-text">
+        <div class="textfield">
+          <span class="textfield-left" :title="$t('ParameterDescription')">{{$t('ParameterDescription')}}:</span>
+          <span class="textfield-right"
+                :title="this.description"
+          >{{this.description}}</span>
+        </div>
+      </div>
+    </a-modal>
+
   </div>
 </template>
 
@@ -219,6 +232,7 @@
         default: {},
         require: true
       },
+      description:'',
       formInline: {
         type: Object,
         default: true
@@ -331,6 +345,7 @@
         Dateline: {},
         getquerySdtId: '', // 当前工程接口人的id
         areaVisibleView: false, // 查看配置得弹框
+        seeVisibleView:false,
         configDetail: {} // 查看配置得详细信息
       }
     },
@@ -376,6 +391,12 @@
         this.$emit('handlePreservation')
         this.getTableList()
       },
+      onClickTitle(val){
+        console.log(val)
+        this.description = val.description
+        this.seeVisibleView = true
+
+      },
       // 查看配置详细信息
       onClickSee(val) {
         let _this = this
@@ -662,6 +683,7 @@
               }
             })
             this.columns = [...this.columns]
+            this.$forceUpdate()
           }
         })
       },
@@ -919,6 +941,34 @@
         font-weight: 400;
       }
     }
+    .textfield {
+      width: 100%;
+      margin-bottom: 8px;
+      display: flex;
+
+      .textfield-left {
+        width: 80px;
+        display: inline-block;
+        font-size: 16px;
+        color: #040B29;
+        font-weight: 400;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+
+      .textfield-right {
+        display: inline-block;
+        font-size: 16px;
+        //text-overflow: ellipsis;
+        //white-space: nowrap;
+        width: 100%;
+        overflow: hidden;
+        word-break: break-word;
+        color: #040B29;
+        font-weight: 400;
+      }
+    }
   }
 </style>
 <style>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 1eae46f47..904a21025 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -290,17 +290,17 @@
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
     <!--  下发收集--->
-    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">
-      <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
+<!--    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
+      <task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
-    </a-modal>
+<!--    </a-modal>-->
     <!--  一键下发收集--->
-    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">
-      <task-time v-if='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
+<!--    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
+      <task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
-    </a-modal>
+<!--    </a-modal>-->
 <!--    调整责任领域-->
     <a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
       <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
@@ -1195,7 +1195,7 @@
         if(this.selectedRowKeysValue.length == 0){
           this.$message.warning(this.$t('selectLeastOne'))
         }else{
-          this.areaVisibleTaskCutOffTime = true
+          this.$refs.areaVisibleTaskCutOffTime.searchData()
         }
         // let homodistributionAndCollection = this.homodistributionAndCollection()
         // if (homodistributionAndCollection == 1) {
@@ -1211,7 +1211,8 @@
       },
       // 一键下发收集
       defOneclickCollection() {
-          this.OneclickCollection = true
+        this.$refs.OneclickCollection.searchData()
+          // this.OneclickCollection = true
       },
       // // 下发收集---请求接口
       // distributionAndCollection() {
@@ -1538,13 +1539,9 @@
       // },
       // 截至时间确定弹框关闭
       areaVisibleTaskCutOffTimeflag(val) {
-        console.log(val)
-        this.areaVisibleTaskCutOffTime = val
         this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
       areaVisibleTaskCutOffTimeAll(val){
-        console.log(val)
-        this.OneclickCollection = val
         this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
       AdjustareasofresponAll(val){
diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
index 513a951b2..fa940c45d 100644
--- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
@@ -78,7 +78,7 @@
     </div>
     <!--  清单弹框  -->
     <a-modal v-model="listVisible" :title="$t('parameterTemplate')" width='700px' :footer="null">
-      <parameter-template v-if='listVisible' @listVisibleRow='listVisibleRow'></parameter-template>
+      <parameter-template v-if='listVisible' @areaVisible='drawerhandleCancel' @listVisibleRow='listVisibleRow'></parameter-template>
     </a-modal>
   </div>
 </template>
@@ -250,6 +250,9 @@ export default {
     handleCancel() {
       this.$emit('areaVisible', false)
     },
+    drawerhandleCancel(val) {
+      this.listVisible = val
+    },
     onSelectChange(selectedRowKeys, selectedRowKeysDate) {
       this.selectedRowKeysDate = selectedRowKeysDate
       this.selectedRowKeys = selectedRowKeys