Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/common/lang/en-us.js

@@ -1310,4 +1310,5 @@ module.exports = {
   notExport:'Not export',
   hasBeenExport:'Has been export',
   firstLevelDirectory:'First level directory',
+  deselectAll:'Deselect All',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1411,4 +1411,5 @@ module.exports = {
   notExport:'未导出',
   hasBeenExport:'已导出',
   firstLevelDirectory:'一级目录',
+  deselectAll:'取消全选',
 }

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue

@@ -27,8 +27,10 @@
                 <div v-for="(item2,index2) in item1.list" style="width: 340px;display: inline-block"
                      class="content-box-left">
                   <div class="content-box-box-top" style="cursor: default" v-if="index == 0">
-                    <img class="content-box-box-img" style="display: inline-block;width: auto" v-if="index2 == 0">
-                    <img :src="item2.img" v-else class="content-box-box-img" alt="">
+                    <span class="content-box-box-img content-box-box-img-text" v-if="index2 == 0"></span>
+                    <span class="content-box-box-img-index" v-else>
+                      <img :src="item2.img" class="content-box-box-img" alt="">
+                    </span>
                     <span v-if="index2 == 0" class="content-box-box-text"></span>
                     <div v-else class="content-box-box-text">
                       {{item2.applyMarket_dictText}}
@@ -37,15 +39,22 @@
                   </div>
                   <div class="content-box-box" :class="{'content-box-box-color':index % 2 == 1 ? true : false}" v-else>
                     <a v-if="index2 == 0 && item2.relevantUrl"
-                       style="color: rgb(33, 201, 204)"
+                       style="color: rgb(33, 201, 204);font-weight: bold"
                        :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
                        class="content-box-box-text content-box-box-text-index"
                        :href="item2.relevantUrl" target="_blank">{{item2.lableName}}</a>
+                    <span v-else-if="index2 == 0"
+                          :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
+                          class="content-box-box-text content-box-box-text-index"
+                          style="color: #040B29;font-weight: bold">
+                         {{item2.lableName}}
+                    </span>
                     <span style="color: #21c9cc"
                           :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
                           class="content-box-box-text content-box-box-text-index"
                           @click="viewFileClick(item2.lableName)"
                           v-else-if="item2.lableType == 7 && item2.lableName && index2 != 0">
+
                          {{$t('viewFile')}}
                     </span>
                     <span class="content-box-box-text content-box-box-text-index"
@@ -349,7 +358,7 @@
 
   .content-box-box-top {
     width: 340px;
-    height: 160px;
+    height: 115px;
     display: inline-block;
     cursor: pointer;
     background: #fff;
@@ -359,13 +368,13 @@
     border-bottom: 1px #d9d9d9 solid;
 
     .content-box-box-img {
-      width: 238px;
-      height: 100%;
+      width: 169px;
+      /*height: 100%;*/
     }
 
     .content-box-box-text {
       display: inline-block;
-      width: calc(100% - 238px);
+      width: calc(100% - 169px);
       text-align: center;
       font-size: 18px;
       font-weight: 500;
@@ -400,7 +409,7 @@
 
     .content-box-box-text {
       display: inline-block;
-      width: calc(100% - 238px);
+      width: calc(100% - 169px);
       text-align: center;
       font-size: 18px;
       font-weight: 500;
@@ -427,7 +436,7 @@
   .content-box-top:first-child {
     position: sticky;
     top: 0;
-    height: 160px;
+    height: 115px;
     z-index: 111;
     background: #fff;
   }
@@ -448,4 +457,20 @@
   .content-box-box-color {
     background: #f2f2f2;
   }
+
+  .content-box-box-img-text {
+    width: auto !important;
+    display: inline-block;
+    height: 112px;
+    vertical-align: middle;
+    border-style: none;
+  }
+
+  .content-box-box-img-index {
+    width: 169px;
+    height: 112px;
+    display: inline-block;
+    vertical-align: middle;
+    border-style: none;
+  }
 </style>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue

@@ -31,6 +31,10 @@
         </a-form>
       </div>
       <div class="box-content-right">
+        <div @click="deselectAllClick" class="operator-text">
+          <a-icon type="eye"/>
+          {{$t('deselectAll')}}
+        </div>
         <div @click="selectAllClick" class="operator-text">
           <a-icon type="eye"/>
           {{$t('selectAll')}}
@@ -106,6 +110,16 @@
           })
         })
       },
+      deselectAllClick(){
+        this.dataList.forEach(res => {
+          res.showOrNot = false
+          this.dataListOne.forEach(val => {
+            if (res.id == val.id) {
+              val.showOrNot = false
+            }
+          })
+        })
+      },
       searchQuery() {
         if (this.queryParam.labelName) {
           this.dataList = this.dataList.filter(res => {
@@ -220,10 +234,13 @@
 
   .operator-text {
     cursor: pointer;
-    margin-right: 13px;
+    margin-right: 56px;
     font-size: 14px;
     font-weight: 400;
     color: #040B29;
     display: inline-block;
   }
+  .operator-text:last-child{
+    margin-right: 13px;
+  }
 </style>

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -37,9 +37,9 @@
             {{$t('DocumentComparison')}}
           </div>
           <div @click="KnowledgeDatabaseClick" v-has="'bussLog:database'" class="operator-text-text"
-               :title="$t('KnowledgeDatabase')">
+               :title="$t('problemKnowledgeBase')">
             <a-icon type="folder"/>
-            {{$t('KnowledgeDatabase')}}
+            {{$t('problemKnowledgeBase')}}
           </div>
         </div>
       </div>