From 0df8425cbd1882a983a8142dc134cb0865966029 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 10:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 106 ++++++++++--------
 .../src/components/TaskCutOffTime/index.vue   |   2 +-
 .../src/components/tableCollection/index.vue  |   2 +-
 .../src/components/uploadFileChange/file.vue  |   2 +-
 .../ParameterItemCollectionList.vue           |  41 ++++++-
 5 files changed, 101 insertions(+), 52 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index e133eb8b3..f3b7439c7 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -24,7 +24,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
@@ -32,7 +32,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -41,7 +41,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -49,7 +49,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -57,7 +57,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -66,7 +66,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -75,7 +75,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -84,7 +84,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -156,7 +156,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="text"'>
+          <div v-else-if='item.type==="text"'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -176,7 +176,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
@@ -185,7 +185,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -194,7 +194,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -202,7 +202,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -210,7 +210,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -219,7 +219,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -228,7 +228,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -237,7 +237,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -271,7 +271,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
@@ -280,7 +280,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -289,7 +289,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -297,7 +297,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -305,7 +305,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -314,7 +314,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -323,7 +323,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -332,7 +332,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -378,7 +378,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
@@ -387,7 +387,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -396,7 +396,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -404,7 +404,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -412,7 +412,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -421,7 +421,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -430,7 +430,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -439,7 +439,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -472,7 +472,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="file"'>
+          <div v-else-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
                       @click="clickButtonToUpload(item)">
               {{ (item.dataValue === 'null' || item.dataValue === '' ||
@@ -496,7 +496,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="file"'>
+          <div v-else-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
                       @click="clickButtonToUpload(item)">
               {{ (item.dataValue === 'null' || item.dataValue === '' ||
@@ -540,7 +540,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :maxLength="1000"
@@ -549,7 +549,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -558,7 +558,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -566,7 +566,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -574,7 +574,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -583,7 +583,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -592,7 +592,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -601,7 +601,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -717,6 +717,7 @@
   .ant-table td {
     white-space: nowrap;
   }
+
   .selectWid .ant-select-selection--multiple {
     overflow: auto;
   }
@@ -724,6 +725,14 @@
   .selectWid .ant-select-selection--multiple::-webkit-scrollbar {
     display: none; /* Chrome Safari */
   }
+
+  .selectWid .ant-select-selection {
+    height: 38px !important;
+    line-height: 38px!important;
+  }
+  .selectWid .ant-select-selection__rendered {
+    line-height: 36px!important;
+  }
 </style>
 <style lang="less" scoped>
   .box {
@@ -742,7 +751,7 @@
   }
 
   .add_flex {
-    display: flex;
+    /*display: flex;*/
   }
 
   /deep/ .box {
@@ -760,11 +769,14 @@
 
   .inputWid {
     min-width: 150px;
+    height: 38px;
+    display: inline-block;
   }
 
   .add-width {
-    width: 33%;
+    width: calc(33.3% - 5px);
     margin-right: 5px;
+    float: left;
   }
 
   .add--number {
@@ -774,9 +786,11 @@
   .ant-input-disabled {
     color: rgba(0, 0, 0, 0.65);
   }
-  .ant-select-disabled{
+
+  .ant-select-disabled {
     color: rgba(0, 0, 0, 0.65);
   }
+
   .itemOption {
     display: inline-block;
     width: 100%;
diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index c343426d7..52b1da1ed 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -12,7 +12,7 @@
         <a-row :gutter='24'>
           <a-col :span='24'>
             <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>
-                <a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
+                <a-date-picker :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
               </span>
           </a-col>
         </a-row>
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index b6b8b2c25..c655dfdc0 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -7,7 +7,7 @@
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 160px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 230px)'}"
         :data-source="dataSource"
         :loading="loading"
         sticky
diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue
index 1a29bf328..f07c8a165 100644
--- a/jero-web/src/components/uploadFileChange/file.vue
+++ b/jero-web/src/components/uploadFileChange/file.vue
@@ -56,7 +56,7 @@ export default {
     this.containerId = 'container-ty-' + new Date().getTime()
   },
   mounted() {
-    console.log(this.detailDate,'lldetailDate')
+    // console.log(this.detailDate,'lldetailDate')
     let long = localStorage.getItem('language')
     this.cut = ''
     if (long && long == 'zh-cn') {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index f714583fd..3184fb619 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -75,7 +75,7 @@
               </a-form>
             </div>
           </div>
-          <div class="table-operator">
+          <div class="table-operator" v-if="!this.$route.query.it">
             <!--      // 认证工程师 homo-->
             <!--      // 工程接口人 sdt-->
             <!--      // 填写人 dre-->
@@ -154,6 +154,7 @@
             </div>
             <!--       角色切换   -->
             <div class="operator-text"
+                 v-if="!this.$route.query.it"
                  @click="roleSwitchingClick">
               <a-icon type="select"/>
               {{ $t('roleSwitching') }}
@@ -178,6 +179,7 @@
     </a-modal>
     <!--  冻结配置--->
     <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
+      <a-spin :spinning="confirmLoading">
       <a-form-model
         class='tag-module'
         ref='ruleForm'
@@ -201,6 +203,7 @@
           </a-col>
         </a-row>
       </a-form-model>
+      </a-spin>
       <div style='padding-left: 60px;color: red'>
         {{$t('Attentionfreeze')}}
       </div>
@@ -461,6 +464,7 @@
         templatetitleId: '',
         rowId: '',
         version: 0,
+        confirmLoading:false,
         itemId: '',
         selectedRowKeysValue: [], // table列表所选得数据
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -851,7 +855,22 @@
         this.areaVisibleFreeze = true
         this.Dateline = {}
         //  获取冻结配置数据
-        this.getFreeze()
+        this.confirmLoading = true
+        this.getFreeze(()=> {
+          this.getLockedConfigIdList()
+        })
+      },
+      getLockedConfigIdList() {
+        getAction('/params/collectManifest/getLockedConfigIdList',
+          { paramsManifestId: this.paramsManifest.id }).then((res) => {
+          if (res.success) {
+            this.Dateline.paramsConfig = res.result
+            this.Dateline = {...this.Dateline}
+          }else{
+            this.Dateline.paramsConfig = []
+          }
+          this.confirmLoading = false
+        })
       },
       // 冻结配置提交
       handleSubmitFreeze() {
@@ -894,7 +913,7 @@
       cancleImportsFreeze() {
         this.areaVisibleFreeze = false
       },
-      getFreeze() {
+      getFreeze(callback) {
         let _this = this
         let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
         axios({
@@ -916,11 +935,15 @@
           .then((res) => {
             if (res.data.success) {
               this.FreezeList = res.data.result
+              callback && callback()
             } else {
               _this.$message.warning(res.data.message)
+              _this.confirmLoading = false
             }
+
           })
           .catch((error) => {
+            _this.confirmLoading = false
           })
       },
       // 下发收集的权限
@@ -1345,7 +1368,19 @@
     }
   }
 </script>
+<style>
+  .popconfirm {
+    z-index: 999;
+  }
 
+  .popconfirm .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirm .anticon-exclamation-circle {
+    display: none !important;
+  }
+</style>
 <style lang="less" scoped>
   @import '~@assets/less/common.less';