From 718cbdcf67440cf5190213c9f099be3fd6e9a946 Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Mon, 1 Apr 2024 16:32:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/components/Card1/index.vue | 56 ++-- .../components/ModifyDutyInformationTable.vue | 11 +- .../event/event/EventDetailDialog/index.vue | 2 +- .../components/railwayDay/assets/charts.js | 2 +- .../TemperatureTrend/assets/charts.js | 5 +- .../components/TemperatureTrend/index.vue | 157 +++++---- .../visibilityTrends/assets/charts.js | 5 +- .../components/visibilityTrends/index.vue | 152 +++++---- .../components/weaterData/index.vue | 297 +++++++++--------- .../components/weatherInfoQuery/index.vue | 64 +++- 10 files changed, 419 insertions(+), 332 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue index d8b9148d..f218b3fc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue @@ -1,32 +1,34 @@ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue index 332f538e..574ba73f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue @@ -32,7 +32,7 @@

{{ item.name }}

@@ -46,7 +46,7 @@

{{ item.name }}

@@ -139,7 +139,7 @@ export default { }, set(bool) { //关闭弹窗组件,清空数据 - if(!bool) { + if (!bool) { this.dayShift = []; this.graveyardShift = []; this.peopleList = []; @@ -184,7 +184,7 @@ export default { this[this.active].push(item); }, removeDutyPerson(item, activeCheck) { - if(activeCheck != this.active) return; + if (activeCheck != this.active) return; const index = this[this.active].findIndex( (_item) => _item.id === item.id @@ -393,7 +393,8 @@ export default { - \ No newline at end of file +} +.charts { + height: 200px; + width: 100%; +} + 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 f44f97da..2e6bf6dd 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 @@ -107,10 +107,7 @@ var options = { showSymbol: false, smooth: true, // 是否曲线 name: "实时数据", // 图例对应类别 - data: [ - 12, 12, 23, 23, 30, 12, 26, 28, 31, 23, 25, 12, 18, 18, 18, 18, 23, 21, - 20, 20, 20, 20, 20, 22, 22, 12, 12, 12, - ], // 纵坐标数据 + data: [], // 纵坐标数据 lineStyle: { color: "#0783FA", }, 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 c7c0cd00..15769caa 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 @@ -1,74 +1,94 @@ - - + + - \ No newline at end of file +} +.charts { + height: 200px; +} + 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 872f3130..4a61f985 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 @@ -1,156 +1,167 @@ - - - - - \ No newline at end of file +} +.charts { + height: 180px; + width: 100%; +} + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue index 469ff15c..a0c27b3c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue @@ -2,24 +2,40 @@
- + +
- - - + + +
@@ -48,27 +64,30 @@ export default { keyMap: [ { label: "设备名称", - key: "name", + key: "deviceName", }, { label: "设备位置", - key: "name", + key: "stakeMark", }, { label: "所属方向", - key: "rote", + key: "direction", }, { label: "采集时间", - key: "time", + key: "createTime", }, { - label: "气象状态", - key: "start", + label: "设备状态", + key: "deviceState", }, ], + deviceName: "", selectIndex: 0, dataList: [], + dataItem: {}, + weatherData: [], data: Array.from({ length: 10 }).map(() => ({ name: "气象监测器1", rote: "济南方向", @@ -85,15 +104,27 @@ export default { this.selectIndex = index; }, resizeChart() { - // console.log(this.$refs.temper); this.$refs.temper.reiszeChart(); this.$refs.visibility.reiszeChart(); }, getList() { getListLatest().then((res) => { - console.log("_____________", res); + this.dataList = res.rows; + this.dataItem = res.rows[0]; + this.deviceName = res.rows[0].deviceName; + this.getWeather(); }); }, + getWeather() { + getDeviceNameListLatest(this.deviceName).then((res) => { + this.weatherData = res.rows; + }); + }, + handleClick(item) { + this.dataItem = item; + this.deviceName = item.deviceName; + this.getWeather(); + }, }, mounted() { this.getList(); @@ -104,7 +135,7 @@ export default {