From 744295e9162ccc2c3e3ec5b5832b55dfc1cad02c Mon Sep 17 00:00:00 2001 From: luojiayi <1712054227@qq.com> Date: Tue, 29 Apr 2025 18:31:02 +0800 Subject: [PATCH] =?UTF-8?q?2025=E5=B9=B404=E6=9C=8829=E6=97=A518:31:00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +-- components.d.ts | 1 - index.html | 2 +- src/api/index.d.ts | 2 + src/assets/img/dir-via-marker.png | Bin 0 -> 4511 bytes src/assets/img/end-marker.png | Bin 1719 -> 5006 bytes src/assets/img/start-marker.png | Bin 1606 -> 4338 bytes src/layout/index.vue | 26 ++++---- src/utils/mapCustom.js | 1 - src/utils/webSocket.js | 2 +- src/views/incidentDispose/index.vue | 15 +++-- src/views/monitoringCenter/deviceHistory.vue | 12 ++-- src/views/monitoringCenter/deviceInfo.vue | 8 +++ .../monitoringCenter/deviceLocationMap.vue | 52 +++++++++++---- src/views/monitoringCenter/index.vue | 54 --------------- src/views/statisticalCenter/index.vue | 63 ++++++++++-------- .../synthesizeManage/deviceInfo/index.vue | 10 ++- .../synthesizeManage/deviceManage/index.vue | 2 +- src/views/synthesizeManage/setting/index.vue | 2 +- .../synthesizeManage/userManage/addUser.vue | 11 +-- .../synthesizeManage/userManage/resetPwd.vue | 2 +- 21 files changed, 137 insertions(+), 136 deletions(-) create mode 100644 src/assets/img/dir-via-marker.png diff --git a/.env.development b/.env.development index 54fa899..ec71f38 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ -# VITE_APP_URL = 'http://192.168.3.116:8001/' -# VITE_APP_URL_WEBSOCKET = 'http://192.168.3.116:8000/api/websocket' +VITE_APP_URL = 'http://192.168.3.116:8001/' +VITE_APP_URL_WEBSOCKET = 'http://192.168.3.116:8000/api/websocket' -VITE_APP_URL = 'http://47.112.185.26:8001/' -VITE_APP_URL_WEBSOCKET = 'ws://47.112.185.26:8000/api/websocket' +# VITE_APP_URL = 'http://47.112.185.26:8001/' +# VITE_APP_URL_WEBSOCKET = 'ws://47.112.185.26:8000/api/websocket' # VITE_APP_URL = 'http://api.handcuff.zhuhaiguangdun.cn' # VITE_APP_URL_WEBSOCKET = 'ws://device.handcuff.zhuhaiguangdun.cn:8000/api/websocket' diff --git a/components.d.ts b/components.d.ts index 9207ae2..6953697 100644 --- a/components.d.ts +++ b/components.d.ts @@ -44,7 +44,6 @@ declare module '@vue/runtime-core' { ElUpload: typeof import('element-plus/es')['ElUpload'] Header: typeof import('./src/components/header.vue')['default'] InfoWindow: typeof import('./src/components/InfoWindow.vue')['default'] - MyComm: typeof import('./src/components/MyComm.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] Sidebar: typeof import('./src/components/sidebar.vue')['default'] diff --git a/index.html b/index.html index 1b39ad8..7c9e053 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ securityJsCode: '83572bd6398cb4594c611f93f89b506a' } + src="https://webapi.amap.com/maps?v=1.4.15&key=e1e6dde852b57c61bacdcf1af21a3d9a&plugin=AMap.MouseTool&plugin=AMap.MarkerClusterer=AMap.PolygonEditor&plugin=AMap.PolyEditor&plugin=AMap.CircleEditor&plugin=AMap.MoveAnimation&plugin=AMap.PlaceSearch&plugin=AMap.AutoComplete&plugin=AMap.MoveAnimation"> diff --git a/src/api/index.d.ts b/src/api/index.d.ts index e4046a2..b3a6113 100644 --- a/src/api/index.d.ts +++ b/src/api/index.d.ts @@ -130,9 +130,11 @@ export namespace TLogin { export namespace TAccount { export interface IAdd { + id?: number | string; username: string; phone: string; name: string; + password?: string; orgId?: number | string; roleId: number | string; status: number; diff --git a/src/assets/img/dir-via-marker.png b/src/assets/img/dir-via-marker.png new file mode 100644 index 0000000000000000000000000000000000000000..5b22a03962b3c27aa2ca183cea3a1a2fc2aa434d GIT binary patch literal 4511 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 WRj`|w?M|glt&otW!eQHG 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 { }; onMounted(() => { - // const isReload = localStorage.getItem("isReload"); - // if (isReload !== "true") { - // ElMessageBox.alert("由于浏览器安全策略，用户必须点击屏幕才能播放告警声音", "提示", { - // confirmButtonText: "OK", - // callback: () => { - // localStorage.setItem("isReload", "true"); - // }, - // }); - // } + const isReload = localStorage.getItem("isReload"); + if (isReload !== "true") { + ElMessageBox.alert("由于浏览器安全策略，用户必须点击屏幕才能播放告警声音", "提示", { + confirmButtonText: "OK", + callback: () => { + localStorage.setItem("isReload", "true"); + }, + }); + } - // if (ws.socket == null) { - // ws.connect(); - // } - // ws.onMessage(onMessage); + if (ws.socket == null) { + ws.connect(); + } + ws.onMessage(onMessage); window.addEventListener("beforeunload", handleBeforeUnload); }); diff --git a/src/utils/mapCustom.js b/src/utils/mapCustom.js index 259f5b2..c0fc8eb 100644 --- a/src/utils/mapCustom.js +++ b/src/utils/mapCustom.js @@ -118,7 +118,6 @@ export class MapCustom { // 创建marker marker(option) { return new AMap.Marker({ - map: this.map, offset: new AMap.Pixel(-13, -26), ...option }) diff --git a/src/utils/webSocket.js b/src/utils/webSocket.js index 6da176f..4ae88c8 100644 --- a/src/utils/webSocket.js +++ b/src/utils/webSocket.js @@ -107,7 +107,7 @@ export default class WebSocketService { onMessage = (callback) => { this.socket.onmessage = (event) => { const data = JSON.parse(event.data); - console.log(data, 'onMessage'); + // console.log(data, 'onMessage'); if (data.cmd == "webLogin" && !data.code == 200) return this.webScoketLogin() callback && callback(data); diff --git a/src/views/incidentDispose/index.vue b/src/views/incidentDispose/index.vue index 942592b..eabcbec 100644 --- a/src/views/incidentDispose/index.vue +++ b/src/views/incidentDispose/index.vue @@ -64,9 +64,9 @@ - + @@ -127,7 +127,7 @@ const options = { trigger: "axis", formatter: function (params) { let unit = { 0: "次/分", 1: "%", 2: "℃" }; - var res = format(options.times[params[0].dataIndex]) + "
"; + var res = format(Number(params[0].name)) + "
"; res += params .map(function (param, index) { return param.marker + param.seriesName + "：" + param.value + unit[index] + "
"; @@ -149,8 +149,12 @@ const options = { type: "category", boundaryGap: false, data: [], + axisLabel: { + formatter: function (item) { + return format(Number(item), "HH:mm:ss"); + }, + }, }, - times: [], yAxis: { type: "value", }, @@ -270,8 +274,7 @@ const getData = async () => { if (res.healthData && res.healthData.length) { res.healthData.forEach((item) => { - options.times.push(item.time); - options.xAxis.data.push(format(item.time, "HH:mm:ss")); + options.xAxis.data.push(item.time); options.series[0].data.push(item.hr); options.series[1].data.push(item.bo); options.series[2].data.push(item.temp); diff --git a/src/views/monitoringCenter/deviceHistory.vue b/src/views/monitoringCenter/deviceHistory.vue index 95798cd..e949195 100644 --- a/src/views/monitoringCenter/deviceHistory.vue +++ b/src/views/monitoringCenter/deviceHistory.vue @@ -25,7 +25,7 @@ const options = { trigger: "axis", formatter: function (params) { let unit = { 心率: "次/分", 血氧: "%", 体表温度: "℃" }; - var res = format(options.times[params[0].dataIndex]) + "
"; + var res = format(Number(params[0].name)) + "
"; res += params .map(function (param, index) { return param.marker + param.seriesName + "：" + param.value + unit[param.seriesName] + "
"; @@ -34,10 +34,14 @@ const options = { return res; }, }, - times: [], xAxis: { type: "category", data: [], + axisLabel: { + formatter: function (item) { + return format(Number(item), "HH:mm:ss"); + }, + }, }, yAxis: { type: "value", @@ -84,10 +88,10 @@ const options = { const getOptionsData = (list: { time: string; value: number }[], name: string, color: string) => { options.xAxis.data = []; options.series.data = []; + if (list && list.length) { list.forEach((item) => { - options.times.push(item.time); - options.xAxis.data.push(format(item.time, "HH:mm:ss")); + options.xAxis.data.push(item.time); options.series.data.push(item.value); }); options.series.name = name; diff --git a/src/views/monitoringCenter/deviceInfo.vue b/src/views/monitoringCenter/deviceInfo.vue index fc1fa99..87d9181 100644 --- a/src/views/monitoringCenter/deviceInfo.vue +++ b/src/views/monitoringCenter/deviceInfo.vue @@ -54,6 +54,10 @@ 模式： {{ modeEnum[item.mode] }} +
+ 佩戴者： + {{ item.userNumber || "--" }} +
@@ -210,6 +214,10 @@ watch( color: #787878; font-size: 16px; text-align: right; + width: 80px; + white-space: nowrap; // 强制一行显示 + overflow: hidden; // 超出隐藏 + text-overflow: ellipsis; } } } diff --git a/src/views/monitoringCenter/deviceLocationMap.vue b/src/views/monitoringCenter/deviceLocationMap.vue index aeb5273..86406e6 100644 --- a/src/views/monitoringCenter/deviceLocationMap.vue +++ b/src/views/monitoringCenter/deviceLocationMap.vue @@ -58,26 +58,52 @@ const getLocateRecord = () => { image: ViaMarker, size: [20, 29], }); - + let markers = []; list.forEach((item, index) => { - let marker: any = ""; - if (index == 0) { - marker = newMap.marker({ icon: endIcon, position: [item.lng, item.lat], zIndex: 13 }); - } else if (index == list.length - 1) { - marker = newMap.marker({ icon: startIcon, position: [item.lng, item.lat], zIndex: 13 }); + if (list.length < 50) { + let marker: any = ""; + if (index == 0) { + marker = newMap.marker({ icon: endIcon, position: [item.lng, item.lat], zIndex: 13 }); + } else if (index == list.length - 1) { + marker = newMap.marker({ icon: startIcon, position: [item.lng, item.lat], zIndex: 13 }); + } else { + marker = newMap.marker({ icon: ViaIcon, position: [item.lng, item.lat], zIndex: 12 }); + } + marker.on("click", () => { + locationInfo.value = item; + InfoWin = newMap.infoWindow(); + InfoWin.open(newMap.map, marker.getPosition()); + }); + markers.push(marker); } else { - marker = newMap.marker({ icon: ViaIcon, position: [item.lng, item.lat], zIndex: 12 }); + if (index % 5 == 0) { + let marker: any = ""; + if (index == 0) { + marker = newMap.marker({ icon: endIcon, position: [item.lng, item.lat], zIndex: 13 }); + } else if (index == list.length - 1) { + marker = newMap.marker({ icon: startIcon, position: [item.lng, item.lat], zIndex: 13 }); + } else { + marker = newMap.marker({ icon: ViaIcon, position: [item.lng, item.lat], zIndex: 12 }); + } + marker.on("click", () => { + locationInfo.value = item; + InfoWin = newMap.infoWindow(); + InfoWin.open(newMap.map, marker.getPosition()); + }); + + markers.push(marker); + } } - marker.setMap(newMap.map); - marker.on("click", () => { - locationInfo.value = item; - InfoWin = newMap.infoWindow(); - InfoWin.open(newMap.map, marker.getPosition()); - }); }); + newMap.map.add(markers); } }); }; + +const fn = () => { + // this.cluster.on("click", this.clusterClickEvent); +}; + onMounted(() => { newMap = new MapCustom({ dom: "mapcontainer" }); getLocateRecord(); diff --git a/src/views/monitoringCenter/index.vue b/src/views/monitoringCenter/index.vue index 8e7879f..1d63b79 100644 --- a/src/views/monitoringCenter/index.vue +++ b/src/views/monitoringCenter/index.vue @@ -52,59 +52,6 @@ let funcList = ref([ { title: "当前体表温度", en: "DANGQIANTIBIAOWENDU", icon: temperature, unit: "℃", num: 0, color: "#FF6905" }, ]); -const options = { - tooltip: { - trigger: "axis", - formatter: function (params) { - let unit = { 心率: "次/分", 血氧: "%", 体表温度: "℃" }; - var res = format(options.times[params[0].dataIndex]) + "
"; - res += params - .map(function (param, index) { - return param.marker + param.seriesName + "：" + param.value + unit[param.seriesName] + "
"; - }) - .join(""); - return res; - }, - }, - times: [], - xAxis: { - type: "category", - data: [], - }, - yAxis: { - type: "value", - }, - grid: { - left: "5%", - right: "4%", - bottom: "20%", - }, - dataZoom: [ - { - show: true, // 是否显示 - start: 0, // 开始位置，百分比 - end: 10, // 结束位置，百分比 - bottom: "10px", - height: 25, - }, - { - type: "inside", - start: 0, - end: 100, - }, - ], - series: { - name: "", - data: [], - type: "line", - showSymbol: false, - itemStyle: { - color: "#ff4567", // 设置线条颜色 - }, - smooth: true, - }, -}; - const devicePaging = reactive({ page: 1, size: 10, @@ -135,7 +82,6 @@ const getHealthLatestData = () => { funcList.value[0].num = res.hr; funcList.value[1].num = res.bo; funcList.value[2].num = res.temp; - handelRadio(devHisRef.value.radio); }); }; diff --git a/src/views/statisticalCenter/index.vue b/src/views/statisticalCenter/index.vue index 3a9ca4d..affff4b 100644 --- a/src/views/statisticalCenter/index.vue +++ b/src/views/statisticalCenter/index.vue @@ -79,6 +79,11 @@ const option = ref({ type: "category", boundaryGap: false, data: [], + axisLabel: { + formatter: function (item) { + return format(item, "MM-DD"); + }, + }, }, yAxis: { type: "value", @@ -169,34 +174,36 @@ const getStatisticsUseCount = () => { }; const getStatisticsContent = (req) => { statisticsContent(req).then((res) => { - option.value.xAxis.data = res?.times; - option.value.series = [ - { - stack: "Total", - name: "SOS预警数组", - data: res?.sosArr, - type: "line", - }, - { - stack: "Total", - name: "围栏预警数组", - data: res?.railArr, - type: "line", - }, - { - stack: "Total", - name: "破坏预警数组", - data: res?.destroyArr, - type: "line", - }, - { - stack: "Total", - name: "生理预警数组", - data: res?.healthArr, - type: "line", - }, - ]; - myChart.setOption(option.value); + if (res.times && res.times.length) { + option.value.xAxis.data = res.times; + option.value.series = [ + { + stack: "Total", + name: "SOS预警数组", + data: res?.sosArr, + type: "line", + }, + { + stack: "Total", + name: "围栏预警数组", + data: res?.railArr, + type: "line", + }, + { + stack: "Total", + name: "破坏预警数组", + data: res?.destroyArr, + type: "line", + }, + { + stack: "Total", + name: "生理预警数组", + data: res?.healthArr, + type: "line", + }, + ]; + myChart.setOption(option.value); + } }); }; const getStatisticsCount = () => { diff --git a/src/views/synthesizeManage/deviceInfo/index.vue b/src/views/synthesizeManage/deviceInfo/index.vue index c93679a..37ab91c 100644 --- a/src/views/synthesizeManage/deviceInfo/index.vue +++ b/src/views/synthesizeManage/deviceInfo/index.vue @@ -7,18 +7,18 @@
手铐序号：{{ query.id }}
-
绑定管理员：{{ query.name }}
+
绑定管理员：{{ query.adminName }}
设备状态：{{ statusEnum[query.status as string] }}
IMEI号：{{ query.deviceId }}
-
绑定管理者账号：{{ query.username }}
+
绑定管理者账号：{{ query.adminUsername }}
当前电量：{{ query.battery }}%
首次绑定时间：{{ query.createTime }}
隶属组织：{{ query.orgName }}
-
联系电话：{{ query.phone }}
+
联系电话：{{ query.adminPhone }}
固件版本：{{ query.deviceVersion }}
@@ -33,6 +33,9 @@ + @@ -95,6 +98,7 @@ let record = ref([ { prop: "userNumber", label: "佩戴者" }, { prop: "createTime", label: "开始使用时间" }, { prop: "updateTime", label: "结束使用时间" }, + { prop: "operator", label: "操作" }, ]); // 表格相关 diff --git a/src/views/synthesizeManage/deviceManage/index.vue b/src/views/synthesizeManage/deviceManage/index.vue index a6e50fe..343c9bb 100644 --- a/src/views/synthesizeManage/deviceManage/index.vue +++ b/src/views/synthesizeManage/deviceManage/index.vue @@ -93,7 +93,7 @@ const editOp = [ // 查询相关 const query = reactive({}); const searchOpt = ref([ - { type: "input", label: "手铐SN：", prop: "deviceId" }, + { type: "input", label: "IMEI：", prop: "deviceId" }, { type: "input", label: "警察名称：", prop: "name" }, { type: "select", diff --git a/src/views/synthesizeManage/setting/index.vue b/src/views/synthesizeManage/setting/index.vue index d819b58..414c2ca 100644 --- a/src/views/synthesizeManage/setting/index.vue +++ b/src/views/synthesizeManage/setting/index.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/synthesizeManage/userManage/addUser.vue b/src/views/synthesizeManage/userManage/addUser.vue index 0461553..459d563 100644 --- a/src/views/synthesizeManage/userManage/addUser.vue +++ b/src/views/synthesizeManage/userManage/addUser.vue @@ -9,6 +9,9 @@ + + + @@ -45,8 +48,8 @@ const { orgAllData, formData, api } = defineProps({ dfault: () => {}, }, formData: { - type: Object, - required: true, + type: Object as PropType, + default: () => {}, }, api: { type: Function, @@ -54,20 +57,20 @@ const { orgAllData, formData, api } = defineProps({ }); const emit = defineEmits(["close"]); -const ruleForm = reactive( +const ruleForm = reactive( formData ? { ...formData } : { name: "", phone: "", username: "", + password: "111111", roleId: "", orgId: "", status: 1, } ); -onMounted(() => {}); const rules = reactive>({ name: [{ required: true, message: "请输入用户名称", trigger: "blur" }], phone: [ diff --git a/src/views/synthesizeManage/userManage/resetPwd.vue b/src/views/synthesizeManage/userManage/resetPwd.vue index 5f34c9a..7f727ce 100644 --- a/src/views/synthesizeManage/userManage/resetPwd.vue +++ b/src/views/synthesizeManage/userManage/resetPwd.vue @@ -1,7 +1,7 @@