From 7243d05010bde40a8c82b7cbbf904eeb35168cdd Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 23 四月 2024 23:09:57 +0800
Subject: [PATCH] update
---
src/views/mdc/status-record.vue | 359 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 347 insertions(+), 12 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 766f57f..9635dfc 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -1,21 +1,356 @@
-<!--
- * @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:12:56
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/status-record.vue
--->
<template>
- <div>
- 鐘舵�佽褰�
- </div>
+ <div class="aposcope-main">
+ <div class="aposcope-left">
+ <div class="left-title">鏌ヨ鏉′欢</div>
+ <div class="left-title-col">鏃ユ湡</div>
+ <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/>
+ <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" type="primary">鏌ヨ</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="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>
+ <div>
+ <div id="record" style="width: 100%;height:280px;"></div>
+ </div>
+ <div class="pagination">
+ <el-pagination layout="prev, pager, next" :total="total" :default-page-size="6"/>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
+ 鎸夊伐浣嶆煡鐪�
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+ </div>
</template>
<script>
- export default {
+import moment from 'moment';
+import MYTree from './MYTree.vue'
+import Shift from './components/Shift.vue'
+import Time from './components/Time.vue'
+import * as echarts from 'echarts';
+export default {
+ components: {
+ time: "",
+ MYTree,
+ Shift,
+ Time
+ },
+ watch: {
+ activeName() {
+ // this.$nextTick(() => {
+ // this.query()
+ // })
+ },
+ btnListActive(val) {
+ // this.query({
+ // ...this.params,
+ // startDate: val,
+ // endDate: val
+ // })
+ // this.queryChart({
+ // ...this.params,
+ // startDate: val,
+ // endDate: val
+ // })
+ }
+ },
+ data() {
+ return {
+ workstationInfoList: [],
+ 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: [],
+ achievements: [],
+ collectionstatus: [],
+ current: "1",
+ size: "6",
+ total: 0,
+ recordOptionLog:{
+ grid: {
+ top: '0%'
+ },
+ tooltip: {
+ //trigger: 'axis' // 瑙﹀彂绫诲瀷锛岄粯璁ゆ暟鎹Е鍙戯紝鍙�変负锛�'item'銆�'axis'
+ },
+ xAxis: {
+ boundaryGap: false,
+ type: 'category',
+ data: ['00:00:00', '04:00:00', '08:00:00', '12:00:00', '16:00:00', '20:00:00', '00:00:00'],
+ },
+ yAxis: {
+ type: 'category',
+ axisLabel: {
+ formatter: '{value}'
+ },
+ data: []
+ },
+ series: [
+ {
+ name: 'wcsLog',
+ type: 'bar',
+ data: [],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ },
+ }
+ },
+ created() {
+ },
+ mounted() {
+ 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) {
+ var today = moment().format('YYYY-MM-DD');
+ var yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD');
+ res.data.forEach(item=> {
+ if(item.title == today) {
+ item.title = "浠婂ぉ";
+ }
+ if(item.title == yesterday) {
+ item.title = "鏄ㄥぉ";
+ }
+ })
+ this.btnList = res.data.reverse();
+ this.btnListActive = res?.data?.[0]?.id
+ }
+ })
+ },
+ getCharts() {
+ var obj = {
+ //date: this.time[1],
+ date: "2024-04-16",
+ humanFeedback: true,
+ machineFeedback: true,
+ workstationInfoList: this.workstationInfoList
+ }
+ this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-date?current=${this.current}&size=${this.size}`,obj).then(res => {
+ if (res.code === 200) {
+ console.log(res.data)
+ var myChart = echarts.init(document.getElementById('record'));
+ this.recordOptionLog.series[0].data = res.data.records.statusRecordList;
+ // var yAxis = [];
+ res.data.records.forEach(item=> {
+ item.value = item.workstationInfo.name;
+ })
+ this.recordOptionLog.yAxis.data = res.data.records;
+ myChart.setOption(this.recordOptionLog);
+ this.total = res.data.total;
+ }
+ })
+ },
+ 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浜哄伐鍙嶉鐘舵��
+ this.getCharts();
+ },
+ timeBtnChange() {
+
+ },
+ query() {
+ this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
+ //this.getCharts();
+ console.log(this.treeChecked,2)
+ }
}
+}
</script>
-<style lang="scss" scoped>
-
+<style scoped>
+.aposcope-main {
+ display: flex;
+ min-height: 100%;
+ height: 100%;
+ overflow: hidden;
+ 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;
+ padding: 8px;
+ background-color: #fff;
+}
+.left-title {
+ font-size: 16px;
+ text-align: center;
+ height: 38px;
+ line-height: 38px;
+ border-bottom: 1px solid #e2e2e2;
+ background-color: #409eff;
+ 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;
+}
+.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;
+}
+.pagination {
+ text-align: right;
+ display: flex;
+ justify-content: end;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3