From f360cde8ff0b28ba677a4693cf45f47f206dd746 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 21 五月 2025 17:52:54 +0800
Subject: [PATCH] 1、设备管理中设备属性的字段显隐权限调整到设备状态字段 2、设备日志添加批量导出功能
---
src/views/system/WorkshopSignageManagement.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 1c02197..1c23229 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -9,7 +9,7 @@
<a-row :gutter="24">
<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-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.workshopName"></a-input>
</a-form-item>
</a-col>
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -85,7 +85,7 @@
<a-row :gutter="24">
<a-col :md="12" :sm="12">
<a-form-item label="缁熶竴缂栫爜">
- <a-input placeholder="" v-model="queryParam2.equipmentId"></a-input>
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam2.equipmentId"></a-input>
</a-form-item>
</a-col>
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -148,7 +148,7 @@
</a-card>
</a-col>
<!-- 琛ㄥ崟鍖哄煙 -->
- <workshop-modal ref="modalForm" @ok="modalFormOk"></workshop-modal>
+ <workshop-modal ref="modalForm" @ok="modalFormOk" :workshopList="workshopList"></workshop-modal>
<!--鏂板杞﹂棿-->
<select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'娣诲姞宸叉湁璁惧'"></select-device-drawer>
<!--宸叉湁璁惧-->
@@ -161,6 +161,7 @@
import WorkshopModal from './modules/WorkshopModal'
import { filterObj } from '@/utils/util'
import moment from 'moment'
+import signageApi from '@/api/signage'
export default {
name: 'WorkshopSignageManagement',
@@ -179,6 +180,7 @@
queryParam1: {},
queryParam2: {},
dataSource1: [],
+ workshopList:[],
dataSource2: [],
ipagination1: {
current: 1,
@@ -232,11 +234,11 @@
align: 'center',
scopedSlots: { customRender: 'backgroundImage' },
},
- {
- title: '璁惧缂栧彿棰滆壊',
- dataIndex: 'equipmentIdColor',
- align: 'center',
- },
+ // {
+ // title: '璁惧缂栧彿棰滆壊',
+ // dataIndex: 'equipmentIdColor',
+ // align: 'center',
+ // },
{
title: '鎿嶄綔',
dataIndex: 'action',
@@ -294,7 +296,18 @@
return this.selectedRowKeys1.length === 0 ? 0 : 12
},
},
+ created(){
+ this.getWorkshopListByApi()
+ },
methods: {
+ getWorkshopListByApi(){
+ const that=this
+ signageApi.getWorkshopListApi()
+ .then(res=>{
+ if(res.success)that.workshopList = res.result
+ })
+ },
+
onSelectChange2(selectedRowKeys, selectionRows) {
this.selectedRowKeys2 = selectedRowKeys
this.selectionRows2 = selectionRows
--
Gitblit v1.9.3