From 093efb2c313c86d46ec41b8e81a5b452e6164d3a Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 18:29:00 +0800
Subject: [PATCH] 1
---
src/views/home/widgets/components/deskNotice.vue | 4 ++--
src/views/mdc/time-analysis.vue | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/home/widgets/components/deskNotice.vue b/src/views/home/widgets/components/deskNotice.vue
index 073f438..0d499f9 100644
--- a/src/views/home/widgets/components/deskNotice.vue
+++ b/src/views/home/widgets/components/deskNotice.vue
@@ -2,12 +2,12 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-16 15:22:46
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-06 16:17:02
+ * @LastEditTime: 2024-06-14 18:00:16
* @FilePath: /src/views/home/widgets/components/welcome.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
- <el-card shadow="hover" header="鍏憡">
+ <el-card shadow="hover" header="鍏憡" style="height: 100%;">
<div class="announcement">
<div v-if="noticeList.length != 0" v-for="item in noticeList" class="mesg">
<div>
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 522f01a..60eeda5 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-05 14:06:08
+ * @LastEditTime: 2024-06-14 18:26:34
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -91,7 +91,7 @@
</div>
</div>
<!-- 鎸夋椂闂村懆鏈熺粺璁harts -->
- <div id="analysisA" v-if="setTitle.length != 0">
+ <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">
@@ -550,10 +550,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=> {
@@ -587,6 +588,7 @@
indexName : firstDayOfJuly + "鑷�" + lastDayOfJuly
});
this.setTitle1 = arr;
+ this.date = this.btnList[0].id;
this.$nextTick(()=> {
this.getDataChartsB("DAY");
this.getDataChartsB("MONTH");
--
Gitblit v1.9.3