From 44d89f2faf9498c0b982613bef7294f83c854e88 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:50:04 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/system/WorkshopSignageManagement.vue | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 962eb2f..380e6d3 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="8" :sm="8">
+ <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
})
@@ -371,16 +375,25 @@
*/
handleDelete2: function (equipmentId) {
if (!this.url.delete2) {
- this.$message.error('璇疯缃畊rl.delete2灞炴��!')
+ this.$notification.error({
+ message:'娑堟伅',
+ description:'璇疯缃畊rl.delete2灞炴��!'
+ });
return
}
var that = this
deleteAction(that.url.delete2, { workshopId: this.currentWorkshopId, equipmentId }).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData2()
} else {
- that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -442,9 +455,15 @@
postAction(this.url.addDeviceInWorkshop, params).then((res) => {
if (res.success) {
this.loadData2()
- this.$message.success(res.message)
+ this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
} else {
- this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -456,11 +475,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 +527,7 @@
}
.close-circle{
position: absolute;
- z-index: 9999;
+ z-index: 1;
right: 15px;
top: 15px;
cursor: pointer;
--
Gitblit v1.9.3