diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js index f1a14095..e7c06df5 100644 --- a/ruoyi-ui/src/api/MonthlyEquipment/index.js +++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js @@ -55,10 +55,17 @@ export function getSystemStatusExport(query) { } // 拖拽排序 - export function getStatusRule(rule) { return request({ url: "/system/status/rule?rule=" + rule, method: "get", }); } + +// 拖拽排序 +export function getStatusSection() { + return request({ + url: "/system/status/section", + method: "get", + }); +} diff --git a/ruoyi-ui/src/api/perception/meteorologyCheck.js b/ruoyi-ui/src/api/perception/meteorologyCheck.js index 3bc24c6f..59101ae2 100644 --- a/ruoyi-ui/src/api/perception/meteorologyCheck.js +++ b/ruoyi-ui/src/api/perception/meteorologyCheck.js @@ -55,3 +55,11 @@ export function getIdDevices(id) { method: "get", }); } + +// 查询气象预警筛选类别 +export function getListVisibility() { + return request({ + url: "/dc/system/meteorologicalDetector/listVisibility", + method: "get", + }); +} diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue index c781c6b4..17ae4079 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue @@ -134,12 +134,12 @@ export default { chemicalsStatus: "", fireStatus: "", }, - fromDept: "济青济南运管中心", + fromDept: "齐鲁高速股份有限公司", createTime: "2024年04月24日17时22分", title: "关于G20青银高速K305+208交通事故的续报1", toDept: "智慧管理中心", content: "路管等单位及清障救援车辆已到达现场。预计结束时间为12时44分。", - createName: "智慧高速菜单", + createName: "张三", phoneNumber: "18678866677", issued: "康传刚", // submitting: false, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue index a549ecb2..c37e9398 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue @@ -40,11 +40,14 @@ export default { } let xData = []; let valueData = []; - console.log("newD", newD); - newD.forEach((element) => { - xData.push(element.title); - valueData.push(+element.pctOnl.replace("%", "")); - }); + for (let key in newD) { + xData.push(key); + valueData.push(newD[key].sucessRate.replace("%", "")); + } + // newD.forEach((element) => { + // xData.push(element.title); + // valueData.push(+element.pctOnl.replace("%", "")); + // }); // newD.forEach((element) => { // value.push(+element.pctOnl.replace("%", "")); // indicator.push({ name: element.title, max: 100 }); 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 60fa0f77..74e47dff 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue @@ -8,7 +8,7 @@ >
- +
@@ -128,6 +128,7 @@ import { getSystemStatusTabList, getSystemStatusType, getSystemStatusExport, + getStatusSection, } from "@/api/MonthlyEquipment"; // import { download } from "../../../../../utils/request.js"; import Pagination from "@screen/components/Pagination.vue"; @@ -182,6 +183,7 @@ export default { activeName: "first", tableData: [], interval: null, + sectionData: [], }; }, provide() { @@ -193,6 +195,11 @@ export default { clearInterval(this.interval); }, methods: { + getSection() { + getStatusSection().then((res) => { + this.sectionData = res.data; + }); + }, handleSizeChange(size) { this.pageSize = size; this.initData(); @@ -242,7 +249,6 @@ export default { this.initQueryTable(1); }, handleSearch(data) { - console.log(777, data); this.typeQuery = data.type; this.startTime = moment(data.time[0]).format("YYYY-MM-DD HH:mm:ss"); this.time = moment(data.time[1]).format("YYYY-MM-DD HH:mm:ss"); @@ -273,7 +279,6 @@ export default { type: this.typeQuery, }) .then((res) => { - console.log(res); const url = window.URL.createObjectURL(new Blob([res])); let link = document.createElement("a"); link.style.display = "none"; @@ -312,7 +317,6 @@ export default { getSystemStatusType().then((res) => { let allList = []; let sort = res.data["排序规则"].rule.split(","); - console.log("sort", sort); sort.forEach((i) => { for (let key in res.data) { let val = res.data[key]; @@ -365,9 +369,6 @@ export default { type: this.typeQuery, }).then((res) => { if (res.code == 200) { - console.log("res.data", res.data); - // if (res.data && Object.keys(res.data).length > 0) { - console.log("res.data", res.data); this.setStatus("01", "finish"); let origin = res.data; let startStamp = +moment(this.startTime).startOf("day").format("x"); @@ -429,6 +430,7 @@ export default { }, async mounted() { await this.initData(); + this.getSection(); }, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue index f3c1a32b..f4a03ac2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue @@ -30,10 +30,14 @@ export default { data: { handler(data) { let newData = []; + // let xData = []; + console.log("data77777", data); data.forEach((item) => { - newData.push(item.avgVisibility); + newData.push(item.avgTemperature); + // xData.push(item.timeSlot); }); temperatureCharts.series[0].data = newData; + // temperatureCharts.xAxis.data = newData; this.myChart.setOption(temperatureCharts); }, deep: true, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js index 2e6bf6dd..4c35fec9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js @@ -5,7 +5,7 @@ var options = { show: true, trigger: "axis", valueFormatter: function (value) { - return value + " M"; + return value + " km"; }, }, grid: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue index 15769caa..d264d44a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue @@ -26,7 +26,7 @@ export default { handler(data) { let newData = []; data.forEach((item) => { - newData.push(item.avgTemperature); + newData.push(item.avgVisibility); }); visibilityCharts.series[0].data = newData; this.myChart.setOption(visibilityCharts); 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 4a61f985..427e1797 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 @@ -28,11 +28,17 @@ }}
- 能见度： + 能见度等级： {{ data.visibilityType ? data.visibilityType + "级" : "-" }}
+
+ 能见度： + {{ + data.visibility ? data.visibility + "km" : "-" + }} +
+
+ 下雨类型： + {{ + data.rainfall == 0 + ? "无降" + : data.rainfall == 1 + ? "雨" + : data.rainfall == 2 + ? "雪" + : data.rainfall == 3 + ? "毛毛雨" + : "雨夹雪" + }} +
降雨量： {{ data.rainfall ? data.rainfall + "mm" : "-" }}
+
+ 路面状态： + {{ + data.remoteRoadSurfaceStatus == "00" + ? "干燥" + : data.rainfall == "01" + ? "潮湿" + : data.rainfall == "02" + ? "积水" + : data.rainfall == "03" + ? "结冰" + : data.rainfall == "04" + ? "积雪" + : data.rainfall == "05" + ? "冰水混合物" + : "泥泞" + }} +
路面温度： {{ @@ -63,6 +101,12 @@ data.atmosphericPressure ? data.atmosphericPressure + "Pa" : "-" }}
+
+ 水膜厚度： + {{ + data.waterFilmlceSnowValue ? data.waterFilmlceSnowValue + "mm" : "-" + }} +
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 daa74c2f..407a1058 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 @@ -1,116 +1,75 @@ - + - - - \ No newline at end of file