commit

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -125,7 +125,7 @@
           align="center">
           <template slot-scope="scope">
             <div>{{
-                scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
+                scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
               }}
             </div>
           </template>
@@ -186,7 +186,7 @@ export default {
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
-        relateFile: '',
+        relateFile: "",
         country: "",
         applyArctic: "",
         energyKind: "",
@@ -263,29 +263,29 @@ export default {
         sortKey: 1,
         page: 1,
         pageSize: 10,
-        ...this.sarSarAccessEOSearch,
+        ...this.sarSarAccessEOSearch
       }, {
         _this: this
       }, res => {
         let arr = res.data.records;
+        let map = new Map();
+        this.countryOptions.forEach(item => {
+          map.set(item.value, item.label);
+        });
         arr.forEach(item => {
           // 国家地区转换
           if (item.countryArea !== null || item.countryArea !== "") {
-            let k = (item.countryArea || "").split(',')
+            let k = (item.countryArea || "").split(",");
-            for (let i in this.countryOptions) {
             for (let m = 0; m < k.length; m++) {
-                if (this.countryOptions[i].value === k[m]) {
+              k[m] = map.get(k[m]);
-                  k[m] = this.countryOptions[i].label
+              item.countryAreaShow = k.join(",");
-                }
-                item.countryAreaShow = k.join(',')
             }
           }
-          }
+        });
-        })
+        this.tableLoading = false;
-        this.sarAccessListDatas = arr
+        this.sarAccessListDatas = arr;
-        this.tableLoading = false
+        this.sarSarAccessEOSearch.page = 1;
-        this.sarSarAccessEOSearch.page = 1
+        this.sarAccessListTotal = res.data.total;
-        this.sarAccessListTotal = res.data.total
       }, e => {
 
       });
@@ -299,8 +299,8 @@ export default {
       // this.searchSarAccess();
     },
     clearSearch() {
-      this.sarSarAccessEOSearch.countryArea = ''
+      this.sarSarAccessEOSearch.countryArea = "";
-      this.sarSarAccessEOSearch.detailedListName = ''
+      this.sarSarAccessEOSearch.detailedListName = "";
       // this.searchSarAccess();
     },
     // 新增相关
@@ -311,29 +311,29 @@ export default {
     },
     // 批量删除
     deleteSarAccess(flag, id) {
-      if (flag === 'delOne') {
+      if (flag === "delOne") {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
       if (this.selectedList.length === 0) {
-        this.$message.warning('请选择要删除的数据')
+        this.$message.warning("请选择要删除的数据");
       } else {
-        this.$confirm('确定删除这些数据？', '提示', {
+        this.$confirm("确定删除这些数据？", "提示", {
-          confirmButtonText: '确定',
+          confirmButtonText: "确定",
-          confirmButtonClass: 'common-button-primary',
+          confirmButtonClass: "common-button-primary",
-          cancelButtonText: '取消',
+          cancelButtonText: "取消",
-          type: 'warning',
+          type: "warning"
         }).then(() => {
-          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
+          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
           this.$http.postDelete(URL, {}, res => {
             this.searchSarAccess();
             this.selectedList = [];
-            this.$message.success('删除成功')
+            this.$message.success("删除成功");
           }, e => {
           });
         }).catch(() => {
 
-        })
+        });
       }
     },
     // 表格选择框
@@ -356,7 +356,7 @@ export default {
     },
     // 点击 table编辑按钮 事件
     editTable(item) {
-      this.$store.commit('SET_ACCESS_STAND_REG_ROW', item)
+      this.$store.commit("SET_ACCESS_STAND_REG_ROW", item);
       this.$router.push({
         name: "ListOfStandardsAndRegulationsDetails",
         query: {
@@ -370,8 +370,8 @@ export default {
     // 将文本状态的id与name对应
     setMap(data) {
       data.forEach(item => {
-        this.$set(this.countryAreaMap, item.value, item.label)
+        this.$set(this.countryAreaMap, item.value, item.label);
-      })
+      });
     }
   },
   created() {
@@ -385,7 +385,7 @@ export default {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
-      this.setMap(this.countryOptions)
+      this.setMap(this.countryOptions);
     }, e => {
     });
   }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -24,8 +24,7 @@
                       @mouseleave="mouseleave(data)">
                         <span
                             :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
-                        <span v-if="node.label.length<15"> {{ node.label}} </span>
+                            <span class="node-font" > {{ node.label }} </span>
-                        <span v-else> {{ node.label.substring(0,15)+'...'}} </span>
                         <span>
                           <el-button
                               type="text"
@@ -5050,7 +5049,7 @@ export default {
 }
 </style>
 
-<style lang="less" scoped>
+<style lang="less" >
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
 
@@ -5069,6 +5068,12 @@ export default {
       width: calc(~'100% - 15px');
       position: absolute;
       left: 0;
+      .node-font{
+        display: inline-block;
+        width: 120px;
+        text-overflow:ellipsis;
+        overflow: hidden;
+      }
     }
 
     .tree-collapse {