diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index acc3b11b..d3777fc1 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -3,7 +3,7 @@ .fl-around{display: flex; justify-content: space-between;} .fl-1{ flex: 1;} .theme-jihe { - $lightBlue: #3de8ff; + $lightBlue: #a7eef8; $textColor: #f4f4f4; $inputHeight: 26px; color: $textColor; @@ -266,6 +266,17 @@ } } + .el-button{ + border-radius: 100px; + } + .el-button--info{ + background-color: #0E708B; border: none; + } + + .el-button--primary{ + background: #00B3CC; + } + .el-card{ background-color:#064258; border: 1px solid #006a99; diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/1.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/1.svg new file mode 100644 index 00000000..a1979bb8 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/1.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/10.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/10.svg new file mode 100644 index 00000000..a0cefbcd --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/10.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/11.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/11.svg new file mode 100644 index 00000000..1c56a53c --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/11.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/2.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/2.svg new file mode 100644 index 00000000..e9678e3e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/2.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/3.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/3.svg new file mode 100644 index 00000000..6a75eadf --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/3.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/4.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/4.svg new file mode 100644 index 00000000..c67a8df1 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/4.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/5.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/5.svg new file mode 100644 index 00000000..8431dd64 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/5.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/6.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/6.svg new file mode 100644 index 00000000..4db5043b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/6.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/7.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/7.svg new file mode 100644 index 00000000..13e8a5b3 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/7.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/8.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/8.svg new file mode 100644 index 00000000..8e78a36f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/8.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/9.svg b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/9.svg new file mode 100644 index 00000000..d845704e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/ListItem/9.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..874c4087 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机_active.svg new file mode 100644 index 00000000..370cad14 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机_active.svg @@ -0,0 +1,3 @@ + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机_fault.svg new file mode 100644 index 00000000..066c2569 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/远端机_fault.svg @@ -0,0 +1,3 @@ + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue new file mode 100644 index 00000000..200357eb --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue @@ -0,0 +1,55 @@ + + + + + + + + + + + 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 new file mode 100644 index 00000000..dc8d4b51 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParams.vue @@ -0,0 +1,199 @@ + + + 暂无设备参数 + + + {{ data.text }} + handleSwitcherChange(value, data)" /> + {{ data.state ? '开' : + '关' }} + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParamsMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParamsMulti.vue new file mode 100644 index 00000000..64b0dda6 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceParamsMulti.vue @@ -0,0 +1,166 @@ + + + 暂无设备参数 + + + {{ data.text }} + handleSwitcherChange(value, data)" /> + {{ data.state ? '开' : + '关' }} + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue new file mode 100644 index 00000000..3053c351 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + 设备操作 + + + 设备离线 + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue index 29feb81b..556bcb0f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue @@ -12,19 +12,12 @@ - + - + 设备操作 @@ -32,10 +25,7 @@ - + @@ -122,12 +112,16 @@ export default { }, async created() { // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883'; - + if(this.dialogData){ + this.data = { + ...this.dialogData, + } + } let deviceInfo = await this.getDeviceInfo(); this.data = { - ...this.dialogData, roadName: null, - deviceStateLiteral: deviceInfo.data.formatValue.deviceState, + deviceStateLiteral: deviceInfo?.data.formatValue.deviceState, + ...this.data }; // console.log( @@ -148,9 +142,8 @@ export default { methods: { async getDeviceInfo() { return request({ - url: `/business/device/properties/latest/${ - this.dialogData.iotDeviceId || "10.0.36.143-1883" - }/3`, + url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || "10.0.36.143-1883" + }/3`, method: "get", params: {}, }); @@ -200,7 +193,7 @@ div.switcher { align-items: center; justify-content: end; - > div { + >div { font-size: 16px; padding: 6px 12px; } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue index 5844f6ff..8c296b5a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue @@ -161,7 +161,7 @@ export default { // this.$emit('traffic-relieve', this.data); // }); request({ - url: `dc/system/event/${this.data.eventType}/${this.dialogData.id}`, + url: `dc/system/event/${this.dialogData.id}`, method: "delete", }).then((result) => { if (result.code == 200) Message.success("成功!"); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue index 4e55059c..f7b33396 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue @@ -110,7 +110,8 @@ export default { this.formList[2].options.options = options; }, immediate: true, - deep: true + deep: true, + isButtonClick: false } }, methods: { @@ -126,6 +127,13 @@ export default { this.$parent.$refs.RoadAndEventsRef?.setFilterDataNoAction?.(data); }, async handleResetForm() { + if(this.isButtonClick){return} + + this.isButtonClick = true; + setTimeout(() => { + this.isButtonClick = false; + }, 500); + this.$refs.FormConfigRef?.reset(); this.activeIcon = "filter"; this.filterEnd(initSearch); 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 df83a4a8..7b231d2a 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 @@ -1,13 +1,18 @@ - - - + popper-class="global-input-search-popover" @hide="onHide()"> + + + + + + + + - + {{ }} @@ -31,7 +36,7 @@ 暂无数据 - + @@ -39,8 +44,8 @@ - handleSwitcherChange(value, item) "> + handleSwitcherChange(value, item) "> goStrategy(item)"> 查看 @@ -322,22 +327,6 @@ export default { return true; }, }, - // { - // label: "控制操作:", - // key: "controlOp", - // type: "select", - // default: null, - // options: { - // clearable: true, - // options: [{ - // label: "在线", - // value: "1" - // }, { - // label: "离线", - // value: "0" - // }] - // }, - // }, ], DeviceTopics, componentMap, @@ -353,6 +342,7 @@ export default { label: "描述", }, ], + data2:[], //批量管控 dataRecord:{ operType: "0", operTime:[] @@ -417,6 +407,10 @@ export default { changeHandle(this.data, this.formList); }, methods: { + onHide(){ + this.data['deviceType']=deviceTypeDefault; + changeHandle(this.data, this.formList); + }, submitClick() { this.$refs.ControlComponent?.handleSubmit(); }, @@ -429,6 +423,9 @@ export default { } else if(this.tabAction === '3'){ this.dataRecord.operTime = [moment().startOf('month').format('YYYY-MM-DD 00:00:00'),moment().endOf('month').format('YYYY-MM-DD 23:59:59'),] this.bindRecord(); + } else if(this.tabAction === '1'){ + // this.data['deviceType']=deviceTypeDefault; + // changeHandle(this.data, this.formList); } }, handleClick(type) { @@ -466,7 +463,7 @@ export default { .then((result) => { if (result.code != 200) return; this.tableTotal = result.total; - this.data = result.rows; + this.data2 = result.rows; }) .finally(() => { }); @@ -487,7 +484,6 @@ export default { e.operTime = moment(e.operTime).format('YYYY-MM-DD HH:mm:ss') e.operType = _.find(this.Enum_ControlType,{key:e.operType}).label }); - console.log(result.rows) this.tableData = result.rows; this.tableTotal = result.total; }) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index 36ee6074..a7291719 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -47,6 +47,7 @@ import TrafficIncidents from "./../Dialogs/TrafficIncidents/index.vue"; import PerceiveEvent from "./../Dialogs/PerceiveEvent/index.vue"; import RoadNetworkFacilities from "./../Dialogs/RoadNetworkFacilities/index.vue"; import SmartDevice from "./../Dialogs/SmartDevice/index.vue"; +import RemoteMachine from "./../Dialogs/RemoteMachine/index.vue"; import SolarEnergy from "./../Dialogs/SolarEnergy/index.vue"; import Intermodulation from "./../Dialogs/Intermodulation/index.vue"; import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue"; @@ -71,7 +72,8 @@ export default { Intermodulation, GuardrailCollision, FatigueWakesUp, - RoadNetworkFacilities + RoadNetworkFacilities, + RemoteMachine }, data() { return { @@ -288,10 +290,10 @@ export default { gridColumnStart: (index % columns) + 1, } }, - async handleTrafficRelieve(e){ + async handleTrafficRelieve(e) { await this.handleDeviceImmediate(e._itemData) setTimeout(async () => { - await this.handleDeviceImmediate(e._itemData) + await this.handleDeviceImmediate(e._itemData) }, 500); this.dialogConfig = { // 0 有 可控(球机)ControlCamera | 1 ⽆ 不可控(枪机)Camera 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 f95c8fac..a2d3858d 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 @@ -79,6 +79,10 @@ export const DeviceForMap = { deviceType: "15", dialog: "SolarEnergy", }, + 远端机: { + deviceType: "16", + dialog: "RemoteMachine", + }, }; export const lngLatMap = {}; //优化 缩略图 + 地图 复用lngLatmap 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 161fd413..4991394e 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 @@ -1,5 +1,5 @@ - + @@ -13,10 +13,11 @@ --> - + 取消 - 提交 + 提交 + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index a30ca6bd..ed9b1bec 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -11,7 +11,7 @@ { if (result.code == 200) Message.success("成功!"); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue index 3a6d21ed..40088810 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue @@ -1,18 +1,18 @@ - + {{ data.descTitle || '-' }} {{ status[data.state].text }} - + {{ data.time || '-' }} - + {{ data.desc }} @@ -65,10 +65,10 @@ export default { data() { return { shareWithData: [ - 'message', 'weChat', - 'weibo', - 'website' + 'message', + 'website', + 'weibo' ],//shareWith.keys().map(item => item.match(/[^./]+/)[0]), status: { 0: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue index b54853ac..fdba8e0a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/ListItem.vue @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue index 712af6fd..3bad094a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue @@ -3,11 +3,12 @@