From 3432c3100ccb4c3b78dc0a5f7f242bdcda503a63 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 18 六月 2025 10:45:49 +0800
Subject: [PATCH] 1、终端程序呼叫页面呼叫原因组件由输入框改为多行文本域 2、设备管理页面新增设备图片字段同时在新增和编辑设备时添加设备图片 3、设备监控以及设备看板页面新增故障状态同时替换设备图片为设备管理页面中维护的设备图片而不再是设备所属设备类型图片以及三色灯增加故障状态灯
---
src/views/mdc/base/DeviceBaseInfo.vue | 178 ++++++++++++++---------------------------------------------
1 files changed, 43 insertions(+), 135 deletions(-)
diff --git a/src/views/mdc/base/DeviceBaseInfo.vue b/src/views/mdc/base/DeviceBaseInfo.vue
index 0394307..15f550c 100644
--- a/src/views/mdc/base/DeviceBaseInfo.vue
+++ b/src/views/mdc/base/DeviceBaseInfo.vue
@@ -7,39 +7,29 @@
<a-col :md="24-5" :sm="24">
<div class="device-status-info">
<a-space v-for="item in deviceStatusList" :key="item.value" class="single-status-info">
- <template v-if="item.value!=99">
- <div>{{ item.label }}</div>
- <div class="status-square" :style="{ backgroundColor: item.color }"></div>
- <div>{{getDeviceNumberByStatus(item.value) }}</div>
- </template>
- <template v-else>
- <div>{{ item.label }}</div>
- <div>{{getDeviceNumberByStatus(item.value) }}</div>
- </template>
+ <div>{{ item.label }}</div>
+ <div v-if="item.value!=99" class="status-square" :style="{ backgroundColor: item.color }"></div>
+ <div>{{getDeviceNumberByStatus(item.value) }}</div>
</a-space>
</div>
<div>
<a-tabs default-active-key="1">
<a-tab-pane key="1" tab="甯冨眬鍥�">
- <equipment-layout :dataList="dataList" :equipmentId="selectEquipmentId"
- :node="selectEquipment"></equipment-layout>
+ <equipment-layout :dataList="dataList" :equipmentId="selectEquipmentId" :node="selectEquipment"/>
</a-tab-pane>
<a-tab-pane key="2" tab="鍒楄〃" force-render>
- <equipment-list :dataSource="dataList" @editEquipmentStatus="editEquipmentStatus"></equipment-list>
+ <equipment-list :dataSource="dataList"/>
</a-tab-pane>
</a-tabs>
</div>
</a-col>
</a-row>
-
-
</a-card>
</template>
<script>
- import { putAction, getAction } from '@/api/manage'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import { getAction } from '@/api/manage'
import BaseTree from '../common/BaseTree'
import EquipmentLayout from './modules/DeviceBaseInfo/EquipmentLayout'
import EquipmentList from './modules/DeviceBaseInfo/EquipmentList'
@@ -58,14 +48,8 @@
selectEquipment: {},
equipmentStatisticsInfo: {},
dataList: [],
- standbyNumber: 0,
- offNumber: 0,
- warningNumber: 0,
- workNumber: 0,
- allNumber: 0,
url: {
- list: '/mdc/mdcEquipment/queryEquipmentMonitorList',
- updateEquipmentStatus: '/mdc/mdcEquipment/updateEquipmentStatus'
+ list: '/mdc/mdcEquipment/queryEquipmentMonitorList'
},
param: {},
timer: null,
@@ -91,9 +75,9 @@
color: '#FF0000'
},
{
- label: '寮傚父',
- value: 33,
- color: '#FFA200'
+ label: '鏁呴殰',
+ value: 5,
+ color: '#C11900'
},
{
label: '鎬绘暟',
@@ -109,67 +93,44 @@
},
methods: {
equipmentStatistics(param, resopnse = { key: false }) {
- getAction(this.url.list, param).then((res) => {
- this.dataList = []
- if (res.success) {
- if (res.result.length != 0) {
- this.standbyNumber = 0
- this.offNumber = 0
- this.warningNumber = 0
- this.workNumber = 0
- this.allNumber = 0
- this.dataList = res.result
- this.allNumber = this.dataList.length
- if (resopnse.key) {
- this.$notification.success({
- key: 'equipmentStatus',
+ getAction(this.url.list, param)
+ .then((res) => {
+ this.dataList = []
+ if (res.success) {
+ if (res.result.length != 0) {
+ this.dataList = res.result
+ if (resopnse.key) {
+ this.$notification.success({
+ key: 'equipmentStatus',
+ message: '娑堟伅',
+ description: resopnse.message
+ })
+ }
+
+ // 绛涢�変粠杞︽澘璺宠浆杩囨潵鐨勯渶姹傛暟鎹�
+ const { signageData } = this.$route.params
+ console.log('signageData', signageData)
+ if (!signageData) return
+ else this.filterDataList(signageData)
+ } else {
+ this.$notification.warning({
message: '娑堟伅',
- description: resopnse.message
+ description: '姝よ溅闂翠笅闈㈡棤璁惧锛侊紒'
})
}
- for (let i = 0; i < this.dataList.length; i++) {
- let item = this.dataList[i]
- switch (item.oporationDict) {
- case '寰呮満' :
- this.standbyNumber = this.standbyNumber + 1
- break
- case '杩愯' :
- this.workNumber = this.workNumber + 1
- break
- case '鍏虫満' :
- this.offNumber = this.offNumber + 1
- break
- case '鎶ヨ' :
- this.warningNumber = this.warningNumber + 1
- break
- default:
- break
- }
- }
-
- // 绛涢�変粠杞︽澘璺宠浆杩囨潵鐨勯渶姹傛暟鎹�
- const { signageData } = this.$route.params
- console.log('signageData', signageData)
- if (!signageData) return
- else this.filterDataList(signageData)
- } else {
+ }
+ else {
this.$notification.warning({
message: '娑堟伅',
- description: '姝よ溅闂翠笅闈㈡棤璁惧锛侊紒'
+ description: res.message
})
}
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
+ })
},
/**
* 绛涢�夋弧瓒充粠鐪嬫澘璺宠浆杩囨潵鏃剁殑鏉′欢鐨勬暟鎹�
- * @param record
+ * @param signageData
*/
filterDataList(signageData) {
this.dataList = this.dataList.filter(item => item.oporationDict === signageData.name)
@@ -182,49 +143,12 @@
this.selectEquipment = val.equipmentId
clearInterval(this.timer)
this.timer = null
- if (!val.equipmentId) {
- this.param.key = val.key
- this.equipmentStatistics(this.param)
- this.timer = setInterval(() => {
- setTimeout(this.equipmentStatistics(this.param), 0)
- }, 1000 * 10)
- } else {
- this.param.key = val.parentId
- this.equipmentStatistics(this.param)
- this.timer = setInterval(() => {
- setTimeout(this.equipmentStatistics(this.param), 0)
- }, 1000 * 10)
- }
- },
-
- /**
- * 鍗曞嚮鐘舵�佸弽棣堝悗瑙﹀彂
- * @param record
- */
- editEquipmentStatus(record) {
- const _this = this
- this.$notification.info({
- key: 'equipmentStatus',
- message: '娑堟伅',
- description: '鍙嶉涓�...'
- })
- getAction(this.url.updateEquipmentStatus, { id: record.id })
- .then(res => {
- if (res.success) {
- _this.equipmentStatistics(this.param, { key: true, message: res.message })
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
- .catch(err => {
- this.$notification.error({
- message: '娑堟伅',
- description: err.message
- })
- })
+ if (!val.equipmentId) this.param.key = val.key
+ else this.param.key = val.parentId
+ this.equipmentStatistics(this.param)
+ this.timer = setInterval(() => {
+ setTimeout(this.equipmentStatistics(this.param), 0)
+ }, 1000 * 10)
},
/**
@@ -269,22 +193,6 @@
display: inline-block;
width: 15px;
height: 15px;
- }
-
- .equipMessage table td .equipShutdown {
- background-color: #808080;
- }
-
- .equipMessage table td .standbyNumber {
- background-color: #ffbf37;
- }
-
- .equipMessage table td .equipRun {
- background-color: #19FE01;
- }
-
- .equipMessage table td .equipAlarm {
- background-color: #FD0008;
}
.device-status-info {
--
Gitblit v1.9.3