fix:修改指挥部大屏中下部分”隐患检查推送“显示超期状态
This commit is contained in:
Vce
parent
0950addcae
commit
d2a0173388
@ -28,8 +28,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
|
||||
// export const COMPANY: string = "zsbf"; //中水北方
|
||||
// export const COMPANY: string = "as"; //鞍山项目
|
||||
// export const COMPANY: string = "agjt"; //鞍钢集团
|
||||
export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
|
||||
// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
|
||||
// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
|
||||
export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
|
||||
// export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
|
||||
// export const COMPANY: string = "slx"; //苏立信项目
|
||||
// export const COMPANY: string = "hfqc"; //合肥启程项目
|
||||
|
||||
@ -25,8 +25,8 @@ export const staticRouter: RouteRecordRaw[] = [
|
||||
path: "/large",
|
||||
name: "大屏",
|
||||
// // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
|
||||
// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
|
||||
component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
|
||||
component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
|
||||
// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
|
||||
// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏
|
||||
// component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页)
|
||||
children: [
|
||||
|
||||
@ -42,12 +42,15 @@
|
||||
<div class="item" v-for="(item, index) in listData" :key="index">
|
||||
<div class="itemHead">
|
||||
<div>
|
||||
<div class="itemHeadInner1" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 2">未整改</div>
|
||||
<div class="itemHeadInner4" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 3">未复查</div>
|
||||
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4">未核验</div>
|
||||
<div class="itemHeadInner6" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
|
||||
<div class="itemHeadInner1" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 2 && !JSON.parse(item.payload).overTime">未整改</div>
|
||||
<div class="itemHeadInner4" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 3 && !JSON.parse(item.payload).overTime">未复查</div>
|
||||
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4 && !JSON.parse(item.payload).overTime">未核验</div>
|
||||
<div class="itemHeadInner1" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 2 && JSON.parse(item.payload).overTime">超期未整改</div>
|
||||
<div class="itemHeadInner4" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 3 && JSON.parse(item.payload).overTime">超期未复查</div>
|
||||
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4 && JSON.parse(item.payload).overTime">超期未核验</div>
|
||||
<!-- <div class="itemHeadInner6" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
|
||||
<div class="itemHeadInner3" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 6">已撤回</div>
|
||||
<div class="itemHeadInner2" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 7">超期未关闭</div>
|
||||
<div class="itemHeadInner2" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 7">超期未关闭</div> -->
|
||||
</div>
|
||||
<div v-if="JSON.parse(item.payload).level">
|
||||
<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
|
||||
@ -89,12 +92,15 @@
|
||||
<div class="item" v-for="(item, index) in listData" :key="index">
|
||||
<div class="itemHead">
|
||||
<div>
|
||||
<div class="itemHeadInner1" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 2">未整改</div>
|
||||
<div class="itemHeadInner4" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 3">未复查</div>
|
||||
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4">未核验</div>
|
||||
<div class="itemHeadInner6" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
|
||||
<div class="itemHeadInner1" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 2 && !JSON.parse(item.payload).overTime">未整改</div>
|
||||
<div class="itemHeadInner4" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 3 && !JSON.parse(item.payload).overTime">未复查</div>
|
||||
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4 && !JSON.parse(item.payload).overTime">未核验</div>
|
||||
<div class="itemHeadInner1" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 2 && JSON.parse(item.payload).overTime">超期未整改</div>
|
||||
<div class="itemHeadInner4" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 3 && JSON.parse(item.payload).overTime">超期未复查</div>
|
||||
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4 && JSON.parse(item.payload).overTime">超期未核验</div>
|
||||
<!-- <div class="itemHeadInner6" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
|
||||
<div class="itemHeadInner3" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 6">已撤回</div>
|
||||
<div class="itemHeadInner2" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 7">超期未关闭</div>
|
||||
<div class="itemHeadInner2" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 7">超期未关闭</div> -->
|
||||
</div>
|
||||
<div v-if="JSON.parse(item.payload).level">
|
||||
<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
|
||||
@ -154,21 +160,21 @@ const getNoticeList = async (showLoading: boolean) => {
|
||||
listData.value = res.result.page.records.map((item: any) => {
|
||||
let statusMsg1 = item.status == 2 ? "未整改":
|
||||
item.status == 3 ? "未复查":
|
||||
item.status == 4 ? "未核验":
|
||||
item.status == 4 ? "未核验":""
|
||||
// item.status == 5 ? "合格":
|
||||
// item.status == 6 ? "已撤回":
|
||||
item.status == 7 ? "超期未整改":""
|
||||
// item.status == 7 ? "超期未整改":""
|
||||
let statusMsg2 = item.status == 2 ? "整改！":
|
||||
item.status == 3 ? "复查！":
|
||||
item.status == 4 ? "核验！":
|
||||
item.status == 4 ? "核验！":""
|
||||
// item.status == 5 ? "合格":
|
||||
// item.status == 6 ? "已撤回":
|
||||
item.status == 7 ? "整改！":""
|
||||
// item.status == 7 ? "整改！":""
|
||||
let tempMsg = item.enterpriseName + "的" + item.regionName + "责任区域内有一条" + item.dangerItemContent + "的隐患"
|
||||
+ statusMsg1 + "，请注意监督" + statusMsg2
|
||||
return {
|
||||
msg:tempMsg,
|
||||
payload: JSON.stringify({status:item.status, level:item.level, time:item.createTime})
|
||||
payload: JSON.stringify({status:item.status, level:item.level, time:item.inspectTime,overTime:item.overTime})
|
||||
}
|
||||
})
|
||||
// listData.value.push({
|
||||
|
||||
@ -298,7 +298,8 @@ function drawEchart() {
|
||||
let option = {
|
||||
animation: false, // 取消动画
|
||||
tooltip: {
|
||||
trigger: "item"
|
||||
trigger: "item",
|
||||
// position: ['50%','50%']
|
||||
},
|
||||
title: {
|
||||
text: questionTotal.value,
|
||||
@ -795,35 +796,57 @@ function getSpecialEchart() {
|
||||
tooltip: {
|
||||
trigger: "item",
|
||||
position: "inside",
|
||||
// confine: true,
|
||||
confine: true,
|
||||
axisPointer: {
|
||||
// 坐标轴指示器，鼠标放上时变阴影，而不是线
|
||||
type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
|
||||
},
|
||||
// textStyle: {
|
||||
// color: "#000000"
|
||||
// },
|
||||
// confine:true,
|
||||
// position:['50%','50%'],
|
||||
appendToBody:true,
|
||||
textStyle: {
|
||||
color: "#fff",
|
||||
fontSize: '3px'
|
||||
},
|
||||
// backgroundColor: "#F3F3F3",
|
||||
extraCssText: "width:150px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);",
|
||||
extraCssText: "width:220px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);",
|
||||
formatter: function (params: any) {
|
||||
const obj = safeList[params.dataIndex];
|
||||
// 当鼠标悬停在柱子上时，显示实际数值和百分比
|
||||
return '<div>'+safeList[params.dataIndex].x+'</div><div><span style="color:#5470c6;line-height:10px;font-weight:bolder;">●</span>动土安全作业：'+obj.xzGroundSafetNum+'</div>'+
|
||||
'<div><span style="color:#91cc75;line-height:10px;font-weight:bolder;">●</span>用电安全作业：'+obj.xzTemporaryElectricitySafeNum+'</div>'+
|
||||
'<div><span style="color:#fac858;line-height:10px;font-weight:bolder;">●</span>高处作业作业：'+obj.xzHighJobSafeNum+'</div>'+
|
||||
'<div><span style="color:#ee6666;line-height:10px;font-weight:bolder;">●</span>盲板抽堵作业：'+obj.xzBlindPlatePlugSafeNum+'</div>'+
|
||||
'<div><span style="color:#73c0de;line-height:10px;font-weight:bolder;">●</span>动火安全作业：'+obj.xzSpecialOperationFireSafetyNum+'</div>'+
|
||||
'<div><span style="color:#3ba272;line-height:10px;font-weight:bolder;">●</span>断路安全作业：'+obj.xzOpenCircuitSafeNum+'</div>'+
|
||||
'<div><span style="color:#fc8452;line-height:10px;font-weight:bolder;">●</span>吊装安全作业：'+obj.xzHoistSafetyWorkNum+'</div>'+
|
||||
'<div><span style="color:#9a60b4;line-height:10px;font-weight:bolder;">●</span>受限空间作业：'+obj.xzLimitSpaceSafeNum+'</div>';
|
||||
return '<div>'+safeList[params.dataIndex].x+'</div>'+
|
||||
// return '<div style="display:flex;justify-content:space-between;"><div><span style="color:#5470c6;line-height:3px;font-weight:bolder;">●</span>动土安全作业：'+obj.xzGroundSafetNum+'</div>'+
|
||||
'<div style="display:flex;justify-content:space-between;"><div><span style="color:#5470c6;line-height:3px;font-weight:bolder;">●</span>动土安全作业：'+obj.xzGroundSafetNum+'</div>'+
|
||||
'<div><span style="color:#91cc75;line-height:3px;font-weight:bolder;">●</span>用电安全作业：'+obj.xzTemporaryElectricitySafeNum+'</div></div>'+
|
||||
|
||||
'<div style="display:flex;justify-content:space-between;"><div><span style="color:#fac858;line-height:3px;font-weight:bolder;">●</span>高处作业作业：'+obj.xzHighJobSafeNum+'</div>'+
|
||||
'<div><span style="color:#ee6666;line-height:3px;font-weight:bolder;">●</span>盲板抽堵作业：'+obj.xzBlindPlatePlugSafeNum+'</div></div>'+
|
||||
|
||||
'<div style="display:flex;justify-content:space-between;"><div><span style="color:#73c0de;line-height:3px;font-weight:bolder;">●</span>动火安全作业：'+obj.xzSpecialOperationFireSafetyNum+'</div>'+
|
||||
'<div><span style="color:#3ba272;line-height:3px;font-weight:bolder;">●</span>断路安全作业：'+obj.xzOpenCircuitSafeNum+'</div></div>'+
|
||||
|
||||
'<div style="display:flex;justify-content:space-between;"><div><span style="color:#fc8452;line-height:3px;font-weight:bolder;">●</span>吊装安全作业：'+obj.xzHoistSafetyWorkNum+'</div>'+
|
||||
'<div><span style="color:#9a60b4;line-height:3px;font-weight:bolder;">●</span>受限空间作业：'+obj.xzLimitSpaceSafeNum+'</div></div>';
|
||||
// return `动火安全作业：${obj.xzSpecialOperationFireSafetyNum}\n盲板抽堵作业：${obj.xzBlindPlatePlugSafeNum}\n动土安全作业：${obj.xzGroundSafetNum}\n高处作业作业：${obj.xzHighJobSafeNum}\n吊装安全作业：${obj.xzHoistSafetyWorkNum}\n受限空间作业：${obj.xzLimitSpaceSafeNum}\n断路安全作业：${obj.xzOpenCircuitSafeNum}\n用电安全作业：${obj.xzTemporaryElectricitySafeNum}`;
|
||||
}
|
||||
},
|
||||
legend:{
|
||||
show:true,
|
||||
itemWidth:10,
|
||||
itemHeight:5,
|
||||
// x:'right',
|
||||
textStyle:{
|
||||
fontSize:'3px',
|
||||
color:'#FFF'
|
||||
},
|
||||
// x:'left',
|
||||
data: ["动土作业", "临时用电", "高处作业", "盲板抽堵","动火作业", "断路作业", "吊装作业", "受限空间"],
|
||||
// icon: 'circle'
|
||||
},
|
||||
grid: {
|
||||
left: "3%",
|
||||
right: "6%",
|
||||
bottom: "0%",
|
||||
top: "3%",
|
||||
top: "30%",
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
@ -911,6 +934,7 @@ function getSpecialEchart() {
|
||||
series: [
|
||||
//动土作业
|
||||
{
|
||||
name:'动土作业',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzGroundSafetNum),
|
||||
type: "bar",
|
||||
@ -918,10 +942,11 @@ function getSpecialEchart() {
|
||||
color: "#5470c6",
|
||||
stack: 'total',
|
||||
// label: { show: true},
|
||||
// emphasis:{focus: 'series'}
|
||||
emphasis:{focus: 'series'}
|
||||
},
|
||||
//临时用电
|
||||
{
|
||||
name:'临时用电',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzTemporaryElectricitySafeNum),
|
||||
type: "bar",
|
||||
@ -933,6 +958,7 @@ function getSpecialEchart() {
|
||||
},
|
||||
//高处作业
|
||||
{
|
||||
name:'高处作业',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzHighJobSafeNum),
|
||||
type: "bar",
|
||||
@ -944,6 +970,7 @@ function getSpecialEchart() {
|
||||
},
|
||||
//盲板抽堵
|
||||
{
|
||||
name:'盲板抽堵',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzBlindPlatePlugSafeNum),
|
||||
type: "bar",
|
||||
@ -955,6 +982,7 @@ function getSpecialEchart() {
|
||||
},
|
||||
//动火作业
|
||||
{
|
||||
name:'动火作业',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzSpecialOperationFireSafetyNum),
|
||||
type: "bar",
|
||||
@ -966,6 +994,7 @@ function getSpecialEchart() {
|
||||
},
|
||||
//断路作业
|
||||
{
|
||||
name:'断路作业',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzOpenCircuitSafeNum),
|
||||
type: "bar",
|
||||
@ -977,6 +1006,7 @@ function getSpecialEchart() {
|
||||
},
|
||||
//吊装作业
|
||||
{
|
||||
name:'吊装作业',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzHoistSafetyWorkNum),
|
||||
type: "bar",
|
||||
@ -988,6 +1018,7 @@ function getSpecialEchart() {
|
||||
},
|
||||
//受限空间
|
||||
{
|
||||
name:'受限空间',
|
||||
// data: safeList.map(item => item.y),
|
||||
data: specialList.value.map((item: any) => item.xzLimitSpaceSafeNum),
|
||||
type: "bar",
|
||||
|
||||
@ -110,7 +110,7 @@ const login = (formEl: FormInstance | undefined) => {
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// router.push("/commandScreen");
|
||||
router.push("/commandScreen");
|
||||
} else if(COMPANY === "agjtProjectKanban") {
|
||||
router.push("/agjtProjectKanban");
|
||||
} else if(COMPANY === "agjtLive") {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user