From ec7f6b503a137f970db9467bd5469756b8a8f8b4 Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 7 May 2024 10:09:57 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E6=B0=94=E8=B1=A1?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=99=A8=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DeviceControlDialog.vue | 184 +++++++++++++++ .../components/chart.js | 114 +++++++++ .../Dialogs/MeteorologicalDetection/index.vue | 221 ++++++++++++++++++ .../Home/components/RoadAndEvents/index.vue | 4 +- .../RoadAndEvents/utils/buttonEvent.js | 5 +- .../RoadAndEvents/utils/httpList.js | 44 +++- .../src/views/JiHeExpressway/utils/enum.js | 122 +++++++--- 7 files changed, 652 insertions(+), 42 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/chart.js create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue 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..0f93b269 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue @@ -0,0 +1,221 @@ + + + + + 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 a7291719..f30a110b 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 @@ -51,6 +51,7 @@ 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"; +import MeteorologicalDetection from "./../Dialogs/MeteorologicalDetection/index.vue"; import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue"; import { addInGraphHandle, markerClusterIns } from "./utils/map" @@ -73,7 +74,8 @@ export default { GuardrailCollision, FatigueWakesUp, RoadNetworkFacilities, - RemoteMachine + RemoteMachine, + MeteorologicalDetection }, data() { return { 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 a2d3858d..c724281d 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 @@ -70,6 +70,7 @@ export const DeviceForMap = { }, 气象检测器: { deviceType: "3", + dialog: "MeteorologicalDetection", }, 疲劳唤醒: { deviceType: "10", @@ -111,7 +112,7 @@ function resolveDataOptions(data, config, component, isDefault) { name: "", config: { markerClick: (extData, item) => { - const formData = extData?.otherConfig + const formData = (extData?.otherConfig && typeof extData?.otherConfig !== 'string') ? JSON.parse(extData.otherConfig) : null; // formData.pictures = ["https://pic1.zhimg.com/80/v2-c00beaae1f6e3c09a6d77c16c70002fe_1440w.webp?source=1def8aca","https://pic1.zhimg.com/80/v2-c56626621906417a453d262ac11f3385_1440w.webp?source=1def8aca"] @@ -121,7 +122,7 @@ function resolveDataOptions(data, config, component, isDefault) { data: { ...extData, formData, - parseOtherConfig: JSON.parse(extData.otherConfig || "{}"), + parseOtherConfig: JSON.parse((extData.otherConfig && typeof extData.otherConfig !== 'string')|| "{}"), _itemData: item, }, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index d8c81886..e07ab632 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -205,7 +205,7 @@ const DeviceTypeMap = { 14: "光线在线监测", */ export function getDeviceList(deviceType, options) { - console.log(deviceType, options,'------------') + console.log(deviceType, options, "------------"); return new Promise((resolve, reject) => { if (!deviceType) { // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`); @@ -223,13 +223,13 @@ export function getDeviceList(deviceType, options) { let data = { deviceType: deviceType, endStakeMark: newEndStakeMark, - startStakeMark: newStartStakeMark - } - if(options.childType && options.childType.split('-')[0] === deviceType){ - data.childType = options.childType + startStakeMark: newStartStakeMark, + }; + if (options.childType && options.childType.split("-")[0] === deviceType) { + data.childType = options.childType; } - if(options.deviceState && options.deviceState !== ''){ - data['deviceState'] = options.deviceState + if (options.deviceState && options.deviceState !== "") { + data["deviceState"] = options.deviceState; } request( Object.keys(options || {}).length @@ -461,3 +461,33 @@ export function getRoadNetworkFacilitiesList(facilityType, options = {}) { }); }); } + +/** + * 气象检测器 获取气象信息 + * @param {string} deviceName + */ +export function getMeteorologicalDetector(deviceName, options = {}) { + return new Promise((resolve, reject) => { + if (!deviceName) { + Message.error(`气象信息加载失败!`); + return reject(); + } + + request({ + url: `/dc/system/meteorologicalDetector/device/${deviceName}`, + method: "get", + }) + .then(({ code, rows }) => { + if (code != 200) { + reject(); + return Message.error(`气象信息加载失败!`); + } + + resolve(rows[0] || {}); + }) + .catch(() => { + Message.error(`气象信息加载失败!`); + reject(); + }); + }); +} diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index 3c4c97e6..c77e90ab 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -126,7 +126,7 @@ export const RoadNFTopics = { 服务区: 6, 停车区: 7, 清障驻点: 8, - 边坡: 9 + 边坡: 9, }; // 事件类型 eventType @@ -168,21 +168,21 @@ export const InfoWarningSource = { }; export const warningSourceMapping = { - 1: '视频AI', - 2: '雷达识别', - 3: '锥桶', - 4: '护栏碰撞', - 5: '扫码报警', - 6: '非机预警', + 1: "视频AI", + 2: "雷达识别", + 3: "锥桶", + 4: "护栏碰撞", + 5: "扫码报警", + 6: "非机预警", // 7: '气象监测器' -} +}; export const warningStateMapping = { - 1: '上报', - 2: '已完成', - 3: '已终止', - 4: '自动结束' -} + 1: "上报", + 2: "已完成", + 3: "已终止", + 4: "自动结束", +}; // 感知事件主类 warningType export const WarningType = { @@ -288,16 +288,16 @@ export const trafficType = Object.keys(EventTopics).reduce((prev, now) => { //激光疲劳唤醒工作模式 export const awakerWorkModeDic = { - "0": "激光关闭", - "1": "常亮模式", - "2": "间隔100ms闪烁模式", - "3": "间隔200ms闪烁模式", - "4": "间隔500ms闪烁模式", - "5": "2次闪烁模式", - "6": "SOS模式", - "7": "自定义模式1", - "8": "自定义模式2", - "9": "自定义模式3", + 0: "激光关闭", + 1: "常亮模式", + 2: "间隔100ms闪烁模式", + 3: "间隔200ms闪烁模式", + 4: "间隔500ms闪烁模式", + 5: "2次闪烁模式", + 6: "SOS模式", + 7: "自定义模式1", + 8: "自定义模式2", + 9: "自定义模式3", }; // 感知事件主类的子类(上方) warningSubclass @@ -1077,14 +1077,14 @@ export const EventSubclass = { "9-6": "其他", "10-1": "雨", "10-2": "雪", - "10-3":"雾", - "10-4":"大风", - "10-5":"低温寒潮", - "10-6":"路面积雪", - "10-7":"路面结冰", - "10-8":"路面积水", - "10-9":"其他", - "11-1":"其他事件" + "10-3": "雾", + "10-4": "大风", + "10-5": "低温寒潮", + "10-6": "路面积雪", + "10-7": "路面结冰", + "10-8": "路面积水", + "10-9": "其他", + "11-1": "其他事件", }; export const directionOptions = [ { value: "1", label: "菏泽方向" }, @@ -1181,4 +1181,62 @@ export const usageStatus = { 1: { text: "未使用", }, -} \ No newline at end of file +}; +//路面类型 +export const remoteRoadSurfaceStatus = { + "00": { + text: "干燥", + }, + "01": { + text: "潮湿", + }, + "02": { + text: "积水", + }, + "03": { + text: "结冰", + }, + "04": { + text: "积雪", + }, + "05": { + text: "冰水混合物", + }, + "06": { + text: "泥泞", + }, +}; + +//下雨类型 +export const precipitationType = { + 0: { + text: "无降雨", + }, + 1: { + text: "雨", + }, + 2: { + text: "雪", + }, + 3: { + text: "毛毛雨", + }, + 4: { + text: "雨夹雪", + }, +}; +//能见度类型 +export const visibilityType = { + 4: { + text: "良好", + }, + 3: { + text: "阴霾", + }, + 2: { + text: "雾", + }, + 1: { + text: "浓雾", + }, +}; From 8ae839a6683af19412c7c5fb2803141d7b219470 Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 7 May 2024 11:08:20 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=A6=96=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/MeteorologicalDetection/index.vue | 3 --- .../SolarEnergy/components/DeviceParams.vue | 15 +++++++++------ .../Home/components/Dialogs/SolarEnergy/index.vue | 9 ++++++++- 3 files changed, 17 insertions(+), 10 deletions(-) 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 index 0f93b269..57ad41ac 100644 --- 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 @@ -9,9 +9,6 @@ - - - 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 201d64af..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 @@ -132,9 +132,7 @@ export default { }, watch: { data: { - handler(newVal) { - console.log(newVal); - }, + handler(newVal) {}, deep: true, }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue index 96b0203d..82d19d5b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue @@ -135,7 +135,6 @@ export default { methods: { getWarningData() { getMeteorologicalEarlyWarning().then((res) => { - console.log("气象预警", res.data); let data = []; for (let key in res.data) { if (res.data[key].length > 0) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue index 45ec4c02..84ff843b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue @@ -56,7 +56,6 @@ export default { }, getWarningType() { getListVisibility().then((res) => { - console.log("获取预警类型", res.rows); this.tableData = res.rows; }); }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue index 5d6f3276..9809cd94 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue @@ -245,8 +245,6 @@ export default { }); } }); - - console.log("新增", this.formData); }, }, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue index e08d87e2..d3bffcc3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue @@ -80,9 +80,9 @@ export default { // this.$emit("handleDelete", item); }, - initData() { - console.log("初始化数据", this.data); - }, + // initData() { + // console.log("初始化数据", this.data); + // }, handleChangeSwitcher(val) { let data = { id: this.data.id, @@ -91,11 +91,10 @@ export default { updateEnabledChannels(data).then(() => { this.$parent.handleSearch(); }); - console.log(88888, val); }, }, mounted() { - this.initData(); + // this.initData(); }, watch: { data: { From 9e19bfea340074845e0227e863a441b825302155 Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Tue, 7 May 2024 15:35:52 +0800 Subject: [PATCH 7/8] 1 --- .../meteorologyCheck/components/weatherForecast/index.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue index 64a79bce..87398a46 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue @@ -120,12 +120,9 @@ export default { }, handleChange() { getWeatherFacts().then((response) => { - console.log("response", response.data); for (let key in response.data) { - debugger; if (response.data[key].name == this.city) { this.cityWeather = response.data[key]; - console.log("this.cityWeather", this.cityWeather); } } }); From fec9414ae90635549e006d7de574f47aa32a6454 Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Tue, 7 May 2024 16:24:11 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/JiHeExpressway/images/weather/0.svg | 25 ++++ .../JiHeExpressway/images/weather/100.svg | 71 +++++++++++ .../JiHeExpressway/images/weather/101.svg | 90 ++++++++++++++ .../JiHeExpressway/images/weather/104.svg | 28 +++++ .../JiHeExpressway/images/weather/302.svg | 38 ++++++ .../JiHeExpressway/images/weather/304.svg | 64 ++++++++++ .../JiHeExpressway/images/weather/305.svg | 31 +++++ .../JiHeExpressway/images/weather/306.svg | 39 +++++++ .../JiHeExpressway/images/weather/307.svg | 49 ++++++++ .../JiHeExpressway/images/weather/310.svg | 45 +++++++ .../JiHeExpressway/images/weather/350.svg | 110 ++++++++++++++++++ .../JiHeExpressway/images/weather/400.svg | 28 +++++ .../JiHeExpressway/images/weather/401.svg | 35 ++++++ .../JiHeExpressway/images/weather/402.svg | 40 +++++++ .../JiHeExpressway/images/weather/404.svg | 38 ++++++ .../JiHeExpressway/images/weather/407.svg | 104 +++++++++++++++++ .../JiHeExpressway/images/weather/500.svg | 26 +++++ .../JiHeExpressway/images/weather/501.svg | 61 ++++++++++ .../JiHeExpressway/images/weather/502.svg | 41 +++++++ .../JiHeExpressway/images/weather/503.svg | 61 ++++++++++ .../JiHeExpressway/images/weather/504.svg | 61 ++++++++++ .../JiHeExpressway/images/weather/507.svg | 48 ++++++++ .../JiHeExpressway/images/weather/508.svg | 9 ++ .../JiHeExpressway/images/weather/509.svg | 35 ++++++ .../JiHeExpressway/images/weather/514.svg | 38 ++++++ .../JiHeExpressway/images/weather/900.svg | 16 +++ .../images/weather/Group 1142814257.svg | 16 +++ .../images/weather/Group 1142814258.svg | 11 ++ .../images/weather/Group 1142814266.svg | 21 ++++ .../images/weather/Group 1142814269.svg | 16 +++ .../images/weather/Group 1142814270.svg | 16 +++ .../images/weather/Group 1142814271.svg | 21 ++++ .../images/weather/Group 1142814272.svg | 33 ++++++ .../images/weather/Group 1142814274.svg | 53 +++++++++ .../images/weather/Group 1142814275.svg | 35 ++++++ .../components/weatherForecast/index.vue | 17 ++- 36 files changed, 1464 insertions(+), 6 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/100.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/101.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/104.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/302.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/304.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/305.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/306.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/307.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/310.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/350.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/400.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/401.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/402.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/404.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/407.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/500.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/501.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/502.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/503.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/504.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/507.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/508.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/509.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/514.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/900.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814257.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814258.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814266.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814269.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814270.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814271.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814272.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814274.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/Group 1142814275.svg 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/perception/meteorologyCheck/components/weatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue index 87398a46..f0adc31a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue @@ -4,7 +4,12 @@
- +
{{ cityWeather.text ? cityWeather.text : "-" }}
@@ -179,14 +184,14 @@ export default { align-items: center; margin-right: 27px; - > img { - display: inline-flex; - width: 43px; - height: 43px; + .img { + width: 30px; + height: 30px; + background-size: 100% 100%; } > div { - font-size: 22px; + font-size: 16px; font-family: PingFang SC, PingFang SC; font-weight: 500; color: #ffffff;