From 0eecbc5bb04d28a6591d25c06defefdc4f12ec9f Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期二, 23 四月 2024 17:12:31 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 317 ++++++++++++++++++++++++++++++++++------------------
src/views/mdc/station-live.vue | 5
2 files changed, 207 insertions(+), 115 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index c94dd47..0afc929 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-19 18:26:26
+ * @LastEditTime: 2024-04-23 17:08:42
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -794,10 +794,7 @@
}
.status-wrap {
display: flex;
- -ms-flex-wrap: wrap;
flex-wrap: wrap;
- -webkit-box-pack: start;
- -ms-flex-pack: start;
justify-content: start;
}
.status-wrap .status-con {
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 89ae316..ae523e8 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -2,71 +2,43 @@
<div class="aposcope-main">
<div class="aposcope-left">
<div class="left-title">鏌ヨ鏉′欢</div>
- <div>鏃ユ湡</div>
- <!-- <el-date-picker
- v-model="time"
- type="datetimerange"
- range-separator="-"
- start-placeholder=""
- end-placeholder="" />
- -->
- <el-date-picker
- v-model="time"
- type="datetimerange"
- :shortcuts="shortcuts"
- range-separator="-"
- start-placeholder="Start date"
- end-placeholder="End date"
- />
-
- <!-- <el-date-picker value-format="YYYY-MM-DD" style="width: 250px" v-model="time" type="daterange" range-separator="-" start-placeholder="" end-placeholder="" /> -->
+ <div class="left-title-col">鏃ユ湡</div>
+ <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;"/>
+ <div class="left-title-col">宸ヤ綅</div>
+ <div class="MYTree">
+ <MYTree v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
+ </div>
+ <div class="footer">
+ <el-button @click="query">鏌ヨ</el-button>
+ <el-button>瀵煎嚭</el-button>
+ </div>
</div>
<div class="aposcope-right">
+ <el-tabs tab-position="top" v-model="activeName" type="card">
+ <el-tab-pane label="鎸夋棩鏈熸煡鐪�" name="shift">
+ <el-button-group>
+ <el-button @click="btnListActive = item.id" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button>
+ </el-button-group>
+ <div class="status">
+ <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
+ <div class="status-wrap align-left">
+ <div class="collect-status">閲囬泦鐘舵��</div>
+ <div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
+ </div>
+ <div class="status-wrap">
+ <el-checkbox v-model="checked1" label="浜哄伐鍙嶉鐘舵��" size="large" />
+ <div class="status-con">
+ <div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
+ </div>
+ </div>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
+ 鎸夊伐浣嶆煡鐪�
+ </el-tab-pane>
+ </el-tabs>
</div>
</div>
- <!-- <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 style="margin-top: 14px;">鏃ユ湡</el-col>
- <el-col>
- <el-date-picker value-format="YYYY-MM-DD" 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 @click="query">鏌ヨ</el-button>
- <el-button>瀵煎嚭</el-button>
- </el-footer>
- </el-container>
- </el-aside>
- <el-container>
- <el-main>
- <el-tabs tab-position="top" v-model="activeName" type="card">
- <el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
- <Shift colname="浜ч噺" url="/api/blade-mdc/output" ref="shift"
- v-if="activeName == 'shift'">
- </Shift>
- </el-tab-pane>
- <el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <Time url="/api/blade-mdc/output" ref="time" v-if="activeName == 'time'">
-
- </Time>
- </el-tab-pane>
- </el-tabs>
- </el-main>
- </el-container>
- </el-container>
- </el-card>
- </el-main> -->
</template>
<script>
@@ -80,73 +52,113 @@
time: "",
MYTree,
Shift,
- Time,
- shortcuts: [
- {
- text: 'Last week',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setDate(start.getDate() - 7)
- return [start, end]
- },
- },
- {
- text: 'Last month',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setMonth(start.getMonth() - 1)
- return [start, end]
- },
- },
- {
- text: 'Last 3 months',
- value: () => {
- const end = new Date()
- const start = new Date()
- start.setMonth(start.getMonth() - 3)
- return [start, end]
- },
- },
- ]
+ Time
},
watch: {
activeName() {
- this.$nextTick(() => {
- this.query()
- })
-
+ // this.$nextTick(() => {
+ // this.query()
+ // })
+ },
+ btnListActive(val) {
+ // this.query({
+ // ...this.params,
+ // startDate: val,
+ // endDate: val
+ // })
+ // this.queryChart({
+ // ...this.params,
+ // startDate: val,
+ // endDate: val
+ // })
}
},
data() {
return {
+ checked1: true,
+ btnListActive: '',
+ btnList: [],
+ timeBtn: "",
+ shortcuts: [
+ {
+ text: '鏈�杩�3澶�',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setDate(start.getDate() - 3)
+ return [start, end]
+ },
+ },
+ {
+ text: '鏈�杩�7澶�',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setMonth(start.getDate() - 7)
+ return [start, end]
+ },
+ },
+ {
+ text: '鏈�杩戜竴涓湀',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setMonth(start.getMonth() - 1)
+ return [start, end]
+ },
+ },
+ ],
activeName: 'shift',
time: [],
treeChecked: [],
- options: [
- {
- label: '绋煎姩鐜�',
- value: 'OEE',
- },
- {
- label: '鎶ヨ鐜�',
- value: 'ALARM',
- },
- {
- label: '杩愯鐜�',
- value: 'RUNNING',
- },
- ]
+ achievements: [],
+ collectionstatus: [],
}
},
created() {
- this.time = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+
},
mounted() {
- this.query()
+ this.query();
+ this.init();
},
methods: {
+ getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
+ this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
+ if(res.code == 200) {
+ var achievements = [];//閲囬泦鐘舵��
+ var collectionstatus = []; //浜哄伐鍙嶉鐘舵��
+ res.data.forEach(item=> {
+ if(item.type == 1) {
+ achievements.push(item);
+ }
+ if(item.type == 4) {
+ collectionstatus.push(item);
+ }
+ })
+ this.achievements = achievements;
+ this.collectionstatus = collectionstatus;
+ }
+ })
+ },
+ getTime(data) {
+ this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ ...data
+ }).then(res => {
+ if (res.code === 200) {
+ this.btnList = res.data
+ this.btnListActive = res?.data?.[0]?.id
+ }
+ })
+ },
+ init() {
+ this.time = [moment().subtract(2, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
+ this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'}); //鏃ユ湡sort
+ this.getachievements(); //閲囬泦鐘舵�乷r浜哄伐鍙嶉鐘舵��
+ },
+ timeBtnChange() {
+
+ },
query() {
// this.$refs[this.activeName].init({
// endDate: this.time[1],
@@ -163,13 +175,18 @@
.aposcope-main {
display: flex;
min-height: 100%;
+ height: 100%;
margin: 8px;
}
.aposcope-left {
+ position: relative;
width: 240px;
margin-right: 8px;
padding: 4px;
+ height: 100%;
background-color: #fff;
+ border-radius: 2px;
+ overflow: hidden;
}
.aposcope-right {
flex: 1;
@@ -186,4 +203,82 @@
color: #fff;
border-radius: 2px 2px 0 0;
}
+.left-title-col {
+ margin-bottom: 8px;
+ font-size: 14px;
+ margin-top: 8px;
+}
+.footer {
+ padding: 0px 32px;
+ border-radius: 0 0 2px 2px;
+ background: #fff;
+ box-shadow: -1px 0 3px rgba(92, 92, 92, .16);
+ height: 48px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 0 10px;
+ box-sizing: border-box;
+ z-index: 99;
+}
+.MYTree {
+ height: calc(100% - 200px);
+ overflow: hidden;
+ overflow-y: auto;
+}
+.status {
+ display: flex;
+ align-items: start;
+ flex-direction: column;
+ justify-content: start;
+ margin: 20px 0 8px;
+ position: relative;
+ width: 100%;
+ font-size: 16px;
+ cursor: pointer;
+}
+.feed-button {
+ position: absolute;
+ right: 10px;
+ top: -2px;
+ color: #3b8e8e;
+ cursor: pointer;
+}
+.status-wrap.align-left, .status-wrap:first-child {
+ padding-left: 24px;
+}
+.status-wrap {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: start;
+}
+.collect-status {
+ color: #3b8e8e;
+ margin-right: 16px;
+ font-size: 14px;
+}
+.status-box {
+ margin: 0 8px;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+}
+.status-color {
+ width: 40px;
+ height: 15px;
+ border-radius: 2px;
+ margin-right: 8px;
+}
+.status-wrap .status-con {
+ display: flex;
+ flex: 1;
+ flex-wrap: wrap;
+}
+.status-wrap /deep/ .el-checkbox.el-checkbox--large {
+ color: #3b8e8e;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3