From 3c647d3837f7a1c2c146b7d4c39a87174782215f Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 23 八月 2022 11:15:51 +0800
Subject: [PATCH] lct

---
 src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue                       |    4 
 src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue                  |   30 +
 src/views/doublePreventAction/riskLevelManage/controlAction/controlActionSelect/index.vue |  557 ++++++++++++++++++++++++++++++++++++++++++
 src/api/riskLevelManage.js                                                                |   12 
 src/views/doublePreventAction/riskLevelManage/controlAction/index.vue                     |   28 +
 src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue                   |   41 ++-
 src/views/doublePreventAction/riskLevelManage/checkUnit/index.vue                         |    5 
 src/views/doublePreventAction/riskLevelManage/event/index.vue                             |   27 +
 src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue            |    2 
 src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue                       |   30 +
 src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue           |    2 
 src/views/doublePreventAction/riskLevelManage/checkUnit/components/inpectionPoint.vue     |   29 +-
 src/views/login/register.vue                                                              |    2 
 src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue            |    2 
 14 files changed, 692 insertions(+), 79 deletions(-)

diff --git a/src/api/riskLevelManage.js b/src/api/riskLevelManage.js
index bf8b89d..a490a6d 100644
--- a/src/api/riskLevelManage.js
+++ b/src/api/riskLevelManage.js
@@ -162,6 +162,18 @@
     })
 }
 
+export function getRiskControlMeasureData(data) {
+    return request({
+        headers: {
+            'Authorization': getToken()
+        },
+        url: process.env.BASE_API + '/prevent/riskControlMeasure/select/listControlMeasure',
+        method: 'post',
+        data:data
+    })
+}
+
+
 export function addRiskControlMeasure(data) {
     return request({
         headers: {
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue
index d8c1f5f..055ac2d 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/index.vue
@@ -53,7 +53,7 @@
                 <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip min-width="200px"></el-table-column>
                 <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip min-width="150px"></el-table-column>
                 <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip min-width="200px"></el-table-column>
-                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width" fixed="right">
                     <template slot-scope="scope">
                         <el-button type="text" @click="viewHandle('查看',scope.row)">查看</el-button>
                         <el-button type="text"  v-show="scope.row.dangerStatus === 1" @click="checkDialog(scope.row)">验收</el-button>
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
index b076905..b2cb38f 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/index.vue
@@ -58,7 +58,7 @@
                 <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip min-width="200px"></el-table-column>
                 <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip min-width="150px"></el-table-column>
                 <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip min-width="200px"></el-table-column>
-                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width" fixed="right">
                     <template slot-scope="scope">
                         <el-button type="text" @click="viewHandle('查看',scope.row)">查看</el-button>
                         <el-button type="text" v-show="scope.row.dangerStatus === 0 || scope.row.dangerStatus === 2" @click="viewHandle('整改', scope.row)">整改</el-button>
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
index ed85ce3..efc8517 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/index.vue
@@ -74,7 +74,7 @@
                 <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip min-width="200px"></el-table-column>
                 <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip min-width="150px"></el-table-column>
                 <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip min-width="200px"></el-table-column>
-                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width" fixed="right">
                     <template slot-scope="scope">
                         <el-button type="text" @click="showCreateHandle('修改', scope.row)">修改</el-button>
                         <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index ef8af35..a845051 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -300,8 +300,8 @@
 
                 },
                 checkWorkTypeList: [
-                    { id: 1, name: '日常作业' },
-                    { id: 2, name: '周期作业' }
+                    { id: 1, name: '周期作业' },
+                    { id: 2, name: '日常作业' }
                 ],
                 checkWorkStatusList: [
                     { id: 1, name: '开启' },
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index 4a01cb4..f9a9c1c 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -30,9 +30,9 @@
             </div>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showAnalyseUnitForm('','新增')">新增</el-button>
-            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showDepartmentChart()">图表</el-button>
-            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
-            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="exportToExcel()">导出</el-button>
+<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showDepartmentChart()">图表</el-button>-->
+<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
+<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="exportToExcel()">导出</el-button>-->
         </div>
         <div class="table_content">
             <el-table
@@ -378,14 +378,22 @@
                     cancelButtonText:'取消',
                     type:'warning',
                 }).then(()=> {
-                    deleteAnalyseUnit({id:val.id}).then( ()=>{
-                        this.getAnalyseUnitData()
-                        this.$notify({
-                            title:'成功',
-                            message:'删除成功',
-                            type:'success',
-                            duration:2000,
-                        })
+                    deleteAnalyseUnit({id:val.id}).then( (res)=>{
+                        if(res.data.code === '200'){
+                            this.getAnalyseUnitData()
+                            this.$notify({
+                                title:'成功',
+                                message:'删除成功',
+                                type:'success',
+                                duration:2000,
+                            })
+                        }else{
+                            this.$message({
+                                type:'warning',
+                                message:res.data.message
+                            })
+                        }
+
                     })
                 })
             },
diff --git a/src/views/doublePreventAction/riskLevelManage/checkUnit/components/inpectionPoint.vue b/src/views/doublePreventAction/riskLevelManage/checkUnit/components/inpectionPoint.vue
index f1f4134..004c809 100644
--- a/src/views/doublePreventAction/riskLevelManage/checkUnit/components/inpectionPoint.vue
+++ b/src/views/doublePreventAction/riskLevelManage/checkUnit/components/inpectionPoint.vue
@@ -15,7 +15,7 @@
             >
                 <el-table-column label="序号" type="index" width="150" align="center">
                 </el-table-column>
-                 <el-table-column label="隐患排查内容" prop="checkContent" align="center">
+                 <el-table-column label="隐患排查内容" prop="checkContent" align="center" show-overflow-tooltip>
                 </el-table-column>
                    <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
                     <template slot-scope="scope">
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-    import controlAction from '../../../riskLevelManage/controlAction/index'
+    import controlAction from '../../../riskLevelManage/controlAction/controlActionSelect/index'
     import { addInspectionControlAction, deleteInspectionControlAction ,getInspectionControlAction } from '../../../../../api/inspectionTask'
     export default {
         props:['title','inspectionTaskForm'],
@@ -61,7 +61,7 @@
             showControlAction (){
                 this.controlActionVisible = true
                 setTimeout( () => {
-                    this.$refs.controlAction.ifShowButton(this.inspectionPointData)
+                    this.$refs.controlAction.ifShowButton(this.inspectionPointData,this.title)
                 })
             },
             showMeasureDetail(val){
@@ -70,25 +70,26 @@
                     this.$refs.controlAction.showMeasureDetail(val)
                     this.$refs.controlAction.ifShowSelf = false
                 })
-
             },
             closeDialog(){
                 this.controlActionVisible = false
             },
             async receiveRiskControlId(value) {
                 this.controlActionVisible  = false
-                    if(value){
-                        this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => {
-                            return {
-                                id:item.id,
-                                checkContent:item.checkContent
-                            }
-                        })))
-                        this.$emit('giveToForm',this.inspectionPointData)
-                    }
+                //     if(value){
+                //         this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => {
+                //             return {
+                //                 id:item.id,
+                //                 checkContent:item.checkContent
+                //             }
+                //         })))
+                this.inspectionPointData = value
+                this.$emit('giveToForm',value)
+                    // }
             },
             deleteById(value,scope){
-                    this.inspectionPointData.splice(value,1)
+                this.inspectionPointData.splice(value,1)
+                this.$emit('giveToForm',this.inspectionPointData)
             },
             async getControlActionList(){
                 let res = await getInspectionControlAction(this.inspectionTaskForm.workId)
diff --git a/src/views/doublePreventAction/riskLevelManage/checkUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/checkUnit/index.vue
index ef0be9d..e53ae55 100644
--- a/src/views/doublePreventAction/riskLevelManage/checkUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/checkUnit/index.vue
@@ -232,9 +232,8 @@
                     this.inspectionTaskForm.measureList = []
                     if(value.measureList !== null){
                         this.inspectionTaskForm.measureList = JSON.parse(JSON.stringify(value.measureList.map( item => {
-                            return {
-                                id:item.id,
-                            }
+                            return item.id
+
                         })))
                     }
 
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/controlActionSelect/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/controlActionSelect/index.vue
new file mode 100644
index 0000000..f2b05b6
--- /dev/null
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/controlActionSelect/index.vue
@@ -0,0 +1,557 @@
+<template>
+    <div class="app-container">
+        <el-card style="margin-bottom: 20px">
+            <el-tabs class="active" style="margin-bottom:10px">
+                <el-tab-pane label="已选择措施">
+                    <div class="table_content" >
+                        <el-table
+                            v-loading="listLoading"
+                            :key="tableKey"
+                            :data="inspectionPointData"
+                            border
+                            fit
+                            highlight-current-row
+                            style="width: 100%;"
+                        >
+                            <el-table-column label="序号" type="index" width="150" align="center">
+                            </el-table-column>
+                            <el-table-column label="隐患排查内容" prop="checkContent" align="center" show-overflow-tooltip>
+                            </el-table-column>
+                            <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
+                                <template slot-scope="scope">
+                                    <!--                        <el-button type="text" @click="showMeasureDetail(scope.row)" v-show="ifEdit">详情</el-button>-->
+                                    <el-button type="text" style="color:red;" @click="deleteInspectPoint(scope.$index,scope.row)">删除</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </el-tab-pane>
+
+            </el-tabs>
+        </el-card>
+
+        <el-card style="margin-bottom: 20px">
+            <el-tabs class="active" style="margin-bottom:10px">
+                <el-tab-pane label="可选择措施">
+                    <div class="filter-container">
+                        <div class="basic_search">
+                            <span>风控措施编码:</span>
+                            <el-input clearable style="width:200px" v-model="listQuery.controlMeasureCode" placeholder="风险措施编码" clearable>
+                            </el-input>
+                        </div>
+                        <div class="basic_search">
+                            <span>管控方式:</span>
+                            <el-select clearable style="width:200px" v-model="listQuery.controlType" placeholder="安全风险事件" clearable>
+                                <el-option v-for="item in controlTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                            </el-select>
+                        </div>
+                        <div class="basic_search">
+                            <span>管控措施分类1:</span>
+                            <el-select clearable style="width:200px" @change="changeClassifyTwoList" v-model="listQuery.classify1" placeholder="安全风险事件" clearable>
+                                <el-option v-for="item in classifyOneList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                            </el-select>
+                        </div>
+
+                        <div class="basic_search">
+                            <span>管控措施分类2:</span>
+                            <el-select clearable style="width:200px" v-model="listQuery.classify2" placeholder="安全风险事件" clearable>
+                                <el-option v-for="item in classifyTwoList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                            </el-select>
+                        </div>
+                        <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
+<!--<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="selectAll">全选当前页</el-button>-->
+                        <!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
+                        <!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>-->
+                    </div>
+                    <div class="table_content">
+                        <el-table
+                            v-loading="listLoading"
+                            :key="tableKey"
+                            :data="riskControlMeasureData"
+                            border
+                            fit
+                            ref="table"
+                            highlight-current-row
+                            style="width: 100%;"
+                        >
+                            <!--                <el-table-column type="selection"  :reserve-selection="true" width="55"></el-table-column>-->
+                            <el-table-column type="index" label="序号" width="60" />
+                            <el-table-column prop="controlMeasureCode" label="风控措施编码" show-overflow-tooltip></el-table-column>
+                            <el-table-column prop="controlType" label="管控方式" show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    {{ parseNumber(scope.row.controlType, '管控方式') }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="checkContent" label="管控内容" show-overflow-tooltip></el-table-column>
+                            <el-table-column prop="classify1" label="管控措施分类1" show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    {{ parseNumber(scope.row.classify1, '管控措施分类1') }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="classify2" label="管控措施分类2" show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    {{ parseNumber(scope.row.classify2, '管控措施分类2') }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="classify3" label="管控措施分类3" show-overflow-tooltip></el-table-column>
+                            <el-table-column prop="measureDesc" label="措施说明" show-overflow-tooltip></el-table-column>
+                            <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
+                                <template slot-scope="scope">
+                                    <el-button type="text" @click="giveValue(scope.row,)">选择</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <br>
+                        <el-pagination
+                            v-show="recordTotal>0"
+                            :current-page="listQuery.pageIndex"
+                            :page-sizes="[10, 20, 30, 50]"
+                            :page-size="listQuery.pageSize"
+                            :total="recordTotal"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            background
+                            style="float:right;"
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                        />
+                        <br>
+                    </div>
+                </el-tab-pane>
+            </el-tabs>
+        </el-card>
+        <div  align="right">
+            <el-button @click="inspectionPointData = false">取消</el-button>
+            <el-button type="primary" @click="submitAllAction()">确认</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { computePageCount } from '@/utils'
+import { addRiskControlMeasure, deleteRiskControlMeasure, getRiskControlMeasureList, updateRiskControlMeasure } from '@/api/riskLevelManage'
+import {
+    exportRiskControlMeasure, getAllSafetyRiskEventList,
+    getClassify,getRiskControlMeasureData,
+    getRiskEventList, importAnalyseUnit, importRiskControlMeasure
+} from "../../../../../api/riskLevelManage";
+import {dictionaryAllItems} from "../../../../../api/dictionary";
+import {parseError} from "../../../../../utils/messageDialog";
+const exampleFile = require('@/assets/example/riskControlMeasure.xlsx')
+export default {
+    name: 'index',
+    filters: {
+    },
+    computed: {
+        ...mapGetters([
+            'userType'
+        ])
+    },
+    data() {
+        return {
+            tableKey: 0,
+            riskControlMeasureData: [],
+            riskEventList:[],
+            inspectionPointData:[],
+            controlTypeList: [
+                { id: 1, name: '自动化监控' },
+                { id: 2, name: '隐患排查' }
+            ],
+            classifyOneList:[],
+            classifyTwoList:[],
+            list:[],
+            riskControlMeasureIdList:[],
+            timeUnitList:[{id:1,name:'小时'},{id:2,name:'天'},{id:3,name:'周'},{id:4,name:'月'},],
+            listLoading: false,
+            showCurrent:true,
+            showOther:false,
+            ifShowSelf:true,
+            pageSize: 10,
+            recordTotal: 0,
+            currentPage: 1,
+            pageTotal: 0,
+            title:'',
+            company:'',
+            code:'',
+            importDialogFormVisible:false,
+            riskControlMeasureVisible:false,
+            riskControlMeasureFormRules:{
+                riskEventId: [{ required: true, message: '请选择风险事件', trigger: 'change' }],
+                controlMeasureCode: [{ required: true, message: '请填写风险措施编码', trigger: 'blur' }],
+                controlType: [{ required: true, message: '请选择管控方式', trigger: 'change' }],
+                checkContent: [{ required: true, message: '请填写管控内容', trigger: 'blur' }],
+                classify1: [{ required: true, message: '请选择管控措施分类1', trigger: 'change' }],
+                classify2: [{ required: true, message: '请选择管控措施分类2', trigger: 'change' }],
+                classify3: [{ required: true, message: '请填写管控措施分类3', trigger: 'blur' }],
+                measureDesc: [{ required: true, message: '请填写措施说明', trigger: 'blur' }]
+            },
+            riskControlMeasureForm:{
+                riskEventId: null,
+                controlMeasureCode: null,
+                controlType: null,
+                checkContent: null,
+                classify1: null,
+                classify2: null,
+                classify3: null,
+                measureDesc: null
+            },
+            listQuery:{
+                pageIndex:1,
+                pageSize:10,
+                controlType: null,
+                controlMeasureCode: null,
+                classify1:null,
+                classify2:null,
+            },
+        }
+    },
+    created() {
+        this.getRiskControlMeasureData()
+        this.getRiskEvent()
+        this.getClassify()
+    },
+    methods: {
+        async getRiskControlMeasureData(){
+            this.listLoading = true
+            let res = await getRiskControlMeasureData(this.listQuery)
+            if(res.data.code === '200'){
+                this.recordTotal = res.data.count
+                this.riskControlMeasureData = res.data.data
+            }else{
+                this.$message({
+                    message:res.data.message,
+                    type:'warning'
+                })
+            }
+            this.listLoading = false
+
+
+        },
+
+        async getData(){
+            this.listLoading = true
+            let res = await getRiskControlMeasureList(this.listQuery)
+            if(res.data.code === '200'){
+                this.recordTotal = res.data.count
+                this.riskControlMeasureData = res.data.data
+            }else{
+                this.$message({
+                    message:res.data.message,
+                    type:'warning'
+                })
+            }
+            this.listLoading = false
+        },
+
+        async getRiskEvent(){
+            let res = await getAllSafetyRiskEventList()
+            if(res.data.code === '200'){
+                this.riskEventList = JSON.parse(JSON.stringify(res.data.data))
+            }else{
+                this.$message({
+                    message:res.data.message,
+                    type:'warning'
+                })
+            }
+        },
+        async getClassify(){
+            let res = await getClassify({pageSize:1000,pageIndex:1,filter:{riskEventName:''}})
+            if(res.data.code === '200'){
+                this.classifyOneList = res.data.result
+                this.list = []
+                this.classifyOneList.forEach(item =>{
+                    for(let i in item.subClassify){
+                        this.list.push(item.subClassify[i])
+                    }
+                })
+            }else{
+                this.$message({
+                    message:res.data.message,
+                    type:'warning'
+                })
+            }
+        },
+
+        changeClassifyTwoList(){
+            debugger
+            if(this.listQuery.classify1 === 1){
+                this.classifyTwoList = this.classifyOneList[0].subClassify
+                this.listQuery.classify2 = ''
+            }else if(this.listQuery.classify1 === 2) {
+                this.classifyTwoList = this.classifyOneList[1].subClassify
+                this.listQuery.classify2 = ''
+            }else if(this.listQuery.classify1 === 3) {
+                this.classifyTwoList = this.classifyOneList[2].subClassify
+                this.listQuery.classify2 = ''
+            }else if(this.listQuery.classify1 === 4){
+                this.classifyTwoList = this.classifyOneList[3].subClassify
+                this.listQuery.classify2 = ''
+            }else{
+                this.classifyTwoList = []
+            }
+        },
+
+        parseNumber(value, type) {
+            if (type === '管控方式') {
+                return this.controlTypeList.find((item) => item.id === value).name;
+            }else if(type === '管控措施分类1'){
+                return this.classifyOneList.find((item) => item.id === value).name
+            }else{
+                return this.list.find((item) => item.id === value).name
+            }
+        },
+
+        showRiskControlMeasureForm(value,type){
+            this.riskControlMeasureVisible = true
+            this.$nextTick(() =>{
+                this.$refs["riskControlMeasureForm"].clearValidate()
+            })
+            if(type === '新增'){
+                this.title = '新增'
+                this.riskControlMeasureForm = {
+                    riskEventId: null,
+                    controlMeasureCode: null,
+                    controlType: null,
+                    checkContent: null,
+                    classify1: null,
+                    classify2: null,
+                    classify3: null,
+                    measureDesc: null
+                }
+            }else{
+                this.title = '修改'
+                for( let key in this.riskControlMeasureForm){
+                    this.riskControlMeasureForm[key] = JSON.parse(JSON.stringify(value))[key]
+                }
+                this.riskControlMeasureForm.id = JSON.parse(JSON.stringify(value)).id
+            }
+        },
+        submitAnalyseUnit(){
+            this.$refs["riskControlMeasureForm"].validate((valid) => {
+                if(valid){
+                    if(this.title === '新增'){
+                        addRiskControlMeasure(this.riskControlMeasureForm).then((res)=>{
+                            if(res.data.code === '200'){
+                                this.riskControlMeasureVisible = false
+                                this.getRiskControlMeasureData()
+                                this.$notify({
+                                    type:'success',
+                                    duration:2000,
+                                    message:'新增成功',
+                                    title:'成功'
+                                })
+                            }else{
+                                this.$message({
+                                    type:'warning',
+                                    message:res.data.message
+                                })
+                            }
+                        })
+                    }else{
+                        updateRiskControlMeasure(this.riskControlMeasureForm).then((res)=>{
+                            if(res.data.code === '200'){
+                                this.riskControlMeasureVisible = false
+                                this.getRiskControlMeasureData()
+                                this.$notify({
+                                    type:'success',
+                                    duration:2000,
+                                    title:'成功',
+                                    message:'编辑成功'
+                                })
+                            }else{
+                                this.$message({
+                                    type:'warning',
+                                    message:res.data.message
+                                })
+                            }
+                        })
+                    }
+                }else{
+                    this.$message({
+                        message:'请完善基本信息',
+                        type:'warning'
+                    })
+                }
+            })
+        },
+        deleteById(val){
+            this.$confirm('删除此条信息,是否继续','提示',{
+                confirmButtonText:'确定',
+                cancelButtonText:'取消',
+                type:'warning',
+            }).then(()=> {
+                deleteRiskControlMeasure({id:val.id}).then( (res)=>{
+                    if(res.data.code === '200'){
+                        this.getRiskControlMeasureData()
+                        this.$notify({
+                            title:'成功',
+                            message:'删除成功',
+                            type:'success',
+                            duration:2000,
+                        })
+                    }else{
+                        this.$message({
+                            type:'warning',
+                            message:res.data.message
+                        })
+                    }
+
+                })
+            })
+        },
+
+        viewHandle() {
+            window.open(exampleFile, '_blank')
+        },
+
+        showImportDialog(){
+            this.importDialogFormVisible = true
+        },
+
+        importToTable(){
+            const formData = new FormData()
+            const files = this.$refs['importLabInput'].files
+            if (files && files.length > 0) {
+                formData.append('file', files[0])
+            }
+            importRiskControlMeasure(formData).then((response) => {
+                const res = response.data
+                if (res.code == 200) {
+                    this.importDialogFormVisible = false
+                    this.$message({
+                        message: '导入成功',
+                        type: 'success'
+                    })
+                    this.getRiskControlMeasureData()
+                } else {
+                    parseError({ error: res.message, vm: this })
+                }
+            }).catch((error) => {
+                parseError({ error: error, vm: this })
+            })
+        },
+
+        exportToExcel() {
+            exportRiskControlMeasure(this.listQuery.filter).then(res=>{
+                if (res.data.code === '200') {
+                    if(res.data.result === null ||res.data.result === [] || res.data.result.length === 0){
+                        this.$message({
+                            type:'warning',
+                            message:'无数据可导出'
+                        })
+                    }
+                    else{
+                        let allData = res.data.result
+                        import('@/vendor/Export2Excel').then((excel) => {
+                            const tHeader = [
+                                '安全风险事件名称',
+                                '管控方式',
+                                '管控方式描述',
+                                '管控措施分类1',
+                                '管控措施分类2',
+                                '管控措施分类3',
+                                '隐患排查内容',
+                            ]
+                            const filterVal = [
+                                'riskEventName',
+                                'dataSrc',
+                                'riskMeasureDesc',
+                                'classify1',
+                                'classify2',
+                                'classify3',
+                                'troubleshootContent',
+                            ]
+                            const data = this.formatJson(filterVal, allData)
+                            excel.export_json_to_excel({
+                                header: tHeader,
+                                data,
+                                filename: '安全风险管控措施数据'
+                            })
+                        })
+
+                    }
+                }
+            })
+        },
+
+        formatJson(filterVal, jsonData) {
+            return jsonData.map(v => filterVal.map(j => v[j]))
+        },
+
+        refreshHandle(){
+            this.getRiskControlMeasureData()
+        },
+        handleSizeChange(val){
+            this.listQuery.pageSize = val
+            this.getRiskControlMeasureData()
+        },
+        handleCurrentChange(val){
+            this.listQuery.pageIndex = val
+            this.getRiskControlMeasureData()
+        },
+
+        ifShowButton (value,title){
+            this.getRiskControlMeasureData()
+            if(title === '新建隐患排查单元'){
+                this.inspectionPointData = []
+            }else{
+                this.inspectionPointData = value
+            }
+        },
+
+        handleSelectionChange(val){
+            this.riskControlMeasureIdList = val
+        },
+
+        getRowKey(value){
+            return value.id
+        },
+
+        deleteInspectPoint(value) {
+            this.inspectionPointData.splice(value,1)
+        },
+
+        submitAllAction() {
+            this.$emit('giveRiskControlId',this.inspectionPointData)
+        },
+
+        giveValue(value){
+            if(this.inspectionPointData.find(item => item.id === value.id) === undefined){
+                this.inspectionPointData.push(
+                    {
+                        id:value.id,
+                        checkContent:value.checkContent
+                    })
+            }else{
+                this.$message({
+                    type:'warning',
+                    message:'该措施已存在已选措施列表中'
+                })
+            }
+
+
+            // this.$emit('giveRiskControlId',value)
+        },
+        showMeasureDetail(value){
+            this.riskControlMeasureVisible = true
+            this.getRiskControlMeasureData().then( ()=>{
+                let riskControlMeasureForm = this.riskControlMeasureData.find(item => item.id === value.measureId)
+                this.riskControlMeasureForm = riskControlMeasureForm
+                this.$emit('closeDialog')
+            })
+        }
+    }
+}
+</script>
+<style scoped>
+.basic_search{
+    display:inline-block;
+    padding-bottom: 10px;
+}
+.analyseUnit_input{
+    width:200px;
+}
+.analyseUnit_box{
+    width:90%;
+}
+</style>
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index 036fb74..34983e2 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -20,8 +20,8 @@
             </div>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskControlMeasureForm('','新增')" v-show="showCurrent">新增</el-button>
-            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
-            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>
+<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
+<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>-->
         </div>
         <div class="table_content">
             <el-table
@@ -426,14 +426,22 @@
                     cancelButtonText:'取消',
                     type:'warning',
                 }).then(()=> {
-                    deleteRiskControlMeasure({id:val.id}).then( ()=>{
-                        this.getRiskControlMeasureData()
-                        this.$notify({
-                            title:'成功',
-                            message:'删除成功',
-                            type:'success',
-                            duration:2000,
-                        })
+                    deleteRiskControlMeasure({id:val.id}).then( (res)=>{
+                        if(res.data.code === '200'){
+                            this.getRiskControlMeasureData()
+                            this.$notify({
+                                title:'成功',
+                                message:'删除成功',
+                                type:'success',
+                                duration:2000,
+                            })
+                        }else{
+                            this.$message({
+                                type:'warning',
+                                message:res.data.message
+                            })
+                        }
+
                     })
                 })
             },
diff --git a/src/views/doublePreventAction/riskLevelManage/event/index.vue b/src/views/doublePreventAction/riskLevelManage/event/index.vue
index ce13a91..5410776 100644
--- a/src/views/doublePreventAction/riskLevelManage/event/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/event/index.vue
@@ -8,8 +8,8 @@
             </div>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskEvent('','新增')">新增</el-button>
-            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
-            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>
+<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
+<!--            <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>-->
         </div>
         <div class="table_content">
             <el-table
@@ -280,14 +280,21 @@
                     cancelButtonText:'取消',
                     type:'warning',
                 }).then(()=> {
-                    deleteRiskEvent({id:val.id}).then( ()=>{
-                        this.getRiskEventData()
-                        this.$notify({
-                            title:'成功',
-                            message:'删除成功',
-                            type:'success',
-                            duration:2000,
-                        })
+                    deleteRiskEvent({id:val.id}).then( (res)=>{
+                        if(res.data.code === '200'){
+                            this.getRiskEventData()
+                            this.$notify({
+                                title:'成功',
+                                message:'删除成功',
+                                type:'success',
+                                duration:2000,
+                            })
+                        }else{
+                            this.$message({
+                                type:'warning',
+                                message:res.data.message
+                            })
+                        }
                     })
                 })
             },
diff --git a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
index b8c42f1..377ace5 100644
--- a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
@@ -16,7 +16,7 @@
             </div>
             <div class="basic_search">
                 <span>风险等级:</span>
-                <el-select v-model="listQuery.level">
+                <el-select v-model="listQuery.riskLevel">
                     <el-option
                         v-for="item in levelList"
                         :key="item.id"
@@ -55,8 +55,8 @@
 
                <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
                <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskSourceForm('','新增')">新增</el-button>
-               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>
-               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="exportToExcel()">导出</el-button>
+<!--               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="showImportDialog()">导入</el-button>-->
+<!--               <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary"  @click="exportToExcel()">导出</el-button>-->
            </div>
         <div class="table_content">
             <el-table
@@ -378,14 +378,22 @@
                 cancelButtonText:'取消',
                 type:'warning',
             }).then(()=> {
-                deleteRiskSource({id:val.id}).then( ()=>{
-                    this.getRiskSourceData()
-                    this.$notify({
-                        title:'成功',
-                        message:'删除成功',
-                        type:'success',
-                        duration:2000,
-                    })
+                deleteRiskSource({id:val.id}).then( (res)=>{
+                    if(res.data.code === '200'){
+                        this.getRiskSourceData()
+                        this.$notify({
+                            title:'成功',
+                            message:'删除成功',
+                            type:'success',
+                            duration:2000,
+                        })
+                    }else{
+                        this.$message({
+                            type:'warning',
+                            message:res.data.message
+                        })
+                    }
+
                 })
             })
         },
diff --git a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
index 9f0c00d..fc5e20c 100644
--- a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
@@ -29,12 +29,13 @@
                 </el-table-column>
                 <el-table-column label="安全风险空间分布图" prop="img" align="center">
                     <template slot-scope="scope">
-                        <el-popover placement="top-start" trigger="click">
-                            <!--                        <a href="http://192.168.0.7:8100/upload/enterprise/20210327184751998.png" target="_blank" title="查看最大化图片"><img src="http://192.168.0.7:8100/upload/enterprise/20210327184751998.png" style="width: 300px;height: 300px" /></a>-->
-                            <!--                        <img slot="reference" src="http://192.168.0.7:8100/upload/enterprise/20210327184751998.png" style="width:40px;height:40px;margin-left:10px;cursor:pointer" ></img>-->
-                            <!--                            <a  :href="scope.row.enterpriseResources.url" target="_blank" title="查看最大化图片"><img v-for="(item,index) in scope.row.enterpriseResources" :src="item.url" style="width: 300px;height: 300px" /></a>-->
-                            <img slot="reference" :src="scope.row.img" style="width:40px;height:40px;margin-left:10px;cursor:pointer" @click="showImg(scope.row.img)"></img>
-                        </el-popover>
+                        <el-button type="text" @click="downloadPic(scope.row)">下载</el-button>
+<!--                        <el-popover placement="top-start" trigger="click">-->
+<!--                            &lt;!&ndash;                        <a href="http://192.168.0.7:8100/upload/enterprise/20210327184751998.png" target="_blank" title="查看最大化图片"><img src="http://192.168.0.7:8100/upload/enterprise/20210327184751998.png" style="width: 300px;height: 300px" /></a>&ndash;&gt;-->
+<!--                            &lt;!&ndash;                        <img slot="reference" src="http://192.168.0.7:8100/upload/enterprise/20210327184751998.png" style="width:40px;height:40px;margin-left:10px;cursor:pointer" ></img>&ndash;&gt;-->
+<!--                            &lt;!&ndash;                            <a  :href="scope.row.enterpriseResources.url" target="_blank" title="查看最大化图片"><img v-for="(item,index) in scope.row.enterpriseResources" :src="item.url" style="width: 300px;height: 300px" /></a>&ndash;&gt;-->
+<!--                            <img slot="reference" :src="scope.row.img" style="width:40px;height:40px;margin-left:10px;cursor:pointer" @click="showImg(scope.row.img)"></img>-->
+<!--                        </el-popover>-->
                     </template>
                 </el-table-column>
                 <el-table-column label="创建人" prop="createUname" align="center">
@@ -220,6 +221,10 @@
                     })
                 }
             },
+            downloadPic(val){
+                debugger
+                window.open( val.img, '_blank')
+            },
             showSafetyRiskSpace(value,type){
                 this.safetyRiskSpaceVisible = true
                 this.$nextTick(() =>{
@@ -274,14 +279,22 @@
                     cancelButtonText:'取消',
                     type:'warning',
                 }).then(()=> {
-                    deleteSafetyRiskSpace(val.id).then( ()=>{
-                        this.getSafetyRiskSpaceData()
-                        this.$notify({
-                            title:'成功',
-                            message:'删除成功',
-                            type:'success',
-                            duration:2000,
-                        })
+                    deleteSafetyRiskSpace(val.id).then( (res)=>{
+                        if(res.data.code === '200'){
+                            this.getSafetyRiskSpaceData()
+                            this.$notify({
+                                title:'成功',
+                                message:'删除成功',
+                                type:'success',
+                                duration:2000,
+                            })
+                        }else{
+                            this.$message({
+                                type:'warning',
+                                message:res.data.message
+                            })
+                        }
+
                     })
                 })
             },
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index e781520..2b9b07d 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -53,7 +53,7 @@
                                 <el-option
                                     v-for="item in departmentList"
                                     :key="item.id"
-                                    :value="item.department"
+                                    :value="item.id"
                                     :label="item.department"
                                 >
                                 </el-option>

--
Gitblit v1.9.2