数据项全选状态

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -269,8 +269,10 @@
           <el-divider content-position="left">数据项</el-divider>
           <div class="cy-line" style="padding-bottom: 10px;">
             <div style="height: 35px;">
-              <el-input placeholder="请输入关键字进行过滤" v-model="filterItemData" size="mini"
-                        @input="itemLabelChangeEvent"></el-input>
+              <el-input style="width: 45%;" placeholder="按层级目录进行过滤（未完成）" v-model="filterDirData" size="mini"
+                        @input="dirLabelChangeEvent" prefix-icon="el-icon-search"></el-input>
+              <el-input style="width: 45%; float: right;" placeholder="按数据项进行过滤" v-model="filterItemData" size="mini"
+                        @input="itemLabelChangeEvent" prefix-icon="el-icon-search"></el-input>
             </div>
             <div style="height: calc(100% - 35px); overflow: auto;">
               <div :style="hasLeavesFlag == 1 ? 'height: 50%; overflow: auto;' : 'height: 100%; overflow: auto;'">
@@ -577,6 +579,7 @@ export default {
       leavesListF: [],
       leavesChooseList: [],
       filterItemData: '',
+      filterDirData: '',
       // 已选择的数据项
       chooseItemDataList: [],
       chooseItemDataListF: [],
@@ -626,10 +629,6 @@ export default {
   },
   props: ['refreshReportTemplateData'],
   watch: {
-    // filterItemData(val) {
-    //   this.$refs.itemTree.filter(val)
-    //   console.log(this.$refs.itemTree.filter(val))
-    // },
     refreshReportTemplateData(val) {
       let node = this.$refs.reportTree.getNode(-1)
       node.loaded = false
@@ -716,11 +715,6 @@ export default {
         }
       }
     },
-    /** 数据项搜索过滤 */
-    filterItemDataNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
     /** 数据项全选事件 */
     selectAllItem() {
       const data = traverseNode(this.$refs.chooseItemTree.store.root.childNodes)
@@ -742,6 +736,15 @@ export default {
         this.isSelectAllItem = false
       }
     },
+    /** 数据目录过滤 */
+    dirLabelChangeEvent(value) {
+      console.log(value)
+      console.log(this.itemDataListByTreeF)
+      let arr = JSON.parse(JSON.stringify(this.itemDataListByTreeF))
+      let filterList = deepTreeFilter(arr, value)
+      console.log(filterList)
+    },
+    /** 数据项过滤 */
     itemLabelChangeEvent(value) {
       this.itemDataExpandAll = true
       let arr = JSON.parse(JSON.stringify(this.itemDataListByTreeF))

chuanyi_client2/src/utils/request.js

@@ -132,13 +132,16 @@ service.interceptors.response.use(res => {
             message = errorCode[905];
         } else if (message.includes("Request failed with status code")) {
             message = "系统接口" + message.substr(message.length - 3) + "异常";
+        } else {
+            message = '网络错误，请稍候再试！'
         }
-        Message({
-            message: message,
-            type: 'error',
-            duration: 5 * 1000
-        })
-        return Promise.reject(error)
+        // Message({
+        //     message: message,
+        //     type: 'error',
+        //     duration: 5 * 1000
+        // })
+        console.warn(message)
+        return Promise.reject(message)
     }
 )
 

chuanyi_client2/src/views/report_template/index.vue

@@ -1009,12 +1009,14 @@ export default {
         if (this.$refs.itemTree) this.$refs.itemTree.setCheckedKeys([])
         if (tempList.length > 0) {
           let idList = Array.from(tempList, ({ id }) => id)
-          if (this.$refs.itemTree) this.$refs.itemTree.setCheckedKeys(idList)
-          if (this.itemDataListByTree.length == idList.length) {
-            this.isSelectAllItem = true
-          } else {
-            this.isSelectAllItem = false
-          }
+          setTimeout(() => {
+            if (this.$refs.itemTree) this.$refs.itemTree.setCheckedKeys(idList)
+            if (this.itemDataListByTree.length == idList.length) {
+              this.isSelectAllItem = true
+            } else {
+              this.isSelectAllItem = false
+            }
+          },100)
         }
         this.dialogDataItemVisible = true
       }).catch((e) => {

chuanyi_client2/vue.config.js

@@ -91,7 +91,7 @@ module.exports = {
                     'publish': [
                         {
                             'provider': 'generic',
-                            'url': 'http://192.168.1.226:18080/'
+                            'url': 'http://192.168.1.99:8081/'
                         }
                     ]
                 }