diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index a955b768..8a6777af 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -1,9 +1,14 @@ +.fl-col{ display: flex; flex-direction: column;} +.fl-1{ flex: 1;} .theme-jihe { $lightBlue: #3de8ff; $textColor: #f4f4f4; $inputHeight: 26px; color: $textColor; + .is-light{ + color: #666; + } .text-center{ text-align: center;} .tc-lb{ color: $lightBlue;} .el-tabs__item { diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue index 07ace08c..fa1d26e4 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Adaptation.vue @@ -53,6 +53,7 @@ export default { }, watch: { headerHeight() { + this.initScale(); } }, methods: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js index f168c54d..b72344fa 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js +++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js @@ -48,6 +48,12 @@ export default{ }, // 发布信息 ____publishInfo() { + let deviceIdList = []; + if (this.selectedDevice){ + deviceIdList = [this.selectedDevice.iotDeviceId]; + }else{ + deviceIdList = this.checkedDeviceIds; + } this.$confirm('是否确定发布情报板?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -78,7 +84,7 @@ export default{ }) }) - let data = { content: content, deviceIdList: this.checkedDeviceIds } + let data = { content: content, deviceIdList } if (IS_TESTING) { // this.saveLog(content); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue index a00f4674..206d1ee3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue @@ -29,16 +29,15 @@ - 摄相机参数 + -
- +
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 bcfc8867..e01a85cb 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 @@ -2,9 +2,14 @@
- + +
+ + + +
设备筛选
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue index 6ff92d96..2e8bd5c4 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue @@ -3,9 +3,13 @@ - +
+ + + +
图标含义
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue index 6940b663..6ef928bf 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue @@ -1,8 +1,10 @@ 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 25b5bb13..bc08da6f 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 @@ -88,7 +88,9 @@ let debounceNoneLngLatMessage = debounce(() => { function resolveDataOptions(data, config, component, isDefault) { let lnglat = - data.longitude && data.latitude ? [data.longitude, data.latitude] : null; + data.longitude && data.latitude + ? [parseFloat(data.longitude), parseFloat(data.latitude)] + : null; if (!lnglat && !isDefault) debounceNoneLngLatMessage(); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index 77a6cb8a..d735a855 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -225,12 +225,18 @@ export default { this.isShowAddNew = true; }, onExport() { + let url = ''; + if (this.activeName == '-1') { + url = '/business/warning/export' + } else { + url = '/dc/system/event/export'; + } let loadingInstance = Loading.service({ fullscreen: true, background: "#00000052", text: "文件正在下载...", }); - request.post('/dc/system/event/export', {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' }) + request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' }) .then((res) => { console.log(res); const url = window.URL.createObjectURL(new Blob([res])); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue index be88d67d..5b557a6d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue @@ -84,7 +84,7 @@ - + @@ -302,8 +302,8 @@ export default { title: key, total: val.sum, pctOnl: val.sucessRate, - pctLose: val.failRate, - pctOffl: val.lostRate, + pctOffl: val.failRate, + pctLose: val.lostRate, sumUseState: val.sumUseState }; if (key.includes("全部设备")) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue index 61dd3fc2..ca1719b6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue @@ -1,7 +1,7 @@