修改

Your Name

2022-09-16 d4c8e63d9f4b111d97879b52f327535ef41c5cae

 修改

 config/dev.env.js

@@ -16,8 +16,8 @@
  //     IMG_API: '"https://sinanoaq.com:8100/upload/"',
  //       BASE_API: '"http://220.171.99.118:4100"',
  //       IMG_API: '"http://220.171.99.118:4100/upload/"',
      BASE_API: '"http://192.168.0.35:8006"',
      IMG_API: '"http://192.168.0.35:8006/upload/"',
  //     BASE_API: '"http://192.168.0.35:8006"',
  //     IMG_API: '"http://192.168.0.35:8006/upload/"',

    // BASE_API: '"http://192.168.0.8:8006"',
    // IMG_API: '"http://192.168.0.8:8006/upload/"',
@@ -25,8 +25,8 @@
    // BASE_API: '"http://192.168.0.69:8006"',
    // IMG_API: '"http://192.168.0.69:8006/upload/"',

    // BASE_API: '"http://192.168.0.35:8006"',
    // IMG_API: '"http://192.168.0.35:8006/upload/"',
    BASE_API: '"http://192.168.0.35:8006"',
    IMG_API: '"http://192.168.0.35:8006/upload/"',
    // BASE_API: '"http://192.168.0.62:8006"',
    // IMG_API: '"http://192.168.0.62:8006/upload/"',
    // BASE_API: '"http://222.92.213.22:8006/zhongtai"',

 config/index.js

@@ -23,7 +23,7 @@

    // can be overwritten by process.env.HOST
    // if you want dev by ip, please set host: '0.0.0.0'
    host: '192.168.0.54',
    host: 'localhost',
    port: 8101, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
    autoOpenBrowser: true,
    errorOverlay: true,

 src/api/hiddenDanger.js

@@ -175,7 +175,7 @@
        headers:{
            'Authorization': getToken()
        },
        url: process.env.BASE_API+'/hiddenDanger/rectifyStatisticsPage',
        url: process.env.BASE_API+'/prevent/riskEvent/statistics/page',
        method: 'post',
        data
    });

 src/api/inspectStatistics.js

@@ -22,3 +22,14 @@
        data
    })
}

export function getInspectTask(data) {
    return request({
        headers: {
            'Authorization': getToken()
        },
        url: process.env.BASE_API + '/prevent/riskEvent/statistics/inspection-task',
        method: 'post',
        data
    })
}

 src/router/index.js

@@ -60,7 +60,7 @@
    {
        path: '/',
        component: Layout,
        redirect: "/specialWorkManage/index/specialWorkManage/workPlan/index/specialWorkManage/workPlan/reserve",
        redirect: "/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/riskSourceManage/index",
        // redirect: '/workPlan/workPlan/reserve',
        children: [
            {

 src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/statistics/index.vue

@@ -1,51 +1,50 @@
<template>
    <div class="app-container">
        <div style="margin: 10px">

            <span class="span-filter-label">单号</span>
            <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
            <span class="span-filter-label" >状态</span>
            <el-select
                v-model="filter.filter.status"
                clearable @clear="clearStatus"
                class="filter-item"
                style="width:120px;margin-bottom: 10px">
                <el-option
                    v-for="item in reportStatus"
                    :key="item.key"
                    :label="item.value"
                    :value="item.key">
                </el-option>
            <div class="basic_search">
                <span>隐患状态：</span>
                <el-select class="analyseUnit_box" v-model="filter.dangerStatus" placeholder="隐患状态" filterable clearable>
                    <el-option v-for="item in dangerStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
            </el-select>
            <span class="span-filter-label">隐患等级</span>
            <el-select v-model="filter.filter.level"
                       clearable @clear="clearLevel"
                       style="width: 100px"
            >
                <el-option
                    v-for="item in levels"
                    :key="item.key"
                    :label="item.value"
                    :value="item.key">
                </el-option>
            </div>
            <div class="basic_search">
                <span>隐患等级：</span>
                <el-select class="analyseUnit_box" v-model="filter.dangerLevel" placeholder="隐患等级" filterable clearable>
                    <el-option v-for="item in dangerLevelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
            </el-select>

            <span class="span-filter-label">上报人</span>
            <el-input style="width: 140px" v-model="filter.filter.requestorName" ></el-input>
            <span class="span-filter-label">整改人</span>
            <el-input style="width: 140px" v-model="filter.filter.rectifierName"></el-input>

            <span class="span-filter-label">隐患来源</span>
            <el-select v-model="filter.filter.source" clearable   placeholder="请选择">
                <el-option
                    v-for="item in sources"
                    :key="item.key"
                    :label="item.value"
                    :value="item.key">
                </el-option>
            </div>
            <div class="basic_search">
                <span>隐患来源：</span>
                <el-select class="analyseUnit_box" v-model="filter.dangerSource" placeholder="隐患来源" filterable clearable>
                    <el-option v-for="item in dangerSourceList" :key="item.id" :label="item.name" :value="item.id"></el-option>
            </el-select>
            </div>
            <div class="basic_search">
                <span>隐患类型：</span>
                <el-select class="analyseUnit_box" v-model="filter.dangerType" placeholder="隐患类型" filterable clearable>
                    <el-option v-for="item in dangerTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                </el-select>
            </div>
            <div class="basic_search">
                <span>上报人：</span>
                <el-select v-model="filter.registantName"  placeholder="请选择审批人" class="analyseUnit_box" clearable filterable>
                    <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="filter.liablePersonName"  placeholder="请选择审批人" class="analyseUnit_box" clearable filterable>
                    <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="filter.acceptPersonName"  placeholder="请选择审批人" class="analyseUnit_box" clearable filterable>
                    <el-option v-for="item in userList" :key="item.id" :value="item.id" :label="item.realname"></el-option>
                </el-select>
            </div>
            <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
                       @click="queryHandle"/>
                       @click="hiddenDangerStatisticsList"/>
        </div>
        <div class="table_content" v-loading="listLoading">
            <el-table
@@ -55,11 +54,11 @@
                highlight-current-row
                style="width: 100%;position: relative;top: -7px"
            >
                <el-table-column label="待整改数" prop="2rectifynum" align="center" />
                <el-table-column label="完成数量" prop="completednum" align="center"/>
                <el-table-column label="驳回总数" prop="rejectnum" align="center" />
                <el-table-column label="上报总数" prop="reportnum" align="center" />
                <el-table-column label="待验收数" prop="2acceptnum" align="center" />
                <el-table-column label="整改中" prop="rectifying" align="center" />
                <el-table-column label="待验收" prop="toAccept" align="center"/>
                <el-table-column label="延期" prop="postpone" align="center" />
                <el-table-column label="超期未整改" prop="overTime" align="center" />
                <el-table-column label="已验收" prop="accepted" align="center" />
            </el-table>
            <el-table
                :key="tableKey"
@@ -70,41 +69,44 @@
                style="width: 100%;"
            >
                <el-table-column type="index" label="序号" align="center" width="80"/>
                <el-table-column label="单号" prop="code" align="center" />
                <el-table-column label="状态" prop="status" align="center" >
                <el-table-column prop="dangerDesc" label="隐患情况描述" show-overflow-tooltip min-width="150px"></el-table-column>
                <el-table-column prop="dangerSource" label="隐患来源" show-overflow-tooltip min-width="150px">
                    <template slot-scope="scope">
                        <span >{{scope.row.status}}</span>
                        <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status  !== '已完成'" class="overdue-img">逾期</span>
                        {{ parseNumber(scope.row.dangerSource, '隐患来源') }}
                    </template>
                </el-table-column>
                <el-table-column label="隐患等级" prop="level" align="center" >
                <el-table-column prop="dangerLevel" label="隐患等级" show-overflow-tooltip min-width="150px" align="center">
                    <template slot-scope="scope">
                        <el-tag :type="scope.row.level == '重大隐患'?'danger':'warning'">{{scope.row.level}}</el-tag>
                        <el-tag :type="scope.row.dangerLevel === 1 ? 'warning' : 'danger'">
                            {{ parseNumber(scope.row.dangerLevel, '隐患等级') }}
                        </el-tag>
                    </template>
                </el-table-column>
                <el-table-column label="隐患来源" prop="source" align="center" >
                <el-table-column prop="dangerType" label="隐患类型" show-overflow-tooltip min-width="150px">
                    <template slot-scope="scope">
                        <span>{{sources.find(item=>item.key === scope.row.source).value}}</span>
                        {{ parseNumber(scope.row.dangerType, '隐患类型') }}
                    </template>
                </el-table-column>
                <el-table-column label="上报人" prop="requestor" align="center" />
                <el-table-column label="上报时间" prop="createtime" align="center" />
                <el-table-column label="整改人" prop="rectifier" align="center" />
                <el-table-column label="整改期限"   prop="rectifydeadline" align="center" >
                <el-table-column prop="dangerReason" label="隐患产生原因分析" show-overflow-tooltip min-width="150px"></el-table-column>
                <el-table-column prop="dangerResult" label="隐患可能导致后果" show-overflow-tooltip min-width="150px" align="center">
                    <template slot-scope="scope">
                        <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status  !== '已完成'}">{{scope.row.rectifydeadline}}
                        </span>
                        <el-tag :type="scope.row.dangerResult === 1 ? 'success' : scope.row.dangerResult === 2 ? 'info' : scope.row.dangerResult === 3 ? 'warning' : 'danger'"> {{ parseNumber(scope.row.dangerResult, '隐患可能导致后果') }}</el-tag>
                    </template>
                </el-table-column>
                <el-table-column label="整改时间" prop="rectifytime" align="center" />
                <el-table-column label="验收时间" prop="accepttime" align="center" />


                <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
                <el-table-column prop="liablePerson" label="整改责任人" show-overflow-tooltip min-width="150px"></el-table-column>
                <el-table-column prop="cost" label="整改资金" show-overflow-tooltip min-width="150px"></el-table-column>
                <el-table-column prop="dangerStatus" label="隐患整改状态" show-overflow-tooltip min-width="150px" align="center">
                    <template slot-scope="scope">
                        <el-button  type="text" @click="viewHandle(scope.row)">查看</el-button>
                        <el-tag :type="scope.row.dangerStatus === 0 ? 'info' : scope.row.dangerStatus === 1 ? 'primary' : scope.row.dangerStatus === 2 ? 'warning' : scope.row.dangerStatus === 4 ? 'danger' : 'success'">
                            {{ parseNumber(scope.row.dangerStatus, '隐患整改状态') }}
                        </el-tag>
                    </template>
                </el-table-column>
<!--                <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>-->
<!--                    </template>-->
<!--                </el-table-column>-->
            </el-table>
            <br>

@@ -133,6 +135,7 @@
<script>
    import { hiddenDangerStatisticsList} from '@/api/hiddenDanger';
    import reportView from "../components/reportView";
    import {safetyInspectionItemName} from "../../../../../api/safetySelfInspection";
    export default {
        name: 'statistics',
        components:{
@@ -144,37 +147,64 @@
                tableKey: 0,
                tableData:[],
                showData:[],
                levels:[
                    {"key":"URGENT","value":"重大隐患"},
                    {"key":"COMMON","value":"一般隐患"},
                userList:[],
                dangerLevelList: [
                    { id: 1, name: '一般隐患' },
                    { id: 2, name: '重大隐患' }
                ],
                sources:[
                    {"key":1,"value":"隐患上报"},
                    {"key":2,"value":"巡检上报"},
                dangerSourceList: [
                    { id: 1, name: '日常排查' },
                    { id: 2, name: '综合性排查' },
                    { id: 3, name: '专业性排查' },
                    { id: 4, name: '季节性排查' },
                    { id: 5, name: '重点时段及节假日前排查' },
                    { id: 6, name: '事故类比排查' },
                    { id: 7, name: '复产复工前排查' },
                    { id: 8, name: '外聘专家诊断式排查' },
                    { id: 9, name: '管控措施失效' },
                    { id: 10, name: '其他' }
                ],
                reportStatus:[
                    {"key":"TORECTIFY","value":"待整改"},
                    {"key":"TOACCEPT","value":"整改待验收"},
                    {"key":"REJECTED","value":"驳回待整改"},
                    {"key":"COMPLETED","value":"已完成"},
                dangerStatusList: [
                    { id: 0, name: '整改中' },
                    { id: 1, name: '待验收' },
                    { id: 2, name: '延期整改' },
                    { id: 4, name: '超期未整改' },
                    { id: 9, name: '已验收' }
                ],
                dangerTypeList: [
                    { id: 1, name: '安全' },
                    { id: 2, name: '工艺' },
                    { id: 3, name: '电气' },
                    { id: 4, name: '仪表' },
                    { id: 5, name: '消防' },
                    { id: 6, name: '总图' },
                    { id: 7, name: '设备' },
                    { id: 8, name: '其他' }
                ],
                dangerResultList: [
                    { id: 1, name: '无' },
                    { id: 2, name: '轻伤' },
                    { id: 3, name: '重伤' },
                    { id: 4, name: '死亡' }
                ],
                recordTotal:0,
                filter:{
                    pageIndex:1,
                    pageSize:10,
                    filter:{
                        code:'',
                        status:null,
                        level:null,
                        requestorName:'',
                        rectifierName:'',
                        source:''
                    }
                    serialCode:'',
                    dangerLevel:'',
                    dangerType:'',
                    dangerSource:'',
                    dangerStatus:'',
                    acceptPersonName:'',
                    liablePersonName:'',
                    registantName:'',
                }

            }},
        created(){
            this.hiddenDangerStatisticsList()
            this.getUserData()
        },
        methods:{
            handleSizeChange: function (val) {
@@ -199,9 +229,9 @@
                hiddenDangerStatisticsList(this.filter)
                    .then(res=>{
                        if (res.data.code === '200') {
                            this.tableData = res.data.result.records
                            this.recordTotal = res.data.result.total
                            this.showData = [(res.data.result.extension)]
                            this.tableData = res.data.data.records
                            this.recordTotal = res.data.data.total
                            this.showData = [(res.data.data.extension)]
                        }
                        else{
                            this.$message({ message: res.data.message, type: 'warning'});
@@ -221,7 +251,34 @@
            },
            clearStatus(){
                this.filter.filter.status = null
            },


            parseNumber(value, type){
                if (type === '隐患来源') {
                    return this.dangerSourceList.find((item) => item.id === value).name;
                } else if (type === '隐患等级') {
                    return this.dangerLevelList.find((item) => item.id === value).name;
                } else if (type === '隐患类型') {
                    return this.dangerTypeList.find((item) => item.id === value).name;
                } else if (type === '隐患整改状态') {
                    return this.dangerStatusList.find((item) => item.id === value).name;
                } else {
                    return this.dangerResultList.find((item) => item.id === value).name;
            }
            },

            async getUserData() {
                let res = await safetyInspectionItemName()
                if(res.data.code === '200'){
                    this.userList = res.data.result
                }else{
                    this.$message({
                        message:res.data.message,
                        type:'warning'
                    })
                }
            },


        }
@@ -251,4 +308,14 @@

    }

    .basic_search{
        display:inline-block;
        padding-bottom: 10px;
    }
    .analyseUnit_input{
        width:90%;
    }
    .analyseUnit_box{
        width:200px;
    }
</style>

 src/views/doublePreventAction/hiddenDanger/inspectionStatistics/components/todayUnusual/index.vue

@@ -5,18 +5,44 @@

<script>

import {getInspectPerson, getInspectTask} from "../../../../../../api/inspectStatistics";

export default {
    name: 'index',
    data(){
        return{
            numData:[],
            claimedData:[],
            timeData:[],
            completedData:[],
            uncompletedData:[],
        }
    },
    mounted() {
        this.drawTodayLine()
    },
    methods:{
        async updateData(val) {
            debugger
            let res = await getInspectTask(val)
            if(res.data.code === '200'){
                debugger
                this.claimedData = res.data.data.claimed.map(item =>{
                    return item.num
                })
                this.completedData = res.data.data.completed.map(item =>{
                    return item.num
                })
                this.uncompletedData = res.data.data.uncompleted.map(item =>{
                    return item.num
                })
                this.timeData = res.data.data.claimed.map(item =>{
                    return item.taskDate
                })
            }else{
                this.$message({
                    type:'warning',
                    message:res.data.message
                })
            }
            await this.drawTodayLine()
        },
        async drawTodayLine(){
            this.myChart = this.$echarts.init(document.getElementById('todayUnusual'))
            this.myChart.setOption({
@@ -24,40 +50,46 @@
                    trigger: 'item'
                },
                legend: {
                    left: 'center',
                    top: '5%',
                    left: 'center'
                    data:['任务数量','已完成','未完成']
                },
                xAxis: {
                    type: 'category',
                    data: this.timeData
                },
                color:['#0180ff','#91cc75','#ee6666',],
                yAxis: {
                    type: 'value'
                },
                series: [
                    {
                    name: 'Access From',
                    type: 'pie',
                    radius: ['40%', '70%'],
                    avoidLabelOverlap: false,
                    itemStyle: {
                        borderRadius: 10,
                        borderColor: '#fff',
                        borderWidth: 2
                    },
                    label: {
                        show: false,
                        position: 'center'
                    },
                    emphasis: {
                        label: {
                        show: true,
                        fontSize: '40',
                        fontWeight: 'bold'
                        data: this.claimedData,
                        type: 'bar',
                        name:'任务数量',
                        showBackground: true,
                        backgroundStyle: {
                            color: '#91cc75'
                        }
                    },
                    color:['#91cc75','#ee6666','#73c0de','#3ba272','#fc8452','#9a60b4'],
                    labelLine: {
                        show: false
                    },
                    data: [
                        { value: 1048, name: '今日完成' },
                        { value: 735, name: '今日异常' },
                    ]
                    {
                        data: this.completedData,
                        type: 'bar',
                        name:'已完成',
                        showBackground: true,
                        backgroundStyle: {
                            color: '#fac858'
                    }
                    },
                    {
                        data: this.uncompletedData,
                        type: 'bar',
                        name:'未完成',
                        showBackground: true,
                        backgroundStyle: {
                            color: '#ee6666'
                        }
                    },
                ]
            })
        }

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

@@ -25,7 +25,8 @@
                    :default-time="['00:00:00','23:59:59']"
                    @change="changeTimeInspectionPerson"
                    end-placeholder="结束日期">
                    </el-date-picker></div>
                    </el-date-picker>
                </div>
                    <el-divider></el-divider>
                <div class="inspectionStatistics_part_body">
                    <inspection-person ref="inspectionPerson"></inspection-person>
@@ -77,31 +78,55 @@
        </div>
        <div class="inspectionStatistics_part">
            <div class="inspectionStatistics_part_today">
                <div class="inspectionStatistics_part_title">{{"今日异常完成"}}</div>
                <el-divider></el-divider>
                <div class="inspectionStatistics_part_body">
                    <today-unusual></today-unusual>
                </div>
            </div>
        </div>
        <div class="inspectionStatistics_part">
            <div class="inspectionStatistics_part_unusual">
                <div class="inspectionStatistics_part_title">{{"巡检异常统计"}}</div>
                <div class="inspectionStatistics_part_title">{{"巡检任务统计"}}</div>
                <div class="inspectionStatistics_part_time">
                    <el-select v-model="taskListQuery.depId" @change="changeInspectionTask">
                        <el-option
                            v-for="item in departmentList"
                            :key="item.id"
                            :value="item.id"
                            :label="item.department"
                        >
                        </el-option>
                    </el-select>
                </div>
                <div class="inspectionStatistics_part_time">

                    <el-date-picker
                    v-model="value3"
                    type="daterange"
                    range-separator="至"
                    start-placeholder="开始日期"
                        value-format="yyyy-MM-dd HH:mm:ss"
                        :default-time="['00:00:00','23:59:59']"
                        @change="changeTimeTask"
                    end-placeholder="结束日期">
                    </el-date-picker>
                </div>
                <el-divider></el-divider>
                <div class="inspectionStatistics_part_body">
                    <inspection-unusual></inspection-unusual>
                    <today-unusual ref="todayUnusual"></today-unusual>
                </div>
            </div>
        </div>
<!--        <div class="inspectionStatistics_part">-->
<!--            <div class="inspectionStatistics_part_unusual">-->
<!--                <div class="inspectionStatistics_part_title">{{"巡检异常统计"}}</div>-->
<!--                <div class="inspectionStatistics_part_time">-->
<!--                    <el-date-picker-->
<!--                    v-model="value3"-->
<!--                    type="daterange"-->
<!--                    range-separator="至"-->
<!--                    start-placeholder="开始日期"-->
<!--                    end-placeholder="结束日期">-->
<!--                    </el-date-picker>-->
<!--                </div>-->
<!--                <el-divider></el-divider>-->
<!--                <div class="inspectionStatistics_part_body">-->
<!--                    <inspection-unusual></inspection-unusual>-->
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
    </div>
</template>

@@ -128,6 +153,11 @@
                "startDate": ""
                },
                personListQuery:{
                    depId:41,
                    startTime:'',
                    endTime:'',
                },
                taskListQuery:{
                    depId:41,
                    startTime:'',
                    endTime:'',
@@ -168,7 +198,10 @@
                this.completeListQuery.startTime = this.value1[0]
                this.completeListQuery.endTime = this.value1[1]
                this.$refs.inspectionComplete.updateData(this.completeListQuery)
                this.value3 = [(newTime.getFullYear()+ '-' + (newTime.getMonth() + 1) + '-' +  1).toString() + ' '  + '00:00:00',(newTime.getFullYear()+ '-' + (newTime.getMonth() + 1) + '-' + newTime.getDate()).toString() + ' ' + '23:59:59']
                this.value3 = [(newTime.getFullYear()+ '-' + ((newTime.getMonth() + 1) < 10 ? '0' + (newTime.getMonth() + 1) : (newTime.getMonth() + 1)) + '-' +  '01').toString() + ' '  + '00:00:00',(newTime.getFullYear()+ '-' + ((newTime.getMonth() + 1) < 10 ? '0' + (newTime.getMonth() + 1) : (newTime.getMonth() + 1)) + '-' + newTime.getDate()).toString() + ' ' + '23:59:59']
                this.taskListQuery.startTime = this.value3[0]
                this.taskListQuery.endTime = this.value3[1]
                this.$refs.todayUnusual.updateData(this.taskListQuery)
            },
            changeTimeInspectionPerson() {
                if(this.value1 !== null){
@@ -177,6 +210,13 @@
                }
                this.$refs.inspectionPerson.updateData(this.personListQuery)
            },
            changeTimeTask(){
                if(this.value3 !== null){
                    this.taskListQuery.startTime = this.value1[0]
                    this.taskListQuery.endTime = this.value1[1]
                }
                this.$refs.todayUnusual.updateData(this.personListQuery)
            },
            changeCompleteTimeInspectionPerson() {
                if(this.value2 !== null){
                    this.completeListQuery.startTime = this.value2[0]
@@ -184,6 +224,9 @@
                }
                this.$refs.inspectionComplete.updateData(this.completeListQuery)
            },
            changeInspectionTask() {
                this.$refs.todayUnusual.updateData(this.personListQuery)
            },
            changeInspectionPerson() {
                this.$refs.inspectionPerson.updateData(this.personListQuery)
            },

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

@@ -318,15 +318,15 @@
            },

            changeClassifyTwoList(){
                if(this.riskControlMeasureForm.classify1 === '工程技术'){
                if(this.riskControlMeasureForm.classify1 === 1){
                    this.classifyTwoList = this.classifyOneList[0].subClassify
                    this.riskControlMeasureForm.classify2 = ''
                    this.riskControlMeasureForm.classify3 = ''
                }else if(this.riskControlMeasureForm.classify1 === '维护保养') {
                }else if(this.riskControlMeasureForm.classify1 === 2) {
                    this.classifyTwoList = this.classifyOneList[1].subClassify
                    this.riskControlMeasureForm.classify2 = ''
                    this.riskControlMeasureForm.classify3 = ''
                }else if(this.riskControlMeasureForm.classify1 === '操作行为') {
                }else if(this.riskControlMeasureForm.classify1 === 3) {
                    this.classifyTwoList = this.classifyOneList[2].subClassify
                    this.riskControlMeasureForm.classify2 = ''
                    this.riskControlMeasureForm.classify3 = ''
@@ -366,6 +366,9 @@
                    }
                }else{
                    this.title = '修改'
                    debugger
                    this.riskControlMeasureForm.classify1 = JSON.parse(JSON.stringify(value)).classify1
                    this.changeClassifyTwoList()
                    for( let key in this.riskControlMeasureForm){
                        this.riskControlMeasureForm[key] = JSON.parse(JSON.stringify(value))[key]
                    }

 src/views/specialWorkManage/workFlow/approveBasic/components/approveBasicDialog.vue

@@ -66,13 +66,9 @@
            departmentList: [],
            isShowApproveBasicDialog: false,
            ruleStandTypeList: [
                { id: 1, name: '可燃气浓度' },
                { id: 2, name: '氧气浓度' },
                { id: 3, name: '一氧化碳浓度' },
                { id: 4, name: '硫化氢浓度' },
                { id: 5, name: '温度' },
                { id: 6, name: '压力' },
                { id: 7, name: '震动' }
                { id: 1, name: '可燃气体' },
                { id: 3, name: '有毒有害气体' },
                { id: 2, name: '氧气' },
            ],
            typeList: [
                { id: 1, name: '大于' },

 src/views/specialWorkManage/workFlow/approveRule/components/approveLevelDialog.vue

@@ -16,7 +16,7 @@
                </el-col>
                <el-col :span="24">
                    <el-form-item label="审批人" prop="unitList">
                        <el-select v-model="approveLevelForm.unitList" multiple placeholder="请选择审批人" class="input-add">
                        <el-select v-model="approveLevelForm.unitList" multiple placeholder="请选择审批人" class="input-add" clearable filterable>
                            <el-option v-for="item in userList" :key="item.id" :value="item.id" :label="item.realname"></el-option>
                        </el-select>
                    </el-form-item>

 src/views/specialWorkManage/workFlow/approveRule/components/approveRuleDialog.vue

@@ -183,7 +183,6 @@
        },

        achieveApprovalLevel(value, title) {
            debugger
            if (title === '新增审批层级') {
                if (this.approveRuleForm.stepList.length === 0) {
                    value.stepSerial = 1;
@@ -204,6 +203,7 @@
            this.userList = userList;
            this.workTypeList = workTypeList;
            this.departmentList = departmentList;
            debugger
            this.$nextTick(()=>{
                this.$refs["approveRuleFormRef"].clearValidate()
            })

 src/views/specialWorkManage/workTicket/myApproval/index.vue

@@ -419,9 +419,9 @@
        width: 100%;
        height: 100%;

        &::v-deep(.el-tabs__content) {
            height: calc(100% - 60px);
        }
        //&::v-deep(.el-tabs__content) {
        //    height: calc(100% - 60px);
        //}

        .el-tab-pane {
            height: 100%;

 src/views/specialWorkManage/workTicket/myJobApply/index.vue

@@ -433,9 +433,9 @@
        width: 100%;
        height: 100%;

        &::v-deep(.el-tabs__content) {
            height: calc(100% - 60px);
        }
        //&::v-deep(.el-tabs__content) {
        //    height: calc(100% - 60px);
        //}

        .el-tab-pane {
            height: 100%;

 src/views/specialWorkManage/workTicket/workApply/index.vue

@@ -120,9 +120,9 @@
        .el-input{
            width: 100% !important;
        }
        .el-date-editor::v-deep{
            width: 100%;
        }
        //.el-date-editor::v-deep{
        //    width: 100%;
        //}
        .el-select{
            width: 100%;
        }