From c44396a8f408bc2b2ef61303786e0121dd8896a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <>
Date: Wed, 28 Jun 2023 14:11:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E6=A0=91=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/analEvaluation.component.vue           |  2 --
 src/components/measure.component.vue                  |  2 --
 src/components/tree.component.vue                     | 11 ++++-------
 src/views/hiddenDanger/clap.component.vue             |  1 +
 src/views/hiddenDanger/common.component.html          |  6 +++---
 src/views/hiddenDanger/manager.component.vue          |  2 +-
 src/views/risk/assessment/device/device.component.vue |  2 +-
 .../risk/assessment/device/deviceAnal.component.vue   |  2 +-
 src/views/risk/assessment/work/work.component.vue     |  2 +-
 src/views/risk/assessment/work/workAnal.component.vue |  2 +-
 10 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/components/analEvaluation.component.vue b/src/components/analEvaluation.component.vue
index 8455ea1..c1a1290 100644
--- a/src/components/analEvaluation.component.vue
+++ b/src/components/analEvaluation.component.vue
@@ -99,7 +99,6 @@ import TableComponent from "hbt-common/components/common/table.component.vue"
 import FormOption from "hbt-common/models/formOptions"
 import BtnOption from "hbt-common/models/btnOptions"
 import DrawComponent from '@/components/draw.component.vue';
-import UnitTreeComponent from '@/components/tree.component.vue';
 import WorkService from '@/service/work.service';
 import UnitService from '@/service/unit.service';
 import AreaService from '@/service/area.service';
@@ -115,7 +114,6 @@ import MeasureComponent from '@/components/measure.component.vue'
         FormComponent,
         TableComponent,
         DrawComponent,
-        UnitTreeComponent,
         ButtonListComponent,
         MeasureComponent,
     }
diff --git a/src/components/measure.component.vue b/src/components/measure.component.vue
index 2b529d5..c832e85 100644
--- a/src/components/measure.component.vue
+++ b/src/components/measure.component.vue
@@ -48,7 +48,6 @@ import TableComponent from "hbt-common/components/common/table.component.vue"
 import FormOption from "hbt-common/models/formOptions"
 import BtnOption from "hbt-common/models/btnOptions"
 import DrawComponent from '@/components/draw.component.vue';
-import UnitTreeComponent from '@/components/tree.component.vue';
 import WorkService from '@/service/work.service';
 import UnitService from '@/service/unit.service';
 import AreaService from '@/service/area.service';
@@ -63,7 +62,6 @@ import { L_LECCOLUMN, L_LECVALUE, E_COLUMN, E_VALUE, C_COLUMN, C_VALUE } from '@
         FormComponent,
         TableComponent,
         DrawComponent,
-        UnitTreeComponent,
         ButtonListComponent,
     }
 })
diff --git a/src/components/tree.component.vue b/src/components/tree.component.vue
index 60779ab..32bb69b 100644
--- a/src/components/tree.component.vue
+++ b/src/components/tree.component.vue
@@ -5,8 +5,6 @@
 </template>
 <script lang="ts">
 import { Component, Emit, Prop, Vue } from 'vue-property-decorator';
-import mapboxgl from "mapbox-gl";
-import "mapbox-gl/dist/mapbox-gl.css"
 import UnitService from '@/service/unit.service';
 @Component
 export default class UnitTreeComponent extends Vue {
@@ -20,7 +18,10 @@ export default class UnitTreeComponent extends Vue {
 
     created(){
         this.unitService.getUnitTree().then(res=>{
-            this.treeData = res.data;
+            this.treeData = [{
+                name:"全部",
+                children:res.data
+            }];
         })
     }
     beforeDestory(){
@@ -29,8 +30,4 @@ export default class UnitTreeComponent extends Vue {
 }
 </script>
 <style lang="scss" scoped>
-.map{
-    width: 100%;
-    height: 100%;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue
index 67c64da..6060631 100644
--- a/src/views/hiddenDanger/clap.component.vue
+++ b/src/views/hiddenDanger/clap.component.vue
@@ -404,6 +404,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
 
     public buildTable(){
         this.tableColumn.push({name:'整改单编号',key:"number"});
+        this.tableColumn.push({name:'隐患描述',key:"description",width:"200px"});
         this.tableColumn.push({name:'整改部门',key:"reformDeptName"});
         this.tableColumn.push({name:'隐患级别',render:(data)=>{
             return this.levelMap[data.level]
diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html
index 8d6bc7d..6832553 100644
--- a/src/views/hiddenDanger/common.component.html
+++ b/src/views/hiddenDanger/common.component.html
@@ -29,9 +29,9 @@
                         <template slot-scope="scope">
                             <el-button type="text" v-if="isFile" @click="showUpdateModel(scope.row.userId)">查看</el-button>
                             <el-button type="text" v-if="isBase" @click="showUpdateModel(scope.row,true)">查看</el-button>
-                            <el-button type="text" v-if="isBase" @click="showUpdateModel(scope.row)">修改</el-button>
-                            <el-button type="text" v-if="isBase" @click="deleteData([scope.row.id])">删除</el-button>
-                            <el-button type="text" v-if="isPlan && !scope.row.status" @click="openSendModel(scope.row)">下发</el-button>
+                            <el-button type="text" v-if="isBase" :disabled="isPlan && ((scope.row.planType===2 && scope.row.state) || (scope.row.planType===1 && scope.row.status))" @click="showUpdateModel(scope.row)">修改</el-button>
+                            <el-button type="text" v-if="isBase" :disabled="isPlan && ((scope.row.planType===2 && (scope.row.state || scope.row.status)) || (scope.row.planType===1 && scope.row.status))" @click="deleteData([scope.row.id])">删除</el-button>
+                            <el-button type="text" v-if="isPlan && !scope.row.status" :disabled="scope.row.planType===2 && scope.row.state===0 " @click="openSendModel(scope.row)">下发</el-button>
                             <el-button type="text" v-if="isPlan && scope.row.planType===2 && !scope.row.state" @click="changeState(scope.row)">启用</el-button>
                             <el-button type="text" v-if="isPlan && scope.row.planType===2 && scope.row.state" @click="changeState(scope.row)">停用</el-button>
                             <el-button type="text" v-if="isPlan" @click="openRecordModel(scope.row)">检查情况</el-button>
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index 0f45b96..7925850 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -91,7 +91,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         type:"primary"
     },{
         name:"保存",
-        value:"save",
+        value:"draft",
         type:"primary"
     }];
 
diff --git a/src/views/risk/assessment/device/device.component.vue b/src/views/risk/assessment/device/device.component.vue
index 980e67c..a411cee 100644
--- a/src/views/risk/assessment/device/device.component.vue
+++ b/src/views/risk/assessment/device/device.component.vue
@@ -262,7 +262,7 @@ export default class DeviceManagerComponent extends BaseRecordComponent<any> {
         if (data.areaId) {
             this.params.unitName = data.name
         } else {
-            this.params.areaName = data.name
+            this.params.areaName = data.name==="全部"?"":data.name
         }
         this.getTableData()
     }
diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue
index 87f985f..313cbd4 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.vue
+++ b/src/views/risk/assessment/device/deviceAnal.component.vue
@@ -407,7 +407,7 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
         if (data.areaId) {
             this.params.unitName = data.name
         } else {
-            this.params.areaName = data.name
+            this.params.areaName = data.name==="全部"?"":data.name
         }
         this.getTableData()
 
diff --git a/src/views/risk/assessment/work/work.component.vue b/src/views/risk/assessment/work/work.component.vue
index 557a18f..4c1fd4d 100644
--- a/src/views/risk/assessment/work/work.component.vue
+++ b/src/views/risk/assessment/work/work.component.vue
@@ -307,7 +307,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
         if(data.areaId){
             this.params.unitName = data.name
         }else{
-            this.params.areaName = data.name
+            this.params.areaName = data.name==="全部"?"":data.name
         }
         this.getTableData()
     }
diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue
index 5542cb7..0825733 100644
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@@ -406,7 +406,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         if (data.areaId) {
             this.params.unitName = data.name
         } else {
-            this.params.areaName = data.name
+            this.params.areaName = data.name==="全部"?"":data.name
         }
         this.getTableData()