合并分支 'dev_third_stage' 到 'feature_20221014_noLogo'

Dev third stage

查看合并请求 laws-nio/laws-weilai!189

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

@@ -3,11 +3,11 @@ module.exports = {
   account: 'User Account',
   EnterAccountFuzzyQuery: 'Enter Account Fuzzy Search',
   Gender: 'Gender',
-  pleaseSelect: 'Please Select',
+  pleaseSelect: 'Please Select ',
   male: 'Male',
   female: 'Female',
   RealName: 'User Name',
-  pleaseEnter: 'Please Enter',
+  pleaseEnter: 'Please Enter ',
   phoneNumber: 'Phone Number',
   query: 'Search',
   userStatues: 'User Status',
@@ -199,6 +199,7 @@ module.exports = {
   OperationType: 'Operation Type',
   selectOperationType: 'Please select Operation type',
   selectProblemClassification:'Please select Problem Classification',
+  selectTranslationResults:'Please select Translation results',
   selectMarket:'Please select Market',
   RequestMethod: 'Request Method',
   RequestParameters: 'Request Parameters',
@@ -348,8 +349,8 @@ module.exports = {
   standard: 'Number',
   title: 'Title',
   TextStatus: 'Text Status',
-  PleaseEnter: 'Please enter',
-  PleaseSelect: 'Please select',
+  PleaseEnter: 'Please enter ',
+  PleaseSelect: 'Please select ',
   PleaseEnterOrSelect: 'Please Enter Or Select',
   ModificationTime: 'Modification Time',
   ModificationContent: 'Modification Content',

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

@@ -197,10 +197,11 @@ module.exports = {
   enterSearchKeyword: '请输入搜索关键词',
   enterSearchContent:'请输入搜索内容',
   enterStandard:'请输入编号',
-  enterTitle:'请输入标题',
+  entertitle:'请输入标题',
   OperationType: '操作类型',
   selectOperationType: '请选择操作类型',
   selectProblemClassification:'请选择问题分类',
+  selectTranslationResults:'请选择翻译结果',
   selectMarket:'请选择市场',
   RequestMethod: '请求方法',
   RequestParameters: '请求参数',

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

@@ -219,6 +219,17 @@
         localStorage.removeItem('serial_number')
       }
       this.isTrue = true
+      let BaseQuery = localStorage.getItem('problemknowledgeBase')
+      if (BaseQuery) {
+        let content = JSON.parse(BaseQuery)
+        if (content.id) {
+          this.isTrue = false
+          this.$nextTick(() => {
+            this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(content)))
+          })
+        }
+        localStorage.removeItem('problemknowledgeBase')
+      }
       this.getList()
       this.replacePage()
     },
@@ -351,7 +362,7 @@
           pageSize: this.pageSize,
           searchStr: this.searchStr,
           problemTypes: selectedTags.join(','),
-          releaseStatus:'Have released'
+          releaseStatus: 'Have released'
         }
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -8,7 +8,7 @@
               <div class="title-text" :title="$t('standard')">
                 <span>{{$t('standard')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+              <j-input class="box-input" :placeholder="$t('enterStandard')"
                        v-model="queryParam.serialNumber"></j-input>
             </div>
           </a-col>
@@ -17,7 +17,7 @@
               <div class="title-text" :title="$t('title')">
                 <span>{{$t('title')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+              <j-input class="box-input" :placeholder="$t('entertitle')"
                        v-model="queryParam.title"></j-input>
             </div>
           </a-col>
@@ -27,7 +27,7 @@
                 <span>{{$t('translationResults')}}</span>
               </div>
               <j-dict-select-tag class="box-input" v-model="queryParam.translationResult"
-                                 :placeholder="$t('PleaseSelect')+$t('translationResults')"
+                                 :placeholder="$t('selectTranslationResults')"
                                  :type="'select'"
                                  :triggerChange="false" dictCode="translation_result"/>
             </div>

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

@@ -176,13 +176,20 @@
         })
       },
       checkedClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/problemKnowledgeBaseView',
+        localStorage.setItem('problemknowledgeBase',JSON.stringify(item))
+        this.$router.push({
+          path: '/problemknowledgeBase',
           query: {
             id: item.id
           }
         })
-        window.open(newUrl.href, '_blank')
+        // let newUrl = this.$router.resolve({
+        //   path: '/problemknowledgeBase',
+        //   query: {
+        //     id: item.id
+        //   }
+        // })
+        // window.open(newUrl.href, '_blank')
       },
       pageOnChange(page, pageSize) {
         this.pageNo = page