wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/1/head
chenxinying 2024-02-04 11:09:47 +08:00
parent 9b4fc4fa0d ecf918bc38
commit 1ed77eabd0
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/hidden_view/index.vue
View File

@ -37,6 +37,9 @@
<span v-else-if="data.info.STATE === '3'"> 已整改 </span> <span v-else-if="data.info.STATE === '3'"> 已整改 </span>
<span v-else-if="data.info.STATE === '4'"> 已验收 </span> <span v-else-if="data.info.STATE === '4'"> 已验收 </span>
<span v-else-if="data.info.STATE === '-1'"> 已超期 </span> <span v-else-if="data.info.STATE === '-1'"> 已超期 </span>
<span v-else-if="data.info.STATE === '100'"> 暂存 </span>
<span v-else-if="data.info.STATE === '101'"> 待指派 </span>
<span v-else-if="data.info.STATE === '102'"> 指派中 </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="隐患描述"> <el-descriptions-item label="隐患描述">
{{ data.info.HIDDENDESCR }} {{ data.info.HIDDENDESCR }}
@ -97,7 +100,7 @@
/> />
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<template v-if="data.info.STATE >= 2"> <template v-if="data.info.RECTIFYDESCR">
<el-divider content-position="left">整改信息</el-divider> <el-divider content-position="left">整改信息</el-divider>
<el-descriptions :column="1" border> <el-descriptions :column="1" border>
<el-descriptions-item label="整改描述"> <el-descriptions-item label="整改描述">
@ -196,7 +199,7 @@
</template> </template>
</el-descriptions> </el-descriptions>
</template> </template>
<template v-if="data.info.STATE >= 4 && data.checkList.length > 0"> <template v-if="data.checkList.length > 0">
<el-divider content-position="left">验收信息</el-divider> <el-divider content-position="left">验收信息</el-divider>
<template v-for="(item, index) in data.checkList" :key="index"> <template v-for="(item, index) in data.checkList" :key="index">
<el-descriptions :column="1" border class="mt-10"> <el-descriptions :column="1" border class="mt-10">

36
src/views/BI/js/trajectory.js
View File

@ -2,13 +2,14 @@ import pako from "pako"; // 解密gzip插件
import { useWebSocket } from "@vueuse/core"; import { useWebSocket } from "@vueuse/core";
import { useUserStore } from "@/pinia/user"; import { useUserStore } from "@/pinia/user";
import pinia from "@/pinia"; import pinia from "@/pinia";
import { getRealTimeList } from "@/request/map"; import { getRealTimeList, getFenceList } from "@/request/map";
const userStore = useUserStore(pinia); const userStore = useUserStore(pinia);
const pls_ip = userStore.getUserInfo.POST_URL; const pls_ip = userStore.getUserInfo.POST_URL;
// const pls_ip = "http://121.22.38.202:8084"; // const pls_ip = "http://121.22.38.202:8084";
let entityArr = []; let entityArr = [];
let billboardArr = []; let billboardArr = [];
const fencesArr = [];
const { open, close } = useWebSocket( const { open, close } = useWebSocket(
encodeURI("ws://" + pls_ip.replace("http://", "") + "/netty/test.io?u=1"), encodeURI("ws://" + pls_ip.replace("http://", "") + "/netty/test.io?u=1"),
@ -54,10 +55,10 @@ export const handleTrajectory = (b) => {
const getOnlineUser = async () => { const getOnlineUser = async () => {
entityArr = new window.CustomCesium.GroupModel("人物模型"); entityArr = new window.CustomCesium.GroupModel("人物模型");
billboardArr = new window.CustomCesium.GroupModel("人物姓名"); billboardArr = new window.CustomCesium.GroupModel("人物姓名");
await getRealTimeList(); // await getRealTimeList();
// const { data } = await getRealTimeList(); const { data } = await getRealTimeList();
// let userList = data.data; let userList = data.data;
const userList = [ userList = [
{ {
cardNo: "8379", cardNo: "8379",
name: "大大", name: "大大",
@ -217,6 +218,27 @@ function peoMovement(moveData) {
}); });
} }
export const handleFence = () => { export const handleFence = async (b) => {
if (b) {
const { data } = await getFenceList();
const fences = data.rows;
fences.forEach((fence) => {
if (fence.list.length > 0) {
const enclosure = new window.CustomCesium.Enclosure(window.$icy);
enclosure.showDataSource(
fence.list, // 数据
30, // 高度
"yellow" // 颜色默认黄色
);
fencesArr.push(enclosure);
}
});
} else {
if (fencesArr) {
fencesArr.forEach((fence) => {
fence.clear();
fence.destroy();
});
}
}
}; };