diff --git a/ruoyi-ui/src/api/perception/meteorologyCheck.js b/ruoyi-ui/src/api/perception/meteorologyCheck.js index 59101ae2..6613d948 100644 --- a/ruoyi-ui/src/api/perception/meteorologyCheck.js +++ b/ruoyi-ui/src/api/perception/meteorologyCheck.js @@ -63,3 +63,19 @@ export function getListVisibility() { method: "get", }); } + +// 路网交通状况 +export function getTrafficConditions() { + return request({ + url: "/business/weatherMonitoring/getTrafficConditions", + method: "get", + }); +} + +// 获取县城经纬度 +export function getRegionList() { + return request({ + url: "/business/region/list", + method: "get", + }); +} diff --git a/ruoyi-ui/src/api/service/PublishingChannelManagement.js b/ruoyi-ui/src/api/service/PublishingChannelManagement.js new file mode 100644 index 00000000..ee15d18e --- /dev/null +++ b/ruoyi-ui/src/api/service/PublishingChannelManagement.js @@ -0,0 +1,61 @@ +import request from "@/utils/request"; + +// 发布渠道列表 +export function getChannelsList(pageNum, pageSize, data) { + return request({ + url: `/business/channels/list?pageNum=${pageNum}&pageSize=${pageSize}`, + method: "post", + data, + }); +} + +// 导出发布渠道列表 +export function getChannelsExport() { + return request({ + url: "/business/channels/export", + method: "post", + }); +} + +// 获取发布渠道详情 +export function getChannels(id) { + return request({ + url: "/business/channels/" + id, + method: "get", + }); +} + +// 新增发布渠道 +export function addChannels(data) { + return request({ + url: "/business/channels", + method: "post", + data, + }); +} + +// 修改发布渠道 +export function editChannels(data) { + return request({ + url: "/business/channels", + method: "put", + data, + }); +} + +// 删除发布渠道 +export function delChannels(id) { + return request({ + url: "/business/channels/" + id, + method: "delete", + }); +} + +// 发布渠道修改状态 +export function updateEnabledChannels(data) { + return request({ + url: "business/channels/updateEnabled", + method: "post", + data, + }); +} diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js index 132a42d4..b8f03c60 100644 --- a/ruoyi-ui/src/router/routerCreater.js +++ b/ruoyi-ui/src/router/routerCreater.js @@ -44,7 +44,7 @@ function processNode(node) { if (!item.component) { temp.component = compX; } else { - console.log(item.component); + // console.log(item.component); temp.component = (resolve) => require(["@/views/JiHeExpressway/pages/" + item.component], resolve); //views/visualization/pages/${item.component} } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue index 1ba9e629..6dc49afb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue @@ -83,7 +83,6 @@ export default { } if (data[this.rangeIndex]) { this.urls = data[this.rangeIndex] - console.log(data[this.rangeIndex][0], this.rangeIndex, 'xxxx'); const firstItem = data[this.rangeIndex]?.[0] || {}; this.cameraId = firstItem['iotDeviceId']; this.dialogData = { ...firstItem, parseOtherConfig: firstItem.otherConfig && JSON.parse(firstItem.otherConfig) } diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg new file mode 100644 index 00000000..4e74f11e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg @@ -0,0 +1,25 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/100.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/100.svg new file mode 100644 index 00000000..7e101469 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/100.svg @@ -0,0 +1,71 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/101.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/101.svg new file mode 100644 index 00000000..b4f76297 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/101.svg @@ -0,0 +1,90 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/104.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/104.svg new file mode 100644 index 00000000..f47acb6f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/104.svg @@ -0,0 +1,28 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/302.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/302.svg new file mode 100644 index 00000000..240913cf --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/302.svg @@ -0,0 +1,38 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/304.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/304.svg new file mode 100644 index 00000000..89eb9cfa --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/304.svg @@ -0,0 +1,64 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/305.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/305.svg new file mode 100644 index 00000000..976e7c2b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/305.svg @@ -0,0 +1,31 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/306.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/306.svg new file mode 100644 index 00000000..26f72add --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/306.svg @@ -0,0 +1,39 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/307.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/307.svg new file mode 100644 index 00000000..a3c7aac6 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/307.svg @@ -0,0 +1,49 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/310.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/310.svg new file mode 100644 index 00000000..84fd91c1 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/310.svg @@ -0,0 +1,45 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/350.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/350.svg new file mode 100644 index 00000000..e828cded --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/350.svg @@ -0,0 +1,110 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/400.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/400.svg new file mode 100644 index 00000000..d460d1cd --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/400.svg @@ -0,0 +1,28 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/401.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/401.svg new file mode 100644 index 00000000..7de03197 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/401.svg @@ -0,0 +1,35 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/402.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/402.svg new file mode 100644 index 00000000..81af6aeb --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/402.svg @@ -0,0 +1,40 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/404.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/404.svg new file mode 100644 index 00000000..b3b8afd7 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/404.svg @@ -0,0 +1,38 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/407.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/407.svg new file mode 100644 index 00000000..fe700255 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/407.svg @@ -0,0 +1,104 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/500.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/500.svg new file mode 100644 index 00000000..9d1f8a5f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/500.svg @@ -0,0 +1,26 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/501.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/501.svg new file mode 100644 index 00000000..4c3b6b2c --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/501.svg @@ -0,0 +1,61 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/502.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/502.svg new file mode 100644 index 00000000..4cdf73ee --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/502.svg @@ -0,0 +1,41 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/503.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/503.svg new file mode 100644 index 00000000..c4ecc598 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/503.svg @@ -0,0 +1,61 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/504.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/504.svg new file mode 100644 index 00000000..65607555 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/504.svg @@ -0,0 +1,61 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/507.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/507.svg new file mode 100644 index 00000000..be0825ef --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/507.svg @@ -0,0 +1,48 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/508.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/508.svg new file mode 100644 index 00000000..ec095a41 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/508.svg @@ -0,0 +1,9 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/509.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/509.svg new file mode 100644 index 00000000..45337c0d --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/509.svg @@ -0,0 +1,35 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/514.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/514.svg new file mode 100644 index 00000000..df9b640f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/514.svg @@ -0,0 +1,38 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/900.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/900.svg new file mode 100644 index 00000000..fdbb76eb --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/900.svg @@ -0,0 +1,16 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814257.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814257.svg new file mode 100644 index 00000000..7828ad8f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814257.svg @@ -0,0 +1,16 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814258.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814258.svg new file mode 100644 index 00000000..b1df0144 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814258.svg @@ -0,0 +1,11 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814266.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814266.svg new file mode 100644 index 00000000..f141b8f8 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814266.svg @@ -0,0 +1,21 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814269.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814269.svg new file mode 100644 index 00000000..5a66ab93 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814269.svg @@ -0,0 +1,16 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814270.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814270.svg new file mode 100644 index 00000000..a3711114 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814270.svg @@ -0,0 +1,16 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814271.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814271.svg new file mode 100644 index 00000000..05c28e66 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814271.svg @@ -0,0 +1,21 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814272.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814272.svg new file mode 100644 index 00000000..0799325e --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814272.svg @@ -0,0 +1,33 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814274.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814274.svg new file mode 100644 index 00000000..607373d1 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814274.svg @@ -0,0 +1,53 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814275.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814275.svg new file mode 100644 index 00000000..f81032ac --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814275.svg @@ -0,0 +1,35 @@ + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue new file mode 100644 index 00000000..91566e7f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue @@ -0,0 +1,184 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/chart.js new file mode 100644 index 00000000..8d786f83 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/chart.js @@ -0,0 +1,114 @@ +import * as echarts from "echarts"; + +export const lineChartOption = { + color: ["#2AD9FD"], + xAxis: { + name: "时", + type: "category", + // boundaryGap: ["15%", "15%"], + nameTextStyle: { + color: "#2AD9FD", + align: "right", + fontSize: 15, + padding: [0, -15, 0, 0], + }, + boundaryGap: false, + data: ['00:00','02:00','04:00','06:00'], + axisTick: { + show: false, + }, + axisLabel: { + color: "#fff", + fontSize: 12, + }, + axisLine: { + lineStyle: { + color: "#668598", + }, + }, + }, + yAxis: { + name: "辆", + type: "value", + nameTextStyle: { + color: "#2AD9FD", + // align: "right", + fontSize: 15, + // padding: [0, -15, 0, 0], + }, + // nameGap: 24, + splitLine: { + lineStyle: { + type: [6, 9], + color: "rgba(255,255,255, .3)", + // dashOffset: [10, 10], + // cap: 21, + // width: 2 + }, + }, + axisLabel: { + color: "#fff", + fontSize: 12, + formatter: "{value}", + }, + }, + grid: { + left: 33, + top: 33, + bottom: 24, + right: 36, + }, + tooltip: { + trigger: "axis", + backgroundColor: "rgba(0,0,0,0.36)", + borderWidth: 0, + textStyle: { + color: "#fff", + }, + formatter: "{b}:{c}", + // formatter: function([axisData]) { + // console.log(axisData) + // let str = axisData.name + ' ' + axisData.data + '辆'; + // // params.forEach(item => { + // // if (item.seriesName === '供温' || item.seriesName === '回温') { + // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' ℃' + ''; + // // } else if (item.seriesName === '压力值(Mpa)') { + // // // 柱状图渐变时设置marker + // // item.marker = ''; + // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' m'; + // // } + // // }); + // return str; + // } + }, + legend: { + textStyle: { + color: '#2AD9FD' + } + }, + series: [ + { + data: [1,2,3,4], + type: "line", + showSymbol: false, + smooth: true, + name: '温度(℃)', + lineStyle: { + color: "#2AD9FD", + }, + areaStyle: { + opacity: 0.8, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "rgb(90, 227, 255, .9)", + }, + { + offset: 1, + color: "rgba(42,217,253,0)", + }, + ]), + }, + }, + ], +}; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue new file mode 100644 index 00000000..57ad41ac --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue @@ -0,0 +1,218 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue index 3241e95e..99d76608 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue @@ -63,12 +63,15 @@ export default { }).then(result => { if (result.code != 200) return Message.error("操作失败"); result.data.forEach(item => { - devs.push({ - label: item.propertyName, - key: item.property, - gridColumn: 3, - }); - this.devicesData[item.property] = item.formatValue; + if (item.propertyName) { + devs.push({ + label: item.propertyName, + key: item.property, + gridColumn: 3, + }); + this.devicesData[item.property] = item.formatValue; + } + }); this.devicesList = devs; }) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue index ba20ca4d..a9008e70 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue @@ -156,11 +156,18 @@ div.switcher { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue index 427e1797..127a77b2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue @@ -53,14 +53,16 @@ 下雨类型: {{ data.rainfall == 0 - ? "无降" + ? "无降雨" : data.rainfall == 1 ? "雨" : data.rainfall == 2 ? "雪" : data.rainfall == 3 ? "毛毛雨" - : "雨夹雪" + : data.rainfall == 4 + ? "雨夹雪" + : "-" }}