From 5fb43d29f47d9b316414b28ea84a6fab3133b856 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 22 四月 2024 22:33:18 +0800
Subject: [PATCH] 完善报警统计
---
src/views/mdc/configComp/Efficiency.vue | 34 +++++++++++------
src/views/mdc/components/TimeAlarm.vue | 80 ++++++++++++++++++++++++++--------------
2 files changed, 74 insertions(+), 40 deletions(-)
diff --git a/src/views/mdc/components/TimeAlarm.vue b/src/views/mdc/components/TimeAlarm.vue
index 871db94..8f1072e 100644
--- a/src/views/mdc/components/TimeAlarm.vue
+++ b/src/views/mdc/components/TimeAlarm.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-21 19:17:55
+ * @LastEditTime: 2024-04-22 22:32:05
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/TimeAlarm.vue
-->
<template>
@@ -12,32 +12,51 @@
<el-col style="margin-top: 12px;">
<el-collapse v-model="active" accordion>
<el-collapse-item title="鏃� 鎸夋棩鏌ョ湅" name="1">
- <el-button-group>
+ <el-button-group style="margin-bottom: 14px">
<el-button size="small" @click="queryDay(item)" :type="valueDay == item.value ? 'primary' : ''"
v-for="item in btnListDay" :key="item.value">{{
item.label
}}</el-button>
</el-button-group>
- <scEcharts v-if="active == 1" style="width:100%" height="300px" :option="dayCharts"></scEcharts>
+ <scEcharts v-show="!isShowTable" style="width:100%" height="300px" :option="dayCharts">
+ </scEcharts>
+ <scTable v-show="isShowTable" ref="table0" row-key="id" border :params="params" :apiObj="apiObj0"
+ stripe>
+ <el-table-column prop="alarmCode" label="鎶ヨ浠ｇ爜" />
+ <el-table-column prop="alarmMsg" label="鎶ヨ淇℃伅" />
+ <el-table-column prop="count" label="鎶ヨ娆℃暟" />
+ </scTable>
</el-collapse-item>
<el-collapse-item title="鍛� 鎸夊懆鏌ョ湅" name="2">
- <el-button-group>
+ <el-button-group style="margin-bottom: 14px">
<el-button size="small" @click="queryWeek(item)"
:type="valueWeek == item.value ? 'primary' : ''" v-for="item in btnListWeek"
:key="item.value">{{ item.label
}}</el-button>
</el-button-group>
- <scEcharts v-if="active == 2" style="width:100%" height="300px" :option="weekCharts"></scEcharts>
+ <scEcharts v-show="!isShowTable" style="width:100%" height="300px" :option="weekCharts">
+ </scEcharts>
+ <scTable v-show="isShowTable" ref="table1" row-key="id" border :params="params" :apiObj="apiObj1"
+ stripe>
+ <el-table-column prop="alarmCode" label="鎶ヨ浠ｇ爜" />
+ <el-table-column prop="alarmMsg" label="鎶ヨ淇℃伅" />
+ <el-table-column prop="count" label="鎶ヨ娆℃暟" />
+ </scTable>
</el-collapse-item>
<el-collapse-item title="鏈� 鎸夋湀鏌ョ湅" name="3">
- <el-button-group>
+ <el-button-group style="margin-bottom: 14px">
<el-button size="small" @click="queryMonth(item)"
:type="valueMonth == item.value ? 'primary' : ''" v-for="item in btnListMonth"
:key="item.value">{{ item.label
}}</el-button>
</el-button-group>
- <scEcharts v-if="active == 3" height="300px" :option="monthCharts"></scEcharts>
-
+ <scEcharts v-show="!isShowTable" height="300px" :option="monthCharts"></scEcharts>
+ <scTable v-show="isShowTable" ref="table2" row-key="id" border :params="params" :apiObj="apiObj2"
+ stripe>
+ <el-table-column prop="alarmCode" label="鎶ヨ浠ｇ爜" />
+ <el-table-column prop="alarmMsg" label="鎶ヨ淇℃伅" />
+ <el-table-column prop="count" label="鎶ヨ娆℃暟" />
+ </scTable>
</el-collapse-item>
</el-collapse>
</el-col>
@@ -60,7 +79,10 @@
data() {
return {
sheetUrl: '/api/blade-mdc/alarm/data-sheet',
- apiObj: '',
+ apiObj0: '',
+ apiObj1: '',
+ apiObj2: '',
+ isShowTable: false,
params: {
enums: "DAY",
month: 0,
@@ -70,7 +92,7 @@
workstationId: "",
year: 0,
},
- active: '1',
+ active: ['1', '2', '3'],
valueDay: '',
valueWeek: '',
valueMonth: '',
@@ -164,13 +186,12 @@
year: row.year,
shiftIndex: 1,
workstationId: this.params.workstationId,
- }).then(res => {
+ }, 0).then(res => {
this.dayCharts = res
})
},
queryWeek(row) {
this.valueWeek = row.value
- console.log(row)
this.query({
enums: "WEEK",
queryTime: this.valueDay,
@@ -178,7 +199,7 @@
month: row.month,
year: row.year,
workstationId: this.params.workstationId,
- }).then(res => {
+ }, 1).then(res => {
this.weekCharts = res
})
},
@@ -191,13 +212,13 @@
month: row.month,
year: row.year,
workstationId: this.params.workstationId,
- }).then(res => {
+ }, 2).then(res => {
this.monthCharts = res
})
},
- query(data) {
- console.log(data)
- this.queryTableData(data)
+ query(data, flag) {
+ console.log('--------')
+ this.queryTableData(data, flag)
return this.$HTTP.post(this.url, data, {}).then(res => {
return this.setOptions(res.data.res)
})
@@ -235,17 +256,20 @@
}]
}
},
- queryTableData() {
- // return this.$HTTP.post(this.sheetUrl, data, {}).then(res => {
- // this.tableData = res.data.map(item => {
- // return {
- // title: `鐝${item.shiftIndex}`,
- // shiftName: item.shiftName,
- // shiftIndex: item.shiftIndex,
- // data: item.alarmDataSheetVOList
- // }
- // })
- // })
+ queryTableData(dataConf, flag) {
+ console.log(dataConf, '>>>>>>>')
+ this[`apiObj${flag}`] = {
+ get: async (data) => {
+ let params = {
+ current: data.current,
+ size: data.size
+ }
+ return await this.$HTTP.post(this.sheetUrl, dataConf, { params }).then(res => {
+ return res
+ })
+ }
+ }
+ // this.$refs[`table${flag}`].reload()
}
}
}
diff --git a/src/views/mdc/configComp/Efficiency.vue b/src/views/mdc/configComp/Efficiency.vue
index ad091cc..01cfeed 100644
--- a/src/views/mdc/configComp/Efficiency.vue
+++ b/src/views/mdc/configComp/Efficiency.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-17 22:17:37
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-17 23:06:48
+ * @LastEditTime: 2024-04-22 19:07:49
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configComp/Efficiency.vue
-->
<template>
@@ -19,7 +19,7 @@
鎺掗櫎鐝鍐呬紤鎭椂闂�
</el-col>
<el-col :span="4">
- <el-switch @change="save" :active-value="1" :inactive-value="0"
+ <el-switch @change="save()" :active-value="1" :inactive-value="0"
v-model="mdc_open_type.TIME_USED_ANALYSIS" />
</el-col>
</el-row>
@@ -45,7 +45,8 @@
鎺掗櫎鐝鍐呬紤鎭椂闂�
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_type.RUNNING" />
+ <el-switch @change="save()" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_type.RUNNING" />
</el-col>
</el-row>
<el-row>
@@ -53,7 +54,8 @@
鎺掗櫎鐝瀵瑰鏃堕棿锛堝寘鎷彮娆″唴鏈畾涔夋椂闂达級
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_shift.RUNNING" />
+ <el-switch @change="save(true)" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_shift.RUNNING" />
</el-col>
</el-row>
<el-row>
@@ -62,7 +64,8 @@
鎺掗櫎鐝鍐呬紤鎭椂闂�
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_type.ALARM" />
+ <el-switch @change="save()" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_type.ALARM" />
</el-col>
</el-row>
<el-row>
@@ -70,7 +73,8 @@
鎺掗櫎鐝瀵瑰鏃堕棿锛堝寘鎷彮娆″唴鏈畾涔夋椂闂达級
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_shift.ALARM" />
+ <el-switch @change="save(true)" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_shift.ALARM" />
</el-col>
</el-row>
<el-row>
@@ -79,7 +83,8 @@
鎺掗櫎鐝鍐呬紤鎭椂闂�
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_type.OEE" />
+ <el-switch @change="save()" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_type.OEE" />
</el-col>
</el-row>
<el-row>
@@ -87,7 +92,8 @@
鎺掗櫎鐝瀵瑰鏃堕棿锛堝寘鎷彮娆″唴鏈畾涔夋椂闂达級
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_shift.OEE" />
+ <el-switch @change="save(true)" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_shift.OEE" />
</el-col>
</el-row>
</el-card>
@@ -102,7 +108,8 @@
鎺掗櫎鐝鍐呬紤鎭椂闂�
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_type.OUT_PUT" />
+ <el-switch @change="save()" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_type.OUT_PUT" />
</el-col>
</el-row>
<el-row>
@@ -110,7 +117,8 @@
鎺掗櫎鐝瀵瑰鏃堕棿锛堝寘鎷彮娆″唴鏈畾涔夋椂闂达級
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_shift.OUT_PUT" />
+ <el-switch @change="save(true)" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_shift.OUT_PUT" />
</el-col>
</el-row>
</el-card>
@@ -125,7 +133,8 @@
鎺掗櫎鐝鍐呬紤鎭椂闂�
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_type.ALARM_ANALYSIS" />
+ <el-switch @change="save()" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_type.ALARM_ANALYSIS" />
</el-col>
</el-row>
<el-row>
@@ -133,7 +142,8 @@
鎺掗櫎鐝瀵瑰鏃堕棿锛堝寘鎷彮娆″唴鏈畾涔夋椂闂达級
</el-col>
<el-col :span="4">
- <el-switch :active-value="1" :inactive-value="0" v-model="mdc_open_shift.ALARM_ANALYSIS" />
+ <el-switch @change="save(true)" :active-value="1" :inactive-value="0"
+ v-model="mdc_open_shift.ALARM_ANALYSIS" />
</el-col>
</el-row>
</el-card>
--
Gitblit v1.9.3