From dcf9c9e0410fe1186239e3f8d6f7bdc789c08010 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 05 六月 2024 18:00:39 +0800
Subject: [PATCH] 1
---
src/views/mdc/time-analysis.vue | 637 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 560 insertions(+), 77 deletions(-)
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 5de5429..522f01a 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,84 +2,159 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-26 18:07:52
+ * @LastEditTime: 2024-06-05 14:06:08
* @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-change="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>
- <analysis-a :setDataA="setDataA" v-if="setTitle.length != 0"></analysis-a>
- </el-tab-pane>
- <el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <div class="fact-analysis-realtim">
- <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>
- </el-tab-pane>
- </el-tabs>
- </div>
- </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="exportData">瀵煎嚭</el-button>
+ </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>
+ </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>
+ <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 * as ElementPlusIconsVue from '@element-plus/icons-vue'
+let icons = []
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+ icons.push(key)
+}
+import * as echarts from 'echarts';
import moment from 'moment';
import MYTree from './MYTree.vue';
-import analysisA from './components/analysisA.vue';
export default {
components: {
- MYTree,analysisA
+ ...ElementPlusIconsVue,MYTree
},
data() {
return {
- setDataA: {},
+ treeListNodeList: [],
+ ids: [],
+ activeNames: [],
+ activeNames1: [1,2,3],
+ current: "1",
+ size: "10",
+ total: "0",
setTitle: [],
+ setTitle1: [],
date: "",
- setChartsA: {},
btnListActive: "",
tree2: [],
btnList: [],
btnLeftList: [{title: "鎸夊伐浣嶇粺璁�",id:"1"},{title: "鎸夊伐浣嶇粍缁熻",id:"2"}],
btnLeftctive: "1",
isshowempty: true,
+ getGlobalColorList: [],
shortcuts: [
{
text: '鏈�杩�3澶�',
@@ -112,7 +187,152 @@
activeName: 'shift',
time: [],
workstationId: "",
- treeChecked: []
+ treeChecked: [],
+ chartOptionA: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ console.log(params)
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ },
+ chartOptionB1: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value * 100 + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ },
+ chartOptionB2: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value * 100 + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ },
+ chartOptionB3: {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ },
+ formatter: function (params) {
+ var dom = `<div>${params[0].name}</div>`;
+ params.forEach(item=> {
+ dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
+ })
+ return dom;
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ show: true,
+ axisLabel: {
+ formatter: function (value) {
+ return value * 100 + "%";
+ }
+ },
+ data: [2,20,40,60,80,100]
+ },
+ series: []
+ }
}
},
created() {
@@ -122,21 +342,194 @@
this.init();
this.getTree2List(); //鎸夊伐浣嶇粺璁℃爲
this.getDataA();
+ this.getGlobal(); //鑾峰彇棰滆壊
},
methods: {
+ getGlobal() {
+ this.$HTTP.get(`/api/blade-cps/global_wcs/list`).then(res=> {
+ if(res.code == 200) {
+ this.getGlobalColorList = res.data;
+ }
+ })
+ },
getDataA() {
- var ids = [];
- this.treeChecked.forEach(item=> {
- ids.push(item.id);
- })
- var obj = {
- ids: ids,
- localDate: this.date,
- type: 0
+ if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
+ var obj = {
+ ids: this.ids,
+ localDate: this.date,
+ type: 0
+ }
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
+ var obj = {
+ groupCategory: 1,
+ groupType: "group_workstation",
+ ids: this.ids,
+ localDate: this.date,
+ type: 1
+ }
}
this.$HTTP.post(`/api/blade-mdc/time-used-analysis/workstation/shiftName`,obj).then(res=> {
if(res.code == 200) {
this.setTitle = res.data.shiftDetails;
+ res.data.shiftDetails.forEach(item=> {
+ this.activeNames.push(item.shiftIndex); //榛樿閮芥槸鍏ㄩ儴灞曞紑
+ this.getDataChartsA(item.shiftIndex); //娓叉煋charts
+ })
+ }
+ })
+ },
+ formatChartData(originalObject) {
+ var resultObject = originalObject.reduce(function(acc, currArray) {
+ currArray.forEach(function(item) {
+ // 濡傛灉acc涓繕娌℃湁杩欎釜statusName鐨勯敭锛屽垯鍒濆鍖栦竴涓┖鏁扮粍
+ if (!acc[item.statusName]) {
+ acc[item.statusName] = [];
+ }
+ // 灏哻ount鍊兼坊鍔犲埌瀵瑰簲statusName鐨勬暟缁勪腑
+ acc[item.statusName].push(item.count);
+ });
+ return acc;
+ }, {}); // 绗簩涓弬鏁皗}鏄痑ccumulator鐨勫垵濮嬪��
+ // 璁＄畻姣忎釜鐘舵�佺殑鏃堕棿鎬诲拰
+ var timeSums = Object.values(resultObject).reduce((acc, curr) => {
+ return acc.map((sum, index) => sum + curr[index]);
+ }, new Array(Object.values(resultObject)[0].length).fill(0));
+
+ // 鎺掗櫎杩愯鏃堕棿涓�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 {
+ // 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',
+ label: {
+ show: false
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ itemStyle: {
+ "color": colorObj[key]
+ },
+ barWidth: 60,
+ data: resultObject[key]
+ })
+ })
+ return lastData.reverse();
+ },
+ getDataChartsA(index) {
+ var obj = {
+ enums: "SHIFT",
+ groupCategory: 1,
+ groupType: "group_workstation",
+ ids: this.ids,
+ month: moment(this.date).get('month') + 1,
+ queryTime: this.date,
+ shiftIndex: index,
+ type: 0,
+ week: moment(this.date).get('week'),
+ year: moment(this.date).get('year')
+ }
+ if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
+ obj.type = 0;
+ }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=> {
+ if(res.code == 200) {
+ var xAxis = [];
+ res.data.workStationDetails.forEach(item=> {
+ xAxis.push(item.name);
+ })
+ this.chartOptionA.xAxis.data = xAxis;
+ var recordDom = document.getElementById('recordwork' + index);
+ this.chartOptionA.series = this.formatChartData(res.data.countStatus);
+ var myChart = echarts.init(recordDom);
+ myChart.setOption(this.chartOptionA);
+ console.log(JSON.stringify(this.chartOptionA))
+ }
+ })
+ },
+ getDataChartsB(enums,month) {
+ var obj = {
+ enums: enums,
+ groupCategory: 1,
+ groupType: "group_workstation",
+ ids: this.ids,
+ month: moment(this.date).get('month') + 1,
+ queryTime: this.date,
+ type: 0,
+ week: moment(this.date).get('week'),
+ year: moment(this.date).get('year')
+ }
+ if(month) {
+ obj.month = month;
+ }
+ if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
+ obj.type = 0;
+ }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=> {
+ 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);
+ })
+ var option = "";
+ var index = 0;
+ if(enums == "DAY") {
+ option = "chartOptionB1";
+ index = 0;
+ }else if(enums == "MONTH") {
+ option = "chartOptionB2";
+ index = 2;
+ }else if(enums == "WEEK") {
+ option = "chartOptionB3";
+ index = 1;
+ }
+ this[option].xAxis.data = xAxis;
+ var recordDom = document.getElementById('chartsB' + index);
+ this[option].series = this.formatChartData(res.data.countStatus);
+ var myChart = echarts.init(recordDom);
+ myChart.setOption(this[option]);
}
})
},
@@ -147,16 +540,62 @@
}
})
},
- treeListNode(data) {
-
+ treeListNode(data,checked) {
+ this.treeListNodeList = checked.checkedNodes;
},
changeLeftTab(item) {
this.btnLeftctive = item.id;
+ this.ids = [];
},
tabChange(val) {
- if(val == "time") { //鎸夌彮娆＄粺璁�
-
- }else if(val == "shift") { //鎸夋椂闂村懆鏈熺粺璁�
+ this.activeName = val;
+ if(val == "time") { //鎸夋椂闂村懆鏈熺粺璁�
+ if(this.setTitle.length != 0) {
+ var obj = {
+ endDate: this.btnList[0].id,
+ startDate: this.btnList[0].id,
+ statisticalMethod: "WEEK"
+ }
+ this.$HTTP.post(`/api/blade-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(res.data[0].startDate).month() + 1;
+ var endDate = moment(res.data[0].endDate).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') + "鍛�"}],
+ name: '鎸夊懆鏌ョ湅',
+ btnListActive: moment(this.date).get('week') + "鍛�",
+ 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.$nextTick(()=> {
+ this.getDataChartsB("DAY");
+ this.getDataChartsB("MONTH");
+ this.getDataChartsB("WEEK");
+ })
+ }
+ })
+ }
+ }else if(val == "shift") { //鎸夌彮娆＄粺璁�
}
},
@@ -176,6 +615,19 @@
this.btnListActive = item.id;
this.date = item.id;
this.getDataA();
+ },
+ changeTabB(item,index,index1) {
+ this.setTitle1[index].btnListActive = item.id;
+ this.date = this.setTitle1[0].btnListActive;
+ if(index == 0) {
+ this.getDataChartsB("DAY");
+ }
+ if(index == 1) {
+ this.getDataChartsB("WEEK");
+ }
+ if(index == 2) { //鏈�
+ this.getDataChartsB("MONTH",this.setTitle1[2].btnListActive.split("鏈�")[0]);
+ }
},
getTime(data) {
this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
@@ -203,14 +655,25 @@
this.date = this.time[1];
},
query() {
+ console.log(this.activeName)
this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
- var ids = [];
- this.treeChecked.forEach(item=> {
- ids.push(item.id)
- })
- this.setDataA = {
- ids: ids,
- localDate: this.time[1]
+ this.date = this.time[1];
+ this.ids = [];
+ if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粺璁�
+ this.treeChecked.forEach(item=> {
+ this.ids.push(item.id);
+ })
+ }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
+ this.treeListNodeList.forEach(item=> {
+ this.ids.push(item.id);
+ })
+ }
+ if(this.activeName == "shift") { //鎸夌彮娆＄粺璁�
+ this.getDataA();
+ }else if(this.activeName == "time") { //鎸夊懆鏈熺粺璁�
+ this.getDataChartsB("DAY");
+ this.getDataChartsB("WEEK");
+ this.getDataChartsB("MONTH",this.setTitle1[2].btnListActive.split("鏈�")[0]);
}
}
}
@@ -273,6 +736,7 @@
.MYTree {
margin-top:12px;
height: 600px;
+ margin-bottom: 48px;
}
.MYTree-content {
height: 100%;
@@ -318,4 +782,23 @@
margin-top: -16px;
line-height: 28px;
}
+ .demo-collapse {
+
+ }
+ .collr-title {
+ margin-left:8px;
+ margin-right: 8px;
+ font-weight: bold;
+ }
+ .demo-collapse /deep/ .el-collapse-item__header {
+ background-color: #d8e8e8;
+ margin: 8px;
+ height: 32px;
+ padding-left: 16px;
+ border-radius: 4px;
+ }
+ .demo-collapse /deep/ .el-collapse-item__content {
+ margin: 8px;
+ padding-left: 16px;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3