默认更改列表

Admin

2022-11-14 d7730dc5d9c2710fb37d79d2a52a8081741827f7

默认更改列表

 .idea/shelf/Update_之前未提交的更改_at_2022_10_25_16_56_[默认更改列表]/big-bg.png

Binary files differ

 .idea/shelf/Update_之前未提交的更改_at_2022_10_25_16_56_[默认更改列表]/shelved.patch

文件已删除

 .idea/shelf/Update_之前未提交的更改_at_2022_10_25_16_56_[默认更改列表]/small-bg.png

Binary files differ

 .idea/shelf/Update_之前未提交的更改_at_2022_10_25_16_56_[默认更改列表]/tit-bg.png

Binary files differ

 .idea/shelf/Update_之前未提交的更改_at_2022_10_25_16_56_[默认更改列表]/top-bg.png

Binary files differ

 package-lock.json

文件太大

 package.json

@@ -30,6 +30,7 @@
    "url": "https://github.com/PanJiaChen/vue-element-admin/issues"
  },
  "dependencies": {
    "@jiaminghi/data-view": "^2.10.0",
    "axios": "^0.18.0",
    "babel-polyfill": "^6.26.0",
    "clipboard": "1.7.1",
@@ -48,7 +49,7 @@
    "highcharts": "^10.1.0",
    "highcharts-vue": "^1.4.0",
    "jquery": "^3.6.0",
    "js-cookie": "2.2.0",
    "js-cookie": "^2.2.0",
    "jsbarcode": "^3.11.4",
    "json-bigint": "^1.0.0",
    "jsonlint": "1.6.3",

 src/main.js

@@ -8,6 +8,9 @@
import Element from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'

import dataV from '@jiaminghi/data-view'
Vue.use(dataV)

import echarts from 'echarts'
Vue.prototype.$echarts = echarts


 src/views/doubleIndex/saftyScreen/components/screen.vue

@@ -29,16 +29,17 @@
                <div class="item-head">
                    <div>
                        <img src="../../../../assets/images/tit-bg.png">
                        <span>告警风险事件概括</span>
                        <span>风险事件概括</span>
                    </div>
                    <div @click="toEvent()">查看更多>></div>
                </div>
                <el-table :data="eventData" style="width: 100%;height: 90%">
                    <el-table-column prop="riskEventName" label="风险事件名称" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="riskUnitName" label="风险分析单元" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip align="center"></el-table-column>
                    <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip align="center"></el-table-column>
                </el-table>
<!--                <el-table :data="eventData" style="width: 100%;height: 90%">-->
<!--                    <el-table-column prop="riskEventName" label="风险事件名称" show-overflow-tooltip></el-table-column>-->
<!--                    <el-table-column prop="riskUnitName" label="风险分析单元" show-overflow-tooltip></el-table-column>-->
<!--                    <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip align="center"></el-table-column>-->
<!--                    <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip align="center"></el-table-column>-->
<!--                </el-table>-->
                <dv-scroll-board :config="riskEventConfig" style="width:100%;height:90%" />
            </div>
            <div class="table-item">
                <div class="item-head item-head1">
@@ -57,26 +58,27 @@
                    </div>
                    <div @click="toRisk()">查看更多>></div>
                </div>
                <el-table :data="riskStatusData" style="width: 100%;height: 90%">
                    <el-table-column type="index" label="序号" width="60" align="center"/>
<!--                <el-table :data="riskStatusData" style="width: 100%;height: 90%">-->
<!--                    <el-table-column type="index" label="序号" width="60" align="center"/>-->
<!--                    <el-table-column prop="reportTime" label="上报时间" show-overflow-tooltip width="170px"></el-table-column>-->
                    <el-table-column prop="dangerCode" label="隐患名称" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="dangerLevel" label="隐患等级" show-overflow-tooltip align="center">
                        <template slot-scope="scope">
                            <div :style="{color: scope.row.dangerLevel==1?'#28c3ff':'#ff0000'}">
                                {{scope.row.dangerLevel==1?'一般隐患':'重大隐患'}}
                            </div>
                        </template>
                    </el-table-column>
                    <el-table-column prop="gmtCreate" label="上报时间" show-overflow-tooltip align="center"></el-table-column>
                    <el-table-column prop="dangerStatus" label="隐患状态" show-overflow-tooltip align="center">
                        <template slot-scope="scope">
                            <div :style="{color: scope.row.dangerStatus==0 || scope.row.dangerStatus==1 ?'#00ff7e':(scope.row.dangerStatus==2 || scope.row.dangerStatus==3?'#F56C6C':'#28c3ff')}">
                                {{scope.row.dangerStatus==0?'整改中':(scope.row.dangerStatus==1?'待验收':(scope.row.dangerStatus==2?'延期整改':(scope.row.dangerStatus==3?'超期未整改':'已验收')))}}
                            </div>
                        </template>
                    </el-table-column>
                </el-table>
<!--                    <el-table-column prop="dangerCode" label="隐患名称" show-overflow-tooltip></el-table-column>-->
<!--                    <el-table-column prop="dangerLevel" label="隐患等级" show-overflow-tooltip align="center">-->
<!--                        <template slot-scope="scope">-->
<!--                            <div :style="{color: scope.row.dangerLevel==1?'#28c3ff':'#ff0000'}">-->
<!--                                {{scope.row.dangerLevel==1?'一般隐患':'重大隐患'}}-->
<!--                            </div>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
<!--                    <el-table-column prop="gmtCreate" label="上报时间" show-overflow-tooltip align="center"></el-table-column>-->
<!--                    <el-table-column prop="dangerStatus" label="隐患状态" show-overflow-tooltip align="center">-->
<!--                        <template slot-scope="scope">-->
<!--                            <div :style="{color: scope.row.dangerStatus==0 || scope.row.dangerStatus==1 ?'#00ff7e':(scope.row.dangerStatus==2 || scope.row.dangerStatus==3?'#F56C6C':'#28c3ff')}">-->
<!--                                {{scope.row.dangerStatus==0?'整改中':(scope.row.dangerStatus==1?'待验收':(scope.row.dangerStatus==2?'延期整改':(scope.row.dangerStatus==3?'超期未整改':'已验收')))}}-->
<!--                            </div>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
<!--                </el-table>-->
                <dv-scroll-board :config="riskStatusConfig" style="width:100%;height:90%" />
            </div>
            <div class="table-item">
                <div class="item-head item-head1">
@@ -133,16 +135,17 @@
                    </div>
                    <div @click="toDevices()">查看更多>></div>
                </div>
                <el-table class="deviceTable" :data="deviceData" style="width: 100%">
                    <el-table-column prop="produceDeviceName" label="装置名称" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="riskLevel" label="风险等级" show-overflow-tooltip align="center">
                        <template slot-scope="scope">
                            <div :style="{color: scope.row.riskLevel==1?'#28c3ff':(scope.row.riskLevel==2?'#00ff7e':(scope.row.riskLevel==3?'#ff9a31':'#ff0000'))}">
                                {{scope.row.riskLevel==1?'低风险':(scope.row.riskLevel==2?'一般风险':(scope.row.riskLevel==3?'较大风险':'重大风险'))}}
                            </div>
                        </template>
                    </el-table-column>
                </el-table>
<!--                <el-table class="deviceTable" :data="deviceData" style="width: 100%">-->
<!--                    <el-table-column prop="produceDeviceName" label="装置名称" show-overflow-tooltip></el-table-column>-->
<!--                    <el-table-column prop="riskLevel" label="风险等级" show-overflow-tooltip align="center">-->
<!--                        <template slot-scope="scope">-->
<!--                            <div :style="{color: scope.row.riskLevel==1?'#28c3ff':(scope.row.riskLevel==2?'#00ff7e':(scope.row.riskLevel==3?'#ff9a31':'#ff0000'))}">-->
<!--                                {{scope.row.riskLevel==1?'低风险':(scope.row.riskLevel==2?'一般风险':(scope.row.riskLevel==3?'较大风险':'重大风险'))}}-->
<!--                            </div>-->
<!--                        </template>-->
<!--                    </el-table-column>-->
<!--                </el-table>-->
                <dv-scroll-board :config="deviceConfig" style="width:100%;height: 60%"/>
                <div class="deviceLevel">
                    <div class="levelItem red">
                        <span>{{majorRisk}}</span>
@@ -221,8 +224,8 @@
                value2:['',''],
                value3:['',''],
                pageIndex: 1,
                pageSize: this.isScreenfull?7:6,
                smallSize: this.isScreenfull?5:4,
                pageSize: 10,
                smallSize: 10,
                eventData: [],
                riskStatusData: [],
                deviceData: [],
@@ -272,7 +275,10 @@
                openCircuitCout: [],
                heightCount: [],
                temporaryPowerCount: [],
                blindPlatePluggingCount: []
                blindPlatePluggingCount: [],
                riskEventConfig: {},
                riskStatusConfig: {},
                deviceConfig: {}
            };
        },
        created(){
@@ -328,6 +334,10 @@
                let res = await getRiskEvent(data)
                if (res.data.code === '200'){
                    this.eventData = res.data.data
                    const conData = res.data.data.map((item)=>{
                        return [item.riskEventName,item.riskUnitName,item.lastEditUserName,item.gmtCreate]
                    })
                    this.riskEventConfig = {data: conData, header: ['风险事件名称', '风险分析单元', '创建人','创建时间'], oddRowBGC: 'rgba(1, 155, 255, 0)', evenRowBGC: 'rgba(1, 155, 255, 0.1)', headerBGC: 'rgba(1,216,255,0.1)',rowNum: 7,align:['center','center','center','center']}
                } else {
                    this.$message({
                        message:res.data.message,
@@ -342,6 +352,10 @@
                let res = await getDangerManage(data)
                if (res.data.code === '200'){
                    this.riskStatusData = res.data.data
                    const conData = res.data.data.map((item)=>{
                        return [item.dangerCode,item.dangerLevel==1?'一般隐患':'重大隐患',item.gmtCreate,item.dangerStatus==0?'整改中':(item.dangerStatus==1?'待验收':(item.dangerStatus==2?'延期整改':(item.dangerStatus==3?'超期未整改':'已验收')))]
                    })
                    this.riskStatusConfig = {data: conData, header: ['隐患名称', '隐患等级', '上报时间','隐患状态'], oddRowBGC: 'rgba(1, 155, 255, 0)', evenRowBGC: 'rgba(1, 155, 255, 0.1)', headerBGC: 'rgba(1,216,255,0.1)',rowNum: 7,align:['center','center','center','center']}
                } else {
                    this.$message({
                        type: 'warning',
@@ -393,7 +407,6 @@
                    this.heightCount = this.reGroup(res.data.data,5)
                    this.temporaryPowerCount = this.reGroup(res.data.data,6)
                    this.blindPlatePluggingCount = this.reGroup(res.data.data,7)
                    console.log(this.depList,'this.depList')
                }else{
                    this.$message({
                        type:'warning',
@@ -405,7 +418,6 @@

            reGroup(data,index){
                let arr = []
                console.log(data,'data')
                for(let i of data){
                    arr.push(i.typeList[index].count)
                }
@@ -449,6 +461,10 @@
                let res = await getDevicePage(data)
                if (res.data.code === '200'){
                    this.deviceData = res.data.data
                    const conData = res.data.data.map((item)=>{
                        return [item.produceDeviceName,item.riskLevel==1?'低风险':(item.riskLevel==2?'一般风险':(item.riskLevel==3?'较大风险':'重大风险'))]
                    })
                    this.deviceConfig = {data: conData, header: ['装置名称', '风险等级'], oddRowBGC: 'rgba(1, 155, 255, 0)', evenRowBGC: 'rgba(1, 155, 255, 0.1)', headerBGC: 'rgba(1,216,255,0.1)',rowNum: 5,align:['center','center']}
                } else {
                    this.$message({
                        type: 'warning',
@@ -902,6 +918,11 @@
</script>

<style lang="scss" scoped>
    ::v-deep.dv-scroll-board{
        .header{
            color: #00fff6 !important;
        }
    }
    .screen-container{
        width: 100%;
        height: 100%;