From 41d50b20c975faeaa9e5277bdcff13b5acecb575 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:57:37 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/system/WorkshopSignageManagement.vue | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 740cf37..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>
@@ -74,8 +76,8 @@
</a-col>
<a-col :md="rightColMd" :sm="24" v-if="this.rightcolval == 1">
<a-card :bordered="false">
- <div style="text-align: right">
- <a-icon type="close-circle" @click="hideUserList" />
+ <div @click="hideUserList" class="close-circle">
+ <a-icon type="close-circle"/>
</div>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -97,7 +99,7 @@
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" :md="24" :sm="24">
- <a-button @click="handleAddDeviceInWorkshop" type="primary" icon="plus" style="margin-top: 16px"
+ <a-button @click="handleAddDeviceInWorkshop" type="primary" icon="plus" style="margin: 5px 0 10px 2px"
>宸叉湁璁惧
</a-button>
@@ -114,6 +116,7 @@
</a-button>
</a-dropdown>
</div>
+
<!-- table鍖哄煙-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px">
@@ -147,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>
@@ -228,6 +231,11 @@
dataIndex: 'backgroundImage',
align: 'center',
scopedSlots: { customRender: 'backgroundImage' },
+ },
+ {
+ title: '璁惧缂栧彿棰滆壊',
+ dataIndex: 'equipmentIdColor',
+ align: 'center',
},
{
title: '鎿嶄綔',
@@ -349,6 +357,8 @@
if (res.success) {
this.dataSource2 = res.result.records
this.ipagination2.total = res.result.total
+ }else{
+ this.dataSource2=[]
}
this.loading2 = false
})
@@ -411,7 +421,7 @@
if (res.success) {
that.$message.success(res.message)
that.loadData2()
- that.onClearSelected()
+ that.onClearSelected2()
} else {
that.$message.warning(res.message)
}
@@ -450,9 +460,11 @@
if (this.currentWorkshopId == '') {
this.$message.error('璇烽�夋嫨涓�涓溅闂�!')
} else {
- this.$refs.selectUserModal.visible = true
- this.$refs.selectUserModal.selectedRowKeys = []
- this.$refs.selectUserModal.selectedRows = []
+ this.$refs.selectDeviceModal.visible = true
+ this.$refs.selectDeviceModal.selectedRowKeys = []
+ this.$refs.selectDeviceModal.selectedRows = []
+ this.$refs.selectDeviceModal.checkedKeys = []
+ this.$refs.selectDeviceModal.expandAll()
}
},
@@ -498,4 +510,11 @@
.ant-btn {
margin-left: 8px;
}
+ .close-circle{
+ position: absolute;
+ z-index: 1;
+ right: 15px;
+ top: 15px;
+ cursor: pointer;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3