From 4385883dbddc36c5391cccc64021a45530839a6f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 16:26:46 +0800
Subject: [PATCH] 产品安全隐患流程与基础

---
 src/views/system/WorkshopSignageManagement.vue |   57 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 962eb2f..1c02197 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,14 +150,14 @@
     <!-- 琛ㄥ崟鍖哄煙 -->
     <workshop-modal ref="modalForm" @ok="modalFormOk"></workshop-modal>
     <!--鏂板杞﹂棿-->
-    <select-device-modal ref="selectUserModal" @selectFinished="selectOK"></select-device-modal>
+    <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'娣诲姞宸叉湁璁惧'"></select-device-drawer>
     <!--宸叉湁璁惧-->
   </a-row>
 </template>
 <script>
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { deleteAction, postAction, getAction } from '@/api/manage'
-import SelectDeviceModal from './modules/SelectDeviceModal'
+import SelectDeviceDrawer from './modules/SelectDeviceDrawer'
 import WorkshopModal from './modules/WorkshopModal'
 import { filterObj } from '@/utils/util'
 import moment from 'moment'
@@ -164,7 +166,7 @@
   name: 'WorkshopSignageManagement',
   mixins: [JeecgListMixin],
   components: {
-    SelectDeviceModal,
+    SelectDeviceDrawer,
     WorkshopModal,
     moment,
   },
@@ -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.selectDeviceDrawer.visible = true
+        this.$refs.selectDeviceDrawer.selectedRowKeys = []
+        this.$refs.selectDeviceDrawer.selectedRows = []
+        this.$refs.selectDeviceDrawer.checkedKeys = []
+        this.$refs.selectDeviceDrawer.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