update

src/api.js

@@ -95,6 +95,9 @@ export default {
 	getEnterprise: params => {
 		return axios.get(`${baseURL}/api/admin/enterprise`,{params:params})
 	},
+	deleteEnterprise: params => {
+		return axios.delete(`${baseURL}/api/admin/enterprise`, {params:params});
+	},
 	saveSubent: params => {
 		return axios.post(`${baseURL}/api/admin/goverment/subent`, params);
 	},
@@ -146,6 +149,9 @@ export default {
 	updateMonittask: params => {
 		return axios.put(`${baseURL}/api/admin/monittask`, params);
 	},
+	deleteMonittask: params => {
+		return axios.delete(`${baseURL}/api/admin/monittask`, {params:params});
+	},
 	//消息
 	getMessagesList: params => {
 		return axios.get(`${baseURL}/api/admin/messages/list`,{params:params})

src/views/company/Company.vue

@@ -34,12 +34,12 @@
                 default-expand-all row-key="id"
                 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
                 style="width: 100%">
-                <el-table-column
+                <!-- <el-table-column
                 type="selection" fixed="left"
                 width="40">
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column
-                prop="name" 
+                prop="name"  width="300"
                 label="公司名称">
                 </el-table-column>
                 <el-table-column
@@ -126,7 +126,7 @@ export default {
                 this.$confirm('确定删除吗', '提示', {
                         type: 'warning'
                     }).then(() => {
-                    this.$api.deleteClass({id:id}).then((res)=>{
+                    this.$api.deleteEnterprise({id:id}).then((res)=>{
                             this.$message({
                                 message: '删除成功',
                                 type: 'success'

src/views/company/Department.vue

@@ -2,6 +2,12 @@
     .staff{
         display: flex;
         justify-content: space-between;
+        .companies{
+                height: 75vh;
+                overflow: auto;
+                margin-right: 10px;
+                overflow-x: hidden;
+        }
         &>li{
             width: 30%;
             list-style: none;
@@ -43,7 +49,7 @@
     <p>公司管理 > 部门列表</p>
     <div class="content">
         <ul class="staff">
-            <li>
+            <li class="companies">
                 <el-form  size="small">
                     <el-form-item>
                         <el-input suffix-icon="el-icon-search" v-model="name" @change="getData"  placeholder="公司名称"></el-input>
@@ -225,8 +231,8 @@ export default {
         },
         getData(){
             this.loading=true
-            this.$api.getEnterpriseAll({name:this.name}).then(res=>{
-                this.data=res.data.data;
+            this.$api.getEnterpriseList({name:this.name}).then(res=>{
+                this.data=res.data.data.list;
                 this.id=this.data[0].id;
                 this.enterprise_name=this.data[0].name;
                 this.getDpt()

src/views/task/Danger.vue

@@ -2,7 +2,13 @@
     .danger{
         display: flex;
         // justify-content: space-between;
-        li{
+        .companies{
+                height: 75vh;
+                overflow: auto;
+                margin-right: 10px;
+                overflow-x: hidden;
+        }
+        &>li{
             width: 45%;
             list-style: none;
             min-height: 70vh;
@@ -72,7 +78,7 @@
     <p>任务管理 > 风险点管理</p>
     <div class="content">
         <ul class="danger">
-            <li>
+            <li class="companies">
                 <el-form size="small" >
                     <el-form-item>
                         <el-input suffix-icon="el-icon-search" v-model="filterText"  placeholder="公司名称"></el-input>

src/views/task/DangerTask.vue

@@ -2,6 +2,12 @@
     .task{
         .danger{
             display: flex;
+            .companies{
+                height: 75vh;
+                overflow: auto;
+                margin-right: 10px;
+                overflow-x: hidden;
+            }
             &>li{
                 width: 25%;
                 list-style: none;
@@ -9,7 +15,7 @@
                 background: #fff;
                 border: 1px solid #d9d9d9;
                 padding:20px 10px;
-                margin-right: 20px;
+                // margin-right: 20px;
             }
         }
         .el-table th{
@@ -25,6 +31,10 @@
                     
                     .label_name{
                         font-size: 14px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        width: 95%;
+                        display: block;
                     }
                     .rsk{
                         color: #DF5706;
@@ -81,7 +91,7 @@
     <p>任务管理 > 风险点任务</p>
     <div class="content task">
         <ul class="danger">
-            <li>
+            <li class="companies">
                 <el-form size="small" >
                     <el-form-item>
                         <el-input suffix-icon="el-icon-search" v-model="filterText" placeholder="公司名称"></el-input>
@@ -93,12 +103,12 @@
                     :expand-on-click-node="false">
                     <span  class="custom-tree-node" slot-scope="{ node, data }" @click="() => edit(data)" >
                         <span v-if='form.riskpoint_id==data.id' class="active">
-                            <span v-if='data.type=="ent"' class="label_name"><i  class="el-icon-film"></i>{{ node.label }}</span> 
+                            <span v-if='data.type=="ent"' class="label_name"><i  class="el-icon-film"></i> {{ node.label }}</span> 
                             <span v-if='data.type=="rsk"' class="label_name rsk"><img  width="15" src="../../images/rsk2.png" alt="">  {{ node.label }}</span>                           
                             <span v-if='!data.type' class="label_name rsk" style="color:#F49C0B;"><img  width="15" src="../../images/rsk1.png" alt="">  {{ node.label }}</span>  
                         </span>
                         <span v-else>
-                            <span v-if='data.type=="ent"' class="label_name"><i  class="el-icon-film"></i>{{ node.label }}</span> 
+                            <span v-if='data.type=="ent"' class="label_name"><i  class="el-icon-film"></i> {{ node.label }}</span> 
                             <span v-if='data.type=="rsk"' class="label_name rsk"><img  width="15" src="../../images/rsk2.png" alt="">  {{ node.label }}</span>                           
                             <span v-if='!data.type' class="label_name rsk" style="color:#F49C0B;"><img  width="15" src="../../images/rsk1.png" alt="">  {{ node.label }}</span>  
                         </span>
@@ -119,7 +129,7 @@
                     </el-form>
                     <el-table
                             class="table"
-                            :data="list" height="60vh"
+                            :data="list" height="55vh"
                             border  v-loading="loading"
                             style="width: 100%">
                             <el-table-column   align="center" label="风险点划分">
@@ -153,6 +163,15 @@
                                 <el-table-column prop="held_person_phone" label="电话"></el-table-column>
                                 <el-table-column prop="cycle" label="管控周期"></el-table-column>
                             </el-table-column>
+                            <el-table-column fixed="right"
+                            prop="zip"  width="150"
+                            label="操作">
+                            <template slot-scope="scope">
+                                <!-- <el-button icon="el-icon-view" size="mini"  type="success">查看</el-button> -->
+                                <el-button icon="el-icon-edit" @click="change(scope.row)" size="mini" type="warning">编辑</el-button>
+                                <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
+                            </template>
+                            </el-table-column>
                     </el-table>
                     <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
             </li>
@@ -334,7 +353,7 @@ export default {
                 this.$confirm('确定删除吗', '提示', {
                         type: 'warning'
                     }).then(() => {
-                    this.$api.deleteClass({id:id}).then((res)=>{
+                    this.$api.deleteMonittask({id:id}).then((res)=>{
                             this.$message({
                                 message: '删除成功',
                                 type: 'success'
@@ -374,6 +393,15 @@ export default {
             }
             
         },
+        change(data){
+            //获取部门
+            this.$api.getDepartmentList({enterprise_id:data.enterprise_id}).then(res=>{
+                this.departmentList=res.data.data.list;
+                this.dialogFormVisible=true;
+                this.rsk={...data}
+            })
+            
+        }
     },
 	created(){
         this.getRisk()