From 45cc2e9af86248745eee29e4f2ed980948fc6fd0 Mon Sep 17 00:00:00 2001 From: VVT789 <sdxt_0802@163.com> Date: 星期一, 17 二月 2025 23:22:53 +0800 Subject: [PATCH] delete dsstore --- zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue index a78185b..2686774 100644 --- a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue +++ b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue @@ -19,8 +19,8 @@ <el-date-picker v-model="queryParams.dataTime" :type="queryParams.timeType == 'DAY' ? 'date' : 'datetime'" - :format="queryParams.timeType == 'DAY' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'" - :value-format="queryParams.timeType == 'DAY' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'" + :format="queryParams.timeType == 'DAY' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:00:00'" + :value-format="queryParams.timeType == 'DAY' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:00:00'" placeholder="鏃堕棿" style="width: 100%" /> @@ -52,7 +52,7 @@ </div> </div> <div class="chart-box" v-loading="loading" v-show="activeKey === 1"> - <LineChart ref="LineChartRef" :chartData="lineChartData" /> + <LineChart ref="LineChartRef" :chartData="lineChartData" :chartType="'bar'" /> </div> <div style="margin-top: 16px" v-show="activeKey === 2"> <div class="" style="padding: 0 16px"> @@ -118,18 +118,18 @@ queryParams.value.nodeId = data.id queryParams.value.nodeName = data.label setTimeout(() => { - handleTimeType(period.value[0].value) + handleTimeType(queryParams.value.timeType) }, 200) } function handleTimeType(e) { queryParams.value.timeType = e - queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss") + queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD HH:00:00") getElectricityMeter({ modelId: queryParams.value.nodeId }) } function changeTimeType(e) { console.log(e) - queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss") + queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD HH:00:00") getElectricityMeter({ modelId: queryParams.value.nodeId }) } const LineChartRef = ref() @@ -185,7 +185,6 @@ proxy.resetForm("queryRef") queryParams.value.timeType = null queryParams.value.dataTime = null - handleTimeType(period.value[0].value) handleQuery() } // 纰虫帓鏀剧鐞�-纰虫帓鏀鹃噺鏍哥畻-瀵煎嚭 -- Gitblit v1.9.3