Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit bdbc2c15 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

parents a5ccfa13 30f91260
Show whitespace changes
Inline Side-by-side
Showing with 783 additions and 109 deletions
danger-manage-admin/src/main/java/com/zehong/web/controller/hiddenDanger/TStaningBookController.java
View file @ bdbc2c15
......@@ -100,4 +100,14 @@ public class TStaningBookController extends BaseController
{
return toAjax(tStaningBookService.deleteTStaningBookByIds(bookIds));
}
/**
* 统计，按年、月、日统计发现数量和已处置数量
* 日，为当日；月为当前30日内；年为当前365日内
* @return
*/
@GetMapping(value = "/statics")
public AjaxResult statics(String type){
return AjaxResult.success(tStaningBookService.statics(type));
}
}
danger-manage-system/src/main/java/com/zehong/system/mapper/TStaningBookMapper.java
View file @ bdbc2c15
package com.zehong.system.mapper;
import java.util.List;
import java.util.Map;
import com.zehong.system.domain.TStaningBook;
/**
......@@ -58,4 +60,6 @@ public interface TStaningBookMapper
* @return 结果
*/
public int deleteTStaningBookByIds(Long[] bookIds);
public Map statics(String type);
}
danger-manage-system/src/main/java/com/zehong/system/service/ITStaningBookService.java
View file @ bdbc2c15
package com.zehong.system.service;
import java.util.List;
import java.util.Map;
import com.zehong.system.domain.TStaningBook;
/**
......@@ -58,4 +60,11 @@ public interface ITStaningBookService
* @return 结果
*/
public int deleteTStaningBookById(Long bookId);
/**
* 统计数量
* @param type
* @return
*/
public Map statics(String type);
}
danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java
View file @ bdbc2c15
......@@ -86,8 +86,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
return a;
}
TNfcSetting ts = tNfcSettingMapper.getInfoByNfcNum(tNfcSetting.getNfcNum());
int nfcNum = tNfcSettingMapper.getNfcNum(tNfcSetting.getNfcNum());
if (nfcNum!=0){
if(ts.getNfcId()!=tNfcSetting.getNfcId()){
ts.setNfcNum("");
tNfcSettingMapper.updateTNfcSetting(ts);
}
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaningBookServiceImpl.java
View file @ bdbc2c15
package com.zehong.system.service.impl;
import java.util.List;
import java.util.Map;
import com.zehong.common.core.domain.entity.SysDept;
import com.zehong.common.utils.DateUtils;
......@@ -110,4 +111,9 @@ public class TStaningBookServiceImpl implements ITStaningBookService
{
return tStaningBookMapper.deleteTStaningBookById(bookId);
}
@Override
public Map statics(String type) {
return tStaningBookMapper.statics(type);
}
}
danger-manage-system/src/main/resources/mapper/system/TStaningBookMapper.xml
View file @ bdbc2c15
......@@ -180,4 +180,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{bookId}
</foreach>
</delete>
<select id="statics" parameterType="String" resultType="Map">
select count(1) faxian,sum(case state when '2' then 1 else 0 end )as zhenggai from t_staning_book where is_del=0
<if test="type=='day'">
and DATE_SUB(now(), INTERVAL 1 DAY) &lt; date(find_time)
</if>
<if test="type=='month'">
and DATE_SUB(now(), INTERVAL 30 DAY) &lt; date(find_time)
</if>
<if test="type=='year'">
and DATE_SUB(now(), INTERVAL 365 DAY) &lt; date(find_time)
</if>
</select>
</mapper>
\ No newline at end of file
danger-manage-web/src/api/indexChars/chars.js
View file @ bdbc2c15
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-10-07 09:05:29
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-10-07 10:16:10
* @LastEditTime: 2022-10-22 11:25:50
* @FilePath: /danger-manage-web/src/api/indexChars/chars.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -17,3 +17,11 @@ export function getRypbData(query) {
params: query,
});
}
// 巡检统计年月日
export function getxjtjYMD(query) {
return request({
url: "/system/book/statics",
method: "get",
params: query,
});
}
danger-manage-web/src/components/bigWindow/Danger.vue
View file @ bdbc2c15
......@@ -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 14:08:16
* @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,100 @@
<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.whhg }}</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">
<div class="item flex">
<span class="left">警示标识:</span>
<span v-unValue class="img"><img :src="deviceData.src" alt="" /></span>
<template v-if="deviceData.data.src && deviceData.data.src.length > 0">
<span v-unValue class="img">
<!-- <img
v-for="src in deviceData.data.src"
:key="src"
:src="src"
alt=""
/> -->
<el-image
v-for="src in deviceData.data.src"
:key="src"
style="width: 70px; height: 90px;margin-left:5px"
:src="src"
:preview-src-list="[src]"
:z-index="9999999"
></el-image>
</span>
</template>
<template v-else>
<span class="right">-</span>
</template>
</div>
</div>
</div>
......@@ -97,7 +117,7 @@ export default {
return {};
},
mounted() {
console.log(this.deviceData);
console.log(this.deviceData.data);
},
methods: {
close() {
......@@ -119,11 +139,9 @@ export default {
.up {
border-bottom: 1px solid #cccccc;
margin-bottom: 15px;
&.noBroder{
&.noBroder {
border-bottom: 0px solid #cccccc;
margin-bottom: 10px;
}
}
.tit {
......@@ -173,14 +191,20 @@ export default {
margin-left: 5px;
}
.img {
width: 300px;
height: 120px;
flex: 1;
width: 100%;
height: 90px;
display: inline-block;
vertical-align: top;
margin-left: 5px;
#img,
img {
width: 100%;
height: 100%;
// width: 100%;
width: 70px;
height: 90px;
margin-left: 5px;
cursor: pointer;
}
}
}
......
danger-manage-web/src/utils/cesium/cesiumClass.js
View file @ bdbc2c15
/*
* @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 @ bdbc2c15
// 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,
// },
// ],
// 禁止烟火
import jzyh from "@/assets/images/dangerPic/jzyh.png";
// 禁止带火种
import jzdhz from "@/assets/images/dangerPic/jzdhz.png";
// 当心中毒
import dxzd from "@/assets/images/dangerPic/dxzd.png";
// 当心泄露
import dxxl from "@/assets/images/dangerPic/dxxl.png";
// 当心爆炸
import dxbz from "@/assets/images/dangerPic/dxbz.png";
// 必须戴防毒面具
import bxdfdmj from "@/assets/images/dangerPic/bxdfdmj.png";
export const dangerArr = [
{
name: "污水处理",
......@@ -8,7 +119,22 @@ 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: "根据作业活动风险分析，指定适用的安全作业规程",
},
},
{
name: "危废库",
......@@ -18,7 +144,9 @@ export const dangerArr = [
[114.08168812394003, 38.250488614016135],
[114.08164030994841, 38.25079994477491],
],
data: {},
data: {
fxlb: "较高风险"
},
colorNum: 2,
},
{
......@@ -31,7 +159,10 @@ export const dangerArr = [
[114.08188193141116, 38.24996130073124],
[114.08037480953207, 38.249932590119556],
],
data: {},
data: {
fxlb: "高风险",
src: [jzyh, jzdhz, dxzd, dxxl, dxbz, bxdfdmj],
},
colorNum: 1,
},
{
......@@ -42,7 +173,9 @@ export const dangerArr = [
[114.0818822111471, 38.24956024306349],
[114.08098376391818, 38.24951885572243],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -53,7 +186,10 @@ export const dangerArr = [
[114.08004240688804, 38.251581774583634],
[114.08002489734042, 38.251950654364265],
],
data: {},
data: {
fxlb: "低风险"
},
colorNum: 4,
},
{
......@@ -64,7 +200,9 @@ export const dangerArr = [
[114.08002301112488, 38.251377061619046],
[114.08000932886821, 38.25149427805925],
],
data: {},
data: {
fxlb: "较高风险"
},
colorNum: 2,
},
{
......@@ -76,7 +214,9 @@ export const dangerArr = [
[114.0799213099661, 38.24870811934452],
[114.07992247747968, 38.2490596822873],
],
data: {},
data: {
fxlb: "高风险"
},
},
{
name: "干煤棚",
......@@ -87,7 +227,9 @@ export const dangerArr = [
[114.0793256381516, 38.248656072998905],
[114.07928660378576, 38.24896257086807],
],
data: {},
data: {
fxlb: "一般风险"
},
},
{
name: "甲醇球罐",
......@@ -97,7 +239,9 @@ export const dangerArr = [
[114.07900555924418, 38.24818826396147],
[114.07896214915758, 38.2485657203445],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -108,7 +252,9 @@ export const dangerArr = [
[114.07970969314668, 38.249177870760086],
[114.07968503158452, 38.249621022521914],
],
data: {},
data: {
fxlb: "较高风险"
},
colorNum: 2,
},
{
......@@ -119,7 +265,9 @@ export const dangerArr = [
[114.07937025504728, 38.24986209608138],
[114.07932854865001, 38.25049906057526],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -130,7 +278,9 @@ export const dangerArr = [
[114.0793149258221, 38.24950495448654],
[114.07929156270377, 38.24989004286162],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -142,7 +292,9 @@ export const dangerArr = [
[114.0781915677119, 38.24883479798143],
[114.07818775308438, 38.24904718615451],
],
data: {},
data: {
fxlb: "高风险"
},
},
{
name: "2400氨合成",
......@@ -155,7 +307,9 @@ export const dangerArr = [
[114.07824052605362, 38.24826869585147],
[114.07822516569071, 38.24873709204756],
],
data: {},
data: {
fxlb: "高风险"
},
},
{
name: "大颗粒",
......@@ -165,7 +319,9 @@ export const dangerArr = [
[114.07793868895763, 38.24933718425533],
[114.0778791617466, 38.24978811628299],
],
data: {},
data: {
fxlb: "较高风险"
},
colorNum: 2,
},
{
......@@ -177,7 +333,9 @@ export const dangerArr = [
[114.07816742485505, 38.25042773313157],
[114.07811902680491, 38.25084109067064],
],
data: {},
data: {
fxlb: "高风险"
},
},
{
name: "1#脱碳",
......@@ -187,7 +345,9 @@ export const dangerArr = [
[114.07813313619934, 38.25025368152452],
[114.07816939918499, 38.250464604821424],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -201,7 +361,9 @@ export const dangerArr = [
[114.07689683035566, 38.24851199022575],
[114.07655032796976, 38.24855692071795],
],
data: {},
data: {
fxlb: "较高风险"
},
},
{
name: "尿素生产装置",
......@@ -212,7 +374,9 @@ export const dangerArr = [
[114.07730309157522, 38.24926803285693],
[114.07645852296761, 38.249258052783055],
],
data: {},
data: {
fxlb: "高风险"
},
},
{
name: "冰机",
......@@ -222,7 +386,9 @@ export const dangerArr = [
[114.07674899410013, 38.24986759777573],
[114.07673177371679, 38.24999869046041],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -233,7 +399,9 @@ export const dangerArr = [
[114.07736221268445, 38.250066057714115],
[114.07638572203807, 38.250006593486276],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -244,7 +412,9 @@ export const dangerArr = [
[114.07729932027942, 38.25065483348539],
[114.0763611632972, 38.2506105391965],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -255,7 +425,9 @@ export const dangerArr = [
[114.07673732219793, 38.25122243174297],
[114.07648591573471, 38.25119899039575],
],
data: {},
data: {
fxlb: "低风险"
},
colorNum: 4,
},
{
......@@ -267,7 +439,9 @@ export const dangerArr = [
[114.07611396280011, 38.24941242465572],
[114.07610863025666, 38.249559594773935],
],
data: {},
data: {
fxlb: "较高风险"
},
},
{
name: "甲醇合成",
......@@ -277,7 +451,9 @@ export const dangerArr = [
[114.07631406585077, 38.249803953760804],
[114.07629629633044, 38.249994075703896],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -288,7 +464,9 @@ export const dangerArr = [
[114.07631539021173, 38.250133221900036],
[114.07629852045858, 38.25036483868555],
],
data: {},
data: {
fxlb: "一般风险"
},
colorNum: 3,
},
{
......@@ -300,7 +478,9 @@ export const dangerArr = [
[114.0762024779363, 38.25064622770106],
[114.07614690640786, 38.250982027231906],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -311,7 +491,9 @@ export const dangerArr = [
[114.0757575736981, 38.24940713702969],
[114.07506815524074, 38.24935807751058],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -322,7 +504,9 @@ export const dangerArr = [
[114.07578164985038, 38.24991737346083],
[114.07575424777615, 38.25022009521355],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -333,7 +517,9 @@ export const dangerArr = [
[114.07568783954892, 38.2503153993018],
[114.07569321404614, 38.25050557141559],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -344,7 +530,9 @@ export const dangerArr = [
[114.07537563494651, 38.25051872866674],
[114.07533109169464, 38.25112532353275],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -355,7 +543,9 @@ export const dangerArr = [
[114.07507479362056, 38.24967638869796],
[114.07506400522227, 38.2498509809399],
],
data: {},
data: {
fxlb: "较高风险"
},
colorNum: 2,
},
{
......@@ -366,7 +556,9 @@ export const dangerArr = [
[114.07509693683168, 38.24947090168923],
[114.07507104315593, 38.249669088954406],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -378,7 +570,9 @@ export const dangerArr = [
[114.07381546333403, 38.24962535790453],
[114.07329016901807, 38.24975956466659],
],
data: {},
data: {
fxlb: "高风险"
},
},
{
name: "预脱硫",
......@@ -388,7 +582,9 @@ export const dangerArr = [
[114.074498874829, 38.24981217373876],
[114.07449942174725, 38.25005976641145],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -399,7 +595,9 @@ export const dangerArr = [
[114.07410013187993, 38.250246230088905],
[114.07409377782558, 38.25057015884229],
],
data: {},
data: {
fxlb: "高风险"
},
colorNum: 1,
},
{
......@@ -410,7 +608,9 @@ export const dangerArr = [
[114.0746029073167, 38.25098940998453],
[114.07457634824875, 38.25117713367422],
],
data: {},
data: {
fxlb: "低风险"
},
colorNum: 4,
},
];
danger-manage-web/src/views/dangerScale/profile/index.vue
View file @ bdbc2c15
......@@ -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/entrance/index.vue
View file @ bdbc2c15
......@@ -190,7 +190,7 @@
<script>
export default {
name: "App",
name: "",
data() {
return {
tableData: [
......@@ -218,7 +218,7 @@
<style lang="scss" scoped>
.entrance{
width: 85%;
height: calc(100vh - 50px);;
height: calc(100vh - 50px);
padding: 30px;
display: flex;
justify-content: space-between;
......
danger-manage-web/src/views/index.vue
View file @ bdbc2c15
......@@ -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 };
......
danger-manage-web/src/views/indexComponents/rightComponents/Xjtj.vue
View file @ bdbc2c15
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-06 13:42:45
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-14 11:44:50
* @LastEditTime: 2022-10-22 11:36:35
* @FilePath: /danger-manage-web/src/views/indexComponents/leftComponents/deviceYx.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -51,6 +51,7 @@ import Title from "@/views/indexComponents/allComponents/Title";
import Chars from "@/components/allCharsCom/Chars";
import rimg1 from "@/assets/indexImages/rimg1.png";
import rimg2 from "@/assets/indexImages/rimg2.png";
import { getxjtjYMD } from "@/api/indexChars/chars";
export default {
name: "",
......@@ -62,8 +63,8 @@ export default {
return {
yearActive: "年",
numData: [
{ icon: rimg1, name: "发现隐患数量", num: 56 },
{ icon: rimg2, name: "整改隐患数量", num: 50 },
// { icon: rimg1, name: "发现隐患数量", num: 2 },
// { icon: rimg2, name: "整改隐患数量", num: 1 },
],
options: {
xAxis: {
......@@ -128,25 +129,45 @@ export default {
},
};
},
created() {
this.getxjtjYMD({ type: "year" });
},
methods: {
getxjtjYMD(query) {
getxjtjYMD(query).then((res) => {
if (res.code == 200) {
const { faxian, zhenggai } = res.data;
this.numData = [
{ icon: rimg1, name: "发现隐患数量", num: faxian },
{ icon: rimg2, name: "整改隐患数量", num: zhenggai },
];
}
});
},
timeChange(e) {
if (this.yearActive == e) return;
this.yearActive = e;
if (this.yearActive == "日") {
this.numData = [
{ icon: rimg1, name: "发现隐患数量", num: 3 },
{ icon: rimg2, name: "整改隐患数量", num: 2 },
];
this.getxjtjYMD({ type: "day" });
// this.numData = [
// { icon: rimg1, name: "发现隐患数量", num: 3 },
// { icon: rimg2, name: "整改隐患数量", num: 2 },
// ];
} else if (this.yearActive == "月") {
this.numData = [
{ icon: rimg1, name: "发现隐患数量", num: 6 },
{ icon: rimg2, name: "整改隐患数量", num: 10 },
];
this.getxjtjYMD({ type: "month" });
// this.numData = [
// { icon: rimg1, name: "发现隐患数量", num: 6 },
// { icon: rimg2, name: "整改隐患数量", num: 10 },
// ];
} else {
this.numData = [
{ icon: rimg1, name: "发现隐患数量", num: 56 },
{ icon: rimg2, name: "整改隐患数量", num: 50 },
];
this.getxjtjYMD({ type: "year" });
// this.numData = [
// { icon: rimg1, name: "发现隐患数量", num: 56 },
// { icon: rimg2, name: "整改隐患数量", num: 50 },
// ];
}
},
},
......
danger-manage-web/src/views/intellect/index.vue 0 → 100644
View file @ bdbc2c15
<template>
<div style="width: 100vw;height: 100%vh;background: rgb(247, 247, 247);">
<div class="intellect">
<div class="intellect-top">
<div class="in-top-l">
<span>视频设备</span>
<div class="top-l">
<div class="topl active">
<span>出入口相机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>储罐区摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>化工罐区摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>危险作业区摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>库区摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>危险作业区摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>中控值班室摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>中控重点工位摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
<div class="topl active">
<span>巡检点摄像机</span>
<img src="../../assets/img/live-fill.png" alt="" >
</div>
</div>
</div>
<div class="in-top-c">
<div style="height: 5%;padding: 6px;">
<el-dropdown trigger="click">
<span class="el-dropdown-link">
<img src="@/assets/img/spilt.png" alt="spilt" style="width: 15px;height: 15px">
分屏设置
</span>
<el-dropdown-menu slot="dropdown" style="width:100px">
<el-dropdown-item command="1">1x1 </el-dropdown-item>
<el-dropdown-item command="4">2x2</el-dropdown-item>
<el-dropdown-item command="9">3x3</el-dropdown-item>
<el-dropdown-item command="16">4x4</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div style="height: 95%;width: 100%;" ref="playVideo" class="video">
<div></div>
<div></div>
<div></div>
<div></div>
</div>
</div>
<div class="in-top-r">
<div class="top-r-t">
<div class="ent-ru-in">
<div class="ru-in-l">
<img src="../../assets/img/zhan.png" alt="">
</div>
<div class="ru-in-r">
<span>最新预警</span>
<div>2022-10-22 20:20:20</div>
</div>
</div>
<div class="rt-b">
<span> 预警：</span>
<div>
储罐区有火焰从原料罐冒出，目前有溢出风险
</div>
</div>
<div class="intellect-btn">
<el-button class="but">查看实时视频</el-button>
</div>
</div>
<div class="top-r-b">
<div class="r-b-l">
<img src="../../assets/img/up.png" alt="" width="50px">
<div>预警统计</div>
</div>
<div class="ent-ruchang">
<div class="ent-ru-in">
<div class="ru-in-l">
<img src="../../assets/img/down.png" alt="">
</div>
<div class="ru-in-r">
<span>日累积预警</span>
<div>0</div>
</div>
</div>
<div class="ent-ru-in">
<div class="ru-in-l">
<img src="../../assets/img/down1.png" alt="">
</div>
<div class="ru-in-r">
<span>月累积预警</span>
<div>0</div>
</div>
</div>
<div class="ent-ru-in">
<div class="ru-in-l">
<img src="../../assets/img/down2.png" alt="">
</div>
<div class="ru-in-r">
<span>年累积预警</span>
<div>0</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="intellect-bottom">
<p>园区内车辆</p>
<div class="ent-yuanqu">
<el-table
:data="tableData"
style="width: 100%">
<el-table-column
prop="date"
label="预警信息">
</el-table-column>
<el-table-column
prop="name"
label="预警类型">
</el-table-column>
<el-table-column
prop="address1"
label="预警开始时间">
</el-table-column>
<el-table-column
prop="address2"
label="预警结束时间">
</el-table-column>
<el-table-column
prop="end"
label="结果">
</el-table-column>
<el-table-column
prop="video"
label="视频">
<template slot-scope="scope">
<img class="demo" :src="require(`../../assets/img/live-fill.png`)" />
</template>
</el-table-column>
</el-table>
<el-pagination
layout="prev, pager, next"
:total="1000">
</el-pagination>
</div>
</div>
</div>
</div>
</template>
<script>
import livefill from "../../assets/img/live-fill.png";
export default {
data() {
return {
tableData: [
{ date: '储罐区有火焰产生',name: '火焰',address1: '2022-10-15 12:00:00',address2: '2022-10-15 12:00:00',end: '未处理',video:''},
{ date: '进入人员未佩戴安全头盔',name: '未佩戴安全头盔',address1: '2022-10-15 12:00:00',address2: '2022-10-15 12:00:00',end: '未处理',video:''},
{ date: '储罐区有设备预警',name: '设备预警',address1: '2022-10-15 12:00:00',address2: '2022-10-15 12:00:00',end: '未处理',video:''},
{ date: '储罐区有设备预警',name: '设备预警',address1: '2022-10-15 12:00:00',address2: '2022-10-15 12:00:00',end: '未处理',video:''},
]
}
},
computed:{
},
};
</script>
<style lang="scss" scoped>
.intellect{
width: calc(100vw - 280px);
height: calc(100vh - 50px);
padding: 30px;
.intellect-top{
width: 100%;
height: 60%;
display: flex;
justify-content: space-between;
.in-top-l{
width: 15%;
height: 100%;
background-color: #fff;
border-radius: 15px;
padding: 20px;
.top-l{
width: 100%;
height: 95%;
margin-top: 10px;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: space-around;
.topl{
width: 100%;
height: 40px;
line-height: 30px;
display: flex;
justify-content: space-between;
padding: 5px 10px;
border: 1px solid rgb(235, 232, 232);
border-radius: 10px;
background-color: #fff;
font-size: 14px;
img{
width: 20px;
height: 20px;
margin-top: 5px;
}
}
}
}
.in-top-c{
width: 62%;
height: 100%;
.video{
display: flex;
justify-content: space-between;
flex-direction: column;
flex-wrap: wrap;
div{
width: 48%;
height: 48%;
background-color: rgb(69, 70, 70);
}
}
}
.in-top-r{
width: 20%;
height: 100%;
.top-r-t{
width: 100%;
height: 36%;
border-radius: 15px;
background-color: #fff;
padding: 10px 20px 0 20px;
.ent-ru-in{
width: 100%;
/* height: 30%; */
display: flex;
.ru-in-l{
width: 45px;
height: 45px;
text-align: center;
margin-top: 10px;
img{
width: 100%;
}
}
.ru-in-r{
padding: 10px 0 0 10px;
span{
font-size: 15px;
}
div{
font-size: 12px;
margin-top: 7px;
}
}
}
.rt-b{
margin-left: 50px;
display: flex;
font-size: 13px;
margin-top: 10px;
div{
width: 75%;
height: auto;
}
}
.intellect-btn{
width: 100%;
text-align: center;
margin-top: 15px;
.but{
border-radius: 10px;
background-color: #51be5f;
color: #fff;
}
}
}
.top-r-b{
width: 100%;
height: 60%;
margin-top: 6%;
background-color: #fff;
border-radius: 15px;
padding: 20px 20px 0 20px;
.r-b-l{
width: 100%;
height: 50px;
display: flex;
div{
width: 150px;
height: 50px;
line-height: 50px;
margin-left: 10px;
font-size: 16px;
}
img{
width: 45px;
height: 45px;
}
}
.ent-ruchang{
width: 100%;
height: 80%;
padding-top: 10px;
.ent-ru-in{
width: 70%;
height: 30%;
display: flex;
margin-top: 2%;
margin-left: 20%;
.ru-in-l{
width: 50px;
height: 50px;
line-height: 55px;
text-align: center;
margin-top: 10px;
img{
width: 100%;
}
}
.ru-in-r{
padding: 7px 0 0 10px;
span{
font-size: 13px;
}
div{
font-size: 22px;
margin-top: 7px;
}
}
}
}
}
}
}
.intellect-bottom{
width: 100%;
height: 38%;
margin-top: 1.5%;
background-color: #fff;
border-radius: 15px;
padding: 10px 20px 20px 20px;
.ent-yuanqu{
width: 100%;
height: 95%;
text-align: center;
}
}
}
::v-deep .el-table th > .cell {
text-align: center;
}
::v-deep .el-table tr td .cell {
text-align: center;
}
</style>
\ No newline at end of file
danger-manage-web/vue.config.js
View file @ bdbc2c15
......@@ -36,6 +36,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: {
target: process.env.VUE_APP_TARGET,
// target: `http://192.168.2.16:8908/dangerManage`,
// target: `http://192.168.2.17:8908/dangerManage`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
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