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 | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 7d0e50e..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-06-22 18:34:40
+ * @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%;">
@@ -39,7 +39,13 @@
</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 :options="chartOption" colname="鏁堢巼" ref="shift" v-if="activeName == 'shift'" />
@@ -52,6 +58,9 @@
</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>
@@ -61,12 +70,20 @@
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,
- exportDialog
+ exportDialog,
+ Efficiency
},
watch: {
activeName() {
@@ -78,6 +95,8 @@
},
data() {
return {
+ dialogVisible: false,
+ showModalList: [2],
activeName: 'shift',
productivityType: 'OEE',
time: [],
@@ -190,8 +209,11 @@
this.query()
},
methods: {
+ openSet() {
+ this.dialogVisible = true;
+ },
exportExcel(statisticalMethod) {
- this.$HTTP.post(`/api/blade-mdc/efficiency-analysis/export`, {
+ this.$HTTP.post(`/api/mdc/efficiency-analysis/export`, {
startDate: this.time[0],
endDate: this.time[1],
statisticalMethod,
@@ -214,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