修改台账查询条件

cqf

2022-05-20 41755a32f967e546271c0ebcb59bad8f0d269ecf

修改台账查询条件

 src/api/sgyhpczl/safetyHazardAccount.js

@@ -47,14 +47,24 @@
    if(data.form.ht_content!=null && data.form.ht_content!=''){
        arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
    }

    /*复查单位*/
    if(data.form.callback_branch!=null && data.form.callback_branch!=''){
        arr.push({field:"callback_branch",value:data.form.callback_branch,type:'TXT'})
    }
    /*班次*/
    if(data.form.check_class!=null && data.form.check_class!=''){
        arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
    }
    /*风险等级*/
    if(data.form.DTRisk_level!=null && data.form.DTRisk_level!=''){
        arr.push({field:"DTRisk_level",value:data.form.DTRisk_level,type:'OPT'})
    }
    /*是否关联*/
    if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
    if(data.form.DTRisk_bankId!=null){
        arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
    }

    /*录入人*/
    if(data.form.createBy!=null && data.form.createBy!=''){
        arr.push({field:"Created_by",value:data.form.createBy,type:'OPT'})

 src/api/sgyhpczl/summaryPotentialSafetyHzards.js

对比新文件
@@ -0,0 +1,17 @@

import request from '@/utils/request';
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";

//汇总查询
export function danger_summary(data) {
    return request({
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify
        },
        url: "/taboi/danger/danger_summary",
        contentType: "application/json",
        method: 'POST',
        data,
    });
}

 src/router/index.js

@@ -380,17 +380,6 @@
                component: () => import('@/views/Issuedbysuperiors'),
                meta: { title: '上级下达隐患', icon: '' }
            },
              {
                  id: 9,
                  parentId: 0,
                  path: '/superiorsSend',
                  name: '发送隐患',
                  component: () => import('@/views/Issuedbysuperiors/superiorsSend'),
                  meta: { title: '发送隐患', icon: '' },
                  hidden: true

              },

            {
                id: 10,
                parentId: 0,

 src/views/Issuedbysuperiors/index.vue

@@ -249,7 +249,6 @@
            llrList: [],
            options: [],
            form: {},

            JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}],
            JCBMList: [],
            YHLXList: [],

 src/views/safetyHazardAccount/index.vue

@@ -43,9 +43,9 @@
                <el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
                    <el-option
                        v-for="item in YHBMList"
                        :key="item.branch_id"
                        :key="item.branch_name"
                        :label="item.branch_name"
                        :value="item.branch_id">
                        :value="item.branch_name">
                    </el-option>
                </el-select>
            </el-form-item>
@@ -96,12 +96,12 @@
                </el-select>
            </el-form-item>
            <el-form-item label="风险等级">
                <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
                <el-select v-model="listQuery.form.DTRisk_level" placeholder="请选择">
                    <el-option
                        v-for="item in reList"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
                        v-for="item in levelList"
                        :key="item.name"
                        :label="item.name"
                        :value="item.name">
                    </el-option>
                </el-select>
            </el-form-item>
@@ -116,7 +116,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="深入现场情况">
                <el-select v-model="listQuery.form.createBy" placeholder="请选择">
                <el-select v-model="listQuery.form.class_situation" placeholder="请选择">
                    <el-option
                        v-for="item in llrList"
                        :key="item.id"
@@ -126,22 +126,22 @@
                </el-select>
            </el-form-item>
            <el-form-item label="是否关联">
                <el-select v-model="listQuery.form.createBy" placeholder="请选择">
                <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
                    <el-option
                        v-for="item in llrList"
                        :key="item.id"
                        :label="item.realName"
                        :value="item.id">
                        v-for="item in reList"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="复查单位">
                <el-select v-model="listQuery.form.createBy" placeholder="请选择">
                <el-select v-model="listQuery.form.callback_branch" placeholder="请选择">
                    <el-option
                        v-for="item in llrList"
                        :key="item.id"
                        :label="item.realName"
                        :value="item.id">
                        v-for="item in YHBMList"
                        :key="item.branch_id"
                        :label="item.branch_name"
                        :value="item.branch_id">
                    </el-option>
                </el-select>
            </el-form-item>
@@ -189,7 +189,7 @@
            <el-col :span="12" style="text-align:right;" v-if="YHType=='0'">
                <el-button type="primary" class="btns" size="small" @click="supervision('1')">督查督办</el-button>
                <el-button type="primary" class="btns" size="small" @click="supervision('2')">举一反三</el-button>
<!--                <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button>-->
                <!--                <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button>-->
                <el-button type="primary" class="btns" size="small" @click='deleteBatch'>删除</el-button>
            </el-col>
        </el-row>
@@ -200,24 +200,59 @@
            <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
            <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
            <el-table-column label="隐患项目" align="center">
                <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
                <el-table-column prop="address" label="地点" align="center"></el-table-column>
                <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
                <el-table-column prop="check_date" label="检查时间" width="120" align="center">
                    <template slot-scope="scope">
                        <label>{{ formatDate(scope.row.check_date) }}</label><br/>
                        <label>{{ scope.row.check_class }}</label>
                    </template>
                </el-table-column>
                <el-table-column prop="address" label="地点" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
                            <p>{{ scope.row.address }}</p>
                            <div slot="reference" class="name-wrapper">{{
                                    scope.row.address != null && scope.row.address.length > 10 ? scope.row.address.substring(0, 8) + "...." : scope.row.address
                                }}
                            </div>
                        </el-popover>
                    </template>
                </el-table-column>
                <el-table-column prop="ht_content" label="内容" width="150" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
                            <p>{{ scope.row.ht_content }}</p>
                            <div slot="reference" class="name-wrapper">{{
                                    scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                                }}
                            </div>
                        </el-popover>
                    </template>
                </el-table-column>
                <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
                <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
            </el-table-column>
            <el-table-column label="整改计划" align="center">
                <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
                <el-table-column prop="measure" label="整改措施" width="150" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
                            <p>{{ scope.row.measure }}</p>
                            <div slot="reference" class="name-wrapper">{{
                                    scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
                                }}
                            </div>
                        </el-popover>
                    </template>
                </el-table-column>
                <el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
                <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
                <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
                <el-table-column prop="alter_time" label="限改时间" width="120"  :formatter="formatColumnDate" align="center"></el-table-column>
                <!-- <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column> -->
            </el-table-column>
            <el-table-column label="整改情况" align="center">
                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"></el-table-column>
                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px"  :formatter="formatColumnDate" align="center"></el-table-column>
                <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
                <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
                <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
                <el-table-column prop="CALLBACKTIME" label="复查时间" width="120"  :formatter="formatColumnDate" align="center"></el-table-column>
            </el-table-column>
            <el-table-column label="隐患处理状态" align="center">
                <template slot-scope="scope">
@@ -229,7 +264,7 @@
            </el-table-column>
            <el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
                <template slot-scope="scope">
                    <span
                    <span style ="color: red"
                        v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
                    <span v-else>已关联</span>
                </template>
@@ -272,7 +307,8 @@
        >
            <el-form>
                <el-row>
                    <el-checkbox style="width: 80px;height: 30px" :key="item.branch_id" v-for="item in YHBMList" v-model="checked"
                    <el-checkbox style="width: 80px;height: 30px" :key="item.branch_id" v-for="item in YHBMList"
                                 v-model="checked"
                                 :label="item.branch_id">{{
                            item.branch_name
                        }}
@@ -321,6 +357,7 @@
            YHJBList: [],
            tableData: [],
            requestData: {},
            levelList:[{id:1,name:'低风险'},{id:2,name:'一般风险'},{id:3,name:'较大风险'},{id:4,name:'重大风险'}],
            listQuery: {
                page: 1,
                limit: 10,
@@ -451,6 +488,7 @@
        },
        getPageList() {
            this.listQuery.page = 1
            console.log(this.listQuery)
            this.checkTime()
            getPageList(this.listQuery).then(res => {
                if (res.data.ok == 1) {
@@ -522,7 +560,7 @@
        },
        updateClick(row) {
            this.$router.push({
                path: "/hiddenDangerAdd?id=" + row.id +"&route=safetyHazardAccount"
                path: "/hiddenDangerAdd?id=" + row.id + "&route=safetyHazardAccount"
            })
        },
        jump() {
@@ -536,6 +574,25 @@
                path: "/hiddenDangerList?id=" + row.id,
            })
        },
        //方法区
        formatDate(data) {
            // 获取单元格数据
            if (data == null) {
                return null
            }
            let dt = new Date(data)
            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
        },
        //方法区
        formatColumnDate(row, column) {
            // 获取单元格数据
            let data = row[column.property]
            if (data == null) {
                return null
            }
            let dt = new Date(data)
            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
        },
        deleteClick(row) {
            this.$confirm('确认删除吗', '提示', {
                confirmButtonText: '确认',

 src/views/summaryPotentialSafetyHzards/index.vue

@@ -1,144 +1,158 @@
<template>
<div>
    <div class="whole_top">
        <el-form ref="form" :inline="true" :model="form" label-width="100px">
           <div class="top">
              <div class="select">
                  <el-form-item>
                    <el-select v-model="value1"  multiple placeholder="请选择" style="color: red">
                        <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                        </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item>
                    <el-select v-model="value2"  multiple placeholder="请选择" style="color: red">
                        <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                        </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item>
                    <el-select v-model="value3"  multiple placeholder="请选择" style="color: red">
                        <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                        </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item>
                    <el-select v-model="value4"  multiple placeholder="请选择" style="color: red">
                        <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                        </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item>
                    <el-select v-model="value5"  multiple placeholder="请选择" style="color: red">
                        <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                        </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item>
                    <el-select v-model="value6"  multiple placeholder="请选择" style="color: red">
                        <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                        </el-option>
                    </el-select>
                  </el-form-item>
              </div>
              <el-form-item>
                <el-radio-group v-model="radio" style="padding: 20px 0;">
                    <el-radio :label="1">按隐患部门</el-radio>
                    <el-radio :label="2">按专业</el-radio>
                    <el-radio :label="3">按级别</el-radio>
                    <el-radio :label="4">按检查类别</el-radio>
                    <el-radio :label="5">按检查单位（上级单位）</el-radio>
                    <el-radio :label="6">按检查单位（本部单位）</el-radio>
                </el-radio-group>
              </el-form-item>
              <el-radio-group v-model="radio">
                  <el-radio :label="1">按隐患部门</el-radio>
                  <el-radio :label="2">按专业</el-radio>
                  <el-radio :label="3">按级别</el-radio>
                  <el-radio :label="4">按检查类别</el-radio>
                  <el-radio :label="5">按检查单位（上级单位）</el-radio>
                  <el-radio :label="6">按检查单位（本部单位）</el-radio>
              </el-radio-group>
           </div>
            <div class="center" style="text-align: center;padding-top: 10px;">
                <el-form-item label="检查时间：">
                    <el-date-picker
                        v-model="time"
                        type="daterange"
                        range-separator="至"
                        start-placeholder="开始日期"
                        end-placeholder="结束日期">
                    </el-date-picker>
                </el-form-item>
                <el-form-item>
                    <el-button  class="btn" size="small" type="primary" @click="close()"
                    >汇总</el-button>
                    <el-button  class="btn" size="small" type="primary" @click="close()"
                    >导出Excel</el-button>
                </el-form-item>
    <div>
        <div class="whole_top">
            <el-form ref="form" :inline="true" :model="form" label-width="100px">
                <div class="top">
                    <div class="select">
                        <el-form-item>
                            <el-select v-model="form.ht_branch" multiple placeholder="请选择隐患部门" style="color: red">
                                <el-option
                                    v-for="item in YHBMList"
                                    :key="item.branch_name"
                                    :label="item.branch_name"
                                    :value="item.branch_name">
                                </el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item>
                            <el-select v-model="form.ht_typesub" multiple placeholder="请选择隐患专业" style="color: red">
                                <el-option
                                    v-for="item in YHLXList"
                                    :key="item.value"
                                    :label="item.value"
                                    :value="item.value">
                                </el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item>
                            <el-select v-model="form.ht_level" multiple placeholder="请选择隐患级别" style="color: red">
                                <el-option
                                    v-for="item in YHJBList"
                                    :key="item.value"
                                    :label="item.value"
                                    :value="item.value">
                                </el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item>
                            <el-select v-model="form.checktype" multiple placeholder="请选择检查类型" style="color: red">
                                <el-option
                                    v-for="item in JCLBList"
                                    :key="item.value"
                                    :label="item.label"
                                    :value="item.value">
                                </el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item>
                            <el-select v-model="form.ht_community" multiple placeholder="请选择上级检查单位"
                                       style="color: red">
                                <el-option
                                    v-for="item in SJLBList"
                                    :key="item.value"
                                    :label="item.value"
                                    :value="item.value">
                                </el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item>
                            <el-select v-model="form.check_branch" multiple placeholder="请选择本部检查单位"
                                       style="color: red">
                                <el-option
                                    v-for="item in JCBMList"
                                    :key="item.value"
                                    :label="item.value"
                                    :value="item.value">
                                </el-option>
                            </el-select>
                        </el-form-item>
                    </div>
                    <el-form-item label="统计类别">
                        <el-radio-group v-model="form.x_axis" style="padding: 0px 0;">
                            <el-radio label="ht_branch">按隐患部门</el-radio>
                            <el-radio label="ht_typesub">按专业</el-radio>
                            <el-radio label="ht_level">按级别</el-radio>
                            <el-radio label="checktype">按检查类别</el-radio>
                            <el-radio label="ht_community">按检查单位（上级单位）</el-radio>
                            <el-radio label="check_branch">按检查单位（本部单位）</el-radio>
                        </el-radio-group>
                    </el-form-item>
                    <el-form-item label="汇总类别">
                        <el-radio-group v-model="form.y_axis">
                            <el-radio label="ht_branch">按隐患部门</el-radio>
                            <el-radio label="ht_typesub">按专业</el-radio>
                            <el-radio label="ht_level">按级别</el-radio>
                            <el-radio label="checktype">按检查类别</el-radio>
                            <el-radio label="ht_community">按检查单位（上级单位）</el-radio>
                            <el-radio label="check_branch">按检查单位（本部单位）</el-radio>
                        </el-radio-group>
                    </el-form-item>
                </div>
                <div class="center" style="text-align: center;padding-top: 10px;">
                    <el-form-item label="检查时间：">
                        <el-date-picker
                            v-model="time"
                            type="daterange"
                            range-separator="至"
                            start-placeholder="开始日期"
                            end-placeholder="结束日期">
                        </el-date-picker>
                    </el-form-item>
                    <el-form-item>
                        <el-button class="btn" size="small" type="primary" @click="queryData"
                        >汇总
                        </el-button>
                        <el-button class="btn" size="small" type="primary" @click="close()"
                        >导出Excel
                        </el-button>
                    </el-form-item>
                </div>
            </el-form>
            <el-table
                :data="tableData"
                style="width: 100%">
                <el-table-column align="center" label="众泰煤焦化-安全隐患台帐">
                    <el-table-column
                        prop="y_label"
                        label="隐患部门\隐患专业"

                        align="center">
                    </el-table-column>
                    <el-table-column
                        v-for="item in tableData[0].items"
                        :label="item.x_label"
                        align="center">
                        <template slot-scope="scope">
                            <span @click="showYHList(scope.row,item)" class="clickSpan">
                                {{ getRowNum(scope.row, item.x_label) }}
                            </span>
                        </template>
                    </el-table-column>
                </el-table-column>
            </el-table>
            <div style="color: #c5021a;margin-top: 20px;">
                <div>温馨提示：</div>
                <div>点选可查询隐患详情。</div>
            </div>
        </el-form>
        <el-table
            :data="tableData"
            style="width: 100%">
            <el-table-column align="center" label="众泰煤焦化-安全隐患台帐">
                <el-table-column
                    prop="name"
                    label="隐患部门\隐患专业"
                    align="center">
                </el-table-column>
                <el-table-column
                    prop="province"
                    label="采掘"
                    align="center">
                </el-table-column>
                <el-table-column
                    prop="city"
                    label="生产"
                    width="120"
                    align="center">
                </el-table-column>
                <el-table-column
                    prop="address"
                    label="合计"
                    width="300"
                    align="center">
                </el-table-column>
            </el-table-column>
        </el-table>
        <div style="color: #c5021a;margin-top: 20px;">
            <div>温馨提示：</div>
            <div>点选可查询隐患详情。</div>
        </div>
    </div>
</div>
</template>

<script>

import {
    initJCBM,
    initYHLX,
    initBC,
    initJCLB,
    initYHBM,
    initYHJB,
    initLlr,
    initReformStatus
} from "@/api/sgyhpczl/initSelect";

import {danger_summary} from "@/api/sgyhpczl/summaryPotentialSafetyHzards";

export default {
    name: "index",
    data() {
@@ -166,58 +180,257 @@
            value5: [],
            value6: [],
            radio: 3,
            time: '',
            tableData: [{
                name: '财务部',
                province: '1',
                city: '4',
                address: '1'
            }, {
                name: '党委副书记',
                province: '0',
                city: '2',
                address: '0'
            }, {
                name: '众泰煤焦化',
                province: '2',
                city: '3',
                address: '1'
            }, {
                name: '王小虎',
                province: '3',
                city: '9',
                address: '2'
            }]
            TJType: "ht_typesub",
            HZType: "ht_branch",
            time: [],
            tableData: [
                {}
            ],
            form: {
                x_axis: "ht_typesub",
                y_axis: "ht_branch"
            },
            JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}],
            JCBMList: [],
            YHLXList: [],
            BCList: [],
            JCLBList: [],
            SJLBList: [],
            YHBMList: [],
            YHJBList: [],
            YHZTList: [],
            startDate: "",
            endDate: "",
        }
    },
    mounted() {
        this.initYHLX()
        this.initYHJB()
        this.initBC()
        this.initJCLB()
        this.initLlr()
        this.initYHBM()
        this.initYHZT()
        this.initJCBM()
        this.initSJJCBM()
        let startDate = this.getCurrentMonthFirst();
        let endDate = this.getCurrentMonthLast();
        this.time.push(startDate, endDate);
        this.queryData();

    },
    methods: {
        initYHLX() {
            initYHLX().then(res => {
                if (res.data.ok == 1) {
                    this.YHLXList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initYHJB() {
            initYHJB().then(res => {
                if (res.data.ok == 1) {
                    this.YHJBList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initYHZT() {
            initReformStatus().then(res => {
                if (res.data.ok == 1) {
                    this.YHZTList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initBC() {
            initBC().then(res => {
                if (res.data.ok == 1) {
                    this.BCList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initJCLB() {
            initJCLB().then(res => {
                if (res.data.ok == 1) {
                    this.JCLBList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initLlr() {
            initLlr().then(res => {
                if (res.data.ok == 1) {
                    this.llrList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initYHBM() {
            initYHBM().then(res => {
                if (res.data.ok == 1) {
                    this.YHBMList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initJCBM() {
            initJCBM(0).then(res => {
                if (res.data.ok == 1) {
                    this.JCBMList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initSJJCBM() {
            initJCBM(1).then(res => {
                if (res.data.ok == 1) {
                    this.SJLBList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        queryData() {
            let requestData = {};
            let selectData = []
            for (const queryElement in this.form) {
                if (queryElement != "x_axis" && queryElement != "y_axis") {
                    if (this.form[queryElement] != null && this.form[queryElement] != '') {
                        let searchCloumn = {
                            "field": queryElement,
                            "value": this.form[queryElement].join(','),
                            "type": "IN"
                        }
                        selectData.push(searchCloumn);
                    }
                } else {
                    requestData[queryElement] = this.form[queryElement];
                }
            }
            let timeSearchCloumn = {
                "field": "check_date",
                "value": this.time[0] + "至" + this.time[1],
                "type": "DAT"
            }
            selectData.push(timeSearchCloumn)
            requestData.query_condition = selectData;
            danger_summary(requestData).then(res => {
                if (res.data.ok == 1) {
                    this.tableData = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        getCurrentMonthFirst() {
            var date = new Date();
            date.setDate(1);
            var month = parseInt(date.getMonth() + 1);
            var day = date.getDate();
            if (month < 10) {
                month = '0' + month
            }
            if (day < 10) {
                day = '0' + day
            }

            return date.getFullYear() + '-' + month + '-' + day;
        },
        getCurrentMonthLast() {
            var date = new Date();
            var currentMonth = date.getMonth();
            var nextMonth = ++currentMonth;
            var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
            var oneDay = 1000 * 60 * 60 * 24;
            var lastTime = new Date(nextMonthFirstDay - oneDay);
            var month = parseInt(lastTime.getMonth() + 1);
            var day = lastTime.getDate();
            if (month < 10) {
                month = '0' + month
            }
            if (day < 10) {
                day = '0' + day
            }
            return date.getFullYear() + '-' + month + '-' + day;
        },
        getRowNum(row, str) {
            var data = row.items.find(n => n.x_label == str);
            return data.value
        },

        showYHList(row,item){
            var searchData = {};
            searchData[this.form.x_axis] = item.x_label;
            searchData[this.form.y_axis] = row.y_label;
            let requestData = {};
            let selectData = []
            for (const queryElement in this.form) {
                if (queryElement != "x_axis" && queryElement != "y_axis") {
                    if (this.form[queryElement] != null && this.form[queryElement] != '') {
                        let searchCloumn = {
                            "field": queryElement,
                            "value": this.form[queryElement].join(','),
                            "type": "IN"
                        }
                        selectData.push(searchCloumn);
                    }
                } else {
                    requestData[queryElement] = this.form[queryElement];
                }
            }
            searchData.query_condition = selectData;
            this.$router.push({
                path: "/summaryList",
                query: {"searchData": searchData}
            })
        }

    }
}
</script>

<style scoped>
.top{
.top {
    padding: 10px 5px;
    background: #e4edf4;
}

/*下拉框图标隐藏*/
.whole_top .select /deep/ .el-input__suffix-inner .is-reverse{
.whole_top .select /deep/ .el-input__suffix-inner .is-reverse {
    display: none;
}
.whole_top .select /deep/ .el-input__suffix-inner .el-icon-arrow-up{

.whole_top .select /deep/ .el-input__suffix-inner .el-icon-arrow-up {
    display: none;
}

/*设下拉框颜色*/
.select /deep/.el-input__inner {
.select /deep/ .el-input__inner {
    border: 1px solid #c5dbec;
    font-weight: bold;
    background: #dfeffc;
/*.el-icon-circle-close*/
    /*.el-icon-circle-close*/
}
.whole_top .select /deep/.el-select .el-input__inner:focus {

.whole_top .select /deep/ .el-select .el-input__inner:focus {
    color: #e6860b;
}
.select /deep/ .is-focus .el-select__tags-text{

.select /deep/ .is-focus .el-select__tags-text {
    color: #000000;
}

/*下拉框选值之后的样式*/
.select /deep/ .el-tag.el-tag--info {
    background-color: transparent;;
@@ -225,24 +438,33 @@
    font-weight: bold;
    color: #e6860b;
}

/*placeholder颜色修改*/
.whole_top ::-webkit-input-placeholder {
    color: #000000;
}

.whole_top :-moz-placeholder {
    color: #000000;
}
.whole_top ::-moz-placeholder{

.whole_top ::-moz-placeholder {
    color: #000000;
}

.whole_top :-ms-input-placeholder {
    color: #000000;
}

/*日期*/
/deep/ .el-date-editor .el-range-separator{
/deep/ .el-date-editor .el-range-separator {
    width: auto;
}
.btn{
.clickSpan:hover{
    cursor: pointer;
}

.btn {
    background-color: #034ea2;
    border: 1px solid #034ea2;
}

 src/views/summaryPotentialSafetyHzards/summaryList.vue

@@ -1,34 +1,34 @@
<template>
    <div class="app-container">
    
        <el-table :data="tableData" style="width: 100%"  @selection-change="changeBox">

        <el-table :data="tableData" style="width: 100%" @selection-change="changeBox">
            <el-table-column type="selection" width="55" align="center"></el-table-column>
             <el-table-column prop="number" label="单位" align="center" width="120"></el-table-column>
            <el-table-column prop="number" label="单位" align="center" width="120"></el-table-column>
            <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
            <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
            <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
            <!-- <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column> -->
            <el-table-column label="隐患项目" align="center">
                <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
                <el-table-column prop="address" label="地点" align="center"> </el-table-column>
                <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
                <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
                <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
                <el-table-column prop="address" label="地点" align="center"></el-table-column>
                <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
                <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
                <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
            </el-table-column>
            <el-table-column label="整改计划" align="center">
                <el-table-column prop="measure" label="整改措施" align="center"> </el-table-column>
                <el-table-column prop="ht_branch" label="责任单位" align="center"> </el-table-column>
                <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
                <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
                <el-table-column prop="ht_branch" label="责任单位" align="center"></el-table-column>
                <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
                <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
                <!-- <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column> -->
            </el-table-column>
            <el-table-column label="整改情况" align="center">
                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"> </el-table-column>
                <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"> </el-table-column>
                <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"> </el-table-column>
                <el-table-column prop="CALLBACKTIME" label="复查时间"  width="120" align="center"></el-table-column>
                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"></el-table-column>
                <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
                <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
                <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
            </el-table-column>
            <el-table-column  label="隐患处理状态" align="center">
            <el-table-column label="隐患处理状态" align="center">
                <template slot-scope="scope">
                    <span v-if="scope.row.step =='1'">初始状态</span>
                    <span v-if="scope.row.step =='2'">整改中</span>
@@ -38,13 +38,14 @@
            </el-table-column>
            <el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
                <template slot-scope="scope">
                    <span v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
                    <span
                        v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
                    <span v-else>已关联</span>
                </template>
            </el-table-column>
            <el-table-column prop="DTRisk_level" label="风险等级" align="center"> </el-table-column>
            <el-table-column prop="warningLevel" label="初始警情" align="center"> </el-table-column>
            <el-table-column prop="curWarningLevel" label="当前警情" align="center"> </el-table-column>
            <el-table-column prop="DTRisk_level" label="风险等级" align="center"></el-table-column>
            <el-table-column prop="warningLevel" label="初始警情" align="center"></el-table-column>
            <el-table-column prop="curWarningLevel" label="当前警情" align="center"></el-table-column>
            <!-- <el-table-column prop="date" label="流程操作" align="center"  fixed="right">
                <template slot-scope="scope">
                    <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
@@ -70,34 +71,41 @@
            >
            </el-pagination>
        </div>
        <div class="btn">
            <el-button size="small" @click="close()">关闭</el-button>
        </div>
    </div>
</template>
<script>
import {getPageList,delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration";
import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
import {getPageList} from "@/api/sgyhpczl/safetyHazardAccount";
import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect";

export default {
    data() {
        return {
            radio1:'超期整改',
            selectedList:[],
            reList:[{label:"未关联",value:0}],
            llrList:[],
            radio1: '超期整改',
            selectedList: [],
            reList: [{label: "未关联", value: 0}],
            llrList: [],
            options: [],
            form:{},
            form: {},

            JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}],
            JCBMList:[],
            YHLXList:[],
            BCList:[],
            JCLBList:[],
            YHBMList:[],
            YHJBList:[],
            JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}],
            JCBMList: [],
            YHLXList: [],
            BCList: [],
            JCLBList: [],
            YHBMList: [],
            YHJBList: [],
            tableData: [],
            listQuery:{
                page:1,
                limit:10,
                form:{
                    ht_community:"众泰煤焦化"
            listQuery: {


                page: 1,
                limit: 10,
                type: 0,
                form: {
                    // ht_community:"众泰煤焦化"
                },
            },
            currentPage: 1,
@@ -105,7 +113,13 @@
            recordTotal: 0,
        };
    },
    mounted(){
    mounted() {
        console.log(this.$route.query.searchData);
        var searchData = this.$route.query.searchData;
        for (const argumentsKey in searchData) {
            this.listQuery.form[argumentsKey] = searchData[argumentsKey];
        }
        console.log(this.listQuery)
        this.getPageList()
        this.initYHLX()
        this.initYHJB()
@@ -113,22 +127,23 @@
        this.initJCLB()
        this.initLlr()
        this.initYHBM()

    },
    methods:{
        deleteBatch(){
            if(this.selectedList==null ||this.selectedList.length==0 ){
                this.$message({type:'warning', message:'至少选中一条数据', duration:3000})
    methods: {
        deleteBatch() {
            if (this.selectedList == null || this.selectedList.length == 0) {
                this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
                return
            }
            var ids=this.selectedList.map((obj) => {
            var ids = this.selectedList.map((obj) => {
                return obj.id
            }).join(",")
            this.$confirm('确认删除吗','提示', {
            this.$confirm('确认删除吗', '提示', {
                confirmButtonText: '确认',
                cancelButtonText: '取消',
                type: 'warning'
            })
                .then(()=>{
                .then(() => {
                    delDanger(ids).then(() => {
                        this.getPageList()
                        this.$notify({
@@ -139,206 +154,186 @@
                        });
                    });
                })
                .catch(error =>{
                .catch(error => {
                });
        },
        changeBox(val){
        changeBox(val) {
            this.selectedList = []
            val.forEach((item) => {
                this.selectedList.push(item)
            })
        },
        initLlr(){
            initLlr().then(res=>{
                if (res.data.ok==1){
                    this.llrList=res.data.data
                } else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
        initLlr() {
            initLlr().then(res => {
                if (res.data.ok == 1) {
                    this.llrList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initYHBM(){
            initYHBM().then(res=>{
                if (res.data.ok==1){
                    this.YHBMList=res.data.data
                } else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
        initYHBM() {
            initYHBM().then(res => {
                if (res.data.ok == 1) {
                    this.YHBMList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        changeJCDW(val){
            initJCBM(val).then(res=>{
                if (res.data.ok==1){
                    this.JCBMList=res.data.data
                } else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
        changeJCDW(val) {
            initJCBM(val).then(res => {
                if (res.data.ok == 1) {
                    this.JCBMList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        checkTime(){
            if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
                if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
                }else {
                    this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
        checkTime() {
            if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') {
                if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') {
                } else {
                    this.$message({type: 'error', message: "请选择检查结束时间", duration: 3000})
                    return
                }

            }
            if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
                if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
                }else {
                    this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
            if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') {
                if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') {
                } else {
                    this.$message({type: 'error', message: "请选择检查开始时间", duration: 3000})
                    return
                }
            }
            if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
                if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
                }else {
                    this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
            if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') {
                if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') {
                } else {
                    this.$message({type: 'error', message: "请选择限改结束时间", duration: 3000})
                    return
                }

            }
            if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
                if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
                }else {
                    this.$message({type:'error', message:"请选择改开始时间", duration:3000})
            if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') {
                if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') {
                } else {
                    this.$message({type: 'error', message: "请选择改开始时间", duration: 3000})
                    return
                }
            }
        },
        getPageList(){
            this.listQuery.page=1
        getPageList() {
            this.listQuery.page = 1
            this.checkTime()
            getPageList(this.listQuery).then(res=>{
                if (res.data.ok==1) {
            getPageList(this.listQuery).then(res => {
                if (res.data.ok == 1) {
                    this.tableData = res.data.data.items
                     this.recordTotal=res.data.data.total
                }else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
                    this.recordTotal = res.data.data.total
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        reset(){
            this.listQuery.form={ht_community:"众泰煤焦化"}
        reset() {
            this.listQuery.form = {ht_community: "众泰煤焦化"}
            this.getPageList()
        },
        handleSizeChange(val){
        handleSizeChange(val) {
            this.listQuery.limit = val
            this.getPageListForPagination();
        },
        handleCurrentChange(val){
        handleCurrentChange(val) {
            this.listQuery.page = val
            this.getPageListForPagination();
        },
        getPageListForPagination(){
        getPageListForPagination() {
            this.checkTime()
            getPageList(this.listQuery).then(res=>{
                if (res.data.ok==1) {
            getPageList(this.listQuery).then(res => {
                if (res.data.ok == 1) {
                    this.tableData = res.data.data.items
                    this.recordTotal=res.data.data.total
                }else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
                    this.recordTotal = res.data.data.total
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initYHLX(){
            initYHLX().then(res=>{
                if (res.data.ok==1){
                    this.YHLXList=res.data.data
                } else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
        initYHLX() {
            initYHLX().then(res => {
                if (res.data.ok == 1) {
                    this.YHLXList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initYHJB(){
            initYHJB().then(res=>{
                if (res.data.ok==1){
                    this.YHJBList=res.data.data
                } else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
        initYHJB() {
            initYHJB().then(res => {
                if (res.data.ok == 1) {
                    this.YHJBList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initBC(){
            initBC().then(res=>{
                if (res.data.ok==1){
                    this.BCList=res.data.data
                } else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
        initBC() {
            initBC().then(res => {
                if (res.data.ok == 1) {
                    this.BCList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        initJCLB(){
            initJCLB().then(res=>{
                if (res.data.ok==1){
                    this.JCLBList=res.data.data
                } else{
                    this.$message({type:'error', message:res.data.msg, duration:3000})
        initJCLB() {
            initJCLB().then(res => {
                if (res.data.ok == 1) {
                    this.JCLBList = res.data.data
                } else {
                    this.$message({type: 'error', message: res.data.msg, duration: 3000})
                }
            })
        },
        updateClick(row){
        updateClick(row) {
            this.$router.push({
                path:"/safetyedit"
                path: "/safetyedit"
            })
        },
        jump(){
        jump() {
            this.$router.push({
                path:"/hiddenDangerAdd"
                path: "/hiddenDangerAdd"
            })
        },

        // 发送隐患单跳转
        handleClick(row){
        base() {
            this.$router.push({
                path:"/hiddenDangerList?id="+row.id,
            })
        },
        deleteClick(row){
            this.$confirm('确认删除吗','提示', {
                confirmButtonText: '确认',
                cancelButtonText: '取消',
                type: 'warning'
            })
                .then(()=>{
                    delDanger(row.id).then(() => {
                        this.getPageList()
                        this.$notify({
                            title: "成功",
                            message: "删除成功",
                            type: "success",
                            duration: 2000,
                        });
                    });
                })
                .catch(error =>{
                });
        },
        base(){
            this.$router.push({
                path:"/Dualbase"
                path: "/Dualbase"
            })
        }
    }
};
</script>
<style scoped>
 .inquire {
        display: flex;
        justify-content: left;
        flex-wrap: wrap;
    }
    .inquire .el-form-item {
        padding: 0 30px;
    }
    .title-center {
        padding: 20px 0;
    }
    .btns {
        background-color: #034ea2;
        border: 1px solid #034ea2;
    }
    .title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
.inquire {
    display: flex;
    justify-content: left;
    flex-wrap: wrap;
}

.inquire .el-form-item {
    padding: 0 30px;
}

.title-center {
    padding: 20px 0;
}

.btns {
    background-color: #034ea2;
    border: 1px solid #034ea2;
}

.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
    border: none;
}

@@ -351,4 +346,8 @@
    background-color: #034ea2;
    background-color: #034ea2;
}
</style>
.btn{
    text-align: center;
    margin-top: 20px;
}
</style>