From a958e950dc675c7a3e9cbbbc66e6656669d3a34b Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 09 九月 2024 11:20:22 +0800
Subject: [PATCH] Merge branch 'master' of http://122.9.151.159:9090/r/smart-web
---
src/views/mdc/time-analysis.vue | 246 +++++++++++++++++++++++++++---------------------
1 files changed, 139 insertions(+), 107 deletions(-)
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 18938c9..89f2c92 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,107 +2,125 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-03 11:00:37
+ * @LastEditTime: 2024-06-24 22:22:47
* @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>
- <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>
+ <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>
- </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>
@@ -181,7 +199,6 @@
params.forEach(item=> {
dom += `<div>${item.marker}${item.seriesName}锛�${item.data}%</div>`
})
- console.log(params)
return dom;
}
},
@@ -200,6 +217,9 @@
show: true,
axisLabel: {
formatter: function (value) {
+ if(value <= 1) {
+ value = value * 100;
+ }
return value + "%";
}
},
@@ -236,7 +256,10 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value * 100 + "%";
+ if(value <= 1) {
+ value = value * 100;
+ }
+ return value + "%";
}
},
data: [2,20,40,60,80,100]
@@ -272,7 +295,11 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value * 100 + "%";
+ if(value <= 1) {
+ value = value * 100;
+ }
+ console.log(value)
+ return value + "%";
}
},
data: [2,20,40,60,80,100]
@@ -308,7 +335,10 @@
show: true,
axisLabel: {
formatter: function (value) {
- return value * 100 + "%";
+ if(value <= 1) {
+ value = value * 100;
+ }
+ return value + "%";
}
},
data: [2,20,40,60,80,100]
@@ -463,7 +493,6 @@
this.chartOptionA.series = this.formatChartData(res.data.countStatus);
var myChart = echarts.init(recordDom);
myChart.setOption(this.chartOptionA);
- console.log(JSON.stringify(this.chartOptionA))
}
})
},
@@ -532,10 +561,11 @@
tabChange(val) {
this.activeName = val;
if(val == "time") { //鎸夋椂闂村懆鏈熺粺璁�
+ var len = this.btnList.length;
if(this.setTitle.length != 0) {
var obj = {
endDate: this.btnList[0].id,
- startDate: this.btnList[0].id,
+ startDate: this.btnList[len-1].id,
statisticalMethod: "WEEK"
}
this.$HTTP.post(`/api/blade-mdc/efficiency-analysis/interval`,obj).then(res=> {
@@ -569,9 +599,12 @@
indexName : firstDayOfJuly + "鑷�" + lastDayOfJuly
});
this.setTitle1 = arr;
- this.getDataChartsB("DAY");
- this.getDataChartsB("MONTH");
- this.getDataChartsB("WEEK");
+ this.date = this.btnList[0].id;
+ this.$nextTick(()=> {
+ this.getDataChartsB("DAY");
+ this.getDataChartsB("MONTH");
+ this.getDataChartsB("WEEK");
+ })
}
})
}
@@ -635,7 +668,6 @@
this.date = this.time[1];
},
query() {
- console.log(this.activeName)
this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
this.date = this.time[1];
this.ids = [];
@@ -771,7 +803,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