excel的线上地址 归并树

src/utils/env-config.js

@@ -109,6 +109,6 @@ export const envConfig = {
     workApiUrl: 'https://work.yunqueyi.com/web',
     workApiSrc: 'https://work.yunqueyi.com',
     reportUrl: 'https://sc-report.yunqueyi.com/',
-    excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
+    excelUrl: 'https://file.yunqueyi.com/File/template/portal/',
   }
 }

src/views/education/add-manager.vue

@@ -2024,19 +2024,25 @@ export default {
       console.log(this.$refs.tree.getCheckedKeys());
     },
     onChecked() {
-      let cData = [],
-        oldData = (this.treeData.length && this.treeData.slice()) || [],
-        checkedKeys = this.$refs.tree.getCheckedKeys(),
-        halfCheckedKeys = this.$refs.tree.getHalfCheckedKeys(),
-        savedCheckedKeys = this.handlerCheckedData(oldData, checkedKeys).map(
-          key => {
-            return { type: 1, key: key };
-          }
-        ),
-        savedHalfCheckedKeys = halfCheckedKeys.map(key => {
-          return { type: 2, key: key };
-        }),
-        allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
+      // let cData = [],
+      //   oldData = (this.treeData.length && this.treeData.slice()) || [],
+      //   checkedKeys = this.$refs.tree.getCheckedKeys(),
+      //   halfCheckedKeys = this.$refs.tree.getHalfCheckedKeys(),
+      //   savedCheckedKeys = this.handlerCheckedData(oldData, checkedKeys).map(
+      //     key => {
+      //       return { type: 1, key: key };
+      //     }
+      //   ),
+      //   savedHalfCheckedKeys = halfCheckedKeys.map(key => {
+      //     return { type: 2, key: key };
+      //   }),
+      //   allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
+
+      //重构归并树
+      let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store);
+      let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys()
+      let allSelectedKeys = operationData.setSelectedKeys(checkedTree,halfCheckedTree);  
+      //重构内容
 
       this.allSelectedKeys = allSelectedKeys;
       this.initCheckList(allSelectedKeys);
@@ -2046,20 +2052,26 @@ export default {
       this.updatedTree = true;
     },
     getTreeCheck() {
-      let cData = [],
-        oldData = (this.treeData.length && this.treeData.slice()) || [],
-        checkedKeys = this.$refs.tree.getCheckedKeys(),
-        halfCheckedKeys = this.$refs.tree.getHalfCheckedKeys(),
-        savedCheckedKeys = this.handlerCheckedData(oldData, checkedKeys).map(
-          key => {
-            return { type: 1, key: key };
-          }
-        ),
-        savedHalfCheckedKeys = halfCheckedKeys.map(key => {
-          return { type: 2, key: key };
-        }),
-        allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
-        // console.log('allSelectedKeys值：',allSelectedKeys)
+      // let cData = [],
+      //   oldData = (this.treeData.length && this.treeData.slice()) || [],
+      //   checkedKeys = this.$refs.tree.getCheckedKeys(),
+      //   halfCheckedKeys = this.$refs.tree.getHalfCheckedKeys(),
+      //   savedCheckedKeys = this.handlerCheckedData(oldData, checkedKeys).map(
+      //     key => {
+      //       return { type: 1, key: key };
+      //     }
+      //   ),
+      //   savedHalfCheckedKeys = halfCheckedKeys.map(key => {
+      //     return { type: 2, key: key };
+      //   }),
+      //   allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
+      //   // console.log('allSelectedKeys值：',allSelectedKeys)
+
+      //重构归并树
+      let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store);
+      let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys()
+      let allSelectedKeys = operationData.setSelectedKeys(checkedTree,halfCheckedTree);  
+      //重构内容
       return allSelectedKeys;
     },
     // 递归删除列表中所有子节点