From 948cd82da669443d18d983e098a18ef7b4424be9 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Tue, 26 Mar 2024 17:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E4=BB=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen1/component/callback.vue | 2 +- .../bigScreen1/component/detailTransfer.vue | 6 +-- src/views/bigScreen1/component/done.vue | 4 +- src/views/bigScreen1/component/toDo.vue | 4 +- src/views/bigScreen1/component/tomorrow.vue | 4 +- src/views/bigScreen1/index.vue | 2 + src/views/dashboard/components/weather.vue | 2 +- src/views/order/component/adjust.vue | 29 +++++++++++- src/views/order/component/createDispatch.vue | 46 ++++++++++++++++++- src/views/order/component/normalCreate.vue | 2 +- src/views/order/handle.vue | 8 ++-- 11 files changed, 92 insertions(+), 17 deletions(-) diff --git a/src/views/bigScreen1/component/callback.vue b/src/views/bigScreen1/component/callback.vue index b93db0c..c9d81c7 100644 --- a/src/views/bigScreen1/component/callback.vue +++ b/src/views/bigScreen1/component/callback.vue @@ -136,7 +136,7 @@ export default { }, submit() { - this.smsForm.content = `${ this.$refs['elEdit_feedback_department_id']?.selectedLabel ? this.$refs['elEdit_feedback_department_id'].selectedLabel + '-' : '' }${ this.$refs['elEdit_feedback_admin_id']?.selectedLabel ? this.$refs['elEdit_feedback_admin_id'].selectedLabel + '-' : '' }${ this.form.content }` + this.smsForm.content = `调令平台反馈：${ this.$moment().format('YYYY-MM-DD HH:mm') }，${ this.row.equipment_id_equipments_id_relation.name }，关于${ this.form.content }指令有误，申请${ this.$refs['elEdit_type']?.selectedLabel || '' }` if (this.type === "add") { this.form.transfer_id = this.transfer_id; if (this.form.hasOwnProperty("id")) { diff --git a/src/views/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue index 5a710cc..cc798a0 100644 --- a/src/views/bigScreen1/component/detailTransfer.vue +++ b/src/views/bigScreen1/component/detailTransfer.vue @@ -104,7 +104,7 @@ 执行状态：{{ typeMap.get(data.status) }}

- 开启数量：{{ data.kaiqishuliang }} / {{ data.equipment_id_equipments_id_relation.bengzhashuliang }} + 开启数量：{{ data.kaiqishuliang }} / {{ data.equipment_id_equipments_id_relation ? data.equipment_id_equipments_id_relation.bengzhashuliang : 0 }}

@@ -363,8 +363,8 @@ export default { [1, "待下发"], [2, "已下发"], [3, "确认接收"], - [4, "已通知开机"], - [5, "确认开机"], + [4, "已通知开启"], + [5, "确认开启"], [6, "已通知关机"], [7, "确认关机"] ]), diff --git a/src/views/bigScreen1/component/done.vue b/src/views/bigScreen1/component/done.vue index 279eb8a..deff40b 100644 --- a/src/views/bigScreen1/component/done.vue +++ b/src/views/bigScreen1/component/done.vue @@ -79,12 +79,12 @@ export default { }, { value: 3, - label: "通知开机", + label: "通知开启", auth: "noticeOpen" }, { value: 4, - label: "开机", + label: "开启", auth: "open" }, { diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue index 38ef43e..49397fd 100644 --- a/src/views/bigScreen1/component/toDo.vue +++ b/src/views/bigScreen1/component/toDo.vue @@ -121,12 +121,12 @@ export default { }, { value: 3, - label: "通知开机", + label: "通知开启", auth: "noticeOpen" }, { value: 4, - label: "开机", + label: "开启", auth: "open" }, ], diff --git a/src/views/bigScreen1/component/tomorrow.vue b/src/views/bigScreen1/component/tomorrow.vue index 62cbed5..587d208 100644 --- a/src/views/bigScreen1/component/tomorrow.vue +++ b/src/views/bigScreen1/component/tomorrow.vue @@ -68,11 +68,11 @@ export default { }, { value: 3, - label: "通知开机" + label: "通知开启" }, { value: 4, - label: "开机" + label: "开启" } ], statusType: [ diff --git a/src/views/bigScreen1/index.vue b/src/views/bigScreen1/index.vue index 758ed3a..74e62d5 100644 --- a/src/views/bigScreen1/index.vue +++ b/src/views/bigScreen1/index.vue @@ -9,6 +9,7 @@ $refs['callbackList'].show() }" @callback="e => { + $refs['callback'].setRow(e) $refs['callback'].setId(e.id) $refs['callback'].setType('add') $refs['callback'].show() @@ -20,6 +21,7 @@ $refs['callbackList'].show() }" @callback="e => { + $refs['callback'].setRow(e) $refs['callback'].setId(e.id) $refs['callback'].setType('add') $refs['callback'].show() diff --git a/src/views/dashboard/components/weather.vue b/src/views/dashboard/components/weather.vue index 638ec64..b6da699 100644 --- a/src/views/dashboard/components/weather.vue +++ b/src/views/dashboard/components/weather.vue @@ -14,7 +14,7 @@ diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue index 9d9653d..7a99ebf 100644 --- a/src/views/order/component/adjust.vue +++ b/src/views/order/component/adjust.vue @@ -35,7 +35,7 @@ style="width: 300px" > + h("Select", { + props: { + value: this.data[index].diaolingleixing, + size: "small" + }, + on: { + ['on-change']:e => { + this.data[index].diaolingleixing = e + } + } + }, + this.diaolingleixing.map(i => h("Option",{ + props: { + value: i.value + } + },i.key))), + }, { title: "开启时间", width: 140, @@ -1159,6 +1183,22 @@ export default { } this.$bus.$emit("yinpaishui", this.abilities); }, + async getDiaolingleixing() { + const obj = (await show({ id: 85 }, false))?.select_item; + if (obj && typeof obj === "object") { + let keys = Object.keys(obj); + if (keys.length > 0) { + this.diaolingleixing = keys.map((key) => { + return { + key, + value: /^\d*$/.test(obj[key]) ? Number(obj[key]) : obj[key], + }; + }); + } + } + console.log(this.diaolingleixing) + this.$bus.$emit("diaolingleixing", this.abilities); + }, pickDate() { this.$bus.$emit("pickDate", this.date); @@ -1259,6 +1299,7 @@ export default { this.getType(); this.getAbility(); this.getEquipmentInfos(); + this.getDiaolingleixing(); }, destroyed() { this.$bus.$off("getDispatches"); @@ -1273,7 +1314,10 @@ export default { ::v-deep .equip-number .ivu-checkbox ~ span { display: none; } -.flex-center { +::v-deep .ivu-checkbox-inner { + border-color: $primaryColor; +} + .flex-center { display: flex; align-items: center; justify-content: center; diff --git a/src/views/order/component/normalCreate.vue b/src/views/order/component/normalCreate.vue index 411265a..63509ed 100644 --- a/src/views/order/component/normalCreate.vue +++ b/src/views/order/component/normalCreate.vue @@ -22,7 +22,7 @@ diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue index fdbe7af..4c3db03 100644 --- a/src/views/order/handle.vue +++ b/src/views/order/handle.vue @@ -25,9 +25,6 @@ - @@ -532,6 +529,11 @@ export default { return false } } + if ([7].find(i => i.status)) { + if (item === 'adjust') { + return false + } + } return true },