update

src/views/company/Add.vue

@@ -132,7 +132,7 @@ export default {
   data(){
     return{
       id:'',
-      form:{name:''},
+      form:{name:'',is_active:true},
       BMap:null,
       keyword:'',
       point:{
@@ -196,9 +196,12 @@ export default {
           })
     },
     getData(){
-        this.$api.getEnterprise({id:this.id}).then(res=>{
-            this.form=res.data.data
-        })
+        if(this.id){
+            this.$api.getEnterprise({id:this.id}).then(res=>{
+                this.form=res.data.data
+            })
+        }
+        
         this.$api.getEnterpriseAll().then(res=>{
             this.company=res.data.data;
             this.area=this.store.area;

src/views/company/Company.vue

@@ -31,6 +31,8 @@
                 class="table"
                 :data="list" height="64vh"
                 border  v-loading="loading"
+                default-expand-all row-key="id"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
                 style="width: 100%">
                 <el-table-column
                 type="selection" fixed="left"
@@ -106,7 +108,14 @@ export default {
             var parm=this.form;
             this.loading=true
             this.$api.getEnterpriseList(parm).then(res=>{
-                this.list=res.data.data.list
+                this.list=res.data.data.list;
+                // list.forEach(item => {
+                //     if(item.children.length>0){
+                //         item.hasChildren=true
+                //     }else{
+                //         item.hasChildren=false
+                //     }
+                // });
                 this.total=res.data.data.total
                 this.loading=false
                 this.area=this.store.area;

src/views/task/DangerTask.vue

@@ -233,7 +233,8 @@ export default {
             },
             total:1,
             loading:false,
-            departmentList:[]
+            departmentList:[],
+            allNode:[]
 		};
     },
     watch: {
@@ -251,7 +252,8 @@ export default {
         },
         getRisk(){
             this.$api.getRiskpointList({name:this.filterText}).then(res=>{
-                this.data=res.data.data
+                this.data=res.data.data;
+                this.spreadRsk();
             })
         },
         addTask(){
@@ -264,7 +266,8 @@ export default {
         edit(data){
             if(data.type != 'ent'){
                 this.form.riskpoint_id=data.id;
-                this.getData()
+                this.getData()  
+                this.findRsk(data.id)            
                 //获取风险点详情
                 this.$api.getRiskpoint({id:data.id}).then(res=>{
                         let _data=res.data.data;
@@ -298,7 +301,35 @@ export default {
                 this.loading=false
             })
         },
-      
+        spreadRsk(){
+            var data=this.data,all=this.allNode;
+            spread(data)
+            function spread(data){
+                data.forEach(item=>{
+                    all.push({name:item.name,id:item.id,parent_id:item.parent_id})
+                    if(item.children.length>0){
+                        spread(item.children)
+                    }
+                })
+            }
+            this.allNode=all
+        },
+        findRsk(id){
+            var list=this.allNode,item_rsk=[];
+            getItem(id)
+            function getItem(id){
+                list.forEach(item=>{
+                    if(item.id == id){
+                        item_rsk.push(item.name)
+                        if(item.parent_id){
+                            getItem(item.parent_id)
+                        }
+                    }
+                })
+            }
+            item_rsk=item_rsk.reverse();
+            this.riskpoint_item=item_rsk.join('|');
+        },
         del(id){
                 this.$confirm('确定删除吗', '提示', {
                         type: 'warning'
@@ -314,6 +345,8 @@ export default {
         },
         add(){
             let parm=this.rsk;
+            parm.riskpoint_item=this.riskpoint_item;
+            console.log(parm)
             // if(!parm.name){
             //     this.$message.error('请输入部门名称');
             //     return;