From fe2c854acbda5041c1d62d6fed324f96c4d7e905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Wed, 7 Sep 2022 18:03:41 +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

---
 .../classificationMaintenanceModel.vue        |  6 ++--
 .../components/countryCardReleaseModel.vue    |  6 ++--
 .../components/optionMaintenance.vue          |  6 ++--
 .../components/TermInformation.vue            |  3 +-
 .../src/views/dashboard/components/myList.vue | 29 +++++++++----------
 .../components/documentDataComparison.vue     |  4 +--
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
index b3616ccb1..3b19b75c0 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
@@ -41,9 +41,9 @@
         </div>
       </div>
 
-      <div class="drawer-bootom-button">
-        <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>
-      </div>
+<!--      <div class="drawer-bootom-button">-->
+<!--        <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>-->
+<!--      </div>-->
     </a-drawer>
     <classificationMaintenanceAdd ref="classificationMaintenanceAddRef"
                                   @classificationMaintenanceAddForm="classificationMaintenanceAddForm"/>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue
index f21f47d46..ddab3183e 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue
@@ -46,9 +46,9 @@
         </div>
       </div>
 
-      <div class="drawer-bootom-button">
-        <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>
-      </div>
+<!--      <div class="drawer-bootom-button">-->
+<!--        <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>-->
+<!--      </div>-->
     </a-drawer>
     <countryCardReleaseModelAdd ref="countryCardReleaseModelAddRef"
                                 @countryCardReleaseModelAddForm="countryCardReleaseModelAddForm"/>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue
index efb36c7bd..959d1be1a 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue
@@ -41,9 +41,9 @@
         </div>
       </div>
 
-      <div class="drawer-bootom-button">
-        <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>
-      </div>
+<!--      <div class="drawer-bootom-button">-->
+<!--        <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>-->
+<!--      </div>-->
     </a-drawer>
     <optionMaintenanceAdd ref="optionMaintenanceAddRef"
                           @optionMaintenanceAddForm="optionMaintenanceAddForm"/>
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 1ea9fa210..bb0933465 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -75,7 +75,8 @@
             title: this.$t('clauseNo'),
             dataIndex: 'itemNum',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 120
           },
           {
             title: this.$t('clauseName'),
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 48c345398..0779fe942 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -11,7 +11,7 @@
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
           <span class="top-text" :title="item.prcName">{{item.prcName}}</span>
-          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>
+<!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
         </div>
         <div class="button">
           {{item.creatTime}}
@@ -161,25 +161,24 @@
             font-family: Blue Sky Noto;
             font-weight: 400;
             color: #040B29;
-            max-width: 50%;
+            max-width: calc(100% - 72px);
             display: inline-block;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
           }
-
-          .top-admin {
-            font-size: 16px;
-            font-family: Blue Sky Noto;
-            display: inline-block;
-            font-weight: 400;
-            color: #040B29;
-            margin-left: 4px;
-            max-width: calc(50% - 72px);
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
+          /*.top-admin {*/
+          /*  font-size: 16px;*/
+          /*  font-family: Blue Sky Noto;*/
+          /*  display: inline-block;*/
+          /*  font-weight: 400;*/
+          /*  color: #040B29;*/
+          /*  margin-left: 4px;*/
+          /*  max-width: calc(50% - 72px);*/
+          /*  overflow: hidden;*/
+          /*  text-overflow: ellipsis;*/
+          /*  white-space: nowrap;*/
+          /*}*/
         }
 
         .button {
diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
index 7eb1bf38e..51876de9c 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
@@ -377,7 +377,7 @@
           return
         }
         for (let i = 0; i < this.resultData.textLeft.length; i++) {
-          if (node.parentId && node.itemName == this.resultData.textLeft[i].itemsName) {
+          if (node.parentId && node.menuId == this.resultData.textLeft[i].menuId) {
             detailContent[0].scrollTop = detailLeft[i].offsetTop - 150
             return
           }
@@ -392,7 +392,7 @@
           return
         }
         for (let i = 0; i < this.resultData.textRight.length; i++) {
-          if (node.parentId && node.itemName == this.resultData.textRight[i].itemsName) {
+          if (node.parentId && node.menuId == this.resultData.textRight[i].menuId) {
             detailContent[0].scrollTop = detailRight[i].offsetTop - 150
             return
           }