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

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

@@ -199,6 +199,7 @@ module.exports = {
   OperationType: 'Operation Type',
   selectOperationType: 'Please select Operation type',
   selectProblemClassification:'Please select Problem Classification',
+  selectClassification:'Please select Classification',
   selectTranslationResults:'Please select Translation results',
   selectMarket:'Please select Market',
   RequestMethod: 'Request Method',

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

@@ -201,6 +201,7 @@ module.exports = {
   OperationType: '操作类型',
   selectOperationType: '请选择操作类型',
   selectProblemClassification:'请选择问题分类',
+  selectClassification:'请选择分类',
   selectTranslationResults:'请选择翻译结果',
   selectMarket:'请选择市场',
   RequestMethod: '请求方法',

jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue

@@ -98,7 +98,7 @@
                                 :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                 :type="'checkbox'"
                                 :disabled="disabled"
-                                :triggerChange="false" :dictCode="'apply_scope'"/>
+                                :triggerChange="false" :dictCode="'fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2'"/>
           </a-form-model-item>
         </div>
       </a-col>

jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue

@@ -4,8 +4,8 @@
       <div class="text-left">
         <div class="text-left-wrap">
           <div class="text-left-select">
-            <span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
-            <a-select :placeholder="$t('selectProblemClassification')"
+            <span class="text-sel" :title="$t('classification')">{{$t('classification')}}</span>
+            <a-select :placeholder="$t('selectClassification')"
                       class="text-select"
                       mode="multiple"
                       :getPopupContainer="triggerNode=> triggerNode.parentNode"

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -1456,15 +1456,18 @@
         this.selectedRowKeys = value
       },
       searchQuery() {
+        this.selectedRowKeys = []
         this.getList()
       },
       searchReset() {
         this.queryParam = {}
+        this.selectedRowKeys = []
         this.$refs.globalAdvancedQueryRef.resetLine()
         this.$refs.globalAdvancedQueryRef.emitCallback()
         // this.getList()
       },
       addModelList() {
+        this.selectedRowKeys = []
         this.getList()
       },
       handleSuperQuery(params, matchType) {
@@ -2130,7 +2133,7 @@
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
@@ -2151,7 +2154,7 @@
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
           window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix)
           window.open(url, '_blank')
         } else {
@@ -2484,17 +2487,17 @@
   }
 
   ::v-deep .ant-table-body-one {
-    padding-bottom: 0!important;
+    padding-bottom: 0 !important;
   }
 
   ::v-deep .antfixedLeft {
-    padding-bottom: 0!important;
-    overflow: scroll!important;
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
   }
 
   ::v-deep .antfixedRight {
-    padding-bottom: 0!important;
-    overflow: scroll!important;
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
   }
 </style>
 <style>