|
@@ -60,7 +60,7 @@
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
<el-col :md="24" :lg="18" style="height: calc(50%);margin-bottom: 20px;">
|
|
|
- <el-card class="card-area" style="height: 100%;" :body-style="{ height: '100%' }">
|
|
|
+ <el-card class="card-area" style="height: 100%;" :body-style="{ height: '100%' }" v-loading="twoChartLoading">
|
|
|
<div class="card-area-header" style="margin-bottom: 20px;">
|
|
|
<img class="image" src="@/assets/images/energyManage/onThatDay.png" alt="整体图片">
|
|
|
<div class="title">支路用电</div>
|
|
@@ -74,10 +74,15 @@
|
|
|
</div>
|
|
|
|
|
|
<div class="card-area-center" style="height: calc(100% - 40px);">
|
|
|
- <countChart ref="twoChartRef" class="chart" height="100%" style="width: 75%;" :chartData="twoChartData"
|
|
|
- v-loading="twoChartLoading" />
|
|
|
+ <countChart ref="twoChartRef" class="chart" height="100%" style="width: 75%;"
|
|
|
+ :chartData="twoChartData" />
|
|
|
<div style="width: 25%;height: 100%;">
|
|
|
-
|
|
|
+ <div style="height: 50%;">
|
|
|
+ <pieChart2 ref="treeChartRef" class="chart" height="100%" :chartData="treeChartData" />
|
|
|
+ </div>
|
|
|
+ <div style="height: 50%;">
|
|
|
+ <pieChart2 ref="fourChartRef" class="chart" height="100%" :chartData="fourChartData" />
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-card>
|
|
@@ -91,6 +96,7 @@ import { ref, onMounted, watch, getCurrentInstance, reactive, toRefs } from 'vue
|
|
|
/*----------------------------------接口引入-----------------------------------*/
|
|
|
/*----------------------------------组件引入-----------------------------------*/
|
|
|
import pieChart from './components/pieChart.vue'
|
|
|
+import pieChart2 from './components/pieChart2.vue'
|
|
|
import countChart from './components/countChart.vue'
|
|
|
/*----------------------------------store引入-----------------------------------*/
|
|
|
/*----------------------------------公共方法引入-----------------------------------*/
|
|
@@ -137,12 +143,36 @@ const state = reactive({
|
|
|
}
|
|
|
},
|
|
|
]
|
|
|
- }
|
|
|
+ },
|
|
|
+ treeChartData: {
|
|
|
+ text: '今日',
|
|
|
+ constValue: 100,
|
|
|
+ unit: "kWh",
|
|
|
+ seriesData: [
|
|
|
+ { value: 1048, name: '尖', selected: true },
|
|
|
+ { value: 1048, name: '峰' },
|
|
|
+ { value: 1048, name: '平' },
|
|
|
+ { value: 1048, name: '谷' },
|
|
|
+ ]
|
|
|
+ },
|
|
|
+ fourChartData: {
|
|
|
+ text: '昨日',
|
|
|
+ constValue: 100,
|
|
|
+ unit: "kWh",
|
|
|
+ seriesData: [
|
|
|
+ { value: 1048, name: '尖' },
|
|
|
+ { value: 1048, name: '峰' },
|
|
|
+ { value: 1048, name: '平' },
|
|
|
+ { value: 1048, name: '谷' },
|
|
|
+ ]
|
|
|
+ },
|
|
|
})
|
|
|
-const { oneChartLoading, oneChartData, twoChartLoading, twoChartData, timeRangeType, pieChartData } = toRefs(state)
|
|
|
+const { oneChartLoading, oneChartData, twoChartLoading, twoChartData, timeRangeType, pieChartData, treeChartData, fourChartData } = toRefs(state)
|
|
|
|
|
|
function initChartData() {
|
|
|
proxy.$refs["pieChartRef"].initEcharts()
|
|
|
+ proxy.$refs["treeChartRef"].initEcharts()
|
|
|
+ proxy.$refs["fourChartRef"].initEcharts()
|
|
|
|
|
|
|
|
|
state.timeRangeType.value = 'dayValue'
|