diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 5fc8b9cc..ce9419fd 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -62,7 +62,7 @@ "fuse.js": "6.4.3", "gis-map-admin": "^0.9.2", "gis-map-tunnel": "^0.1.3", - "gis-map-universal": "^0.3.4", + "gis-map-universal": "^0.3.5", "highlight.js": "9.18.5", "html-docx-js": "^0.3.1", "imports-loader": "^0.8.0", diff --git a/ruoyi-ui/src/utils/auth.js b/ruoyi-ui/src/utils/auth.js index 6258738c..234a0a7a 100644 --- a/ruoyi-ui/src/utils/auth.js +++ b/ruoyi-ui/src/utils/auth.js @@ -1,6 +1,6 @@ import Cookies from 'js-cookie' -const TokenKey = 'DC-Pro-Token' +const TokenKey = 'DC-Token' export function getToken() { return Cookies.get(TokenKey) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue index 302eb23c..561598c3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue @@ -23,6 +23,7 @@ v-model="value" :placeholder="placeholder" clearable + @clear="handleSearch" @keyup.enter.native="handleSearch" > @@ -162,13 +163,12 @@ export default { this.value = ""; } console.log(this.$refs.FormConfigRef?.formData , "重置前"); - // this.visible = true; + this.$refs.FormConfigRef?.reset(); this.$refs.FormConfigRef?.$refs.ElFormRef.resetFields(); - // this.$refs.PopoverRef.doClose(); const param = cloneDeep(this.$refs.FormConfigRef?.formData); - if (this.types === "input") { + if (param && this.types === "input") { param[this.params] = null } console.log(this.$refs.FormConfigRef?.formData , "重置后"); diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue index 7e33e528..542b63c8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue @@ -42,7 +42,7 @@ - + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue index 77beff39..3a31f2f3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue @@ -71,6 +71,7 @@ diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_active.svg new file mode 100644 index 00000000..51294d66 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_active.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_fault.svg new file mode 100644 index 00000000..10240939 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_fault.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_active.svg new file mode 100644 index 00000000..380afc50 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_active.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_fault.svg new file mode 100644 index 00000000..ce00f1ac --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_fault.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_active.svg new file mode 100644 index 00000000..54e47be9 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_active.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_fault.svg new file mode 100644 index 00000000..c9fe4cb7 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_fault.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_active.svg new file mode 100644 index 00000000..3fc577d8 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_active.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_fault.svg new file mode 100644 index 00000000..9ae22030 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_fault.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_active.svg new file mode 100644 index 00000000..84d525b3 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_active.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_fault.svg new file mode 100644 index 00000000..ab128e00 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_fault.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png b/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png index 0bfac37a..f30ee615 100644 Binary files a/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png and b/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png differ diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/180全景摄像机.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/180全景摄像机.svg new file mode 100644 index 00000000..5ef5d799 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/180全景摄像机.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/360全景摄像机.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/360全景摄像机.svg new file mode 100644 index 00000000..3f984927 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/360全景摄像机.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/桥下球机.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/桥下球机.svg new file mode 100644 index 00000000..7b98c2c3 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/桥下球机.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/站前悬臂式可变信息标志.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/站前悬臂式可变信息标志.svg new file mode 100644 index 00000000..88bb067c --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/站前悬臂式可变信息标志.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/雨棚可变信息标志.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/雨棚可变信息标志.svg new file mode 100644 index 00000000..78674bac --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/雨棚可变信息标志.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue index 5d67f79a..20680f10 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue @@ -1,11 +1,11 @@ @@ -21,8 +21,8 @@ export default { data() { return { mapBoxHeight: '100vh', - mapZoom: '7.5', // 默认值'7.5' String类型 - mapCenter: [116.329514, 35.505288], //默认值[118.75, 36.46] Array类型 + mapZoom: '15', // 默认值'7.5' String类型 + mapCenter: [110.329514, 35.505288], //默认值[118.75, 36.46] Array类型 }; }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue index 3886a99c..b43edbd5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue @@ -100,7 +100,7 @@ export default { { label: '温度', key: `temperature`, - text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} °C` : '-', + text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} ` : '-', gridColumn: 2 }, { @@ -112,7 +112,7 @@ export default { { label: '湿度', key: `humidity`, - text: deviceInfo.formatValue['humidity'] ? `${deviceInfo.formatValue['humidity']} %` : '-', + text: deviceInfo.formatValue['humidity'] ? `${deviceInfo.formatValue['humidity']} ` : '-', gridColumn: 2 }, { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue index 901c4791..218c2a0e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue @@ -575,7 +575,7 @@ export default { let pop = document.getElementsByClassName('el-popover') for(let i of pop){ if(i.getAttribute('aria-hidden') === 'false'){ - i.style['z-index'] = '2001' + i.style['z-index'] = '1000' } } }, 100); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js index f5925b49..7a6bc60e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js @@ -13,8 +13,19 @@ import Vue from "vue"; import { markerClusterIns, getContent, getLatAndLng } from "./map"; const cameraIcon = { // 球机 - "00": require("@screen/images/deviceType/ballb_active.svg"), - "01": require("@screen/images/deviceType/ballb_fault.svg"), + "b0": require("@screen/images/deviceType/ballb_active.svg"), + "b1": require("@screen/images/deviceType/ballb_fault.svg"), + "c0": require("@screen/images/deviceType/ballc_active.svg"), + "c1": require("@screen/images/deviceType/ballc_fault.svg"), + "d0": require("@screen/images/deviceType/balld_active.svg"), + "d1": require("@screen/images/deviceType/balld_fault.svg"), +}; +const boardIcon = { + // 雨棚 + "b0": require("@screen/images/deviceType/boardb_active.svg"), + "b1": require("@screen/images/deviceType/boardb_fault.svg"), + "c0": require("@screen/images/deviceType/boardc_active.svg"), + "c1": require("@screen/images/deviceType/boardc_fault.svg"), }; export const cacheRemoveFunc = {}; @@ -29,8 +40,17 @@ export const DeviceForMap = { * 0 球机 可控 * 1 枪机 不可控 */ - const type = JSON.parse(item.otherConfig || "{}")?.ptzCtrl || 1; - + let type = 1; + const ctype = item.childType; + if(ctype && ctype === '1-2'){ + type = 'b' + } else if(ctype && ctype === '1-4'){ + type = 'c' + } else if(ctype && ctype === '1-5'){ + type = 'd' + } else if(ctype && ctype === '1-3'){ + type = 'e' + } return cameraIcon[`${type}${+!bool}`]; }, }, @@ -42,6 +62,19 @@ export const DeviceForMap = { 情报板: { deviceType: "2", dialog: "InfoBoard", + options: { + iconCallback(bool, item) { + let type = 1; + const ctype = item.childType; + // const ctype = JSON.parse(item.otherConfig || "{}")?.childType; + if(ctype && ctype === '2-3'){ + type = 'b' + } else if(ctype && (ctype === '2-4'||ctype === '2-2')){ + type = 'c' + } + return boardIcon[`${type}${+!bool}`]; + }, + }, }, 语音广播: { deviceType: "5", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue index 3cb90145..0a3ed0d2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue @@ -2,7 +2,6 @@ @@ -243,6 +242,7 @@ export default { }); }, onAddTaskGroup() { + this.editingTime = '0:0'; this.isShowTimeEdit = true; }, onModifyTime(taskG) { @@ -282,23 +282,21 @@ export default { }, onSubmitTime(time) { this.isShowTimeEdit = false; + let aryTime = time.split(':') + if(aryTime.length >= 2){ + if(aryTime[0].length === 1){ + aryTime[0] = '0'+aryTime[0] + } + if(aryTime[1].length === 1){ + aryTime[1] = '0'+aryTime[1] + } + } + let _time = aryTime.join(':'); if (Object.keys(this.selectedTaskGroup).length > 0) { - let aryTime = time.split(':') - if(aryTime.length === 3){ - if(aryTime[0].length === 1){ - aryTime[0] = '0'+aryTime[0] - } - if(aryTime[1].length === 1){ - aryTime[1] = '0'+aryTime[1] - } - if(aryTime[2].length === 1){ - aryTime[2] = '0'+aryTime[1] - } - } - this.selectedTaskGroup.time = aryTime.join(':'); + this.selectedTaskGroup.time = _time; this.selectedTaskGroup = {}; } else { - this.taskGroupsEditing.push({ time, tasks: [] }); + this.taskGroupsEditing.push({ time: _time, tasks: [] }); } let detailedConfiguration = []; @@ -360,13 +358,14 @@ export default { if (result.code != 200) return; this.taskGroupsEditing.forEach((item) => { let aryTime = item.time.split(':') - if(aryTime.length === 3){ + + if(aryTime.length >= 2){ + if(aryTime[0].length === 1){ + aryTime[0] = '0'+aryTime[0] + } if(aryTime[1].length === 1){ aryTime[1] = '0'+aryTime[1] } - if(aryTime[2].length === 1){ - aryTime[2] = '0'+aryTime[1] - } } item.time = aryTime.join(':') let arr = _.filter(result.data, (itm) => { @@ -374,7 +373,6 @@ export default { }); this.$set(item, "tasksEdit", arr); // item.tasksEdit = arr; - console.log(this.taskGroupsEditing,333344) }); }); } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue index 32ec9d13..6bc7ddf5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue @@ -1,5 +1,5 @@