From 54e0beddb5d45876a70ceb651c86bf379547c540 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 2 Apr 2024 17:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order/component/createDispatch.vue | 12 +
src/views/order/component/weather.vue | 316 ++++++++++++++++---
src/views/order/handle.vue | 60 ++--
3 files changed, 324 insertions(+), 64 deletions(-)
diff --git a/src/views/order/component/createDispatch.vue b/src/views/order/component/createDispatch.vue
index 6c98d1d..a57438b 100644
--- a/src/views/order/component/createDispatch.vue
+++ b/src/views/order/component/createDispatch.vue
@@ -866,6 +866,7 @@ export default {
content: "",
level: 1,
kaiqishuliang: 0,
+ diaolingleixing: "",
leibie: this.ability,
situations: i.id_equip_situation_relations_equipment_id_relation
})) || [];
@@ -906,6 +907,11 @@ export default {
if (!item.start_time || !item.end_time) {
verify = false;
}
+ if (this.diaolingleixing.find(i => i.value === item.diaolingleixing)?.key === "船只过闸调令") {
+ if (item.start_time) {
+ verify = true
+ }
+ }
});
if (!verify) {
this.$message({
@@ -938,6 +944,7 @@ export default {
content: i.content,
level: i.level,
kaiqishuliang: i.kaiqishuliang,
+ diaolingleixing: i.diaolingleixing,
}))
),
}).then((_) => {
@@ -994,6 +1001,11 @@ export default {
if (!item.start_time || !item.end_time || !item.level) {
verify = false;
}
+ if (this.diaolingleixing.find(i => i.value === item.diaolingleixing)?.key === "船只过闸调令") {
+ if (item.start_time) {
+ verify = true
+ }
+ }
});
if (!verify) {
this.$message({
diff --git a/src/views/order/component/weather.vue b/src/views/order/component/weather.vue
index eb81713..0508ebd 100644
--- a/src/views/order/component/weather.vue
+++ b/src/views/order/component/weather.vue
@@ -3,25 +3,199 @@
-
- 实时水位(米)
+
+
+
+ {{ info.daily_water[0].taihu }}
+
+ {{ info.daily_water[0].xiangcheng }}
+ {{ info.daily_water[0].fengqiao }}
+
+ {{ info.daily_water[0].suzhouer }}
+
+
+ {{ info.daily_water[0].qichebeizhan }}
+
+ {{ info.daily_water[0].miduqiao }}
+ {{ info.daily_water[0].shihu }}
+
+ {{ info.daily_water[0].xiaonianyukou }}
+
+
-
-
- 当日累计雨量(毫米)
+
+
+
+
+ {{ info.yuliang[0].shangtangheshuniu }}
+
+
+ {{ info.yuliang[0].shiziyangzha }}
+
+
+ {{ info.yuliang[0].loujiangshuniu }}
+
+
+ {{ info.yuliang[0].xiguoqiaobengzhan }}
+
+
+ {{ info.yuliang[0].dalonggangshuniu }}
+
+
+ {{ info.yuliang[0].qiujiacunbengzhan }}
+
+
+ {{ info.yuliang[0].yuanhetangshuniu }}
+
+
-
- 闸门开度/堰闸顶高(米)
+
+
+ {{ info.kaidu[0].changmenyan }}
+ {{ info.kaidu[0].loumenyan }}
+
+ {{ info.kaidu2[0].regulatorOpen1 }}
+
+
+ {{ info.kaidu2[0].regulatorOpen2 }}
+
+
-
-
- 机组实时状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -36,50 +210,100 @@ import { index, save } from "@/api/system/baseForm";
export default {
data() {
return {
- weather: {},
- }
+ info: {
+ daily_water: [{}],
+ yuliang: [{}],
+ kaidu: [{}],
+ kaidu2: [{}],
+ yunxingzhuangtai: [
+ {
+ 大龙港枢纽: [],
+ 外塘河枢纽: [],
+ 仙人大港枢纽: [],
+ 胥江南支枢纽: [],
+ 澹台湖枢纽: [],
+ 娄江枢纽: [],
+ 南庄枢纽: [],
+ 青龙桥枢纽: [],
+ 东风新枢纽: [],
+ 元和塘枢纽: [],
+ },
+ ],
+ },
+ };
},
methods: {
- async getWeatherInfo () {
+ async getWeatherInfo() {
let infoObj = {
- weather: '',
- water: '',
- rain: '',
- prevent: '',
- early_warning: ''
- }
- const weatherInfo = await weather()
- infoObj.weather = `${weatherInfo.weather},${weatherInfo.wD}${weatherInfo.wS},${weatherInfo.sendibleTemp}-${weatherInfo.temp}°C`
- const info = await infoStatics()
- console.log(info)
+ weather: "",
+ water: "",
+ rain: "",
+ prevent: "",
+ early_warning: "",
+ };
+ const weatherInfo = await weather();
+ infoObj.weather = `${weatherInfo.weather},${weatherInfo.wD}${weatherInfo.wS},${weatherInfo.sendibleTemp}-${weatherInfo.temp}°C`;
+ const info = await infoStatics();
+ this.info = info;
},
-
- async getWeather () {
- const res = (await index({
- table_name: 'waters',
- filter: [
- {
- key: 'date',
- op: 'eq',
- value: this.$moment().format('YYYY-MM-DD')
- }
- ]
- },false)).data[0]
-
- if (!res) {
- await this.getWeatherInfo()
- } else {
- this.weather = res
- }
- }
},
computed: {},
created() {
- //this.getWeather()
- this.getWeatherInfo()
- }
-}
+ this.getWeatherInfo();
+ },
+};
diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue
index 047db91..d0f047e 100644
--- a/src/views/order/handle.vue
+++ b/src/views/order/handle.vue
@@ -158,24 +158,18 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -743,6 +737,36 @@ export default {
width: 46,
reserveSelection: true
})
+ this.table.unshift({
+ prop: "expand",
+ type: "expand",
+ width: 46,
+ expandFn:({ row }) => {
+ return (
+
+ {
+ (row.id_transfers_to_transfer_id_relation || []).map((i,index) => (
+
+
{index+1}.
+
+ 调整时间:
+ { this.$moment(this.created_at).format('YYYY-MM-DD HH:mm') }
+
+
+ 调整类型:
+ { i.tiaozhengleixing }
+
+
+ 调整内容:
+ { i.content }
+
+
+ ))
+ }
+
+ )
+ }
+ })
},
},