From e0da0326db6e82833e9f9ad6816bed90751c5635 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Tue, 12 Mar 2024 17:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E7=BB=84=E6=95=B0=E9=87=8F=E3=80=81?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen1/component/title.vue | 5 + src/views/dashboard/components/feedback.vue | 105 +++++++ src/views/dashboard/components/weather.vue | 229 ++++++++++++++++ src/views/dashboard/index.vue | 273 +------------------ src/views/order/component/createDispatch.vue | 25 +- src/views/order/handle.vue | 1 + src/views/order/history.vue | 11 +- 7 files changed, 375 insertions(+), 274 deletions(-) create mode 100644 src/views/dashboard/components/feedback.vue create mode 100644 src/views/dashboard/components/weather.vue diff --git a/src/views/bigScreen1/component/title.vue b/src/views/bigScreen1/component/title.vue index 3099b3b..7eabafc 100644 --- a/src/views/bigScreen1/component/title.vue +++ b/src/views/bigScreen1/component/title.vue @@ -42,6 +42,11 @@ export default { key: 'start_time', op: 'range', value: `${this.$moment().add(1,'day').startOf('days').format('YYYY-MM-DD HH:mm:ss')},${this.$moment().add(1,'days').endOf('days').format('YYYY-MM-DD HH:mm:ss')}` + }, + { + key: "status", + op: "eq", + value: 2 } ] },false) diff --git a/src/views/dashboard/components/feedback.vue b/src/views/dashboard/components/feedback.vue new file mode 100644 index 0000000..9701977 --- /dev/null +++ b/src/views/dashboard/components/feedback.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/dashboard/components/weather.vue b/src/views/dashboard/components/weather.vue new file mode 100644 index 0000000..e068fe8 --- /dev/null +++ b/src/views/dashboard/components/weather.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 3e3f399..9b216ae 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,297 +2,46 @@
- +
- +
+ +
diff --git a/src/views/order/component/createDispatch.vue b/src/views/order/component/createDispatch.vue index 3b440cc..5ab5bba 100644 --- a/src/views/order/component/createDispatch.vue +++ b/src/views/order/component/createDispatch.vue @@ -145,6 +145,7 @@ export default { table_name: "transfer_templates", page: 1, page_size: 20, + is_auth: 0 }, templateTable: [ { @@ -522,7 +523,7 @@ export default { const create = () => { let dom = []; let cirs = [] - if (type === 2 || type === 3) { + if (/枢纽/g.test(name)) { const datas = this.equipmentInfos.shuniu.find(i => (name === i.stnm) )?.data[0] if (datas) { let values = datas.Value?.split('.') @@ -530,8 +531,7 @@ export default { cirs.push(Number(i)) }) } - } - if (type === 1) { + } else { const datas = this.equipmentInfos.zhazhan.find(i => (name === i.STNMNEW || name === i.STNM) )?.data[0] if (datas) { Object.keys(datas).forEach(key => { @@ -571,23 +571,24 @@ export default { }, { title: "机组数量", - key: "bengzhashuliang", + key: "kaiqishuliang", width: 200, align: "center", render: (h, { row, index }) => this.$createElement('CheckboxGroup',{ class: "equip-number", ref: `bengzhashuliang${index}`, + props: { + value: Array.from({ length: Number(row.kaiqishuliang || 0) },(_,i) => i), + }, on: { ["on-change"]:e => { this.$nextTick(() => { - this.data[index].bengzhashuliang = this.$refs[`bengzhashuliang${index}`].$children.reduce((pre, cur) => (pre + (cur.currentValue ? 1 : 0)),0) + this.data[index].kaiqishuliang = this.$refs[`bengzhashuliang${index}`].$children.reduce((pre, cur) => (pre + (cur.currentValue ? 1 : 0)),0) }) } } - }, [ - Array.from({ length: Number(row.equipment.bengzhashuliang || 0)}, - (_,i) => this.$createElement("Checkbox",{ props: { label: i } })) - ]) + }, Array.from({ length: Number(row.equipment.bengzhashuliang || 0)}, + (_,i) => this.$createElement("Checkbox",{ props: { label: i } }))) }, { title: "类别", @@ -952,6 +953,12 @@ export default { leibie: this.ability, situations: i.id_equip_situation_relations_equipment_id_relation })) || []; + + for (let key in this.$refs) { + if (/bengzhashuliang/g.test(key)) { + this.$refs[key].$children.forEach(i => i.currentValue = false) + } + } }, async submit() { diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue index 13a4400..da2480b 100644 --- a/src/views/order/handle.vue +++ b/src/views/order/handle.vue @@ -603,6 +603,7 @@ export default { end_time: this.$moment(i.end_time).format('HH:mm'), content: i.content, level: i.level, + kaiqishuliang: i.kaiqishuliang })) } }) diff --git a/src/views/order/history.vue b/src/views/order/history.vue index c2c2fcb..19afc4f 100644 --- a/src/views/order/history.vue +++ b/src/views/order/history.vue @@ -31,9 +31,9 @@ style="width: 200px;margin-left: 6px;" @on-change="abilityChange"> - + + + @@ -424,6 +424,11 @@ export default { key: "equipment_id", op: "in", value: [] + }, + { + key: "status", + op: "eq", + value: 7 } ], sort_name: 'start_time',