From 3931e2728f618d0090f129b2665bc1285c4440c3 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 03 十一月 2024 17:27:32 +0800
Subject: [PATCH] update
---
src/views/mdc/time-analysis.vue | 513 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 309 insertions(+), 204 deletions(-)
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index bf2fcd3..d2631f5 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,109 +2,130 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-28 18:58:58
+ * @LastEditTime: 2024-11-01 14:48:23
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
- <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>
- <el-button-group >
- <el-button @click="changeLeftTab(item)" :type="btnLeftctive == item.id ? 'primary' : ''" v-for="item in btnLeftList" :key="item.id" size="small">{{item.title }}</el-button>
- </el-button-group>
- <div class="MYTree">
- <MYTree v-if="btnLeftctive == '1'" getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
- <el-tree v-if="btnLeftctive == '2'" :data="tree2" :expand-on-click-node="false" default-expand-all show-checkbox :props="{label: 'name', children: 'children'}" class="treeActive" @check="treeListNode" />
- </div>
- <div class="footer">
- <el-button @click="query" type="primary">鏌ヨ</el-button>
- <el-button @click="exportData">瀵煎嚭</el-button>
- </div>
- </div>
- <div class="aposcope-right">
- <el-tabs tab-position="top" v-model="activeName" type="card" @tab-change="tabChange">
- <el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
- <!-- 鏃ユ湡 -->
- <el-button-group>
- <el-button @click="changeTab(item)" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button>
- </el-button-group>
- <div class="fact-analysis-realtim" v-if="setTitle.length == 0">
- <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);">
- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
- <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
- </div>
- <div class="empty-description">
- <div>鏆傛棤鏁版嵁</div>
- </div>
- </div>
- </div>
- <!-- 鎸夌彮娆＄粺璁harts -->
- <div id="analysisA" v-if="setTitle.length != 0">
- <div class="demo-collapse">
- <el-collapse v-model="activeNames" accordion>
- <el-collapse-item v-for="(item,index) in setTitle" :name="index + 1">
- <template #title>
- <el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
- <span class="collr-title">鐝{{index + 1}}</span>
- <el-button size="small">{{item.indexName}}</el-button>
- </template>
- <div>
- <!-- charts -->
- <div :id="'recordwork' + item.shiftIndex" style="height:300px;"></div>
- </div>
- </el-collapse-item>
- </el-collapse>
- </div>
- <div class="paginationwork">
- <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
- </div>
- </div>
- </el-tab-pane>
- <el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <div class="fact-analysis-realtim" v-if="setTitle.length == 0">
- <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);">
- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
- <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
- </div>
- <div class="empty-description">
- <div>鏆傛棤鏁版嵁</div>
- </div>
- </div>
- </div>
- <!-- 鎸夋椂闂村懆鏈熺粺璁harts -->
- <div id="analysisA" v-if="setTitle.length != 0">
- <div class="demo-collapse">
- <el-collapse v-model="activeNames1" accordion>
- <el-collapse-item v-for="(item,index) in setTitle1" :name="index + 1">
- <template #title>
- <el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
- <span class="collr-title">{{item.name}}</span>
- </template>
- <div>
- <el-button-group>
- <el-button @click="changeTabB(item1,index,index1)" :type="item.btnListActive == item1.id ? 'primary' : ''" v-for="(item1,index1) in item.btnList" :key="item1.id" size="small">{{item1.title }}</el-button>
- </el-button-group>
- <!-- charts -->
- <div :id="'chartsB' + index" style="height:300px;"></div>
+ <el-main style="height: 100%;">
+ <el-card shadow="never" style="height: 100%;" body-style="height: 100%;padding: 0;">
+ <el-container style="height: 100%;">
+ <el-aside width="300px" style="height: 100%;">
+ <el-container>
+ <div class="left-title">鏌ヨ鏉′欢</div>
+ <el-main style="padding: 20px;">
+ <el-row>
+ <el-col style="margin-bottom: 12px;">鏃ユ湡</el-col>
+ <el-col>
+ <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 14px;">
+ 宸ヤ綅
+ </el-row>
+ <el-row style="margin-top: 14px;">
+ <el-button-group >
+ <el-button @click="changeLeftTab(item)" :type="btnLeftctive == item.id ? 'primary' : ''" v-for="item in btnLeftList" :key="item.id" size="small">{{item.title }}</el-button>
+ </el-button-group>
+ </el-row>
+ <el-row style="margin-top: 14px;">
+ <MYTree v-if="btnLeftctive == '1'" getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
+ <el-tree v-if="btnLeftctive == '2'" :data="tree2" :expand-on-click-node="false" default-expand-all show-checkbox :props="{label: 'name', children: 'children'}" class="treeActive" @check="treeListNode" />
+ </el-row>
+ </el-main>
+ <el-footer>
+ <el-button @click="query" type="primary">鏌ヨ</el-button>
+ <!-- <el-button @click="exportVisible = true">瀵煎嚭</el-button> -->
+ <exportDialog @export="exportExcel"></exportDialog>
+ </el-footer>
+ </el-container>
+ </el-aside>
+ <el-container>
+ <el-main>
+ <el-tabs tab-position="top" v-model="activeName" type="card" @tab-change="tabChange">
+ <el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
+ <!-- 鏃ユ湡 -->
+ <el-button-group>
+ <el-button @click="changeTab(item)" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button>
+ </el-button-group>
+ <div class="fact-analysis-realtim" v-if="setTitle.length == 0">
+ <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);">
+ <!-- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
+ <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
+ </div> -->
+ <div class="empty-description">
+ <div>鏆傛棤鏁版嵁</div>
+ </div>
</div>
- </el-collapse-item>
- </el-collapse>
- </div>
- <!-- <div class="paginationwork">
- <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
- </div> -->
- </div>
- </el-tab-pane>
- </el-tabs>
- </div>
- </div>
+ </div>
+ <!-- 鎸夌彮娆＄粺璁harts -->
+ <div id="analysisA" v-if="setTitle.length != 0">
+ <div class="demo-collapse">
+ <el-collapse v-model="activeNames" accordion>
+ <el-collapse-item v-for="(item,index) in setTitle" :name="index + 1">
+ <template #title>
+ <el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
+ <span class="collr-title">鐝{{index + 1}}</span>
+ <el-button size="small">{{item.indexName}}</el-button>
+ </template>
+ <div>
+ <!-- charts -->
+ <div :id="'recordwork' + item.shiftIndex" style="height:300px;"></div>
+ </div>
+ </el-collapse-item>
+ </el-collapse>
+ </div>
+ <!-- <div class="paginationwork">
+ <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
+ </div> -->
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
+ <div class="fact-analysis-realtim" v-if="setTitle.length == 0">
+ <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);">
+ <!-- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
+ <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
+ </div> -->
+ <div class="empty-description">
+ <div>鏆傛棤鏁版嵁</div>
+ </div>
+ </div>
+ </div>
+ <!-- 鎸夋椂闂村懆鏈熺粺璁harts -->
+ <div id="analysisB" v-if="setTitle.length != 0">
+ <div class="demo-collapse">
+ <el-collapse v-model="activeNames1" accordion>
+ <el-collapse-item v-for="(item,index) in setTitle1" :name="index + 1">
+ <template #title>
+ <el-icon size="16" color="#3b8e8e"><Memo /></el-icon>
+ <span class="collr-title">{{item.name}}</span>
+ <el-button size="small" v-if="index != 0">{{item.indexName}}</el-button>
+ </template>
+ <div>
+ <el-button-group>
+ <el-button @click="changeTabB(item1,index,index1)" :type="item.btnListActive == item1.id ? 'primary' : ''" v-for="(item1,index1) in item.btnList" :key="item1.id" size="small">{{item1.title }}</el-button>
+ </el-button-group>
+ <!-- charts -->
+ <div :id="'chartsB' + index" style="height:300px;"></div>
+ </div>
+ </el-collapse-item>
+ </el-collapse>
+ </div>
+ <!-- <div class="paginationwork">
+ <el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
+ </div> -->
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ </el-main>
+ </el-container>
+ </el-container>
+ </el-card>
+ </el-main>
</template>
<script>
+import exportDialog from '@/layout/components/exportDialog.vue'
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
let icons = []
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
@@ -115,7 +136,7 @@
import MYTree from './MYTree.vue';
export default {
components: {
- ...ElementPlusIconsVue,MYTree
+ ...ElementPlusIconsVue,MYTree,exportDialog
},
data() {
return {
@@ -135,6 +156,7 @@
btnLeftList: [{title: "鎸夊伐浣嶇粺璁�",id:"1"},{title: "鎸夊伐浣嶇粍缁熻",id:"2"}],
btnLeftctive: "1",
isshowempty: true,
+ getGlobalColorList: [],
shortcuts: [
{
text: '鏈�杩�3澶�',
@@ -197,6 +219,9 @@
show: true,
axisLabel: {
formatter: function (value) {
+ if(value <= 1) {
+ value = value * 100;
+ }
return value + "%";
}
},
@@ -233,6 +258,9 @@
show: true,
axisLabel: {
formatter: function (value) {
+ if(value <= 1) {
+ value = value * 100;
+ }
return value + "%";
}
},
@@ -269,6 +297,9 @@
show: true,
axisLabel: {
formatter: function (value) {
+ if(value <= 1) {
+ value = value * 100;
+ }
return value + "%";
}
},
@@ -305,6 +336,9 @@
show: true,
axisLabel: {
formatter: function (value) {
+ if(value <= 1) {
+ value = value * 100;
+ }
return value + "%";
}
},
@@ -321,68 +355,51 @@
this.init();
this.getTree2List(); //鎸夊伐浣嶇粺璁℃爲
this.getDataA();
+ this.getGlobal(); //鑾峰彇棰滆壊
},
methods: {
- convertArrayToPercentage(inputArray) {
- return inputArray.map((subarray, index) => {
- // 璁＄畻瀛愭暟缁勭殑鎬诲拰
- var total = subarray.reduce((acc, obj) => acc + obj.count, 0);
-
- // 纭繚鎬诲拰涓嶄负0锛屼互閬垮厤闄や互0鐨勯敊璇�
- if (total === 0) {
- return {
- name: `Direct${index + 1}`,
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: subarray.map(() => 0) // 濡傛灉鎬诲拰涓�0锛屽垯杩斿洖鍏ㄤ负'0%'鐨勭櫨鍒嗘瘮鏁扮粍
- };
- }
-
- // 璁＄畻鐧惧垎姣斿苟鍒涘缓鏂扮殑data鏁扮粍
- var percentages = subarray.map(obj => ((obj.count / total) * 100).toFixed(2));
-
- // 杩斿洖缁撴灉瀵硅薄
- return {
- name: `Direct${index + 1}`,
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: percentages // 灏嗚绠楀緱鍒扮殑鐧惧垎姣旀暟缁勪綔涓篸ata
- };
- });
+ exportExcel(statisticalMethod) {
+ var ids = [];
+ this.treeChecked.forEach(item=> {
+ ids.push(item.id);
+ })
+ this.$HTTP.post(`/api/mdc/time-used-analysis/excel/export`, {
+ startTime: this.time[0],
+ endTime: this.time[1],
+ enums: statisticalMethod,
+ ids
+ }).then(res => {
+ if (res.success) {
+ window.open(res.data.link)
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
+ getGlobal() {
+ this.$HTTP.get(`/api/smis/global_wcs/list`).then(res=> {
+ if(res.code == 200) {
+ this.getGlobalColorList = res.data;
+ }
+ })
},
getDataA() {
- var ids = [];
- this.treeChecked.forEach(item=> {
- ids.push(item.id);
- })
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
var obj = {
- ids: ids,
+ ids: this.ids,
localDate: this.date,
type: 0
}
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
var obj = {
groupCategory: 1,
groupType: "group_workstation",
- ids: ids,
+ ids: this.ids,
localDate: this.date,
type: 1
}
}
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/workstation/shiftName`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/time-used-analysis/workstation/shiftName`,obj).then(res=> {
if(res.code == 200) {
this.setTitle = res.data.shiftDetails;
res.data.shiftDetails.forEach(item=> {
@@ -411,17 +428,43 @@
// 鎺掗櫎杩愯鏃堕棿涓�0鐨勬儏鍐�
var totalRunTime = timeSums[0] || 1;
-
// 璁＄畻姣忎釜鐘舵�佺殑鐧惧垎姣旀暟鎹�
- var lastData = Object.keys(resultObject).map(key => {
- var data = resultObject[key].map((item, index) => {
- if (index === 0) { // 鍙绠楁椂闂寸殑鐧惧垎姣�
- return item == 0?0:Number((item / totalRunTime * 100).toFixed(2));
- } else {
- return item; // 璁℃暟淇濇寔涓嶅彉
- }
- });
- return {
+ // var lastData = Object.keys(resultObject).map(key => {
+ // var data = resultObject[key].map((item, index) => {
+ // if (index === 0) { // 鍙绠楁椂闂寸殑鐧惧垎姣�
+ // return item == 0?0:Number((item / totalRunTime * 100).toFixed(2));
+ // } else {
+ // return item; // 璁℃暟淇濇寔涓嶅彉
+ // }
+ // });
+ // return {
+ // name: key,
+ // type: 'bar',
+ // stack: 'total',
+ // label: {
+ // show: false
+ // },
+ // emphasis: {
+ // focus: 'series'
+ // },
+ // barWidth: 60,
+ // data
+ // }
+ // });
+ var lastData = [];
+ var colorObj = {}; //璁剧疆棰滆壊
+ this.getGlobalColorList.forEach(item=> {
+ colorObj[item.name] = item.color;
+ })
+ Object.keys(resultObject).map(key => {
+ resultObject[key].forEach((item,index)=> {
+ if(item != 0) {
+ var num = item/timeSums[index]* 100;
+ item = num.toFixed(2);
+ }
+ resultObject[key][index] = item;
+ })
+ lastData.push({
name: key,
type: 'bar',
stack: 'total',
@@ -431,10 +474,14 @@
emphasis: {
focus: 'series'
},
- data
- }
- });
- return lastData;
+ itemStyle: {
+ "color": colorObj[key]
+ },
+ barWidth: 60,
+ data: resultObject[key]
+ })
+ })
+ return lastData.reverse();
},
getDataChartsA(index) {
var obj = {
@@ -451,10 +498,10 @@
}
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
obj.type = 0;
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
obj.type = 1;
}
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
if(res.code == 200) {
var xAxis = [];
res.data.workStationDetails.forEach(item=> {
@@ -463,13 +510,13 @@
this.chartOptionA.xAxis.data = xAxis;
var recordDom = document.getElementById('recordwork' + index);
this.chartOptionA.series = this.formatChartData(res.data.countStatus);
- console.log(this.chartOptionA.series)
var myChart = echarts.init(recordDom);
myChart.setOption(this.chartOptionA);
}
})
},
- getDataChartsB(enums) {
+ getDataChartsB(enums,month) {
+ console.log(enums,month,this.date)
var obj = {
enums: enums,
groupCategory: 1,
@@ -481,14 +528,22 @@
week: moment(this.date).get('week'),
year: moment(this.date).get('year')
}
+ if(enums == "WEEK") {
+ obj.week = this.setTitle1[1].btnListActive.split("-")[1];
+ }
+ if(month) {
+ obj.month = month;
+ }
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
obj.type = 0;
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
obj.type = 1;
}
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
if(res.code == 200) {
var xAxis = [];
+ res.data.workStationDetails == null ? res.data.workStationDetails = [] : res.data.workStationDetails;
+ res.data.countStatus == null ? res.data.countStatus = [] : res.data.countStatus;
res.data.workStationDetails.forEach(item=> {
xAxis.push(item.name);
})
@@ -513,7 +568,7 @@
})
},
getTree2List() { //鎸夊伐浣嶇粍缁熻
- this.$HTTP.get(`/api/blade-cps/group/tree?groupCategory=1&groupType=group_workstation`).then(res=> {
+ this.$HTTP.get(`/api/smis/group/tree?groupCategory=1&groupType=group_workstation`).then(res=> {
if(res.code == 200) {
this.tree2 = res.data;
}
@@ -525,45 +580,77 @@
changeLeftTab(item) {
this.btnLeftctive = item.id;
this.ids = [];
+ if(item.id == 2) { //鎸夊伐浣嶇粺璁℃爲
+ this.getTree2List();
+ }
},
tabChange(val) {
this.activeName = val;
if(val == "time") { //鎸夋椂闂村懆鏈熺粺璁�
+ var len = this.btnList.length;
if(this.setTitle.length != 0) {
- var arr = [];
- arr.push({
- btnList: this.btnList,
- name: '鎸夋棩鏌ョ湅',
- btnListActive: this.btnList[0].id
- },{
- btnList: [{title:moment(this.date).get('week') + "鍛�",id: moment(this.date).get('week') + "鍛�"}],
- name: '鎸夊懆鏌ョ湅',
- btnListActive: moment(this.date).get('week') + "鍛�"
- },{
- btnList: [{title:moment(this.date).get('month') + 1 + "鏈�",id: moment(this.date).get('month') + 1 + "鏈�"}],
- name: '鎸夋湀鏌ョ湅',
- btnListActive: moment(this.date).get('month') + 1 + "鏈�"
- });
- this.setTitle1 = arr;
- this.getDataChartsB("DAY");
- this.getDataChartsB("MONTH");
- this.getDataChartsB("WEEK");
+ var obj = {
+ endDate: this.btnList[0].id,
+ startDate: this.btnList[len-1].id,
+ statisticalMethod: "WEEK"
+ }
+ this.$HTTP.post(`/api/mdc/efficiency-analysis/interval`,obj).then(res=> {
+ if(res.code == 200) {
+ var dateInJuly = moment(this.btnList[0].id);
+ // 鑾峰彇璇ユ湀浠界殑绗竴澶�
+ var firstDayOfJuly = dateInJuly.startOf('month').format('YYYY-MM-DD');
+ // 鑾峰彇璇ユ湀浠界殑鏈�鍚庝竴澶�
+ var lastDayOfJuly = dateInJuly.endOf('month').format('YYYY-MM-DD');
+ //璺ㄦ湀
+ var startDate = moment(this.btnList[this.btnList.length - 1].id).month() + 1;
+ var endDate = moment(this.btnList[0].id).month() + 1;
+ var arrMonth = [];
+ for (var i = startDate; i <= endDate; i++) {
+ arrMonth.push({title: (i + "鏈�"),id: (i + "鏈�")});
+ }
+ var arr = [];
+ arr.push({
+ btnList: this.btnList,
+ name: '鎸夋棩鏌ョ湅',
+ btnListActive: this.btnList[0].id
+ },{
+ //btnList: [{title:moment(this.date).get('week') + "鍛�",id: moment(this.date).get('week') + "鍛�"}],
+ //btnListActive: moment(this.date).get('week') + "鍛�",
+ btnList: res.data,
+ name: '鎸夊懆鏌ョ湅',
+ btnListActive: res.data[0].id,
+ indexName : res.data[0].startDate + "鑷�" + res.data[0].endDate
+ },{
+ btnList: arrMonth.reverse(),
+ name: '鎸夋湀鏌ョ湅',
+ btnListActive: moment(this.date).get('month') + 1 + "鏈�",
+ indexName : firstDayOfJuly + "鑷�" + lastDayOfJuly
+ });
+ this.setTitle1 = arr;
+ this.date = this.btnList[0].id;
+ this.$nextTick(()=> {
+ this.getDataChartsB("DAY");
+ this.getDataChartsB("MONTH");
+ this.getDataChartsB("WEEK");
+ })
+ }
+ })
}
}else if(val == "shift") { //鎸夌彮娆＄粺璁�
-
+ this.query();
}
},
exportData() { //瀵煎嚭
- var obj = {
- endTime: this.time[1],
- startTime: this.time[0],
- workstationInfoList: this.workstationInfoList
- }
- this.$HTTP.post(`/api/blade-mdc/status-record/excel/export`,obj).then(res=> {
- if(res.code == 200) {
- window.open(res.data.link);
- }
- })
+ // var obj = {
+ // endTime: this.time[1],
+ // startTime: this.time[0],
+ // workstationInfoList: this.workstationInfoList
+ // }
+ // this.$HTTP.post(`/api/mdc/time-used-analysis/excel/export`,obj).then(res=> {
+ // if(res.code == 200) {
+ // window.open(res.data.link);
+ // }
+ // })
},
changeTab(item) {
this.btnListActive = item.id;
@@ -571,14 +658,28 @@
this.getDataA();
},
changeTabB(item,index,index1) {
+ console.log(item,index,index1,this.setTitle1);
this.setTitle1[index].btnListActive = item.id;
- this.date = item.id;
- this.getDataChartsB("DAY");
- this.getDataChartsB("MONTH");
- this.getDataChartsB("WEEK");
+ this.date = this.setTitle1[0].btnListActive;
+ if(index == 0) {
+ this.getDataChartsB("DAY");
+ }
+ if(index == 1) {
+ this.getDataChartsB("WEEK");
+ this.setTitle1[index].indexName = item.startDate + "鑷�" + item.endDate
+ }
+ if(index == 2) { //鏈�
+ var dateInJuly = moment(this.setTitle1[index].indexName.split("-")[0] + "-" + this.setTitle1[index].btnListActive.replace("鏈�","") + "-01");
+ // 鑾峰彇璇ユ湀浠界殑绗竴澶�
+ var firstDayOfJuly = dateInJuly.startOf('month').format('YYYY-MM-DD');
+ // 鑾峰彇璇ユ湀浠界殑鏈�鍚庝竴澶�
+ var lastDayOfJuly = dateInJuly.endOf('month').format('YYYY-MM-DD');
+ this.setTitle1[index].indexName = firstDayOfJuly + "鑷�" + lastDayOfJuly;
+ this.getDataChartsB("MONTH",this.setTitle1[2].btnListActive.split("鏈�")[0]);
+ }
},
getTime(data) {
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
...data
}).then(res => {
if (res.code === 200) {
@@ -603,21 +704,24 @@
this.date = this.time[1];
},
query() {
+ this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: "SHIFT"});
+ if(this.activeName != "shift") {
+ this.tabChange("time");
+ }
+ this.date = this.time[1];
this.ids = [];
- console.log(this.btnLeftctive)
if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
this.treeChecked.forEach(item=> {
this.ids.push(item.id);
})
- }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
this.treeListNodeList.forEach(item=> {
this.ids.push(item.id);
})
}
- console.log(this.ids,2)
- this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
- this.date = this.time[1];
- this.getDataA();
+ if(this.activeName == "shift") { //鎸夌彮娆＄粺璁�
+ this.getDataA();
+ }
}
}
}
@@ -679,6 +783,7 @@
.MYTree {
margin-top:12px;
height: 600px;
+ margin-bottom: 48px;
}
.MYTree-content {
height: 100%;
@@ -733,7 +838,7 @@
font-weight: bold;
}
.demo-collapse /deep/ .el-collapse-item__header {
- background-color: #d8e8e8;
+ background-color: #7eb9f7;
margin: 8px;
height: 32px;
padding-left: 16px;
--
Gitblit v1.9.3