Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/api/manager/wbsprivate.js

@@ -127,7 +127,7 @@ export const syncNodeTable = (primaryKeyId) => {
 //清表树
 export const tabTypeLazyTree = (params) => {
   return request({
-    url: '/api/blade-manager/wbsPrivate/tab_Type_lazy-tree',
+    url: '/api/blade-manager/wbsPrivate/tab-Type-lazy-tree',
       method: 'get',
       params
   })
@@ -135,8 +135,36 @@ export const tabTypeLazyTree = (params) => {
 
 export const tabTypeLazyTreeAll = (params) => {
   return request({
-    url: '/api/blade-manager/wbsPrivate/tab_Type_lazy-tree/tab_Type_lazy-tree_all',
+    url: '/api/blade-manager/wbsPrivate/tab-Type-lazy-tree-all',
       method: 'get',
       params
   })
+}
+//后管-添加元素到项目
+// export const projecttabInfo = (primaryKeyIds,projectId) => {
+//   return request({
+//     url: '/blade-manager/wbsPrivate/add-projecttab-info',
+//     method: 'post',
+//     params: {
+//       primaryKeyIds,
+//       projectId
+//     }
+//   })
+// }
+// export const projecttabInfo = (primaryKeyIds,projectId) => {
+//   return request({
+//     url: '/api/blade-manager/wbsPrivate/add-projecttab-info',
+//     method: 'post',
+//     params: {
+//       primaryKeyIds,
+//       projectId
+//     }
+//   })
+// }
+export const projecttabInfo = (data) => {
+  return request({
+    url: '/api/blade-manager/wbsPrivate/add-projecttab-info',
+    method: 'post',
+    data:data
+  })
 }

src/views/manager/projectinfo/independent.vue

@@ -53,6 +53,7 @@
               :page.sync="page"
               @search-change="searchChange" 
               @search-reset="resetChange"
+               @on-load="onLoad"
             >
             
          
@@ -89,8 +90,8 @@
         </div>
       </div>
     </div>
-    <Qute ref="Qute" :projectid="projectid"> </Qute>
-    <Relation ref="Relation" :GLExcelFrom="GLExcelFrom"/>
+    <Qute ref="Qute" :projectid="projectid" :wbsid="wbsid"> </Qute>
+    <Relation ref="Relation" :GLExcelFrom="GLExcelFrom" :wbsid="wbsid"></Relation>
     <!-- 编辑元素 -->
        <!-- 编辑元素 -->
     <el-dialog
@@ -184,7 +185,7 @@
 </template>
 
 <script>
-import {tabTypeLazyTree,tabTypeLazyTreeAll} from "@/api/manager/wbsprivate";
+import {tabTypeLazyTree,removeTableByCondition} from "@/api/manager/wbsprivate";
 import {
   updateBatchNodeTableInfo,
   selectByNodeTable,
@@ -204,6 +205,7 @@ import EditElement from "@/views/manager/projectinfo/editElement/editElement.vue
 import dynamicExcel from "./treeTemplate/dynamicExcel.vue";
 import FormulaEdit from "@/views/formula/edit.vue";
 
+
 export default {
    components: { dynamicExcel, EditElement, Qute,Relation,FormulaEdit },
   computed:{
@@ -391,6 +393,7 @@ export default {
   created() {
     // this.loadData = this.loadData1;
      this.projectid = this.$route.query.pid;
+     this.wbsid=this.$route.query.wbsid;
      this.treeLoad1()
   },
   methods: {
@@ -416,10 +419,19 @@ export default {
      this.tabTypeLazyTree(this.treeId, this.projectid,this.page.current,this.page.size,params.title).then((res)=>{
           console.log(res.records);
           this.loadData=res.records;
-           this.page.total=this.loadData.length
+           this.page.total=res.total
            done();
         })
 
+    },
+     onLoad(page){
+      console.log(page,'page');
+      if(this.treeId){
+         this.tabTypeLazyTreeAll(this.treeId, page.currentPage,page.pageSize).then((res)=>{
+          this.loadData=res.records
+           this.page.total=res.total
+        })
+      }
     },
 
     resetChange(item){
@@ -427,7 +439,7 @@ export default {
         this.tabTypeLazyTree(this.treeId, this.projectid,this.page.current,this.page.size).then((res)=>{
           console.log(res.records);
           this.loadData=res.records;
-           this.page.total=this.loadData.length
+           this.page.total=res.total
           
         })
     },
@@ -437,7 +449,7 @@ export default {
         this.tabTypeLazyTree(data.id, this.projectid,this.page.current,this.page.size).then((res)=>{
           console.log(res.records);
           this.loadData=res.records;
-           this.page.total=this.loadData.length
+           this.page.total=res.total
           
         })
     },
@@ -453,6 +465,7 @@ export default {
       this.$refs.Qute.show();
 
     },
+    
     handleDelete () {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
@@ -464,8 +477,13 @@ export default {
         type: "warning"
       })
         .then(() => {
-          // return remove(this.ids);
-          console.log(this.ids,'this.ids删除');
+          console.log(this.ids,'this.ids');
+          let ids=this.ids.split(',')
+          ids.forEach((item)=>{
+            return removeTableByCondition(item,this.projectid,this.wbsid);
+          })
+         
+          
         })
         .then(() => {
          this.tabTypeLazyTree(this.treeId, this.projectid,this.page.current,this.page.size)
@@ -491,9 +509,9 @@ export default {
       // this.GLExcelFrom.name = row.modeId;
    
       this.GLExcelFrom.id = row.primaryKeyId;
-      this.GLExcelFrom.excelId =row.id;
-      this.GLExcelFrom.ids = row.id;
-      this.GLEidxcelFrom.initTableName =row.title;
+      // this.GLExcelFrom.excelId =row.id;
+      // this.GLExcelFrom.ids = row.id;
+      // this.GLEidxcelFrom.initTableName =row.title;
       // this.GLExcelFrom.excelId=row.excelId
     },
        //#region 编辑元素

src/views/manager/projectinfo/qutediaolog/qute.vue

@@ -16,159 +16,205 @@
             :data="loadData"
             :option="loadOption"
             v-model="obj"
+            :page.sync="page"
+            @on-load="onLoad"
+            @search-change="searchChange" 
+            @search-reset="resetChange"
+            @selection-change="selectionChange"
+            ref="crud"
+
             ></avue-crud>
         </el-main>
         </el-container>
         <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            <el-button type="primary" @click="submitQute">确 定</el-button>
         </span>
     </el-dialog>
 </template>
 
 <script>
-import {tabTypeLazyTreeAll} from "@/api/manager/wbsprivate";
+import {tabTypeLazyTreeAll,projecttabInfo} from "@/api/manager/wbsprivate";
 export default {
     data() {
       return {
         dialogVisible:false,
         obj: {},
-        treeData:[{
-          value:0,
-          label:'一级部门',
-          children:[
-            {
-              value:1,
-              label:'一级部门1',
-            }
-          ]
-        }],
-      treeOption:{
-        defaultExpandAll:true,
-        filter:false,
-        addBtn:false,
-        formOption:{
-          labelWidth:100,
-          column:[{
-              label:'自定义项',
-              prop:'test'
-          }],
+        treeData:[],
+        treeOption:{
+          defaultExpandAll:true,
+          filter:false,
+          addBtn:false,
+          props:{
+            labelText:'标题',
+            label:'title',
+            value:'id',
+            children:'children'
+          }
         },
-        props:{
-          labelText:'标题',
-          label:'label',
-          value:'value',
-          children:'children'
-        }
-      },
+      selectionList:[],
       loadData:[],
-      loadData1: [
-        {
-          tableName: '张三',
-          formatTableType: '男'
-        }
-      ],
-      loadData2: [
-        {
-          tableName: '李四2',
-          formatTableType: '女'
-        }
-      ],
       loadOption: {
-        height: 'auto',
-        calcHeight: 30,
-        tip: false,
-        searchShow: false,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: false,
-        selection: true,
-        editBtn:false,
-        delBtn:false,
-        addBtn:false,
-        menu:false,
-      
-        dialogClickModal: false,
-        column: [
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow:true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          selection: true,
+          editBtn:false,
+          delBtn:false,
+          addBtn:false,
+          menu:false,
+        
+          dialogClickModal: false,
+         column: [
           {
-            label: '表单名称',
-            prop: 'tableName',
-           
+            label: "元素表名称",
+            prop: "title",
+            search: true,
             editDisplay: false,
             addDisplay: false,
+            searchPlaceholder:'请输入元素表名称',
+            searchSpan:18,
+            searchLabelWidth:100,
           },
           {
             label: "元素表类型",
-            prop: "formatTableType",
+            prop: "tabType",
             // search: true,
-            rules: [{
-              required: true,
-              message: "请输入名称",
-              trigger: "blur"
-            }]
+            rules: [
+              {
+                required: true,
+                message: "请输入名称",
+                trigger: "blur",
+              },
+            ],
           },
 
           {
             label: "元素总量",
             prop: "elementTotal",
-          
+
             editDisplay: false,
             addDisplay: false,
-            rules: [{
-              message: "请输入表数量",
-              trigger: "blur",
-            }]
+            rules: [
+              {
+                message: "请输入表数量",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "所书方",
-            prop: "formatOwner",
-          
+            prop: "tabOwner",
+
             editDisplay: false,
             addDisplay: false,
-            rules: [{
-              message: "请输入表数量",
-              trigger: "blur",
-            }]
+            rules: [
+              {
+                message: "请输入表数量",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "填报率",
             prop: "fillRate",
-          
+
             editDisplay: false,
             addDisplay: false,
-            rules: [{
-              message: "请输入表数量",
-              trigger: "blur",
-            }]
+            rules: [
+              {
+                message: "请输入表数量",
+                trigger: "blur",
+              },
+            ],
           },
-
-        ]
-      },
-      }
+        ],
+       
+        },
+        page:{
+          current:1,
+          size:10,
+          total:10
+        },
+        treeId:''
+        
+     }
+    },
+    props:{
+      projectid:String
     },
+    computed:{
+     ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
     created(){
       //  this.loadData=this.loadData1;
-      // this.tabTypeLazyTreeAll(this.projectId)
+      
     },
-    methods: {
 
-    async tabTypeLazyTreeAll ( projectId) {//清表树
-      console.log(projectId);
-      const { data: res } = await tabTypeLazyTreeAll()
+
+    methods: {
+    onLoad(page){
+      console.log(page,'page');
+      if(this.treeId){
+         this.tabTypeLazyTreeAll(this.treeId, page.currentPage,page.pageSize).then((res)=>{
+          this.loadData=res.records
+           this.page.total=res.total
+        })
+      }
+    },
+    selectionChange (list) {
+      this.selectionList = list;
+      },
+    selectionClear () {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      //搜索
+    searchChange(params,done){
+     if(this.treeId){
+         this.tabTypeLazyTreeAll(this.treeId, this.page.current,this.page.size,params.title).then((res)=>{
+          this.loadData=res.records
+          this.page.total=res.total
+           done()
+        })
+      }
+     
+    },
+    resetChange(item){
+      console.log(item);
+        this.tabTypeLazyTreeAll(this.treeId, this.page.current,this.page.size).then((res)=>{
+          this.loadData=res.records
+          this.page.total=res.total
+           
+        })
+    },
+    async tabTypeLazyTreeAll ( parentId,current,size,titleName) {//清表树
+      console.log(parentId);
+      const { data: res } = await tabTypeLazyTreeAll({parentId,current,size,titleName}	)
       console.log(res,'tabTypeLazyTreeAll');
       if (res.code === 200) {
-        // return res.data
-        console.log(res.data,'tabTypeLazyTreeAll');
+        return res.data
+        
       }
     },
       nodeClick(data){
-        if(data.value==0){
-          this.loadData=this.loadData1;
-        }else  if(data.value==1){
-          this.loadData=this.loadData2;
-        }
-        this.$message.success(JSON.stringify(data))
+          console.log(data,'treedata');
+          this.treeId=data.id
+          this.tabTypeLazyTreeAll(data.id, this.page.current,this.page.size).then((res)=>{
+          this.loadData=res.records
+           this.page.total=res.total
+        })
       },
       handleClose(done) {
         this.$confirm('确认关闭？')
@@ -178,8 +224,29 @@ export default {
           .catch(_ => {});
       },
       show(){
-        this.dialogVisible=true
+        this.dialogVisible=true;
+        let id=12345678910
+        this.tabTypeLazyTreeAll(id).then((res)=>{
+            this.treeData=res.records;
+        })
+      },
+      submitQute(){
+        console.log('确定');
+        console.log(this.ids,'ids');
+       
+       
+        projecttabInfo({primaryKeyIds:this.ids,projectId:this.projectid}).then((res)=>{
+          console.log(res,'res');
+          if(res.data.code===200){
+             this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+          }
+        })
       }
+    
     },
     
    

src/views/manager/projectinfo/qutediaolog/relation.vue

@@ -1,13 +1,13 @@
 <template>
-  <div>
+ 
     <el-dialog
         title="关联清表"
-        class="excelBox"
         :visible.sync="GLExcel"
-        width="300px"
-        modal-append-to-body
         append-to-body
+        destroy-on-close
+        
         @close="GLExcelMD"
+          width="70%"
         >
         <div>
             <el-select
@@ -60,21 +60,39 @@
             >确 定</el-button
             >
         </span>
+              <!-- 编辑元素 -->
+        <el-dialog
+        title="　"
+        :visible.sync="editElementVisible"
+        fullscreen
+        append-to-body
+        class="full-dialog"
+        >
+        <EditElement
+            :pkeyId="editElementQuery.pkeyId"
+            :excelId="editElementQuery.excelId"
+            :id="editElementQuery.id"
+            :initTableName="editElementQuery.initTableName"
+            :pid="editElementQuery.pid"
+            :wbsid="editElementQuery.wbsid"
+            :nodeid="editElementQuery.nodeid"
+            @hideDialog="editElementVisible = false"
+            v-if="editElementVisible"
+        ></EditElement>
+        </el-dialog>
         </el-dialog>
-  </div>
+  
 </template>
 
 <script>
-import {
-  getList,
-  tabLazytreeAll,
-  saveLinkTab,
-  getExcelHtml,
-} from "@/api/exctab/excelmodel";
+import {getList,tabLazytreeAll,saveLinkTab, getExcelHtml,} from "@/api/exctab/excelmodel";
+import EditElement from "@/views/manager/projectinfo/editElement/editElement.vue";
+import {findNodeTableByCondition as selectByNodeTable} from "@/api/manager/wbsprivate";
 export default {
     props:{
         GLExcelFrom:Object
     },
+    components:{EditElement},
     data(){
         return{
             GLExcel:false,
@@ -98,6 +116,7 @@ export default {
             exceldata: [], //清表模板
             GLExcelData: [], //
             GLExcelLoading: false,
+            editElementVisible: false, //编辑元素弹框
             GLExcelProps: {
                 label: "name",
                 children: "children",
@@ -126,15 +145,17 @@ export default {
     methods:{
             show(){
                 this.GLExcel=true;
+                console.log(this.GLExcel,'GLExcel');
                 console.log(this.GLExcelFrom,'GLExcelFrom');
                 this.getList({
                     current: 1,
                     size: 100000,
                     parentId: 0,
                 });
-                setTimeout(() => {
-                    this.$refs.tree.setCheckedKeys([this.GLExcelFrom.excelId]);
-                }, 2000);
+                // setTimeout(() => {
+                //     console.log(11111111);
+                //     // this.$refs.tree.setCheckedKeys([this.GLExcelFrom.excelId]);
+                // }, 2000);
             },
            GLExcelMD() {
                 //弹框关闭事件
@@ -186,6 +207,13 @@ export default {
                     this.$refs.tree.setCheckedKeys([data.id]);
                 }
             },
+            async getExcelHtml2(pkeyId) {
+                    const { data: res } = await getExcelHtml({ pkeyId });
+                    console.log(res);
+                    if (res.code === 200) {
+                        localStorage.setItem("editElement", res.data);
+                    }
+                },
                 //#region 编辑元素
             async rightClick(pkeyId, excelId, id, initTableName) {
                 await this.getExcelHtml2(pkeyId);
@@ -195,10 +223,21 @@ export default {
                 this.editElementQuery.initTableName = initTableName;
                 this.editElementQuery.pid = this.$route.query.pid;
                 this.editElementQuery.wbsid = this.$route.query.wbsid;
-                this.editElementQuery.nodeid = this.curTreeData.id;
+                // this.editElementQuery.nodeid = this.curTreeData.id;
 
                 this.editElementVisible = true;
-                },
+            },
+             updateNodeTable() {
+                // selectByNodeTable(this.curTreeData.id, this.projectid, this.id).then(
+                //     (res) => {
+                //     if (res.data.data.length) {
+                //         this.formData = res.data.data;
+                //     } else {
+                //         this.formData = [];
+                //     }
+                //     }
+                // );
+            },
             async saveLinkTab() {
                 //保存按钮
                 let checkNodes = this.$refs.tree.getCheckedNodes();
@@ -226,12 +265,12 @@ export default {
                     // selectByNodeTable刷新表单列表
                     // this.updateNodeTable();
                     this.GLExcel = false;
-                    // this.rightClick(
-                    //     this.GLExcelFrom.id,
-                    //     this.GLExcelFrom.excelId,
-                    //     this.GLExcelFrom.ids,
-                    //     this.GLExcelFrom.initTableName
-                    // );
+                    this.rightClick(
+                        this.GLExcelFrom.id,
+                        this.GLExcelFrom.excelId,
+                        this.GLExcelFrom.ids,
+                        this.GLExcelFrom.initTableName
+                    );
                     }
                 } else {
                     this.$message({
@@ -245,6 +284,10 @@ export default {
 }
 </script>
 
-<style>
-
+<style scoped lang="scss">
+.excelBox {
+  /deep/.el-dialog__body {
+    padding: 20px;
+  }
+}
 </style>

src/views/manager/projectinfo/tree.vue

@@ -1735,6 +1735,7 @@ export default {
       });
     },
     getNodeDetail(data, node) {
+      console.log('getNodeDetail',data);
       let parentName = "";
       if (node.parent.data) {
         parentName = node.parent.data.title;

src/views/manager/wbsinfo/element.vue

@@ -9,34 +9,7 @@
     >
       <div class="boxnei" style="display: flex;flex-direction: column;"> 
         <div style="overflow: auto;flex:1">
-        <el-tree
-          style="display: inline-block;min-width: 100%;"
-          ref="trees"
-          :loading="loading"
-          :load="treeLoad"
-          lazy
-          :data="data"
-          :props="defaultProps"
-          @node-click="nodeClick"
-          node-key="id"
-          :expand-on-click-node="false"
-          v-show="!allTreeShow"
-        >
-          <span
-            class="custom-tree-node"
-            slot-scope="{ data ,node }"
-            @mouseover.stop="mouseOver(data)"
-            @mouseleave.stop="mouseLeave(data)"
-            style="box-sizing: border-box;padding-right:70px!important;;"
-          >
-            <div style="width:100%;">
-              <span style="text-overflow: ellipsis;"> {{ data.name }} </span>
-              <!-- <span> {{ node}} </span> -->
-              <!-- 添加 -->
-          
-            </div>
-          </span>
-        </el-tree>
+          <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" ></avue-tree>
    
         </div>
       </div>
@@ -69,16 +42,13 @@
             style="flex:1;"
           >
               <avue-crud ref="crud"
-                  :option="elemntOption"
+                  :data="loadData"
+                  :option="loadOption"
+                  v-model="obj"
                   :page.sync="page"
-                  :table-loading="elementloading"
-                  @on-load="getList"
-                  @row-update="rowUpdate"
-              
-                  @refresh-change="refreshChange"
-                  @selection-change="selectionChange"
-                  v-model="elemtform"
-                  :data="elemtData">
+                  @on-load="onLoad"
+                  @search-change="searchChange" 
+                  @search-reset="resetChange">
 
                   <template slot="menuRight">
                           <el-button
@@ -471,6 +441,7 @@
 <script>
 import { detailExcel, excelType, tabLazytree,  wbstree, getWbsTypeList,} from '@/api/exctab/excelmodel';
 import {updateBatchNodeTableInfo,selectByNodeTable,selectFormElements} from "@/api/manager/wbstree";
+import {tabTypeLazyTreeAll} from "@/api/manager/wbsprivate";
 import FormulaEdit from "@/views/formula/edit.vue";
 import PublicWbs from './PublicWbs.vue'
 import { searchNodeTables, } from "@/api/exctab/excelmodel";
@@ -485,93 +456,107 @@ export default {
       editElementFormTag:false,//编辑元素
       formDatass: [],
       selectionList:[],
-       page: {
-        pageSize: 10,
-        currentPage: 1,
+      page: {
+        size: 10,
+        current: 1,
         total: 2
       },
-      formelemtfoelemtformrm: {},
-      elementloading: false,
-      elemtData:[
-        {
-          tableName:'张三',
-          sex:'男',
-          id:1
-        }, {
-          tableName:'李四',
-          sex:'女',
-          id:2
-        }
-      ],
-      elemntOption: {
-        height: 'auto',
-        calcHeight: 30,
-        tip: false,
-        searchShow: false,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: false,
-        selection: true,
-        editBtn:false,
-        delBtn:false,
-        addBtn:false,
-        dialogClickModal: false,
-        column: [
+       loadOption: {
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow:true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          selection: true,
+          editBtn:false,
+          delBtn:false,
+          addBtn:false,
+          menu:true,
+        
+          dialogClickModal: false,
+         column: [
           {
-            label: '表单名称',
-            prop: 'tableName',
-           
+            label: "元素表名称",
+            prop: "title",
+            search: true,
             editDisplay: false,
             addDisplay: false,
+            searchPlaceholder:'请输入元素表名称',
+            searchSpan:18,
+            searchLabelWidth:100,
           },
           {
             label: "元素表类型",
-            prop: "formatTableType",
+            prop: "tabType",
             // search: true,
-            rules: [{
-              required: true,
-              message: "请输入名称",
-              trigger: "blur"
-            }]
+            rules: [
+              {
+                required: true,
+                message: "请输入名称",
+                trigger: "blur",
+              },
+            ],
           },
 
           {
             label: "元素总量",
             prop: "elementTotal",
-          
+
             editDisplay: false,
             addDisplay: false,
-            rules: [{
-              message: "请输入表数量",
-              trigger: "blur",
-            }]
+            rules: [
+              {
+                message: "请输入表数量",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "所书方",
-            prop: "formatOwner",
-          
+            prop: "tabOwner",
+
             editDisplay: false,
             addDisplay: false,
-            rules: [{
-              message: "请输入表数量",
-              trigger: "blur",
-            }]
+            rules: [
+              {
+                message: "请输入表数量",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "填报率",
             prop: "fillRate",
-          
+
             editDisplay: false,
             addDisplay: false,
-            rules: [{
-              message: "请输入表数量",
-              trigger: "blur",
-            }]
+            rules: [
+              {
+                message: "请输入表数量",
+                trigger: "blur",
+              },
+            ],
           },
-
-        ]
-      },
+        ],
+       
+        },
+      formelemtfoelemtformrm: {},
+      elementloading: false,
+      elemtData:[
+        {
+          tableName:'张三',
+          sex:'男',
+          id:1
+        }, {
+          tableName:'李四',
+          sex:'女',
+          id:2
+        }
+      ],
+    
       curEleTable:{},
       eleReg: /(-|>|<|≥|≤|±|【】)?([^≥≤±【】]*)/,
       editEleList:[],
@@ -585,10 +570,10 @@ export default {
       threessW: 400,
       //#endregion
       heightss: '',//
-      loading: false,//懒加载
+     
       data: [],//清表模板
       filterText:"",//搜索关键字
-      allTreeShow:false,//是否显示整棵树
+     
       treeloading:false,
       defaultProps: {
         children: "children",
@@ -631,6 +616,19 @@ export default {
       formulaCurRow: {}, //当前元素
       id:'',
       curTreeData:{},
+      loadData:[],
+      treeOption:{
+        defaultExpandAll:true,
+        filter:false,
+        addBtn:false,
+        props:{
+          labelText:'标题',
+          label:'title',
+          value:'id',
+          children:'children'
+        }
+      },
+      treeData:'',
       projectid:""
 
     }
@@ -658,36 +656,56 @@ export default {
         this.selectionList = [];
         this.$refs.crud.toggleSelection();
       },
-     getList () {
-      // this.elementloading = true;
-      const data = Object.assign({
-        pageNum: this.page.currentPage,
-        pageSize: this.page.pageSize,
-      }, this.params)
-      this.data = [];
-      // getList(data).then(res => {
-      //   const data = res.data.data
-      //   this.loading = false;
-      //   this.page.total = data.total;
-      //   const result = data.list;
-      //   this.data = result;
-      // })
+     async tabTypeLazyTreeAll ( parentId,current,size,titleName) {//清表树
+      console.log(parentId);
+      const { data: res } = await tabTypeLazyTreeAll({parentId,current,size,titleName}	)
+      console.log(res,'tabTypeLazyTreeAll');
+      if (res.code === 200) {
+        return res.data
+        
+      }
     },
+    nodeClick(data){
+          console.log(data,'treedata');
+          this.treeId=data.id
+          this.tabTypeLazyTreeAll(data.id, this.page.current,this.page.size).then((res)=>{
+          this.loadData=res.records
+           this.page.total=res.total
+        })
+      },
 
 
     refreshChange () {
       this.getList();
       this.$message.success('刷新成功')
     },
-     onLoad (page, params = {}) {
-      this.loading = true;
-      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   const data = res.data.data;
-      //   this.page.total = data.total;
-      //   this.data = data.records;
-      //   this.loading = false;
-      //   this.selectionClear();
-      // });
+     onLoad(page){
+      console.log(page,'page');
+      if(this.treeId){
+         this.tabTypeLazyTreeAll(this.treeId, page.currentPage,page.pageSize).then((res)=>{
+          this.loadData=res.records
+           this.page.total=res.total
+        })
+      }
+    },
+        //搜索
+    searchChange(params,done){
+     if(this.treeId){
+         this.tabTypeLazyTreeAll(this.treeId, this.page.current,this.page.size,params.title).then((res)=>{
+          this.loadData=res.records
+          this.page.total=res.total
+           done()
+        })
+      }
+     
+    },
+    resetChange(item){
+      console.log(item);
+        this.tabTypeLazyTreeAll(this.treeId, this.page.current,this.page.size).then((res)=>{
+          this.loadData=res.records
+          this.page.total=res.total
+           
+        })
     },
     handleDelete () {
       if (this.selectionList.length === 0) {
@@ -887,47 +905,8 @@ export default {
     // },
 
 
-    //#region  外层左侧事件
-    mouseLeave (data) {
-      if (data.moreShow) {
-        this.$set(data, 'moreShow', false)
-      }
-    },
-    mouseOver (data) {
-      if (!data.moreShow) {
-        this.$set(data, 'moreShow', true)
-      }
-    },
-    async treeLoad (node, resolve) {
-      let id = node.data.id
-      if (node.level == 0) {
-        id = 0
-      }
-      let das = await this.tabLazytree(id, this.$route.params.id)
-      return resolve(das)
-    },
-    nodeClick (data) {//外层树结构
-    console.log(data,'treedata');
-      this.from.import=""
-      if (data.hasChildren == false) {
-        this.from.checkd = true
-      } else if (data.fileType == 3) {
-        this.from.checkd = true
-      } else {
-        this.from.checkd = false
-      }
-      if (this.from.checkd) {
-        this.detailExcel(data.id)
-      } else {
-        this.from = {
-          checkd: false,//判断是否可以进行上传、重新上传excel
-          id: '',//清表树ID
-          extension: '', //文件名称
-          fileUrl: '',//文件路径
-         
-        }
-      }
-    },
+    
+ 
 
 
     
@@ -952,7 +931,10 @@ export default {
 
   },
   created () {
-    this.excelType()//清表类型
+    let id=12345678910
+    this.tabTypeLazyTreeAll(id).then((res)=>{
+            this.treeData=res.records;
+        })
   },
   mounted () {
     // this.heightss = this.$refs.rulesss.clientHeight

vue.config.js

@@ -27,8 +27,8 @@ module.exports = {
             '/api': {
                 //本地服务接口地址
                 // target: 'http://192.168.3.64',
-                // target: 'http://47.110.251.215:8090',
-                 target: 'http://192.168.1.179',
+                target: 'http://47.110.251.215:8090',
+                //  target: 'http://192.168.1.179',
                 // target: 'http://192.168.0.108',
                 // target: 'http://192.168.31.96',
                 //远程演示服务地址,可用于直接启动项目