From eef1ef0be935d4a3d8fc691b2666f41796b2d4a5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 04 十一月 2024 19:57:08 +0800
Subject: [PATCH] 增加列表显示
---
src/views/mdc/efficiency-analysis.vue | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 161 insertions(+), 18 deletions(-)
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 56beb57..aa82aff 100644
--- a/src/views/mdc/efficiency-analysis.vue
+++ b/src/views/mdc/efficiency-analysis.vue
@@ -1,12 +1,12 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-20 19:41:25
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-11-04 12:23:49
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
<template>
- <el-main style="height: 100%;">
+ <el-main style="height: 100%;" class="efficiencyAnalysis">
<el-card shadow="never" style="height: 100%;" body-style="height: 100%">
<el-container style="height: 100%;">
<el-aside width="300px" style="height: 100%;">
@@ -32,25 +32,35 @@
<MYTree v-model="treeChecked" show-checkbox></MYTree>
</el-main>
<el-footer>
- <el-button @click="query">鏌ヨ</el-button>
- <el-button>瀵煎嚭</el-button>
+ <el-button type="primary" @click="query">鏌ヨ</el-button>
+ <!-- <el-button @click="exportExcel">瀵煎嚭</el-button> -->
+ <exportDialog @export="exportExcel"></exportDialog>
</el-footer>
</el-container>
</el-aside>
<el-container>
- <el-main>
+ <el-main style="position: relative;">
+ <span class="setSpan">
+ <el-icon class="setIcon">
+ <Setting />
+ </el-icon>
+ <span class="setBtn" @click="openSet">鏁堢巼鍒嗘瀽璁剧疆</span>
+ </span>
<el-tabs tab-position="top" v-model="activeName" type="card">
<el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
- <Shift ref="shift" v-if="activeName == 'shift'" />
+ <Shift :options="chartOption" colname="鏁堢巼" ref="shift" v-if="activeName == 'shift'" />
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <Time ref="time" v-if="activeName == 'time'" />
+ <Time :options="chartOption1" ref="time" v-if="activeName == 'time'" />
</el-tab-pane>
</el-tabs>
</el-main>
</el-container>
</el-container>
</el-card>
+ <el-dialog title="璁剧疆" v-model="dialogVisible" v-if="dialogVisible" width="30%" class="setModelStyle">
+ <Efficiency :showModalList="showModalList" />
+ </el-dialog>
</el-main>
</template>
@@ -59,12 +69,21 @@
import MYTree from './MYTree.vue'
import Shift from './components/Shift.vue'
import Time from './components/Time.vue'
-
+import exportDialog from '@/layout/components/exportDialog.vue'
+import Efficiency from './configComp/Efficiency.vue'
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+let icons = []
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+ icons.push(key)
+}
export default {
components: {
+ ...ElementPlusIconsVue,
MYTree,
Shift,
- Time
+ Time,
+ exportDialog,
+ Efficiency
},
watch: {
activeName() {
@@ -76,10 +95,97 @@
},
data() {
return {
+ dialogVisible: false,
+ showModalList: [2],
activeName: 'shift',
productivityType: 'OEE',
time: [],
treeChecked: [],
+ chartOption1: {
+ title: {
+ text: '缁熻鍥捐〃',
+ subtext: '',
+ },
+ grid: {
+ top: '80px'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ tooltip: {
+ trigger: 'axis',
+ valueFormatter: (params) => {
+ return params.toFixed(2) + '%'
+ }
+ },
+ xAxis: {
+ type: 'category',
+ axisLabel: {
+ interval: 'auto',
+ }
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ formatter: (value) => {
+ return value + '%'
+ }
+ },
+ },
+ dataZoom: [
+ { type: 'slider' }
+ ],
+ dataset: {
+ source: []
+ },
+ series: []
+ },
+ chartOption: {
+ legend: {
+ type: 'plain',
+ },
+ title: {
+ text: '缁熻鍥捐〃',
+ subtext: '',
+ },
+ grid: {
+ top: '80px'
+ },
+ tooltip: {
+ trigger: 'axis',
+ valueFormatter: (params) => {
+ console.log(params, '>>>>>>>>.113213')
+ return params.toFixed(2) + '%'
+ }
+ },
+ xAxis: {
+ type: 'category',
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ formatter: (value) => {
+ return value + '%'
+ }
+ },
+ },
+ dataZoom: [
+ { type: 'slider' }
+ ],
+ dataset: {
+ source: [
+ ['product', '鐝1', '鐝2'],
+ ]
+ },
+ series: [
+ {
+ type: 'bar',
+ },
+ {
+ type: 'bar',
+ }
+ ]
+ },
options: [
{
label: '绋煎姩鐜�',
@@ -103,6 +209,25 @@
this.query()
},
methods: {
+ openSet() {
+ this.dialogVisible = true;
+ },
+ exportExcel(statisticalMethod) {
+ this.$HTTP.post(`/api/mdc/efficiency-analysis/export`, {
+ startDate: this.time[0],
+ endDate: this.time[1],
+ statisticalMethod,
+ productivityType: this.productivityType,
+ shiftIndexList: [1, 2],
+ workStationIdList: this.treeChecked
+ }).then(res => {
+ if (res.success) {
+ window.open(res.data.link)
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
query() {
this.$refs[this.activeName].init({
endDate: this.time[1],
@@ -111,16 +236,34 @@
shiftIndexList: [1, 2],
workStationIdList: [...this.treeChecked]
})
- // this.$HTTP.post('/api/blade-mdc/efficiency-analysis?size=-1', {
-
- // })
- // this.$HTTP.post('/api/blade-mdc/efficiency-analysis?current=1&size=15', {
-
- // })
- // this.$HTTP.post('/api/blade-cps/workstation-wcs-feedback/feedback-status', [...vals])
}
}
}
</script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style scoped>
+ .setSpan {
+ vertical-align: sub;
+ font-size: 14px;
+ position: absolute;
+ top: 26px;
+ left: 280px;
+ z-index: 11;
+ }
+ .setIcon {
+ color: #409eff;
+ margin-left: 15px;
+ vertical-align: -2px;
+ }
+ .setBtn {
+ margin-left: 2px;
+ color: #409eff;
+ margin-left: 8px;
+ cursor: pointer;
+ font-size: 14px;
+ }
+ .efficiencyAnalysis >>> .el-dialog__body {
+ padding-bottom: 0px;
+ padding-top: 0px;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3