From 4ae10eaf3d7be607891ba053be561d60f6f4fec1 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 30 五月 2025 15:33:01 +0800
Subject: [PATCH] 设备看板设备检索展示label由设备编号调整为设备编号+设备安装位置
---
src/views/mdc/base/modules/GradeSignage/SectionSignage.vue | 268 ++++-------------------------------------------------
1 files changed, 20 insertions(+), 248 deletions(-)
diff --git a/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue b/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue
index cffc7c0..88f4e97 100644
--- a/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue
+++ b/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue
@@ -25,8 +25,13 @@
<div class="equipment-search-container">
<img src="@/assets/signage/section/search-input.png"/>
<a-auto-complete @select="handleSelectChange" placeholder="鍥炶溅閿煡璇�" :filter-option="filterOption"
- :dataSource="equipmentList.map(item=>item.equipmentId)"
- style="position: absolute;width: 15vw;height: 2.24vw;"/>
+ style="position: absolute;width: 15vw;height: 2.24vw;">
+ <template slot="dataSource">
+ <a-select-option v-for="item in equipmentList" :key="item.equipmentId">
+ {{item.equipmentId+`[${item.equipmentName}]`}}
+ </a-select-option>
+ </template>
+ </a-auto-complete>
</div>
</div>
</div>
@@ -81,239 +86,7 @@
chartQuantity: 6,
hasLoadedChartDataQuantity: 0,
activeIndex: null,
- equipmentList: [
- {
- 'id': '1694181185660579842',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:54:05',
- 'updateBy': 'admin',
- 'updateTime': '2024-09-14 09:15:10',
- 'equipmentId': '2140342',
- 'equipmentName': '鏁版帶鍗ц溅',
- 'equipmentType': '澶嶅悎鏈哄簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.44',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'GLS-200',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2140342',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': 'A',
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1694181274449801217',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:54:26',
- 'updateBy': 'admin',
- 'updateTime': '2024-09-12 13:27:27',
- 'equipmentId': '2140345',
- 'equipmentName': '鏁版帶鍗у紡杞﹀簥',
- 'equipmentType': '杞﹀簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.45',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'FTC-350L',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2140345',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1694182117068697602',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:57:47',
- 'updateBy': 'admin',
- 'updateTime': '2024-01-31 11:30:00',
- 'equipmentId': '2640236',
- 'equipmentName': '绔嬪紡鍔犲伐涓績',
- 'equipmentType': '鍔犲伐涓績',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.17',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'VNP-32A',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2640236',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1694182375483961346',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:58:49',
- 'updateBy': 'admin',
- 'updateTime': '2024-01-31 11:29:19',
- 'equipmentId': '2640263',
- 'equipmentName': '鏁版帶鍔犲伐涓績',
- 'equipmentType': '鍔犲伐涓績',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.74',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'SW-850',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2640263',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1701169612893388801',
- 'createBy': 'admin',
- 'createTime': '2023-09-11 17:43:36',
- 'updateBy': 'admin',
- 'updateTime': '2023-11-29 16:45:11',
- 'equipmentId': '2640315',
- 'equipmentName': '鍔犲伐涓績',
- 'equipmentType': '杞﹀簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.90',
- 'dataPort': '19000',
- 'driveType': 'LSV2',
- 'equipmentModel': 'C32U',
- 'controlSystem': 'LSV2',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'LSV2_2640315',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1728950536953856002',
- 'createBy': 'admin',
- 'createTime': '2023-11-27 09:35:05',
- 'updateBy': 'admin',
- 'updateTime': '2024-01-31 11:29:01',
- 'equipmentId': '2140111',
- 'equipmentName': '鏁版帶杞﹀簥',
- 'equipmentType': '杞﹀簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.167',
- 'dataPort': '502',
- 'driveType': 'ZUOLAN',
- 'equipmentModel': 'SSCKZ40-1000',
- 'controlSystem': 'ZUOLAN',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'ZUOLAN_2140111',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1753259512871624705',
- 'createBy': 'admin',
- 'createTime': '2024-02-02 11:30:16',
- 'updateBy': null,
- 'updateTime': null,
- 'equipmentId': '3102038',
- 'equipmentName': '鐢电伀鑺辨垚鍨嬫満',
- 'equipmentType': null,
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.23',
- 'dataPort': '502',
- 'driveType': 'ZUOLAN',
- 'equipmentModel': 'DM7150',
- 'controlSystem': 'ZUOLAN',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'ZUOLAN_3102038',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': '222333',
- 'selectedDeparts': null,
- 'selectedProduction': null
- }
- ],
+ equipmentList: []
}
},
watch: {
@@ -356,9 +129,9 @@
signageApi.getEquipmentStatusAnalysisApi(this.currentProductionId)
.then(res => {
if (res.success) {
- this.leftChart1Data = res.result.equipmentStatus
+ that.leftChart1Data = res.result.equipmentStatus
}
- this.initLeftChart1()
+ that.initLeftChart1()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -370,14 +143,14 @@
signageApi.getRepairAndMaintenanceStatusApi(this.currentProductionId)
.then(res => {
if (res.success) {
- this.leftChart2Data = res.result.map(item => {
+ that.leftChart2Data = res.result.map(item => {
return {
name: item.statusText,
value: item.totalNumber
}
})
}
- this.initLeftChart2()
+ that.initLeftChart2()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -388,8 +161,8 @@
const that = this
signageApi.getRateAnalysisTrendApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightTopChartData = res.result
- this.initRightTopChart()
+ if (res.success) that.rightTopChartData = res.result
+ that.initRightTopChart()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -400,8 +173,8 @@
const that = this
signageApi.getRepairAnalysisApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightBottomChart1Data = res.result
- this.initRightBottomChart1()
+ if (res.success) that.rightBottomChart1Data = res.result
+ that.initRightBottomChart1()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -412,8 +185,8 @@
const that = this
signageApi.getInspectionAnalysisApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightBottomChart2Data = res.result
- this.initRightBottomChart2()
+ if (res.success) that.rightBottomChart2Data = res.result
+ that.initRightBottomChart2()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -424,8 +197,8 @@
const that = this
signageApi.getMaintenanceAnalysisApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightBottomChart3Data = res.result
- this.initRightBottomChart3()
+ if (res.success) that.rightBottomChart3Data = res.result
+ that.initRightBottomChart3()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -1217,7 +990,6 @@
* @param equipmentId 璁惧缂栧彿
*/
handleSelectChange(equipmentId) {
- // this.equipmentId = value
console.log('equipment', equipmentId)
this.$emit('nextSignage', { id: equipmentId })
},
--
Gitblit v1.9.3