From 142f2e839bf76eff614ca7c07c30b5da2745681a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:47:20 +0800
Subject: [PATCH] 处理冲突
---
src/views/system/WorkshopSignageManagement.vue | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 837a674..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>
@@ -74,15 +76,15 @@
</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">
<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>
@@ -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>
@@ -243,7 +246,7 @@
],
columns2: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
width: 120,
@@ -354,6 +357,8 @@
if (res.success) {
this.dataSource2 = res.result.records
this.ipagination2.total = res.result.total
+ }else{
+ this.dataSource2=[]
}
this.loading2 = false
})
@@ -370,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
+ });
}
})
},
@@ -416,7 +430,7 @@
if (res.success) {
that.$message.success(res.message)
that.loadData2()
- that.onClearSelected()
+ that.onClearSelected2()
} else {
that.$message.warning(res.message)
}
@@ -441,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
+ });
}
})
},
@@ -455,9 +475,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()
}
},
@@ -503,4 +525,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