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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -293,7 +293,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //文档动态信息添加
         if(StringUtils.isNotBlank(sbTemp)){
             HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
-            String msgContent = "The " + StringUtils.join(serialNumberListTemp,",") + " has been deleted from the document library.";
+            String msgEndStr = " has been deleted from the document library.";
+            if (serialNumberListTemp.size() > 1) {
+                msgEndStr = " have been deleted from the document library.";
+            }
+            String msgContent = "The standard " + StringUtils.join(serialNumberListTemp,",") + msgEndStr;
             homeDocumentDynamicEO.setMsgContent(msgContent);
             homeDocumentDynamicEO.setMsgContentInfo(msgContent);
             homeDocumentDynamicEOService.save(homeDocumentDynamicEO);
@@ -2596,8 +2600,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         StringBuilder msgContentSb = new StringBuilder();
         StringBuilder msgContentInfoSb = new StringBuilder();
         //适用车型
-        StringBuilder msgContentSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + serialNumber + " " + titleEn);
-        StringBuilder msgContentInfoSbCarType = new StringBuilder("Vehicle Type of the " + category + " "  + href);
+        StringBuilder msgContentSbCarType = new StringBuilder("Vehicle Type of the standard " + category + " " + serialNumber + " " + titleEn);
+        StringBuilder msgContentInfoSbCarType = new StringBuilder("Vehicle Type of the standard " + category + " "  + href);
         //状态
         StringBuilder msgContentSbStatus = new StringBuilder("The Status of the standard " + category + " " + serialNumber + " " + titleEn);
         StringBuilder msgContentInfoSbStatus = new StringBuilder("The Status of the standard " + category + " "  + href);
@@ -2634,8 +2638,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
                 //
                 if(StringUtils.isBlank(value)){
-                    msgContentSbStatus.append(" has been modified to be null ,");
-                    msgContentInfoSbStatus.append(" has been modified to be null ,");
+                    msgContentSbStatus.append(" has been modified to be null,");
+                    msgContentInfoSbStatus.append(" has been modified to be null,");
                     msgContentSb.append(msgContentSbStatus);
                     msgContentInfoSb.append(msgContentInfoSbStatus);
                 }else{
@@ -2670,8 +2674,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     value = substring;
                 }
                 if(StringUtils.isBlank(value)){
-                    msgContentSbCarType.append(" has been modified to be null ,");
-                    msgContentInfoSbCarType.append(" has been modified to be null ,");
+                    msgContentSbCarType.append(" has been modified to be null,");
+                    msgContentInfoSbCarType.append(" has been modified to be null,");
                     msgContentSb.append(msgContentSbCarType);
                     msgContentInfoSb.append(msgContentInfoSbCarType);
                 }else{
@@ -2691,8 +2695,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             msgContentInfoSb.append(contentInfoFile);
         }
         if(count > 0){
-            String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1);
-            String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1);
+            String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1) + ".";
+            String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1) + ".";
             HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
             homeDocumentDynamicEO.setMsgContent(msgContent);
             homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo);

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

@@ -37,55 +37,26 @@
       </div>
     </div>
     <div class="content-box">
-      <div class="content-box-box" @click="contentClick()">
+      <div class="content-box-box" v-for="(item,index) in conList" :key="index" @click="contentClick(item)">
         <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
         <span class="content-box-box-text">
-             中国
+             {{item.applyMarket_dictText}}
         </span>
       </div>
-      <div class="content-box-box">
-        <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
-        <span class="content-box-box-text">
-             中国
-        </span>
-      </div>
-      <div class="content-box-box">
-        <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
-        <span class="content-box-box-text">
-             中国
-        </span>
-      </div>
-      <div class="content-box-box">
-        <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
-        <span class="content-box-box-text">
-             中国
-        </span>
-      </div>
-      <div class="content-box-box">
-        <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
-        <span class="content-box-box-text">
-             中国
-        </span>
-      </div>
-      <div class="content-box-box">
-        <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
-        <span class="content-box-box-text">
-             中国
-        </span>
-      </div>
-      <div class="page">
-        <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="pageSize"
-          :total="total"
-          :current="pageNo"
-          @change="pageOnChange"
-          @showSizeChange="SizeChange"
-        />
-      </div>
     </div>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
@@ -101,11 +72,16 @@
         applyMarketList: [],
         pageSize: 10,
         total: 0,
-        pageNo: 1
+        pageNo: 1,
+        loading: false,
+        url: {
+          getInfoList: '/problemKnowledgeBase/countryCardManageReleaseEO/page'
+        }
       }
     },
     mounted() {
       this.getApplyMarketList()
+      this.getList()
     },
     methods: {
       getApplyMarketList() {
@@ -118,10 +94,15 @@
         })
       },
       searchQuery() {
-
+        this.pageNo = 1
+        this.getApplyMarketList()
+        this.getList()
       },
       searchReset() {
-
+        this.pageNo = 1
+        this.getApplyMarketList()
+        this.queryParam = {}
+        this.getList()
       },
       pageOnChange(page, pageSize) {
         this.pageNo = page
@@ -135,14 +116,19 @@
       getList() {
         let query = {
           pageNo: this.pageNo,
-          pageSize: this.pageSize
+          pageSize: this.pageSize,
+          releaseStatus: 'Have released',
+          ...this.queryParam
         }
-        postAction(this.url.getInfoList, query).then((res) => {
+        this.loading = true
+        getAction(this.url.getInfoList, query).then((res) => {
           if (res.success) {
             this.conList = res.result.records
             this.total = res.result.total
+            this.loading = false
           } else {
             this.conList = []
+            this.loading = false
           }
         })
       },
@@ -153,10 +139,13 @@
         })
         window.open(newUrl.href, '_blank')
       },
-      contentClick() {
+      contentClick(row) {
         let newUrl = this.$router.resolve({
           path: '/countryCardView',
-          query: {}
+          query: {
+            applyMarket: row.applyMarket,
+            id: row.id,
+          }
         })
         window.open(newUrl.href, '_blank')
       }
@@ -208,6 +197,7 @@
 
   .content-box {
     width: 100%;
+    overflow: hidden;
   }
 
   .content-box-box {

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

@@ -26,16 +26,19 @@
               <div style="width: 100%" v-for="(item1,index) in 14" class="content-box-top">
                 <div v-for="(item2,index2) in 16" style="width: 340px;display: inline-block" class="content-box-left">
                   <div class="content-box-box-top" v-if="index == 0">
-                    <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
-                    <span class="content-box-box-text">
+                    <img class="content-box-box-img" style="display: inline-block;width: auto" v-if="index2 == 0">
+                    <img src="../../../../assets/mobileHome.png" v-else class="content-box-box-img" alt="">
+                    <span v-if="index2 == 0" class="content-box-box-text"></span>
+                    <span v-else class="content-box-box-text">
                       中国
-                </span>
+                    </span>
+
                   </div>
                   <div class="content-box-box" v-else>
                     <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
                     <span class="content-box-box-text">
                       中国
-                </span>
+                  </span>
                   </div>
                 </div>
               </div>
@@ -63,7 +66,9 @@
     data() {
       return {
         clientWidth: '',
-        isTrue: false
+        isTrue: false,
+        dataList: [],
+        list: '/problemKnowledgeBase/countryCardManageReleaseEO/queryCountryCardManageReleaseByApplyMarkets'
       }
     },
     mounted() {
@@ -72,6 +77,7 @@
         this.clientWidth = 340 * 14 + 'px'
         this.isTrue = true
       })
+      this.queryCountry()
     },
     methods: {
       displayInformationClick() {
@@ -80,8 +86,19 @@
       newlyAddedClick() {
         this.$refs.countryCardViewAddRef.add()
       },
-      countryCardViewAddForm() {
+      countryCardViewAddForm(val) {
 
+      },
+      queryCountry() {
+        let applyMarkets = this.$route.query.applyMarket
+        let query = {
+          applyMarkets: applyMarkets
+        }
+        postAction(this.list, query).then((res) => {
+          if (res.success) {
+
+          }
+        })
       }
     }
   }

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

@@ -14,14 +14,15 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required">*</span>
               <span class="title-text-text"
                     :title="$t('applicableMarket')">{{$t('applicableMarket')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="applicableMarket">
-              <a-input class="box-input"
-                       v-model="formInline.applicableMarket"
-                       :placeholder="$t('PleaseEnter')+$t('applicableMarket')"/>
+              <j-dict-select-tag class="box-input" v-model="formInline.applyMarket"
+                                 :disabled="true"
+                                 :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'region'"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -34,15 +35,24 @@
               <span class="title-text-text" :title="$t('comparisonMarket')+(index+1)">{{$t('comparisonMarket')+(index+1)}}</span>
             </div>
             <a-form-model-item class="itemModel" style="width: calc(100% - 220px)" prop="comparisonMarket">
-              <a-input class="box-input"
-                       v-model="formInline.comparisonMarket"
-                       :placeholder="$t('PleaseEnter')+$t('comparisonMarket')"/>
+              <a-select :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
+                        :disabled="false"
+                        @change="applyMarketChange"
+                        v-model="item.applyMarket">
+                <a-select-option v-for="(item, key) in item.applyMarketList"
+                                 :key="key"
+                                 :value="item.applyMarket">
+                     <span style="display: inline-block;width: 100%" :title=" item.applyMarket_dictText ">
+                           {{ item.applyMarket_dictText}}
+                     </span>
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
 
             <a-icon class="icon-size"
                     style="margin-left: 8px"
                     @click="addData"
-                    v-if="(formInline.dataList.length-1) == index"
+                    v-if="(formInline.dataList.length-1) == index && formInline.dataList.length < 5"
                     type="plus-circle"/>
             <a-icon class="icon-size"
                     @click="deleteData"
@@ -65,6 +75,10 @@
         visible: false,
         confirmLoading: false,
         formInline: {},
+        applyMarketList: [],
+        url: {
+          getInfoList: '/problemKnowledgeBase/countryCardManageReleaseEO/list'
+        },
         rules: {
           personChargeName: [
             {
@@ -101,9 +115,11 @@
         this.visible = true
         this.$nextTick(() => {
           this.formInline = {}
+          this.formInline.applyMarket = this.$route.query.applyMarket
           this.formInline.dataList = [{
             relatedSection: ''
           }]
+          this.getList()
           this.formInline = { ...this.formInline }
           this.$refs.ruleForm.clearValidate()
         })
@@ -124,18 +140,71 @@
       },
       addData() {
         this.formInline.dataList.push({
-          relatedSection: ''
+          applyMarket: ''
         })
+        this.consolidateData()
         this.formInline = { ...this.formInline }
       },
       deleteData() {
         this.formInline.dataList.pop()
+        this.consolidateData()
         this.formInline = { ...this.formInline }
+      },
+      getList() {
+        let query = {
+          releaseStatus: 'Have released'
+        }
+        getAction(this.url.getInfoList, query).then((res) => {
+          if (res.success) {
+            this.applyMarketList = res.result
+            this.consolidateData()
+          } else {
+            this.applyMarketList = []
+          }
+        })
+      },
+      consolidateData() {
+        let content = []
+        content.push(this.$route.query.applyMarket)
+        content = content.join(',')
+        this.applyMarketList = this.applyMarketList.filter(res => {
+          return !content.includes(res.applyMarket)
+        })
+        let contentIndex = []
+        if (this.formInline.dataList && this.formInline.dataList.length > 0) {
+          this.formInline.dataList.forEach(res => {
+            contentIndex.push(res.applyMarket)
+            res.applyMarketList = []
+            this.applyMarketList.forEach(val => {
+              res.applyMarketList.push(val)
+            })
+          })
+        }
+        contentIndex = contentIndex.join(',')
+        for (let i = 0; i < this.formInline.dataList.length; i++) {
+          for (let j = 0; j < this.formInline.dataList[i].applyMarketList.length; j++) {
+            if (contentIndex.includes(this.formInline.dataList[i].applyMarketList[j].applyMarket)
+              && this.formInline.dataList[i].applyMarket != this.formInline.dataList[i].applyMarketList[j].applyMarket) {
+              console.log(111)
+              console.log(j)
+              this.formInline.dataList[i].applyMarketList.splice(j, 1)
+              j--
+            }
+          }
+        }
+        this.formInline = { ...this.formInline }
+      },
+      applyMarketChange() {
+        this.consolidateData()
       }
     }
   }
 </script>
-
+<style>
+  .ant-select-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>
 <style scoped>
   .box-title-text {
     line-height: 1.4;

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

@@ -12,7 +12,7 @@
       <div style="margin-bottom: 60px">
         <a-table
           :columns="columns"
-          :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
+          :scroll="{x: '100%',y:'calc(100vh - 200px)'}"
           :data-source="dataList"
           :pagination="false"
           :loading="loading">
@@ -20,18 +20,6 @@
               <a-checkbox :value="text"></a-checkbox>
            </span>
         </a-table>
-        <div class="page" v-if="dataList.length > 0">
-          <a-pagination
-            :show-total="total => $t('total')+`${total}`+$t('strip')"
-            show-quick-jumper
-            show-size-changer
-            :page-size.sync="pageSize"
-            :total="total"
-            :current="pageNo"
-            @change="onChange"
-            @showSizeChange="SizeChange"
-          />
-        </div>
       </div>
       <div class="drawer-bootom-button">
         <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
@@ -49,21 +37,18 @@
     data() {
       return {
         url: {
-          list: '',
+          list: '/problemKnowledgeBase/countryCardTempEO/list',
           deleteOne: ''
         },
         visible: false,
         selectedRowKeys: [],
-        dataList: [{}],
+        dataList: [],
         loading: false,
-        pageNo: 1,
-        pageSize: 10,
-        confirmLoading:false,
-        total: 0,
+        confirmLoading: false,
         columns: [
           {
             title: this.$t('LabelName'),
-            dataIndex: 'LabelName',
+            dataIndex: 'lableName',
             align: 'center',
             ellipsis: true
           },
@@ -82,40 +67,26 @@
     methods: {
       getData() {
         this.visible = true
+        this.replacePage()
       },
       handleCancel() {
         this.visible = false
       },
-      handleSubmit(){
+      handleSubmit() {
 
-      },
-      onChange(page, pageSize) {
-        this.pageNo = page
-        this.replacePage()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.replacePage()
       },
       replacePage() {
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize
-        }
         this.loading = true
-        postAction(this.url.list, query).then((res) => {
+       getAction(this.url.list, {}).then((res) => {
           if (res.success) {
-            this.dataList = res.result.records || []
-            this.total = res.result.total
+            this.dataList = res.result || []
             this.loading = false
           } else {
             this.dataList = []
-            this.total = 0
             this.loading = false
           }
         })
-      }
+      },
     }
   }
 </script>

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

@@ -50,8 +50,9 @@
                 <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
               </a-tooltip>
             </div>
-              <div class="text-content" v-html="item.content">
-              </div>
+            <div class="text-content">
+              {{item.content}}
+            </div>
           </div>
         </div>
       </li>
@@ -308,6 +309,8 @@
     font-weight: 400;
     color: #040B29;
     opacity: 0.7;
+    white-space: pre-wrap;
+    word-wrap: break-word;
   }
 
   .page {