Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-06-09 f29d0382c54aff9448c9c1cfc77420e06b34022c

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

@@ -1,14 +1,14 @@
<template>
    <div class="app-container">
           <div class="filter-container">
            <div class="basic_search">
                <span>巡检开始时间:</span>
                <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始时间"></el-date-picker>
            </div>
            <div class="basic_search">
                <span>巡检结束时间:</span>
                <el-date-picker v-model="listQuery.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束时间"></el-date-picker>
            </div>
<!--            <div class="basic_search">-->
<!--                <span>巡检开始时间:</span>-->
<!--                <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始时间"></el-date-picker>-->
<!--            </div>-->
<!--            <div class="basic_search">-->
<!--                <span>巡检结束时间:</span>-->
<!--                <el-date-picker v-model="listQuery.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束时间"></el-date-picker>-->
<!--            </div>-->
            <div class="basic_search">
                <span>风险源名称:</span>
                     <el-input v-model="listQuery.name" class="analyseUnit_input">
@@ -122,9 +122,9 @@
            <br>
            <el-pagination
                v-show="recordTotal>0"
                :current-page="currentPage"
                :current-page="listQuery.pageIndex"
                :page-sizes="[10, 20, 30, 50]"
                :page-size="pageSize"
                :page-size="listQuery.pageSize"
                :total="recordTotal"
                layout="total, sizes, prev, pager, next, jumper"
                background
@@ -190,6 +190,7 @@
import { computePageCount } from '@/utils'
import { getRiskSourceList , addRiskSource , updateRiskSource , deleteById } from '@/api/riskSource'
import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
import {deleteRiskSource} from "../../../../api/riskSource";
export default {
    name: 'index',
    filters: {
@@ -243,7 +244,12 @@
            code:'',
            riskSourceVisible:false,
            riskSourceFormRules:{
                name: [{ required: true, message: '风险名称不能为空', trigger: 'blur' }],
                name: [{ required: true, message: '风险源名称不能为空', trigger: 'blur' }],
                type: [{ required: true, message: '风险源类型不能为空', trigger: 'change' }],
                level: [{ required: true, message: '风险等级不能为空', trigger: 'change' }],
                accidentDesc: [{ required: true, message: '可能导致事故的主要原因不能为空', trigger: 'blur' }],
                location: [{ required: true, message: '区域位置不能为空', trigger: 'blur' }],
                depId: [{ required: true, message: '所属部门不能为空', trigger: 'change' }],
            },
            riskSourceForm:{
                accidentDesc: "",
@@ -279,10 +285,7 @@
            this.listLoading = true
            let res = await getRiskSourceList(this.listQuery)
            if(res.data.code === '200'){
                this.recordTotal =JSON.parse(res.data.message).totalCount
                this.pageSize = JSON.parse(res.data.message).pageSize
                this.pageTotal = computePageCount(this.recordTotal, this.pageSize)
                this.currentPage = JSON.parse(res.data.message).pageIndex
                this.recordTotal = JSON.parse(res.data.message).totalCount
                this.riskSourceData = res.data.result
            }else{
                this.$message({
@@ -382,7 +385,7 @@
                cancelButtonText:'取消',
                type:'warning',
            }).then(()=> {
                deleteAnalyseUnit({id:val.id}).then( ()=>{
                deleteRiskSource({id:val.id}).then( ()=>{
                    this.getRiskSourceData()
                    this.$notify({
                        title:'成功',
@@ -395,6 +398,7 @@
        },

        refreshHandle(){
            this.listQuery.pageIndex = 1
            this.getRiskSourceData()
        },
        handleSizeChange(val){
@@ -414,6 +418,6 @@
    padding-bottom: 10px;
}
.analyseUnit_input{
    width:200px;
    width:300px;
}
</style>