Skip to content

Z
zh-baseversion-project
Commit c7b0aa42 authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

Merge branch 'jzl'

parents 0b5d307d 024e64bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 385 additions and 223 deletions
zh-baseversion-web/src/api/detector/detectorInfo.js
View file @ c7b0aa42
/* /*
* @Author: your name * @Author: your name
* @Date: 2022-02-26 16:01:37 * @Date: 2022-02-26 16:01:37
* @LastEditTime: 2022-02-26 21:11:12 * @LastEditTime: 2024-09-07 15:08:36
* @LastEditors: Please set LastEditors * @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /gassafety-progress/gassafetyprogress-web/src/api/detector/detectorInfo.js * @FilePath: /gassafety-progress/gassafetyprogress-web/src/api/detector/detectorInfo.js
*/ */
...@@ -31,6 +31,17 @@ export function yhqlistDetectorInfo(query) { ...@@ -31,6 +31,17 @@ export function yhqlistDetectorInfo(query) {
}, },
}); });
} }
export function getUserList(query) {
return request({
url: "/supervise/user/pageQueryLabelsLayerMarksDUser",
method: "get",
params: {
pageNum: 1,
pageSize: 5,
...query,
},
});
}
// 探测器列表 // 探测器列表
export function detectorInfoList(query) { export function detectorInfoList(query) {
return request({ return request({
......
zh-baseversion-web/src/components/bigWindow/UserCenter.vue
View file @ c7b0aa42
...@@ -12,48 +12,65 @@ ...@@ -12,48 +12,65 @@
<el-table <el-table
size="mini" size="mini"
:data="tableData" :data="tableData"
style="width: 720px" style="width: 780px !important"
class="el-bottom" class="el-bottom"
:key="Math.random()" :key="Math.random()"
> >
<!-- :height="tableHeight" --> <el-table-column
<!-- <el-table-column prop="detectorCode" label="设备编号" width="180"> prop="detectonickNamerName"
<template slot-scope="scope"> label="用户姓名"
<div :title="scope.row.detectorCode" class="ddd" v-unValue> width="100"
{{ scope.row.detectorCode }} >
</div>
</template>
</el-table-column> -->
<el-table-column prop="detectorName" label="设备名称" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div :title="scope.row.detectorName" class="ddd" v-unValue> <div :title="scope.row.nickName" class="ddd" v-unValue>
{{ scope.row.detectorName }} {{ scope.row.detectorName }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="medium" label="监测介质" width="100"> <el-table-column prop="phone" label="联系电话" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue>{{ scope.row.medium }}</div> <div v-unValue>{{ scope.row.phone }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="detectorAddr" label="设备地址" width="100"> <el-table-column prop="detectorAddr" label="地址" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{ scope.row.detectorAddr }}</div> <div v-unValue class="zzz">{{ scope.row.address }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="linkman" label="联系人" width="80">
<el-table-column prop="linkman" label="设备详情" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue>{{ scope.row.linkman }}</div> <div class="detail">
<el-button
:disabled="scope.row.safetyDeviceList.length == 0"
type="text"
@click.stop="deviceShow(scope.row.safetyDeviceList)"
>设备</el-button
>
<el-button disabled type="text">气瓶</el-button>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="phone" label="联系电话" width="100">
<el-table-column
prop="detectorStatus"
label="末次安检时间"
width="120"
>
<template slot-scope="scope">
<div v-unValue>
{{ scope.row.time }}
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="detectorStatus" label="设备状态" width="100">
<el-table-column prop="alarmTime" label="安检人员" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue :style="{color:scope.row.detectorStatus==1?'red':''}">{{scope.row.detectorStatus}}</div> <div v-unValue>{{ scope.row.alarmTime }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="alarmTime" label="预警时间" width="140">
<el-table-column prop="alarmTime" label="安检情况" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue>{{ scope.row.alarmTime }}</div> <div v-unValue>{{ scope.row.alarmTime }}</div>
</template> </template>
...@@ -72,6 +89,31 @@ ...@@ -72,6 +89,31 @@
</div> </div>
</div> </div>
</div> </div>
<div
class="toBody"
ref="toBody"
@click.stop="toBodyClick"
v-show="yhquserCenterShow"
>
<div class="list-top">
<div class="title">设备列表</div>
<div class="close" @click="close">
<i
class="el-icon-close"
style="font-size: 20px; color: #5dfefe"
></i>
</div>
</div>
<yhqUserCenter
ref="yhquserCenter"
:show="true"
:detcetorList="safetyDeviceList"
v-if="safetyDeviceList.length > 0"
/>
</div>
</div> </div>
</transition> </transition>
</template> </template>
...@@ -79,7 +121,8 @@ ...@@ -79,7 +121,8 @@
<script> <script>
// import Velocity from "velocity-animate"; // import Velocity from "velocity-animate";
// import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm"; // import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
import { listDetectorInfo } from "@/api/detector/detectorInfo"; import { listDetectorInfo, getUserList } from "@/api/detector/detectorInfo";
import yhqUserCenter from "@/components/bigWindow/yhqUserCenter.vue";
export default { export default {
props: { props: {
...@@ -93,7 +136,7 @@ export default { ...@@ -93,7 +136,7 @@ export default {
title: { title: {
type: String, type: String,
}, },
userId: { villageId: {
type: [Number, String], type: [Number, String],
}, },
total: { total: {
...@@ -103,6 +146,9 @@ export default { ...@@ -103,6 +146,9 @@ export default {
type: Number, type: Number,
}, },
}, },
components: {
yhqUserCenter,
},
data() { data() {
return { return {
// 动画效果的切换 // 动画效果的切换
...@@ -116,6 +162,8 @@ export default { ...@@ -116,6 +162,8 @@ export default {
// address: "上海市普陀区金沙江路", // address: "上海市普陀区金沙江路",
// }, // },
], ],
safetyDeviceList: [],
yhquserCenterShow: false,
}; };
}, },
created() { created() {
...@@ -127,22 +175,43 @@ export default { ...@@ -127,22 +175,43 @@ export default {
detcetorList(newData) { detcetorList(newData) {
// console.log(bol); // console.log(bol);
// if (bol) { // if (bol) {
console.log("55555555",newData); console.log("55555555", newData);
this.tableData = [...newData]; this.tableData = [...newData];
// } // }
}, },
}, },
mounted() {
// document.querySelector(".bigwindow").removeChild(this.$refs.toBody);
let domArr = document.querySelectorAll(".bigwindow .toBody");
console.log("domArr", domArr.length);
domArr.forEach((item) => {
document.querySelector(".bigwindow").removeChild(item);
});
console.log("domArr", domArr);
// document.querySelector("body").addEventListener("click", () => {
// console.log(123);
// this.yhquserCenterShow = false;
// console.log(this.yhquserCenterShow);
// });
document.querySelector(".bigwindow").appendChild(this.$refs.toBody);
},
methods: { methods: {
toBodyClick() {},
deviceShow(list) {
this.yhquserCenterShow = true;
this.safetyDeviceList = list;
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(val); console.log(val);
}, },
handleCurrentChangvale(val) { handleCurrentChangvale(val) {
this.$parent.getDetectorInfoList( this.$parent.getDetectorInfoList(
listDetectorInfo, getUserList,
{ {
userId: this.userId, villageId: this.villageId,
pageNum: val, pageNum: val,
pageSize: this.pageSize, pageSize: this.pageSize,
}, },
...@@ -151,13 +220,14 @@ export default { ...@@ -151,13 +220,14 @@ export default {
}, },
close() { close() {
// this.fade = "fade"; // this.fade = "fade";
this.$parent.userCenterShow = false; this.safetyDeviceList=[];
this.yhquserCenterShow = false;
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper { .wrapper {
// width: 978px; // width: 978px;
// max-height: 600px; // max-height: 600px;
...@@ -169,7 +239,7 @@ export default { ...@@ -169,7 +239,7 @@ export default {
// // background-color: #fff; // // background-color: #fff;
// display: flex; // display: flex;
// justify-content: space-between; // justify-content: space-between;
margin-top: 10px; margin-top: 2px;
z-index: 9999; z-index: 9999;
& > div { & > div {
...@@ -254,7 +324,7 @@ export default { ...@@ -254,7 +324,7 @@ export default {
} }
} }
.right { .right {
width: 740px; width: 800px;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
// justify-content: space-between; // justify-content: space-between;
...@@ -304,4 +374,29 @@ export default { ...@@ -304,4 +374,29 @@ export default {
font-size: 50px !important; font-size: 50px !important;
} }
} }
</style> .toBody {
\ No newline at end of file position: fixed;
left: 50%;
top: 20%;
height: 500px;
width: 760px;
margin-left: -380px;
background: rgba(0, 0, 0, 0.3);
box-sizing: border-box;
padding: 10px 20px;
// padding-top:-10px;
.list-top {
display: flex;
justify-content: space-between;
.title {
color: rgb(73, 216, 255);
flex:1;
text-align: center;
}
.close{
cursor: pointer;
}
}
}
</style>
zh-baseversion-web/src/components/bigWindow/yhqUser.vue
View file @ c7b0aa42
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2022-01-26 20:07:52 * @Date: 2022-01-26 20:07:52
* @LastEditTime: 2024-07-25 17:11:56 * @LastEditTime: 2024-09-07 15:55:19
* @LastEditors: 纪泽龙 jizelong@qq.com * @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
...@@ -10,52 +10,52 @@ ...@@ -10,52 +10,52 @@
<template> <template>
<div class="devicea-wrapper"> <div class="devicea-wrapper">
<div class="title"> <div class="title">
{{ deviceData.township }} {{ deviceData.nickName }}
</div> </div>
<div class="close" @click="close"> <div class="close" @click="close">
<!-- <img src="@/assets/mapImages/closeBtn.png" alt="" /> --> <!-- <img src="@/assets/mapImages/closeBtn.png" alt="" /> -->
<i class="el-icon-close" style="font-size: 20px; color: #5dfefe"></i> <i class="el-icon-close" style="font-size: 20px; color: #5dfefe"></i>
</div> </div>
<div class="line"></div> <div class="line"></div>
<div> <div>
<!--<div class="top flex top-top">--> <div class="top flex top-top">
<!--<div class="group" style="width:20%">--> <div class="group" style="width: 20%">
<!--<div class="left">联系人：</div>--> <div class="left">用户姓名</div>
<!--<div class="right zzz">{{ deviceData.linkman }}</div>--> <div :title="deviceData.nickName" class="right zzz">{{ deviceData.nickName }}</div>
<!--</div>--> </div>
<!--<div class="group" style="width:30%">--> <div class="group" style="width: 30%">
<!--<div class="left">联系电话:</div>--> <div class="left">联系电话:</div>
<!--<div v-unValue class="right zzz">--> <div v-unValue class="right zzz">
<!--{{ deviceData.phone }}--> {{ deviceData.phone }}
<!--</div>--> </div>
<!--</div>--> </div>
<!--<div class="group" style="width:30%">--> <div class="group" style="width: 30%">
<!--<div class="left">联系地址：</div>--> <div class="left">联系地址：</div>
<!--<div :title="deviceData.address" class="right last zzz">--> <div :title="deviceData.address" class="right last zzz">
<!--{{ deviceData.address || "-" }}--> {{ deviceData.address || "-" }}
<!--</div>--> </div>
<!--</div>--> </div>
<!--</div>--> </div>
<!-- <div class="top flex top-bottom"> <!-- <div class="top flex top-bottom">
<div class="group"> <div class="group">
<div class="left">联系地址：</div> <div class="left">联系地址：</div>
<div :title="deviceData.address" class="right last zzz"> <div :title="deviceData.address" class="right last zzz">
{{ deviceData.address || "-" }} {{ deviceData.address || "-" }}
</div>
</div> </div>
</div> </div> -->
</div> -->
<template v-if="deviceData.detectorCountList"> <!-- <template v-if="deviceData.detectorCountList">
<div class="foot"> <div class="foot">
<div class="thead flex"> <div class="thead flex">
<div class="first">设备类型</div> <div class="first">设备类型</div>
<div>设备数量</div> <div>设备数量</div>
<div>在线设备</div> <div>在线设备</div>
<div>离线设备</div> <div>离线设备</div>
<!-- <div>历史报警</div> <div>历史报警</div>
<div>已处理报警</div> --> <div>已处理报警</div>
<div class="last">报警中</div> <div class="last">报警中</div>
</div> </div>
<div <div
...@@ -71,21 +71,21 @@ ...@@ -71,21 +71,21 @@
<div v-unValue class=""> <div v-unValue class="">
{{ data.offLineNum }} {{ data.offLineNum }}
</div> </div>
<!-- <div v-unValue class=""> <div v-unValue class="">
{{ data.historyAlarmNum }} {{ data.historyAlarmNum }}
</div> </div>
<div v-unValue class=""> <div v-unValue class="">
{{ data.cancelAlarmNum }} {{ data.cancelAlarmNum }}
</div> --> </div>
<div v-unValue class="last zzz"> <div v-unValue class="last zzz">
{{ data.processingAlarmNum }} {{ data.processingAlarmNum }}
</div> </div>
</div> </div>
</div> </div>
</template> </template> -->
</div> </div>
<div style="width: 100%; display: flex"> <div style="width: 100%; display: flex" v-if="deviceData.safetyDeviceList.length>0">
<div class="btn"> <div class="btn">
<div>感知设备</div> <div>感知设备</div>
</div> </div>
...@@ -108,16 +108,30 @@ ...@@ -108,16 +108,30 @@
/> />
</div> </div>
</div> </div>
<yhqUserCenter <yhqUserCenter
:title="centerTitle" :title="centerTitle"
:show="yhquserCenterShow" :show="yhquserCenterShow"
ref="yhquserCenter" ref="yhquserCenter"
:detcetorList="detcetorList" :detcetorList="deviceData.safetyDeviceList"
:userId="centerUserId" :userId="centerUserId"
:total="centerTotal" :total="centerTotal"
:pageSize="5" :pageSize="5"
v-show="!isShow" v-show="!isShow"
/> />
<div class="body-wrapper" ref="toBody">
<!-- <yhqUserCenter
:title="centerTitle"
:show="false"
ref="yhquserCenter"
:detcetorList="detcetorList"
:userId="centerUserId"
:total="centerTotal"
:pageSize="5"
v-show="!isShow"
/> -->
</div>
</div> </div>
</template> </template>
...@@ -129,8 +143,8 @@ import { ...@@ -129,8 +143,8 @@ import {
deviceUserList, deviceUserList,
} from "@/api/bigWindow/getDevice"; } from "@/api/bigWindow/getDevice";
import { companyType, deviceType } from "@/utils/mapClass/config.js"; import { companyType, deviceType } from "@/utils/mapClass/config.js";
import { yhqlistDetectorInfo } from "@/api/detector/detectorInfo"; // import { yhqlistDetectorInfo } from "@/api/detector/detectorInfo";
import { yhqdetectorUserList } from "@/api/detector/detectorUser"; import { yhqdetectorUserList,labelsLayerMarksDUserVillageSafDevInfoMap } from "@/api/detector/detectorUser";
import yhqUserCenter from "@/components/bigWindow/yhqUserCenter.vue"; import yhqUserCenter from "@/components/bigWindow/yhqUserCenter.vue";
export default { export default {
...@@ -139,6 +153,7 @@ export default { ...@@ -139,6 +153,7 @@ export default {
}, },
data() { data() {
return { return {
dialogVisible: true,
flag: true, flag: true,
isShow: true, isShow: true,
companyType, companyType,
...@@ -166,9 +181,13 @@ export default { ...@@ -166,9 +181,13 @@ export default {
this.companyType[item.conpanyId] = item.companyName; this.companyType[item.conpanyId] = item.companyName;
}); });
} }
//this.myHttp(); //this.myHttp();
// console.log(this.deviceData); // console.log("this.deviceData",this.deviceData);
this.btnClick(); // this.btnClick();
// console.log(this.$refs.toBody);
// document.querySelector(".bigwindow").appendChild(this.$refs.toBody);
}, },
methods: { methods: {
//用户的设备center //用户的设备center
...@@ -190,33 +209,44 @@ export default { ...@@ -190,33 +209,44 @@ export default {
} }
}); });
}, },
getDeviceList(){
// return labelsLayerMarksDUserVillageSafDevInfoMap().then(res=>{
// console.log("设备",res)
// })
},
close() { close() {
this.mapClass.infowindowClose(); this.mapClass.infowindowClose();
}, },
btnClick() { btnClick() {
this.isShow = !this.isShow; this.isShow = !this.isShow;
// this.vueRoot.centerDataFunc(this.deviceData.pressureFlows); // this.vueRoot.centerDataFunc(this.deviceData.pressureFlows);
this.getDetectorInfoList( // this.getDetectorInfoList(
deviceUserList, // deviceUserList,
{ township: this.deviceData.township, pageNum: 1, pageSize: 5 }, // { township: this.deviceData.township, pageNum: 1, pageSize: 5 },
this.deviceData.nickName // this.deviceData.nickName
); // );
}, },
myHttp() { myHttp() {
yhqdetectorUserList({ userId: this.deviceData.userId }).then((res) => {
if (res.code == 200) { // yhqdetectorUserList({ userId: this.deviceData.userId }).then((res) => {
const data = res.data.filter( // if (res.code == 200) {
(item) => item.userId == this.deviceData.userId // const data = res.data.filter(
)[0].detectorCountList; // (item) => item.userId == this.deviceData.userId
this.deviceData.detectorCountList = data; // )[0].detectorCountList;
} // this.deviceData.detectorCountList = data;
}); // }
// });
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.body-wrapper {
position: fixed;
top: 100px;
}
.arrowTransform { .arrowTransform {
transition: 0s; transition: 0s;
transform-origin: center; transform-origin: center;
...@@ -241,9 +271,9 @@ export default { ...@@ -241,9 +271,9 @@ export default {
font-size: 14px; font-size: 14px;
line-height: 14px; line-height: 14px;
color: #ffffff; color: #ffffff;
padding-left:5px; padding-left: 5px;
} }
.line { .line {
width: 50%; width: 50%;
height: 2px; height: 2px;
margin-top: 10px; margin-top: 10px;
...@@ -275,10 +305,10 @@ export default { ...@@ -275,10 +305,10 @@ export default {
.group { .group {
height: 30px; height: 30px;
display: flex; display: flex;
justify-content: space-between; // justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
div { div {
flex: 1; // flex: 1;
box-sizing: border-box; box-sizing: border-box;
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
...@@ -293,6 +323,9 @@ export default { ...@@ -293,6 +323,9 @@ export default {
.left { .left {
text-align: left; text-align: left;
} }
.right{
flex:1;
}
} }
&.top-bottom { &.top-bottom {
.left { .left {
......
zh-baseversion-web/src/components/bigWindow/yhqUserCenter.vue
View file @ c7b0aa42
...@@ -11,63 +11,67 @@ ...@@ -11,63 +11,67 @@
<div class="bottom right-bottom-data-left"> <div class="bottom right-bottom-data-left">
<el-table <el-table
size="mini" size="mini"
:data="tableData" :data="detcetorList"
style="width: 720px" style="width: 720px"
class="el-bottom" class="el-bottom"
:key="Math.random()" :key="Math.random()"
> >
<!-- :height="tableHeight" --> <!-- :height="tableHeight" -->
<!-- <el-table-column prop="detectorCode" label="设备编号" width="180"> <el-table-column prop="detectorCode" label="报警器编号" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div :title="scope.row.detectorCode" class="ddd" v-unValue> <div :title="scope.row.detectorCode" class="zzz" v-unValue>
{{ scope.row.detectorCode }} {{ scope.row.iotNo }}
</div> </div>
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column prop="detectorName" label="设备名称" width="100"> <el-table-column prop="detectorName" label="报警器名称" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div :title="scope.row.detectorName" class="ddd" v-unValue> <div :title="scope.row.detectorName" class="zzz" v-unValue>
家用报警器 {{scope.row.deviceName}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="medium" label="监测介质" width="100"> <el-table-column prop="medium" label="监测介质" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue>{{ scope.row.medium }}</div> <div v-unValue>{{ scope.row.detctionMedium }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="detectorAddr" label="设备地址" width="100"> <!-- <el-table-column prop="detectorAddr" label="设备地址" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" :title="scope.row.address"> <div v-unValue style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" :title="scope.row.address">
{{ scope.row.address }} {{ scope.row.address }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column prop="linkman" label="联系人" width="80"> <!-- <el-table-column prop="linkman" label="联系人" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{ scope.row.linkman }}</div> <div v-unValue style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{ scope.row.linkman }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="phone" label="联系电话" width="100"> <el-table-column prop="phone" label="联系电话" width="100">
</el-table-column> </el-table-column> -->
<el-table-column prop="detectorStatus" label="设备状态" width="100"> <el-table-column prop="detectorStatus" label="状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.status == 0">在线</div> <div class="detail" v-if="scope.row.status == 0">在线</div>
<div v-else-if="scope.row.status == 1"> <div class="detail" v-else-if="scope.row.status == 1">离线</div>
离线 <div class="detail" v-else>-</div>
</div>
<div v-else>-</div>
<!-- <div v-unValue :style="{color:scope.row.detectorStatus==1?'red':''}">{{scope.row.detectorStatus}}</div> --> <!-- <div v-unValue :style="{color:scope.row.detectorStatus==1?'red':''}">{{scope.row.detectorStatus}}</div> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="alarmTime" label="预警时间" width="140"> <el-table-column prop="alarmTime" label="报警记录" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-unValue>{{ scope.row.alarmTime }}</div> <div class="zzz" v-unValue>{{ scope.row.alarmTime }}</div>
</template>
</el-table-column>
<el-table-column prop="alarmTime" label="安装时间" width="140">
<template slot-scope="scope">
<div class="zzz" v-unValue>{{ scope.row.deviceInstallTime }}</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <!-- <el-pagination
@current-change="handleCurrentChangvale" @current-change="handleCurrentChangvale"
:page-size="pageSize" :page-size="pageSize"
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
...@@ -75,7 +79,7 @@ ...@@ -75,7 +79,7 @@
:hide-on-single-page="total <= pageSize" :hide-on-single-page="total <= pageSize"
:key="total + '' + pageSize" :key="total + '' + pageSize"
> >
</el-pagination> </el-pagination> -->
</div> </div>
</div> </div>
</div> </div>
...@@ -123,10 +127,10 @@ export default { ...@@ -123,10 +127,10 @@ export default {
// address: "上海市普陀区金沙江路", // address: "上海市普陀区金沙江路",
// }, // },
], ],
detectorStatusList:{ detectorStatusList: {
"0":"在线", 0: "在线",
"1":"离线", 1: "离线",
} },
}; };
}, },
created() { created() {
...@@ -138,11 +142,15 @@ export default { ...@@ -138,11 +142,15 @@ export default {
detcetorList(newData) { detcetorList(newData) {
// console.log(bol); // console.log(bol);
// if (bol) { // if (bol) {
console.log("222222222222222222222222222222222222222222",newData); console.log("222222222222222222222222222222222222222222", newData);
this.tableData = [...newData]; this.tableData = [...newData];
console.log(this.tableData)
// } // }
}, },
}, },
mounted(){
},
methods: { methods: {
handleSizeChange(val) { handleSizeChange(val) {
...@@ -167,7 +175,7 @@ export default { ...@@ -167,7 +175,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper { .wrapper {
// width: 978px; // width: 978px;
// max-height: 600px; // max-height: 600px;
...@@ -179,7 +187,7 @@ export default { ...@@ -179,7 +187,7 @@ export default {
// // background-color: #fff; // // background-color: #fff;
// display: flex; // display: flex;
// justify-content: space-between; // justify-content: space-between;
margin-top: 10px; // margin-top: 10px;
z-index: 9999; z-index: 9999;
& > div { & > div {
...@@ -314,4 +322,7 @@ export default { ...@@ -314,4 +322,7 @@ export default {
font-size: 50px !important; font-size: 50px !important;
} }
} }
.detail{
text-align: left;
}
</style> </style>
zh-baseversion-web/src/utils/mapClass/map.js
View file @ c7b0aa42
/* /*
* @Author: your name * @Author: your name
* @Date: 2022-01-11 13:45:12 * @Date: 2022-01-11 13:45:12
* @LastEditTime: 2024-08-01 10:21:14 * @LastEditTime: 2024-09-07 14:57:27
* @LastEditors: 纪泽龙 jizelong@qq.com * @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/mapClass.js * @FilePath: /test/hello-world/src/utils/mapClass.js
...@@ -979,7 +979,12 @@ export class EditorMap { ...@@ -979,7 +979,12 @@ export class EditorMap {
* @param {*} component * @param {*} component
* @param {*} showBool * @param {*} showBool
*/ */
labelsLayerMarksDetectorUserList(mapData, compontent, showBool = true) { labelsLayerMarksDetectorUserList(
mapData,
compontent1,
compontent2,
showBool = true
) {
if (mapData !== null && mapData !== undefined) { if (mapData !== null && mapData !== undefined) {
const hashMap = new Map(); const hashMap = new Map();
for (var key in mapData) { for (var key in mapData) {
...@@ -998,7 +1003,7 @@ export class EditorMap { ...@@ -998,7 +1003,7 @@ export class EditorMap {
const icon = { const icon = {
type: "image", //图标类型，现阶段只支持 image 类型 type: "image", //图标类型，现阶段只支持 image 类型
image: svgUrl[6], //可访问的图片 URL image: svgUrl[6], //可访问的图片 URL
size: [44, 49], //图片尺寸 size: [44, 49], //图片尺寸
anchor: "center", //图片相对 position 的锚点，默认为 bottom-center anchor: "center", //图片相对 position 的锚点，默认为 bottom-center
}; };
var markers = []; var markers = [];
...@@ -1007,7 +1012,7 @@ export class EditorMap { ...@@ -1007,7 +1012,7 @@ export class EditorMap {
jsonValueArr.forEach((item) => { jsonValueArr.forEach((item) => {
let longitude = item.longitude; let longitude = item.longitude;
let latitude = item.latitude; let latitude = item.latitude;
var userId = item.userId; var userId = item.villageId;
icon.userId = userId; icon.userId = userId;
var curData = { var curData = {
position: [longitude, latitude], position: [longitude, latitude],
...@@ -1027,7 +1032,7 @@ export class EditorMap { ...@@ -1027,7 +1032,7 @@ export class EditorMap {
var userId = JSON.stringify(optsObj.icon.userId); var userId = JSON.stringify(optsObj.icon.userId);
var extData = hashMap.get(userId); var extData = hashMap.get(userId);
// 如果control==0就是默认值，没有使用123功能，就显示infowindow // 如果control==0就是默认值，没有使用123功能，就显示infowindow
this.massMarksMarkerClick(extData, compontent); this.massMarksMarkerClick(extData, compontent1);
}); });
if (item.companyType) { if (item.companyType) {
labelMarker.filterData = { labelMarker.filterData = {
...@@ -1089,7 +1094,7 @@ export class EditorMap { ...@@ -1089,7 +1094,7 @@ export class EditorMap {
var userId = JSON.stringify(optsObj.icon.userId); var userId = JSON.stringify(optsObj.icon.userId);
var extData = hashMap.get(userId); var extData = hashMap.get(userId);
// 如果control==0就是默认值，没有使用123功能，就显示infowindow // 如果control==0就是默认值，没有使用123功能，就显示infowindow
this.massMarksMarkerClick(extData, compontent); this.massMarksMarkerClick(extData, compontent2);
}); });
if (item.companyType) { if (item.companyType) {
...@@ -1774,9 +1779,9 @@ export class EditorMap { ...@@ -1774,9 +1779,9 @@ export class EditorMap {
this.pipeArr[item].forEach((pipe) => { this.pipeArr[item].forEach((pipe) => {
const options = pipe.getOptions(); const options = pipe.getOptions();
pipe.setOptions({ ...options, strokeOpacity: num }); pipe.setOptions({ ...options, strokeOpacity: num });
}); });
} }
console.log(123) console.log(123);
} }
// searchPipeClear() { // searchPipeClear() {
// const { pipePressure } = this.searchDevice.getExtData(); // const { pipePressure } = this.searchDevice.getExtData();
......
zh-baseversion-web/src/views/bigWindow/components/Top.vue
View file @ c7b0aa42
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
val: 61, val: 61,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/syUser1.png"), imgurl: require("@/assets/firstimage/syUser1.png"),
name: "商业用户", name: "工商业用户",
}, },
{ {
val: 18, val: 18,
...@@ -293,7 +293,7 @@ export default { ...@@ -293,7 +293,7 @@ export default {
height: 20px; height: 20px;
} }
.device-btn-wrapper { .device-btn-wrapper {
width: 780px; width: 790px;
margin-right: 5px; margin-right: 5px;
flex-wrap: wrap; flex-wrap: wrap;
} }
......
zh-baseversion-web/src/views/bigWindow/index.vue
View file @ c7b0aa42
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2022-01-11 13:44:17 * @Date: 2022-01-11 13:44:17
* @LastEditTime: 2024-08-02 14:09:08 * @LastEditTime: 2024-09-06 16:40:07
* @LastEditors: 纪泽龙 jizelong@qq.com * @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue * @FilePath: /test/hello-world/src/views/Home.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="home bigwindow" @click="windowClick"> <div class="home bigwindow" @click="windowClick">
<div id="map"></div> <div id="map"></div>
<!-- <Center :show="show" :centerData="centerData" /> --> <!-- <Center :show="show" :centerData="centerData" /> -->
<UserCenter <!-- <UserCenter
:title="centerTitle" :title="centerTitle"
:show="userCenterShow" :show="userCenterShow"
ref="userCenter" ref="userCenter"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
:userId="centerUserId" :userId="centerUserId"
:total="centerTotal" :total="centerTotal"
:pageSize="20" :pageSize="20"
/> /> -->
<!-- <PipeSelect <!-- <PipeSelect
@transmit="getPipeSelectMessage" @transmit="getPipeSelectMessage"
@closeMediumPressureLine="clearBigWindowsSelectPipe" @closeMediumPressureLine="clearBigWindowsSelectPipe"
...@@ -309,8 +309,7 @@ export default { ...@@ -309,8 +309,7 @@ export default {
}, },
async mounted() { async mounted() {
// labelsLayerMarksDUserVillageSafDevInfoMap();
labelsLayerMarksDUserVillageSafDevInfoMap();
// console.log(99999999999999) // console.log(99999999999999)
// getPipe().then(res=>{ // getPipe().then(res=>{
// console.log("成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功",res) // console.log("成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功",res)
...@@ -384,13 +383,19 @@ export default { ...@@ -384,13 +383,19 @@ export default {
this.labelsLayerMarksVideoGoMap(getVideo, VideoView, false); this.labelsLayerMarksVideoGoMap(getVideo, VideoView, false);
//this.goMap(getYhq, this.addDevice2, yhqUser, false); //液化气用户上图 //this.goMap(getYhq, this.addDevice2, yhqUser, false); //液化气用户上图
if (this.enterpriseId == -2) { if (this.enterpriseId == -2) {
this.labelsLayerMarksDeviceUserGoMap(deviceUser, yhqUser, false); //用户上图 // this.labelsLayerMarksDeviceUserGoMap(deviceUser, yhqUser, false); //用户上图
this.labelsLayerMarksDeviceUserGoMap(
labelsLayerMarksDUserVillageSafDevInfoMap,
yhqUser,
false
); //用户上图
} }
// 用户要等一下 因为有报警数据 // 用户要等一下 因为有报警数据
this.labelsLayerMarksDetectorUserGoMap( this.labelsLayerMarksDetectorUserGoMap(
labelsLayerMarksDetectorUserList, labelsLayerMarksDUserVillageSafDevInfoMap,
User, User,
yhqUser,
false false
).then((res) => { ).then((res) => {
// 先查一下，然后开启定时器 // 先查一下，然后开启定时器
...@@ -633,9 +638,8 @@ export default { ...@@ -633,9 +638,8 @@ export default {
labelsLayerMarksDeviceUserGoMap(httpFunc, component, show) { labelsLayerMarksDeviceUserGoMap(httpFunc, component, show) {
return httpFunc().then((res) => { return httpFunc().then((res) => {
const mapData = res.data; const mapData = res.data[18];
console.log("液化气用户用户", mapData); console.log("液化气用户用户", mapData);
this.map.labelsLayerMarksDeviceUserGoMap(mapData, component, show); this.map.labelsLayerMarksDeviceUserGoMap(mapData, component, show);
}); });
}, },
...@@ -671,11 +675,17 @@ export default { ...@@ -671,11 +675,17 @@ export default {
this.map.labelsLayerMarksTysGoMap(mapData, component, show); this.map.labelsLayerMarksTysGoMap(mapData, component, show);
}); });
}, },
labelsLayerMarksDetectorUserGoMap(httpFunc, component, show) { labelsLayerMarksDetectorUserGoMap(httpFunc, component1, component2, show) {
return httpFunc().then((res) => { return httpFunc().then((res) => {
const mapData = res.data; const mapData = { 6: res.data[6], 61: res.data[61] };
// const mapData =res.data
console.log("用户用户用户用户用户", mapData); console.log("用户用户用户用户用户", mapData);
this.map.labelsLayerMarksDetectorUserList(mapData, component, show); this.map.labelsLayerMarksDetectorUserList(
mapData,
component1,
component2,
show
);
}); });
}, },
goMap(httpFunc, addFunc, component, show) { goMap(httpFunc, addFunc, component, show) {
......
zh-baseversion-web/vue.config.js
View file @ c7b0aa42
...@@ -34,9 +34,11 @@ module.exports = { ...@@ -34,9 +34,11 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8905/gassafety`, // target: `http://localhost:8905/gassafety`,
// target: `http://27.128.233.145:8905/gassafety`, // target: `http://27.128.233.145:8905/gassafety`,
// target: `http://36.138.180.82:8905/gassafety`, // target: `http://36.138.180.82:8905/gassafety`,
// 服务器
target: `http://36.138.180.82:8079//gassafety`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + 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