From 635abed7e12f57937abaca3f57f2579fedf95b40 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Wed, 13 Mar 2024 17:30:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E4=BB=A4=E8=B0=83=E6=95=B4=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigScreen1/component/detailTransfer.vue | 28 ++- src/views/bigScreen1/component/doing.vue | 23 +- src/views/bigScreen1/component/toDo.vue | 23 +- src/views/dashboard/components/weather.vue | 2 +- src/views/order/component/adjust.vue | 211 ++++++++++++++++++ src/views/order/component/normalCreate.vue | 2 +- src/views/order/handle.vue | 176 ++++++++++----- src/views/order/orderPlan.vue | 137 ++++++++---- 8 files changed, 486 insertions(+), 116 deletions(-) create mode 100644 src/views/order/component/adjust.vue diff --git a/src/views/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue index f90a8f6..916adaa 100644 --- a/src/views/bigScreen1/component/detailTransfer.vue +++ b/src/views/bigScreen1/component/detailTransfer.vue @@ -44,7 +44,7 @@ - 时间 + 日志 内容 @@ -52,15 +52,23 @@
-
- {{ - $moment(data.start_time).format("YYYY-MM-DD HH:mm") - }} -
-
~
-
- {{ $moment(data.end_time).format("YYYY-MM-DD HH:mm") }} +
接收时间：{{ $moment(data.receive_time).format("YYYY-MM-DD HH:mm") }}
+
通知开启：{{ $moment(data.notice_open_time).format("YYYY-MM-DD HH:mm") }}
+
开启时间：{{ $moment(data.open_time).format("YYYY-MM-DD HH:mm") }}
+
通知关闭：{{ $moment(data.notice_close_time).format("YYYY-MM-DD HH:mm") }}
+
关闭时间：{{ $moment(data.close_time).format("YYYY-MM-DD HH:mm") }}
+
+

{{ item.content }}

+ + + + + + + + +
@@ -375,7 +383,7 @@ export default { } ).then((res) => { let copyData = deepCopy(this.data); - copyData.status = 3; + copyData.status = copyData.tiaozhengleixing === 0 ? 5 : 3; copyData.receive_time = this.$moment().format('YYYY-MM-DD HH:mm') for (let key in copyData) { if (/_relation/g.test(key)) { diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue index a0d539c..3057d30 100644 --- a/src/views/bigScreen1/component/doing.vue +++ b/src/views/bigScreen1/component/doing.vue @@ -56,14 +56,14 @@
执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
- 发布时间：{{ timeFormat(item.created_at) }} + 发布时间：{{ timeFormat(item.created_at,'YYYY-MM-DD HH:mm') }}
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true).toFixed(2) }}小时
-
+
-
+
{{ s.label }}
@@ -88,6 +88,23 @@ export default { inject: ["transfers", "nowTime", "auths"], data() { return { + closeStatus: [ + { + value: 2, + label: "接收", + auth: "receive" + }, + { + value: 5, + label: "确认关闭通知", + auth: "noticeClose" + }, + { + value: 6, + label: "确认关闭", + auth: "close" + }, + ], status: [ { value: 4, diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue index c52e5e3..d7f4659 100644 --- a/src/views/bigScreen1/component/toDo.vue +++ b/src/views/bigScreen1/component/toDo.vue @@ -56,14 +56,14 @@
运行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
- 发布时间：{{ timeFormat(item.created_at,'HH:mm') }} + 发布时间：{{ timeFormat(item.created_at,'YYYY-MM-DD HH:mm') }}
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true).toFixed(2) }}小时
-
+
-
+
{{ s.label }}
@@ -88,6 +88,23 @@ export default { inject: ["transfers", "nowTime", "auths"], data() { return { + closeStatus: [ + { + value: 2, + label: "接收", + auth: "receive" + }, + { + value: 5, + label: "确认关闭通知", + auth: "noticeClose" + }, + { + value: 6, + label: "确认关闭", + auth: "close" + }, + ], status: [ { value: 2, diff --git a/src/views/dashboard/components/weather.vue b/src/views/dashboard/components/weather.vue index e068fe8..638ec64 100644 --- a/src/views/dashboard/components/weather.vue +++ b/src/views/dashboard/components/weather.vue @@ -109,7 +109,7 @@ export default { date: this.$moment().format('YYYY-MM-DD') }))[0] infoObj.water = `${infos?.daily_water?.map(i => i.range + i.stnm + i.s_value + 'm,')?.toString()}` - infoObj.rain = `${infos?.daily_rain?.map(i => i.type + i.rain_value + 'mm,')?.toString()}` + infoObj.rain = `${infos?.daily_rain?.map(i => i.type + (typeof i.rain_value === "number" ? i.rain_value.toFixed(2) : parseFloat(i.rain_value).toFixed(2)) + 'mm,')?.toString()}` this.weather = infoObj diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue new file mode 100644 index 0000000..8f18a2a --- /dev/null +++ b/src/views/order/component/adjust.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/order/component/normalCreate.vue b/src/views/order/component/normalCreate.vue index 6d5c6ac..411265a 100644 --- a/src/views/order/component/normalCreate.vue +++ b/src/views/order/component/normalCreate.vue @@ -166,7 +166,7 @@ export default { date: this.$moment().format('YYYY-MM-DD') }))[0] infoObj.water = `${infos?.daily_water?.map(i => i.range + i.stnm + i.s_value + 'm,')?.toString()}` - infoObj.rain = `${infos?.daily_rain?.map(i => i.type + i.rain_value + 'mm,')?.toString()}` + infoObj.rain = `${infos?.daily_rain?.map(i => i.type + (typeof i.rain_value === "number" ? i.rain_value.toFixed(2) : parseFloat(i.rain_value).toFixed(2)) + 'mm,')?.toString()}` this.weather = infoObj diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue index da2480b..1671b8c 100644 --- a/src/views/order/handle.vue +++ b/src/views/order/handle.vue @@ -282,76 +282,102 @@
- + + + + + + { $refs['dialog'].setId(row.id); $refs['dialog'].setType('editor'); $refs['dialog'].show(); } " - > - + - - - - + >反馈 + + + + + + + +
@@ -396,6 +423,7 @@ import headerContent from "@/components/LxHeader/XyContent.vue"; import drawer from "@/views/component/drawer.vue"; import imports from "@/views/component/imports.vue"; import callback from "@/views/order/component/callback.vue"; +import adjust from "@/views/order/component/adjust.vue"; import {deepCopy} from "@/utils"; import {mergeTableRow} from "@/utils/mergeTableRow"; export default { @@ -406,6 +434,7 @@ export default { drawer, imports, callback, + adjust }, mixins: [authMixin], provide: { @@ -413,6 +442,7 @@ export default { }, data() { return { + equipments: [], areas: [], abilities: [], window: { @@ -441,7 +471,12 @@ export default { key: "start_time", op: "like", value: this.$moment().format('YYYY-MM-DD') - } + }, + { + key: "equipment_id", + op: "in", + value: [] + }, ], sort_name: 'start_time', page_size: 9999, @@ -524,6 +559,25 @@ export default { }) }, + async getEquipments () { + const res = (await index({ + table_name: 'equipments', + page: 1, + page_size: 9999 + },false))?.data || [] + this.equipments = this.areas.map(i => ({ + id: `area_${i.value}`, + name: i.key, + children: res.filter(j => j.area === i.value) + })) + + this.$nextTick(() => { + this.areas.forEach(i => { + this.$refs['elTree'].setChecked(`area_${i.value}`, true, true) + }) + }) + }, + async getArea() { const obj = (await formFieldShow({ id: 4 }, false))?.select_item; if (obj && typeof obj === "object") { @@ -538,6 +592,7 @@ export default { } } this.$bus.$emit("areas", this.areas); + await this.getEquipments() }, async getAbility() { const obj = (await formFieldShow({ id: 31 }, false))?.select_item; @@ -609,6 +664,13 @@ export default { }) }, + handleCheckChange (data, checked, indeterminate) { + this.treeValue = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.name).toString() + this.select.filter[3].value = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.id) + + this.$refs['xyTable'].getTableData(true) + }, + setTransferStatus (status,row) { let copyRow = deepCopy(row); copyRow.status = status; @@ -930,6 +992,10 @@ export default { filter, }; }, + + treeHeight () { + return (this.$refs['xyTable']?.tableHeight + 36 || 630) + 'px' + }, }, created() { this.window.width = screen.availWidth * 0.95 diff --git a/src/views/order/orderPlan.vue b/src/views/order/orderPlan.vue index 961a409..da61e57 100644 --- a/src/views/order/orderPlan.vue +++ b/src/views/order/orderPlan.vue @@ -13,6 +13,9 @@