From 76e1054cc97323d4b78ce1a8c603dcc616150bc6 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 7 Jul 2022 09:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/searchalonesplit/index.vue |  8 +++----
 .../searchCenter/components/whole.vue         | 23 +++++++++++--------
 .../commponts/conventionalmodle.vue           |  6 ++---
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue
index 77bfd3a66..ee71b3b6e 100644
--- a/jero-web/src/components/searchalonesplit/index.vue
+++ b/jero-web/src/components/searchalonesplit/index.vue
@@ -23,14 +23,14 @@
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
-            <a-input class="box-input" style='width: 226px' :placeholder="$t('PleaseEnter')+item.db_field_txt"
+            <a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+item.db_field_txt"
                      v-model="queryParam[item.db_field_name]"></a-input>
           </div>
           <div class="box-title-text" v-else-if="item.field_show_type == '2'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
-            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+            <a-input-number class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+item.db_field_txt"
                             v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
           </div>
           <div class="box-title-text" v-else-if="item.field_show_type == '4'">
@@ -90,14 +90,14 @@
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+            <a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+item.db_field_txt"
                      v-model="queryParam[item.db_field_name]"></a-input>
           </div>
           <div class="box-title-text" v-else-if="item.field_show_type == '2'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
-            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+            <a-input-number class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+item.db_field_txt"
                             v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
           </div>
           <div class="box-title-text" v-else-if="item.field_show_type == '4'">
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 899af7f78..43aaff7fb 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -11,31 +11,34 @@
           <div class="text-text-right"
                :class="{ 'null-input':item.checked }">
             <div class="text-header" @click="titleClick(item)">
-              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" >
                 <template slot="title">
                   <span v-html="item.module_type"></span>
                 </template>
-                <span v-html="item.module_type"></span>
-              </a-tooltip>
-              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+                <span style="cursor: pointer" v-html="item.module_type"></span>
                 <template slot="title">
                   <span v-html="item.serial_number"></span>
                 </template>
                 <span style="cursor: pointer"
-                       v-html="item.serial_number"></span>
-              </a-tooltip>
-              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+                      v-html="item.serial_number"></span>
                 <template slot="title">
                   <span v-html="item.title"></span>
                 </template>
                 <span style="cursor: pointer" v-html="item.title"></span>
-              </a-tooltip>
-              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
                 <template slot="title">
                   <span v-html="item.file_name"></span>
                 </template>
                 <span style="cursor: pointer" v-html="item.file_name"></span>
               </a-tooltip>
+<!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
+
+<!--              </a-tooltip>-->
+<!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
+
+<!--              </a-tooltip>-->
+              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+
+              </a-tooltip>
             </div>
             <a-tooltip placement="topLeft" v-if="!queryParam.selectValue" :mouseEnterDelay="0.5">
               <template slot="title">
@@ -262,7 +265,7 @@
       font-weight: bold;
       color: #040B29;
       display: inline-block;
-      max-width: 200px;
+      max-width: 500px;
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index e61148de4..ccffec82e 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -42,7 +42,7 @@
                                         :options="dictOptions"
                                         :placeholder="$t('PleaseSelect')+$t('configure')"
                                         :type="'select'"
-                                        :triggerChange="false" :dictCode="'cert_category'"/>
+                                        :triggerChange="false"/>
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -75,7 +75,7 @@
                 <span class="title-text-text"
                       :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="this.disabled == true?'separator':''">
+                  <a-form-model-item class="itemModel" :prop="required?'separator':''">
 <!--                    :disabled="disabled"-->
                     <a-input class="box-input"
 
@@ -180,10 +180,8 @@ export default {
       console.log(value.target.value)
       if(value.target.value == 2){
         this.required = true
-        this.disabled = true
       }else{
         this.required = false
-        this.disabled = false
       }
     },
     getNameList() {