14328 地图BI页显示优化建议:1.特殊作业图标修改优化例如动火是红色火苗依次类推 2.显示作业添加特殊作业简称
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 2.5 KiB |
After Width: | Height: | Size: 1.8 KiB |
|
@ -13,10 +13,10 @@ export const MODEL = {
|
||||||
export const MENU = [
|
export const MENU = [
|
||||||
{ title: "双重预防", model: MODEL["1"] },
|
{ title: "双重预防", model: MODEL["1"] },
|
||||||
{ title: "教育培训", model: MODEL["2"] },
|
{ title: "教育培训", model: MODEL["2"] },
|
||||||
{ title: "高危作业管理", model: MODEL["3"] },
|
{ title: "特殊作业", model: MODEL["3"] },
|
||||||
{ title: "监测预警", model: MODEL["4"] },
|
{ title: "监测预警", model: MODEL["4"] },
|
||||||
{ title: "综合管理", model: MODEL["5"] },
|
{ title: "综合管理", model: MODEL["5"] },
|
||||||
{ title: "定位管理", model: MODEL["6"] },
|
{ title: "人员定位", model: MODEL["6"] },
|
||||||
];
|
];
|
||||||
export const PRINT_STYLE =
|
export const PRINT_STYLE =
|
||||||
'<style type="text/css" media="print">\n' +
|
'<style type="text/css" media="print">\n' +
|
||||||
|
|
|
@ -252,38 +252,43 @@
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
<template v-if="(data.info.SOURCE === '4' || data.info.SOURCE === '5') && data.info.FINAL_CHECK">
|
<template
|
||||||
|
v-if="
|
||||||
|
(data.info.SOURCE === '4' || data.info.SOURCE === '5') &&
|
||||||
|
data.info.FINAL_CHECK
|
||||||
|
"
|
||||||
|
>
|
||||||
<el-divider content-position="left">安全环保验收信息</el-divider>
|
<el-divider content-position="left">安全环保验收信息</el-divider>
|
||||||
<el-descriptions :column="1" border class="mt-10">
|
<el-descriptions :column="1" border class="mt-10">
|
||||||
<el-descriptions-item label="验收描述">
|
<el-descriptions-item label="验收描述">
|
||||||
{{ data.info.FINAL_CHECKDESCR }}
|
{{ data.info.FINAL_CHECKDESCR }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="是否合格">
|
<el-descriptions-item label="是否合格">
|
||||||
<span v-if="data.info.FINAL_CHECK === '1'"> 是 </span>
|
<span v-if="data.info.FINAL_CHECK === '1'"> 是 </span>
|
||||||
<span v-else-if="data.info.FINAL_CHECK === '2'"> 否 </span>
|
<span v-else-if="data.info.FINAL_CHECK === '2'"> 否 </span>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="验收部门">
|
<el-descriptions-item label="验收部门">
|
||||||
{{ data.info.FINAL_CHECKOR_NDEPTNAME }}
|
{{ data.info.FINAL_CHECKOR_NDEPTNAME }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="验收人">
|
<el-descriptions-item label="验收人">
|
||||||
{{ data.info.FINAL_CHECKOR_NAME }}
|
{{ data.info.FINAL_CHECKOR_NAME }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="验收时间">
|
<el-descriptions-item label="验收时间">
|
||||||
{{ data.info.FINAL_CHECKTIME }}
|
{{ data.info.FINAL_CHECKTIME }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="验收图片">
|
<el-descriptions-item label="验收图片">
|
||||||
<img
|
<img
|
||||||
v-for="item1 in data.yImgs"
|
v-for="item1 in data.yImgs"
|
||||||
:key="item1.IMGFILES_ID"
|
:key="item1.IMGFILES_ID"
|
||||||
v-viewer
|
v-viewer
|
||||||
:src="VITE_FILE_URL + item1.FILEPATH"
|
:src="VITE_FILE_URL + item1.FILEPATH"
|
||||||
alt=""
|
alt=""
|
||||||
width="100"
|
width="100"
|
||||||
height="100"
|
height="100"
|
||||||
class="ml-10"
|
class="ml-10"
|
||||||
/>
|
/>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -154,7 +154,7 @@ const bottomOptionsList = [
|
||||||
img: new URL("/src/assets/images/map/bico2.png", import.meta.url).href,
|
img: new URL("/src/assets/images/map/bico2.png", import.meta.url).href,
|
||||||
imgSelect: new URL("/src/assets/images/map/bico2_on.png", import.meta.url)
|
imgSelect: new URL("/src/assets/images/map/bico2_on.png", import.meta.url)
|
||||||
.href,
|
.href,
|
||||||
title: "安全作业",
|
title: "特殊作业",
|
||||||
type: "workSafely",
|
type: "workSafely",
|
||||||
check: false,
|
check: false,
|
||||||
components: [markRaw(WorkSafely)],
|
components: [markRaw(WorkSafely)],
|
||||||
|
|
|
@ -210,7 +210,6 @@ const fnPause = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
console.log("onBeforeUnmount");
|
|
||||||
pause();
|
pause();
|
||||||
hadleDestroy();
|
hadleDestroy();
|
||||||
});
|
});
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { reactive } from "vue";
|
import { reactive } from "vue";
|
||||||
import { flyTo, reduction } from "../js/map";
|
import { flyTo, reduction } from "../js/map";
|
||||||
import { useFullscreen,useVModel } from "@vueuse/core";
|
import { useFullscreen, useVModel } from "@vueuse/core";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
isPureMap: {
|
isPureMap: {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="block1">
|
<div class="block1">
|
||||||
<layout-title title="安全作业状态统计" />
|
<layout-title title="特殊作业状态统计" />
|
||||||
<div class="option">
|
<div class="option">
|
||||||
<div
|
<div
|
||||||
v-for="(item, index) in data.block1OptionsList"
|
v-for="(item, index) in data.block1OptionsList"
|
||||||
|
@ -18,11 +18,11 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="block2">
|
<div class="block2">
|
||||||
<layout-title title="安全作业情况统计" />
|
<layout-title title="特殊作业情况统计" />
|
||||||
<div id="main1" class="option"></div>
|
<div id="main1" class="option"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="block3">
|
<div class="block3">
|
||||||
<layout-title title="安全作业记录" />
|
<layout-title title="特殊作业记录" />
|
||||||
<div class="option">
|
<div class="option">
|
||||||
<div class="table">
|
<div class="table">
|
||||||
<div class="tr">
|
<div class="tr">
|
||||||
|
|
|
@ -30,11 +30,11 @@ const showHotworkList = async () => {
|
||||||
hotworkList,
|
hotworkList,
|
||||||
HOTWORK_ID,
|
HOTWORK_ID,
|
||||||
"动火作业",
|
"动火作业",
|
||||||
CHECK_NO,
|
'动火作业:'+CHECK_NO,
|
||||||
WORK_POSITION.split(",")[0],
|
WORK_POSITION.split(",")[0],
|
||||||
WORK_POSITION.split(",")[1],
|
WORK_POSITION.split(",")[1],
|
||||||
WORK_POSITION.split(",")[2],
|
WORK_POSITION.split(",")[2],
|
||||||
"/src/assets/images/map/bottom/ico4_on.png"
|
"/src/assets/images/map/bottom/ico1_select.png"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
hotworkList.show(true);
|
hotworkList.show(true);
|
||||||
|
@ -61,11 +61,11 @@ const showConfinedspaceWorkList = async () => {
|
||||||
confinedspaceList,
|
confinedspaceList,
|
||||||
CONFINEDSPACE_ID,
|
CONFINEDSPACE_ID,
|
||||||
"受限空间作业",
|
"受限空间作业",
|
||||||
CHECK_NO,
|
'受限空间作业:'+CHECK_NO,
|
||||||
WORK_POSITION.split(",")[0],
|
WORK_POSITION.split(",")[0],
|
||||||
WORK_POSITION.split(",")[1],
|
WORK_POSITION.split(",")[1],
|
||||||
WORK_POSITION.split(",")[2],
|
WORK_POSITION.split(",")[2],
|
||||||
"/src/assets/images/map/bottom/ico5_on.png"
|
"/src/assets/images/map/bottom/ico2_select.png"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
confinedspaceList.show(true);
|
confinedspaceList.show(true);
|
||||||
|
@ -92,11 +92,11 @@ const showHighWorkList = async () => {
|
||||||
highWorkList,
|
highWorkList,
|
||||||
HIGHWORK_ID,
|
HIGHWORK_ID,
|
||||||
"高处作业",
|
"高处作业",
|
||||||
CHECK_NO,
|
'高处作业:'+CHECK_NO,
|
||||||
WORK_POSITION.split(",")[0],
|
WORK_POSITION.split(",")[0],
|
||||||
WORK_POSITION.split(",")[1],
|
WORK_POSITION.split(",")[1],
|
||||||
WORK_POSITION.split(",")[2],
|
WORK_POSITION.split(",")[2],
|
||||||
"/src/assets/images/map/bottom/ico7_on.png"
|
"/src/assets/images/map/bottom/ico4_select.png"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
highWorkList.show(true);
|
highWorkList.show(true);
|
||||||
|
|