From 0bb01174c95cf26e8ac3c432f847b4cc6007bf5a Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 26 三月 2025 11:21:46 +0800 Subject: [PATCH] 1、设备管理台账页面新增打印铭牌功能(二维码还未调试完) 2、mdc模块新增四个利用率相关图表页面 --- src/views/eam/equipment/EamEquipmentList.vue | 58 +++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 19 deletions(-) diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue index 059f2ce..da0b8cd 100644 --- a/src/views/eam/equipment/EamEquipmentList.vue +++ b/src/views/eam/equipment/EamEquipmentList.vue @@ -17,18 +17,21 @@ </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="鍏抽敭璁惧鏍囪瘑"> - <j-dict-select-tag dict-code="yn" placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑" v-model="queryParam.equipmentImportance"></j-dict-select-tag> + <j-dict-select-tag dict-code="yn" placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑" + v-model="queryParam.equipmentImportance"></j-dict-select-tag> </a-form-item> </a-col> <template v-if="toggleSearchStatus"> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="璧勪骇鐘舵��"> - <j-dict-select-tag dict-code="asset_status" placeholder="璇烽�夋嫨璧勪骇鐘舵��" v-model="queryParam.assetStatus"></j-dict-select-tag> + <j-dict-select-tag dict-code="asset_status" placeholder="璇烽�夋嫨璧勪骇鐘舵��" + v-model="queryParam.assetStatus"></j-dict-select-tag> </a-form-item> </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="鎶�鏈姸鎬�"> - <j-dict-select-tag dict-code="technology_status" placeholder="璇烽�夋嫨鎶�鏈姸鎬�" v-model="queryParam.technologyStatus"></j-dict-select-tag> + <j-dict-select-tag dict-code="technology_status" placeholder="璇烽�夋嫨鎶�鏈姸鎬�" + v-model="queryParam.technologyStatus"></j-dict-select-tag> </a-form-item> </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> @@ -51,7 +54,8 @@ </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="璁惧鍒嗙被"> - <j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨璁惧鍒嗙被" v-model="queryParam.equipmentCategory"></j-dict-select-tag> + <j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨璁惧鍒嗙被" + v-model="queryParam.equipmentCategory"></j-dict-select-tag> </a-form-item> </a-col> </template> @@ -61,7 +65,7 @@ <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button> <a @click="handleToggleSearch" style="margin-left: 8px"> {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }} - <a-icon :type="toggleSearchStatus ? 'up' : 'down'" /> + <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> </a> </span> </a-col> @@ -81,12 +85,12 @@ <a-dropdown v-if="selectedRowKeys.length > 0"> <a-menu slot="overlay"> <a-menu-item key="1" @click="batchDel"> - <a-icon type="delete" /> + <a-icon type="delete"/> 鍒犻櫎 </a-menu-item> </a-menu> <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 - <a-icon type="down" /> + <a-icon type="down"/> </a-button> </a-dropdown> </div> @@ -112,27 +116,30 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> <span slot="equipmentImportance" slot-scope="text"> - <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�" /> + <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/> </span> <span slot="mdcFlag" slot-scope="text"> - <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�" /> + <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/> </span> <span slot="processParametersFlag" slot-scope="text"> - <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�" /> + <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/> </span> <span slot="precisionParametersFlag" slot-scope="text"> - <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�" /> + <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/> </span> <span slot="specialEquipment" slot-scope="text"> - <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�" /> + <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/> </span> <span slot="action" slot-scope="text, record"> <a @click="handleEdit(record)">缂栬緫</a> - <a-divider type="vertical" /> + <a-divider type="vertical"/> <a-dropdown> - <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a> + <a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a> <a-menu slot="overlay"> + <a-menu-item> + <a href="javascript:;" @click="handleOpenNameplateModal(record)">閾墝</a> + </a-menu-item> <a-menu-item> <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a> </a-menu-item> @@ -151,6 +158,8 @@ <!-- 琛ㄥ崟鍖哄煙 --> <eamEquipment-modal ref="modalForm" @ok="modalFormOk"></eamEquipment-modal> + <!--閾墝寮圭獥--> + <nameplate-modal ref="nameplateModalRef"/> </a-card> </template> @@ -159,11 +168,13 @@ import EamEquipmentModal from './modules/EamEquipmentModal' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getAction } from '@api/manage' +import NameplateModal from '@views/eam/equipment/modules/NameplateModal.vue' export default { name: 'EamEquipmentList', mixins: [JeecgListMixin], components: { + NameplateModal, EamEquipmentModal }, data() { @@ -189,7 +200,7 @@ dataIndex: 'equipmentCode', ellipsis: true, fixed: 'left', - sorter: true, + sorter: true }, { title: '璁惧鍚嶇О', @@ -399,9 +410,9 @@ deleteBatch: '/eam/equipment/deleteBatch', exportXlsUrl: 'eam/equipment/exportXls', importExcelUrl: 'eam/equipment/importExcel', - loadProductionOptions:'/mdc/mdcProduction/loadProductionTreeOptions' + loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions' }, - treeData: [], + treeData: [] } }, computed: { @@ -410,7 +421,7 @@ } }, created() { - this.loadAllProductionTree(); + this.loadAllProductionTree() }, methods: { loadAllProductionTree() { @@ -418,11 +429,20 @@ getAction(this.url.loadProductionOptions).then(res => { if (res.success) { this.treeData = [...res.result] - }else { + } else { that.$message.warning(res.message) } }) }, + + /** + * 寮�鍚摥鐗屽脊绐� + * @param record + */ + handleOpenNameplateModal(record) { + this.$refs.nameplateModalRef.model = Object.assign({}, record) + this.$refs.nameplateModalRef.visible = true + } } } </script> -- Gitblit v1.9.3