From 237b5f107cf9fab2a6b730f1a036dbdcbfb63498 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 27 十一月 2023 15:45:08 +0800
Subject: [PATCH] 1、车间看板页面非全屏模式下使图纸盒子占满底部，而不是被屏幕任务栏遮盖 2、报警分析页面调整右侧表格以及图表布局，调整表格合计持续字段展示格式为时分秒 3.大屏车间管理页面选择已有设备窗口弹出方式由模态窗改为右侧抽屉
---
src/views/system/WorkshopSignageManagement.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 1572098..b413673 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -82,7 +82,7 @@
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="12" :sm="12">
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input placeholder="" v-model="queryParam2.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -230,6 +230,11 @@
scopedSlots: { customRender: 'backgroundImage' },
},
{
+ title: '璁惧缂栧彿棰滆壊',
+ dataIndex: 'equipmentIdColor',
+ align: 'center',
+ },
+ {
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
@@ -238,7 +243,7 @@
],
columns2: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
width: 120,
@@ -411,7 +416,7 @@
if (res.success) {
that.$message.success(res.message)
that.loadData2()
- that.onClearSelected()
+ that.onClearSelected2()
} else {
that.$message.warning(res.message)
}
@@ -453,6 +458,8 @@
this.$refs.selectUserModal.visible = true
this.$refs.selectUserModal.selectedRowKeys = []
this.$refs.selectUserModal.selectedRows = []
+ this.$refs.selectUserModal.checkedKeys = []
+ this.$refs.selectUserModal.expandAll()
}
},
--
Gitblit v1.9.3