Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit b3d9ee63 authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

更改危险区域的组件

parent d2fee209
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 48 deletions
danger-manage-web/src/components/bigWindow/Danger.vue
View file @ b3d9ee63
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-06-21 09:24:11
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-06-24 17:38:50
* @LastEditTime: 2022-10-22 10:36:04
* @FilePath: /danger-manage-web/src/components/bigWindow/Danger.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -11,80 +11,87 @@
<div class="close" @click="close">
<img src="@/assets/images/closeBtn.png" alt="" />
</div>
<div class="up pb10" :class="{noBroder:deviceData.colorNum>2}">
<div class="tit fz16 pb10">风险辨识</div>
<div class="up pb10" :class="{ noBroder: deviceData.data.colorNum > 2 }">
<div class="tit fz16 pb10">{{ deviceData.name }}</div>
<div class="one flex fz16">
<div class="flex-item">
<span class="left">风险类别:</span
><span v-unValue class="right">{{ deviceData.fxlb }}</span>
><span v-unValue class="right">{{ deviceData.data.fxlb }}</span>
</div>
<div class="flex-item">
<span class="left">辨识计划:</span
><span v-unValue class="right">{{ deviceData.bsjh }}</span>
><span v-unValue class="right">{{ deviceData.data.bsjh }}</span>
</div>
<div class="flex-item">
<span class="left">危险源:</span
><span v-unValue class="right">{{ deviceData.wxy }}</span>
><span v-unValue class="right">{{ deviceData.data.wxy }}</span>
</div>
<!-- <div class="flex-item">
<span class="left">风险点:</span
><span v-unValue class="right">{{ deviceData.fxd }}</span>
><span v-unValue class="right">{{ deviceData.data.fxd }}</span>
</div> -->
</div>
<div class="item">
<span class="left">危险因素:</span
><span v-unValue class="right">{{ deviceData.wxys }}</span>
><span v-unValue class="right">{{ deviceData.data.wxys }}</span>
</div>
<div class="item">
<span class="left">危害后果:</span
><span v-unValue class="right">{{ deviceData.fxlb }}</span>
><span v-unValue class="right">{{ deviceData.data.fxlb }}</span>
</div>
<div class="one flex fz16">
<div class="flex-item">
<span class="left">事故类型:</span
><span v-unValue class="right">{{ deviceData.sglx }}</span>
><span v-unValue class="right">{{ deviceData.data.sglx }}</span>
</div>
<div class="flex-item">
<span class="left">事故发生频率:</span
><span v-unValue class="right">{{ deviceData.sgfspl }}</span>
><span v-unValue class="right">{{ deviceData.data.sgfspl }}</span>
</div>
<div class="flex-item">
<span class="left">管控层级:</span
><span v-unValue class="right">{{ deviceData.gkcj }}</span>
><span v-unValue class="right">{{ deviceData.data.gkcj }}</span>
</div>
<div class="flex-item">
<span class="left">管控部门:</span
><span v-unValue class="right">{{ deviceData.gkbm }}</span>
><span v-unValue class="right">{{ deviceData.data.gkbm }}</span>
</div>
<div class="flex-item">
<span class="left">管控责任岗位:</span
><span v-unValue class="right">{{ deviceData.gkzrgw }}</span>
><span v-unValue class="right">{{ deviceData.data.gkzrgw }}</span>
</div>
<div class="flex-item">
<span class="left">管控责任人:</span
><span v-unValue class="right">{{ deviceData.gkzrr }}</span>
><span v-unValue class="right">{{ deviceData.data.gkzrr }}</span>
</div>
</div>
</div>
<!-- deviceData.colorNum<3的风险区域没有下面这些东西 -->
<div class="bottom pb10" v-if="deviceData.colorNum<3">
<!-- deviceData.data.colorNum<3的风险区域没有下面这些东西 -->
<div class="bottom pb10" v-if="deviceData.colorNum < 3">
<div class="tit fz16 pb10">采取的风险管控措施</div>
<div class="item">
<span class="left">管理:</span
><span v-unValue class="right">{{ deviceData.gl }}</span>
><span v-unValue class="right">{{ deviceData.data.gl }}</span>
</div>
<div class="item">
<span class="left">工程技术:</span
><span v-unValue class="right">{{ deviceData.gcjs }}</span>
><span v-unValue class="right">{{ deviceData.data.gcjs }}</span>
</div>
<div class="item">
<span class="left">警示标识:</span>
<span v-unValue class="img"><img :src="deviceData.src" alt="" /></span>
<template v-if="deviceData.data.src">
<span v-unValue class="img"
><img :src="deviceData.data.src" alt=""
/></span>
</template>
<template v-else>
<span class="right">-</span>
</template>
</div>
</div>
</div>
......@@ -97,7 +104,7 @@ export default {
return {};
},
mounted() {
console.log(this.deviceData);
console.log(this.deviceData.data);
},
methods: {
close() {
......@@ -119,11 +126,9 @@ export default {
.up {
border-bottom: 1px solid #cccccc;
margin-bottom: 15px;
&.noBroder{
border-bottom: 0px solid #cccccc;
margin-bottom: 10px;
&.noBroder {
border-bottom: 0px solid #cccccc;
margin-bottom: 10px;
}
}
.tit {
......
danger-manage-web/src/utils/cesium/cesiumClass.js
View file @ b3d9ee63
/*
* @Author: your name
* @Date: 2021-12-07 14:19:18
* @LastEditTime: 2022-10-12 10:09:44
* @LastEditTime: 2022-10-22 10:31:44
* @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /cesium-vue/src/utils/seieumClass.js
......@@ -1122,9 +1122,9 @@ export default class CreateCesium {
this.dangerArr.forEach((item) => {
item.show = bool;
});
this.deviceTilesArr[10].forEach((item) => {
item.show = bool;
});
// this.deviceTilesArr[10].forEach((item) => {
// item.show = bool;
// });
}
// 危险源与风险分布区切换
dangeDeviceChange(type, bottomDeviceArr) {
......
danger-manage-web/src/utils/cesium/dangerArr.js
View file @ b3d9ee63
// danger: [
// {
// lnglatArr: [
// [114.07699224128288, 38.24917864421566],
// [114.07647701382231, 38.24916311225547],
// [114.07651429608312, 38.24895731354076],
// [114.07708709377842, 38.248960473114614],
// ],
// colorNum: 1,
// fxlb: "高风险区域",
// bsjh: "",
// wxy: "锅炉操作",
// fxd: "锅炉点火",
// wxys: "操作人员违章作业来点火成功继续频繁点火",
// whhg: "丧失劳动能力",
// sglx: "锅炉爆炸，出点活在",
// sgfspl: "平均2-3年发生一起",
// gkcj: "班组级",
// gkbm: "安全管理部",
// gkzrgw: "锅炉工",
// gkzrr: "张三",
// gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
// gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
// src: danger,
// },
// {
// lnglatArr: [
// [114.07806724970564, 38.25034815051717],
// [114.07639696862833, 38.2502261900133],
// [114.07639078797055, 38.24993383198078],
// [114.078151284626, 38.25000196180475],
// ],
// colorNum: 2,
// fxlb: "中风险区域",
// bsjh: "",
// wxy: "锅炉操作",
// fxd: "锅炉点火",
// wxys: "操作人员违章作业来点火成功继续频繁点火",
// whhg: "丧失劳动能力",
// sglx: "锅炉爆炸，出点活在",
// sgfspl: "平均2-3年发生一起",
// gkcj: "班组级",
// gkbm: "安全管理部",
// gkzrgw: "锅炉工",
// gkzrr: "张三",
// gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
// gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
// src: danger,
// },
// {
// lnglatArr: [
// [114.0777392710896, 38.250782019890394],
// [114.07734950538038, 38.250761421969486],
// [114.0773933590535, 38.25022891713582],
// [114.07777116413182, 38.250232988449945],
// ],
// colorNum: 3,
// fxlb: "低风险区域",
// bsjh: "",
// wxy: "锅炉操作",
// fxd: "锅炉点火",
// wxys: "操作人员违章作业来点火成功继续频繁点火",
// whhg: "丧失劳动能力",
// sglx: "锅炉爆炸，出点活在",
// sgfspl: "平均2-3年发生一起",
// gkcj: "班组级",
// gkbm: "安全管理部",
// gkzrgw: "锅炉工",
// gkzrr: "张三",
// gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
// gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
// src: danger,
// },
// {
// lnglatArr: [
// [114.08185866090808, 38.24985142677479],
// [114.08093871524032, 38.24985819653048],
// [114.08100272185587, 38.249491674544146],
// [114.08185575292462, 38.24951700145305],
// ],
// colorNum: 4,
// fxlb: "中低风险区域",
// bsjh: "",
// wxy: "锅炉操作",
// fxd: "锅炉点火",
// wxys: "操作人员违章作业来点火成功继续频繁点火",
// whhg: "丧失劳动能力",
// sglx: "锅炉爆炸，出点活在",
// sgfspl: "平均2-3年发生一起",
// gkcj: "班组级",
// gkbm: "安全管理部",
// gkzrgw: "锅炉工",
// gkzrr: "张三",
// gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
// gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
// src: danger,
// },
// ],
export const dangerArr = [
{
name: "污水处理",
......@@ -8,7 +107,23 @@ export const dangerArr = [
[114.08121715606055, 38.25164695300115],
[114.08118032640901, 38.25221024391822],
],
data: {},
data: {
fxlb: "高风险区域",
bsjh: "",
wxy: "锅炉操作",
fxd: "锅炉点火",
wxys: "操作人员违章作业来点火成功继续频繁点火",
whhg: "丧失劳动能力",
sglx: "锅炉爆炸，出点活在",
sgfspl: "平均2-3年发生一起",
gkcj: "班组级",
gkbm: "安全管理部",
gkzrgw: "锅炉工",
gkzrr: "张三",
gl: "公司建立有奖惩制度，安全巡检制度，及时制止违章操作，开对为长者进行适量触发，锅炉工持证上岗，定期接受安全培训",
gcjs: "根据作业活动风险分析，指定适用的安全作业规程",
// src: danger,
},
},
{
name: "危废库",
......@@ -53,6 +168,7 @@ export const dangerArr = [
[114.08004240688804, 38.251581774583634],
[114.08002489734042, 38.251950654364265],
],
data: {},
colorNum: 4,
},
......
danger-manage-web/src/views/dangerScale/profile/index.vue
View file @ b3d9ee63
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-06-16 15:03:40
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-10-12 09:20:17
* @LastEditTime: 2022-10-22 10:39:48
* @FilePath: /danger-manage-web/src/views/bigwindow/index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -224,13 +224,13 @@ export default {
// this.data1.forEach((item) => {
// this.Cesium.addDevice(item, "pic", Video);
// });
this.data2.forEach((item, index) => {
if (index == 0) {
this.Cesium.addDevice(item, "pic", weixiandian);
} else {
this.Cesium.addDevice(item, "pic", ydqt);
}
});
// this.data2.forEach((item, index) => {
// if (index == 0) {
// this.Cesium.addDevice(item, "pic", weixiandian);
// } else {
// this.Cesium.addDevice(item, "pic", ydqt);
// }
// });
},
methods: {
dangerChange() {
......
danger-manage-web/src/views/index.vue
View file @ b3d9ee63
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-03 10:51:24
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-10-12 09:22:21
* @LastEditTime: 2022-10-20 10:25:41
* @FilePath: /danger-manage-web/src/views/index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -379,13 +379,13 @@ export default {
// },
init() {
this.data2.forEach((item, index) => {
if (index == 0) {
this.Cesium.addDevice(item, "pic", weixiandian);
} else {
this.Cesium.addDevice(item, "pic", ydqt);
}
});
// this.data2.forEach((item, index) => {
// if (index == 0) {
// this.Cesium.addDevice(item, "pic", weixiandian);
// } else {
// this.Cesium.addDevice(item, "pic", ydqt);
// }
// });
// 如果有缓存
// const J = localStorage.getItem("J");
// if (J) {
......@@ -413,7 +413,7 @@ export default {
};
})
.forEach((item) => {
this.Cesium.addDanger(item, Danger2);
this.Cesium.addDanger(item, Danger);
});
// this.data11.forEach((item) => {
// item.config = { scale: 1, textHeight: -32 };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment