From cabb42ddb2ee6d5daeb8e6b4cf2142d725dda845 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 18 四月 2024 21:50:15 +0800
Subject: [PATCH] update
---
src/views/mdc/MYTree.vue | 16 +++++++-
src/views/mdc/efficiency-analysis.vue | 67 +++++++++++++++++++++++++++++----
2 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/src/views/mdc/MYTree.vue b/src/views/mdc/MYTree.vue
index c54ec8f..0d290aa 100644
--- a/src/views/mdc/MYTree.vue
+++ b/src/views/mdc/MYTree.vue
@@ -1,16 +1,17 @@
<!--
* @Date: 2024-04-18 19:53:35
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-18 20:56:37
+ * @LastEditTime: 2024-04-18 21:30:19
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/MYTree.vue
-->
<template>
<el-tree ref="treeRef" v-bind="$attrs" :show-checkbox="showCheckbox" :current-node-key="currentNodeKey"
node-key="id" :props="defalutProps" :data="data" @check-change="checkChange" @node-click="handleNodeClick"
- highlight-current default-expand-all></el-tree>
+ highlight-current default-expand-all :render-content="renderContent"></el-tree>
</template>
<script>
+import pmsPng from '@/assets/pms.png'
export default {
props: {
showCheckbox: {
@@ -20,6 +21,7 @@
},
data() {
return {
+ pmsPng,
firstWorkKey: '',
currentNodeKey: '',
defalutProps: {
@@ -44,6 +46,16 @@
this.getList()
},
methods: {
+ renderContent(h, { data }) {
+ let img = data.groupTag == 'fms_beltline'
+ return h('span', {
+
+ },
+ img ? h('img', {
+ src: pmsPng
+ }, '') : '',
+ data.title)
+ },
getList() {
this.$HTTP.post('/api/blade-cps/group/groupWorkstation/type', {
groupCategory: 1,
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 9160c0e..2776c22 100644
--- a/src/views/mdc/efficiency-analysis.vue
+++ b/src/views/mdc/efficiency-analysis.vue
@@ -1,31 +1,52 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-18 20:57:46
+ * @LastEditTime: 2024-04-18 21:48:13
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
<template>
- <el-main>
- <el-card shadow="never">
- <el-container>
- <el-aside width="200px" v-loading="showGrouploading">
+ <el-main style="height: 100%;">
+ <el-card shadow="never" style="height: 100%;" body-style="height: 100%">
+ <el-container style="height: 100%;">
+ <el-aside width="300px" style="height: 100%;">
<el-container>
<el-main class="nopadding">
<el-row>
<el-col>缁熻鏁版嵁</el-col>
<el-col>
- <el-select></el-select>
+ <el-select style="width: 250px" v-model="productivityType">
+ <el-option v-for="(item, index) in options" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
</el-col>
- <el-col>鏃ユ湡</el-col>
+ <el-col style="margin-top: 14px;">鏃ユ湡</el-col>
<el-col>
- <el-select></el-select>
+ <el-date-picker style="width: 250px" v-model="time" type="daterange"
+ range-separator="-" start-placeholder="" end-placeholder="" />
</el-col>
+ </el-row>
+ <el-row style="margin-top: 14px;">
+ 宸ヤ綅
</el-row>
<MYTree v-model="treeChecked" show-checkbox></MYTree>
</el-main>
+ <el-footer>
+ <el-button>鏌ヨ</el-button>
+ <el-button>瀵煎嚭</el-button>
+ </el-footer>
</el-container>
</el-aside>
+ <el-container>
+ <el-tabs tab-position="top" v-model="activeName">
+ <el-tab-pane label="鎸夌彮娆＄粺璁�" name="ban">
+
+ </el-tab-pane>
+ <el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
+
+ </el-tab-pane>
+ </el-tabs>
+ </el-container>
</el-container>
</el-card>
</el-main>
@@ -44,12 +65,40 @@
},
data() {
return {
- treeChecked: []
+ activeName: '',
+ productivityType: '',
+ time: [],
+ options: [
+ {
+ label: '绋煎姩鐜�',
+ value: 'OEE',
+ },
+ {
+ label: '鎶ヨ鐜�',
+ value: 'ALARM',
+ },
+ {
+ label: '杩愯鐜�',
+ value: 'RUNNING',
+ },
+ ]
}
},
methods: {
query(vals) {
console.log([...vals])
+ this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ endDate: this.time[0],
+ startDate: this.time[1],
+ statisticalMethod: 'SHIFT'
+ })
+ 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])
}
}
}
--
Gitblit v1.9.3