'修改問題'

Your Name

2022-05-18 68418bbc13c3dc440899dd8b963e2ca8f1f92ba8

'修改問題'

 src/components/Tab/Plot.vue

@@ -44,12 +44,13 @@
                        circle
                        @click="() => focusHandle(label.attr.id)"
                    />
                    <el-button
                        icon="el-icon-edit"
                        size="mini"
                        circle
                        @click="() => editHandle(label)"
                    />

<!--                    <el-button-->
<!--                        icon="el-icon-edit"-->
<!--                        size="mini"-->
<!--                        circle-->
<!--                        @click="() => editHandle(label)"-->
<!--                    />-->
                    <el-button
                        icon="el-icon-delete"
                        type="danger"

 src/components/Tab/index.vue

@@ -8,10 +8,10 @@
-->
<template>
  <div class="tab">
    <div class="tool-button">
      <el-button icon="el-icon-setting" circle @click="showTab = !showTab" />
    </div>
    <div class="tab-content" v-show="showTab">
          <div>
              <el-button type="text" @click="showTab = !showTab" >隐藏菜单</el-button>
          </div>
      <el-tabs v-model="activeName">
        <el-tab-pane label="模型" name="model">
          <model-panel />
@@ -19,7 +19,7 @@
        <!-- <el-tab-pane label="标注" name="label">
          <label-panel />
        </el-tab-pane> -->
        <el-tab-pane label="电子围栏" name="plot">
              <el-tab-pane label="四色图" name="plot">
          <plot-panel :type='type' :colorMapList='colorMapList'/>
        </el-tab-pane>
        <el-tab-pane label="图标" name="marker">
@@ -37,6 +37,9 @@
      </el-tabs>
      <!-- <tool-panel /> -->
    </div>
    <div v-show="!showTab">
        <el-button type="text" @click="showTab = !showTab" >显示菜单</el-button>
    </div>
  </div>
</template>


 src/router/index.js

@@ -157,7 +157,7 @@
        ]
    },
    {
        id: 2,
        id: 124,
        parentId: 0,
        path: '/accidentHidden',
        component: Layout,

 src/store/modules/changeData.js

@@ -1,6 +1,6 @@
const changeData = {
    state:{
        classifyOne:'',
        selectionData:[],
    },
    mutations: {
        SET_ONE : (state , name) =>{

 src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue

@@ -26,7 +26,7 @@
            </el-table>
        </div>
        <el-dialog :visible.sync="controlActionVisible"  append-to-body :close-on-click-modal="false" width="80%">
            <control-action ref="controlAction" @closeDialog="closeDialog" @giveRiskControlId="receiveRiskControlId"></control-action>
            <control-action ref="controlAction" @closeDialog="closeDialog" @giveRiskControlId="receiveRiskControlId" @keepValue="keepValue"></control-action>
        </el-dialog>
    </div>
</template>
@@ -47,6 +47,7 @@
                riskControlMeasureVisible:false,
                riskControlMeasureForm:[],
                inspectionPointData:[],
                keepValueList:[],
                controlActionForm:{
                    workId:'',
                    measureId:'',
@@ -60,7 +61,7 @@
            showControlAction (){
                this.controlActionVisible = true
                setTimeout( () => {
                    this.$refs.controlAction.ifShowButton()
                    this.$refs.controlAction.ifShowButton(this.inspectionPointData)
                })
            },
            showMeasureDetail(val){
@@ -75,20 +76,20 @@
                this.controlActionVisible = false
            },
            async receiveRiskControlId(value) {
                debugger
                this.controlActionVisible  = false
                if(this.title === '新建巡检计划设定'){
                    if(value){
                        //     this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => {
                        //     return {
                        //         id:item.id,
                        //         content:item.riskMeasureDesc    
                        //     }
                        // })))
                            if(this.inspectionPointData.findIndex(item => item.id === value.id) === -1) {
                                this.inspectionPointData.push({id:value.id,content:value.troubleshootContent})
                                this.$emit('giveToForm',this.inspectionPointData)
                        this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => {
                            return {
                                id:item.id,
                                content:item.troubleshootContent
                            }
                        })))
                        this.$emit('giveToForm',this.inspectionPointData)
                            // if(this.inspectionPointData.findIndex(item => item.id === value.id) === -1) {
                            //     this.inspectionPointData.push({id:value.id,content:value.troubleshootContent})
                            //     this.$emit('giveToForm',this.inspectionPointData)
                            // }
                        }
                }else{
                    this.controlActionForm.workId = JSON.stringify(this.inspectionTaskForm.workId)
@@ -138,6 +139,10 @@
            async getControlActionList(){
                let res = await getInspectionControlAction(this.inspectionTaskForm.workId)
                this.inspectionPointData = res.data.result.checkContents
            },
            keepValue(value){
                debugger
                this.keepValueList = value
            }
        }
    }

 src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue

@@ -42,17 +42,17 @@
                    ></el-option>
                </el-select>
            </div>
            <div class="basic_search">
                <span>异常通知人员：</span>
                <el-select v-model="listQuery.noticeUid" filterable clearable>
                   <el-option
                        v-for="item in userList"
                        :key="item.id"
                        :value="item.id"
                        :label="item.realname"
                    ></el-option>
                </el-select>
            </div>
<!--            <div class="basic_search">-->
<!--                <span>异常通知人员：</span>-->
<!--                <el-select v-model="listQuery.noticeUid" filterable clearable>-->
<!--                   <el-option-->
<!--                        v-for="item in userList"-->
<!--                        :key="item.id"-->
<!--                        :value="item.id"-->
<!--                        :label="item.realname"-->
<!--                    ></el-option>-->
<!--                </el-select>-->
<!--            </div>-->
            <div class="basic_search">
                <span>执行巡检人员：</span>
                <el-select v-model="listQuery.execUid" filterable clearable>
@@ -96,8 +96,8 @@
                </el-table-column>
                <el-table-column label="任务开始时间" prop="startTime" align="center">
                </el-table-column>
                <el-table-column label="异常通知人" prop="noticeUname" align="center">
                </el-table-column>
<!--                <el-table-column label="异常通知人" prop="noticeUname" align="center">-->
<!--                </el-table-column>-->
                <el-table-column label="巡检人" prop="execUname" align="center">
                </el-table-column>
                <el-table-column label="创建人" prop="createUname" align="center">
@@ -202,32 +202,32 @@
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="12">
                            <el-form-item label="异常通知部门" prop="noticeDepartment">
                                <el-select v-model="noticeDepartment" class="analyseUnit_input" filterable clearable @change="changeNotice">
                                    <el-option
                                        v-for="item in departmentList"
                                        :key="item.id"
                                        :value="item.department"
                                        :label="item.department"
                                    ></el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="12">
                        <el-form-item label="异常通知人员" prop="noticeUid">
                            <el-select v-model="inspectionTaskForm.noticeUid" filterable clearable class="analyseUnit_input">
                                <el-option
                                    v-for="item in noticeUidList"
                                    :key="item.id"
                                    :value="item.id"
                                    :label="item.realname"
                                ></el-option>
                            </el-select>
                        </el-form-item>
                    </el-col>
                    </el-row>
<!--                    <el-row>-->
<!--                        <el-col :span="12">-->
<!--                            <el-form-item label="异常通知部门" prop="noticeDepartment">-->
<!--                                <el-select v-model="noticeDepartment" class="analyseUnit_input" filterable clearable @change="changeNotice">-->
<!--                                    <el-option-->
<!--                                        v-for="item in departmentList"-->
<!--                                        :key="item.id"-->
<!--                                        :value="item.department"-->
<!--                                        :label="item.department"-->
<!--                                    ></el-option>-->
<!--                                </el-select>-->
<!--                            </el-form-item>-->
<!--                        </el-col>-->
<!--                        <el-col :span="12">-->
<!--                        <el-form-item label="异常通知人员" prop="noticeUid">-->
<!--                            <el-select v-model="inspectionTaskForm.noticeUid" filterable clearable class="analyseUnit_input">-->
<!--                                <el-option-->
<!--                                    v-for="item in noticeUidList"-->
<!--                                    :key="item.id"-->
<!--                                    :value="item.id"-->
<!--                                    :label="item.realname"-->
<!--                                ></el-option>-->
<!--                            </el-select>-->
<!--                        </el-form-item>-->
<!--                    </el-col>-->
<!--                    </el-row>-->
                    <el-row>
                        <el-col :span="12">
                            <el-form-item label="执行巡检部门" prop="execDepartment">
@@ -324,10 +324,10 @@
                inspectionTaskData: [],
                departmentList:[],
                userList:[],
                noticeUidList:[],
                // noticeUidList:[],
                execUidList:[],
                statusList:[{name:'任务开启',id:1},{id:2,name:'任务关闭'}],
                intervalSecondsList:[{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'},{id:17280,name:'2天'}],
                intervalSecondsList:[{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:28800,name:'8小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'},{id:17280,name:'2天'},{id:604800,name:'每周'},{id:2592000,name:'每月'},{id:7862400,name:'每季度'}],
                noticeSecondsList:[{id:600,name:'10分'},{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'}],
                effectSecondsList:[{id:1800,name:'30分'},{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'}],
                typeList:[{id:1,name:'日常检查'},{id:2,name:'周期检查'}],
@@ -339,7 +339,7 @@
                title:'',
                company:'',
                code:'',
                noticeDepartment:'',
                // noticeDepartment:'',
                execDepartment:'',
                inspectionTaskVisible:false,
                inspectionTaskFormRules:{
@@ -359,7 +359,7 @@
                    execUid: null,
                    intervalSeconds: null,
                    noticeSeconds: null,
                    noticeUid: null,
                    // noticeUid: null,
                    title:'',
                    riskControlMeasureIdList: [
                    ],
@@ -369,7 +369,6 @@
                    createUid: "",
                    endTime: "",
                    execUid: "",
                    noticeUid: "",
                    startTime: "",
                    status:"",
                    type: "",
@@ -413,13 +412,13 @@
                    })
                }
            },
            changeNotice(){
                if(this.noticeDepartment === '') {
                    this.noticeUidList = []
                    this.inspectionTaskForm.noticeUid = ''
                }
                this.noticeUidList = this.userList.filter( item => item.department === this.noticeDepartment)
            },
            // changeNotice(){
            //     if(this.noticeDepartment === '') {
            //         this.noticeUidList = []
            //         this.inspectionTaskForm.noticeUid = ''
            //     }
            //     this.noticeUidList = this.userList.filter( item => item.department === this.noticeDepartment)
            // },
            changeExec(){
                if(this.execDepartment === '') {
                    this.execUidList = []
@@ -468,12 +467,12 @@
                }else{
                    this.ifShow = true
                    this.title = '编辑巡检计划设定'
                    this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
                    this.changeNotice()
                    // this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
                    // this.changeNotice()
                    this.execDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).execUid)
                    this.changeExec()
                    this.inspectionTaskForm = JSON.parse(JSON.stringify(value))
                    // this.inspectionTaskForm.execUid = value.execUname
                    this.inspectionTaskForm.execUid = value.execUname
                    // this.inspectionTaskForm.noticeUid = value.noticeUname
                     setTimeout(() => {
                        this.$refs.inspectionPoint.inspectionPointData =  this.inspectionTaskForm.checkContents
@@ -534,7 +533,7 @@
                                    execUid: this.inspectionTaskForm.execUid,
                                    intervalSeconds: this.inspectionTaskForm.intervalSeconds,
                                    noticeSeconds: this.inspectionTaskForm.noticeSeconds,
                                    noticeUid: this.inspectionTaskForm.noticeUid,
                                    // noticeUid: this.inspectionTaskForm.noticeUid,
                                    startTime: this.inspectionTaskForm.startTime,
                                    status: this.inspectionTaskForm.status,
                                    workId: this.inspectionTaskForm.workId

 src/views/doublePreventAction/riskLevelManage/controlAction/index.vue

@@ -7,7 +7,7 @@
                </el-input>
            </div>
            <div class="basic_search">
                <span>事件名称：</span>
                <span>管控方式：</span>
                <el-select v-model="listQuery.filter.dataSrc" clearable style="width:200px">
                    <el-option
                        v-for="item in DataSrcList"
@@ -28,10 +28,12 @@
                :data="riskControlMeasureData"
                border
                fit
                ref="table"
                :row-key="getRowKey"
                highlight-current-row
                style="width: 100%;"
            >
                <!-- <el-table-column type="selection" width="55"></el-table-column> -->
                 <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
                <el-table-column label="安全风险事件名称" prop="riskEventId" align="center">
                </el-table-column>
                <el-table-column label="管控方式" prop="dataSrc" align="center">
@@ -102,10 +104,10 @@
                    </el-select>
                </el-form-item>
                <el-form-item label="管控方式描述" prop="riskMeasureDesc">
                    <el-input v-model="riskControlMeasureForm.riskMeasureDesc" class="analyseUnit_input"></el-input>
                    <el-input type="textarea" :rows="4" v-model="riskControlMeasureForm.riskMeasureDesc" class="analyseUnit_input"></el-input>
                </el-form-item>
                <el-form-item label="管控措施分类1" prop="classify1">
                    <el-select v-model="riskControlMeasureForm.classify1" class="analyseUnit_input" @change="changeClassifyTwoList(val)">
                    <el-select v-model="riskControlMeasureForm.classify1" class="analyseUnit_input" @change="changeClassifyTwoList()">
                        <el-option
                            v-for="item in classifyOneList"
                            :key="item.id"
@@ -128,7 +130,7 @@
                    <el-input v-model="riskControlMeasureForm.classify3" class="analyseUnit_input"></el-input>
                </el-form-item>
                <el-form-item label="隐患排查内容" prop="troubleshootContent">
                    <el-input v-model="riskControlMeasureForm.troubleshootContent" class="analyseUnit_input"></el-input>
                    <el-input type="textarea" :rows="4" v-model="riskControlMeasureForm.troubleshootContent" class="analyseUnit_input"></el-input>
                </el-form-item>
            </el-form>
            <div  align="right">
@@ -169,7 +171,7 @@
                DataSrcList:[],
                classifyOneList:[],
                classifyTwoList:[],
                riskCcntrolMeasureIdList:[],
                riskControlMeasureIdList:[],
                listLoading: false,
                showCurrent:true,
                showOther:false,
@@ -371,7 +373,6 @@
                        })
                    }
                })

            },
            deleteById(val){
                this.$confirm('删除此条信息，是否继续','提示',{
@@ -402,18 +403,29 @@
                this.getRiskControlMeasureData()
            },

            ifShowButton (){
            ifShowButton (value){
                this.showCurrent = false
                this.showOther = true
                // this.$refs.table.clearSelection()
                // value.forEach(row => {
                //     this.$refs.table.toggleRowSelection(this.riskControlMeasureData.find(item => {
                //         return row.id === item.id
                //     }) , this.riskControlMeasureData.find(item => {return row.id === item.id}) === undefined ? false :true)
                // })
            },

            handleSelectionChange(val){
                debugger
                this.riskControlMeasureIdList = val
            },

            getRowKey(value){
                return value.id
            },

            giveValue(value){
                // this.$emit('giveRiskControlId',this.riskControlMeasureIdList)
                this.$emit('giveRiskControlId',value)
                this.$emit('giveRiskControlId',this.riskControlMeasureIdList)
                // this.$emit('giveRiskControlId',value)
            },
            showMeasureDetail(value){
                this.riskControlMeasureVisible = true
@@ -422,8 +434,6 @@
                    this.riskControlMeasureForm = riskControlMeasureForm
                    this.$emit('closeDialog')
                })


            }
        }
    }