From 547aab154e85a9a89f1e320f92bd43854d10faeb Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 14 十二月 2023 14:12:45 +0800
Subject: [PATCH] 1、调整车间看板页面详情弹窗描述列表内容字段 2、报警分析页面在原有表格中为每个报警号增加子表格，内容为出现此报警号的设备ID以及报警时间等 3、报警分析页面表格请求数据设置加载中动画 4、调整设备参数阈值管理页面添加或编辑阈值上下限输入框为数字输入框，避免上下限数字比较大小时出现问题
---
src/views/system/WorkshopSignageManagement.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 962eb2f..6c68353 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -7,15 +7,17 @@
<!-- 鎼滅储鍖哄煙 -->
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="12" :sm="8">
- <a-form-item label="杞﹂棿鍚嶇О" :labelCol="{ span: 5 }" :wrapperCol="{ span: 18, offset: 1 }">
+ <a-col :md="6" :sm="6">
+ <a-form-item label="杞﹂棿鍚嶇О" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19}">
<a-input placeholder="" v-model="queryParam.workshopName"></a-input>
</a-form-item>
</a-col>
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
- <a-col :md="12" :sm="24">
- <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-col>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
</a-col>
</span>
</a-row>
@@ -148,7 +150,7 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<workshop-modal ref="modalForm" @ok="modalFormOk"></workshop-modal>
<!--鏂板杞﹂棿-->
- <select-device-modal ref="selectUserModal" @selectFinished="selectOK"></select-device-modal>
+ <select-device-modal ref="selectDeviceModal" @selectFinished="selectOK" :title="'娣诲姞宸叉湁璁惧'"></select-device-modal>
<!--宸叉湁璁惧-->
</a-row>
</template>
@@ -355,6 +357,8 @@
if (res.success) {
this.dataSource2 = res.result.records
this.ipagination2.total = res.result.total
+ }else{
+ this.dataSource2=[]
}
this.loading2 = false
})
@@ -456,11 +460,11 @@
if (this.currentWorkshopId == '') {
this.$message.error('璇烽�夋嫨涓�涓溅闂�!')
} else {
- this.$refs.selectUserModal.visible = true
- this.$refs.selectUserModal.selectedRowKeys = []
- this.$refs.selectUserModal.selectedRows = []
- this.$refs.selectUserModal.checkedKeys = []
- this.$refs.selectUserModal.expandAll()
+ this.$refs.selectDeviceModal.visible = true
+ this.$refs.selectDeviceModal.selectedRowKeys = []
+ this.$refs.selectDeviceModal.selectedRows = []
+ this.$refs.selectDeviceModal.checkedKeys = []
+ this.$refs.selectDeviceModal.expandAll()
}
},
@@ -508,7 +512,7 @@
}
.close-circle{
position: absolute;
- z-index: 9999;
+ z-index: 1;
right: 15px;
top: 15px;
cursor: pointer;
--
Gitblit v1.9.3