From b5cbce0d6a02c23a8f9f4329f16f92b07012a94f Mon Sep 17 00:00:00 2001
From: wulitaotao <547306458@qq.com>
Date: 星期一, 27 二月 2023 18:23:38 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW
---
src/components/Screen/right.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/src/components/Screen/right.vue b/src/components/Screen/right.vue
index 6b74147..fef52f4 100644
--- a/src/components/Screen/right.vue
+++ b/src/components/Screen/right.vue
@@ -23,23 +23,34 @@
<div
class="rightContainer2"
- v-if="CourtyDisplay && currentProject =='鍏ㄧ悆椤圭洰'"
+ v-if="CourtyDisplay && currentProject == '鍏ㄧ悆椤圭洰'"
>
<div class="current1">
<div class="aside-title">椤圭洰鏁伴噺鏌辩姸鍥�</div>
- <country-dimension-bar ref="barRef"></country-dimension-bar>
+ <!-- <country-dimension-bar ref="barRef"></country-dimension-bar> -->
+ <base-bar-chart :project="currentProject"></base-bar-chart>
</div>
<div class="current1">
<div class="aside-title">椤圭洰鏁伴噺楗肩姸鍥�</div>
<country-dimension-pie ref="pieRef"></country-dimension-pie>
</div>
+ <div class="current1">
+ <div class="aside-title">椤圭洰鏁伴噺楗肩姸鍥�</div>
+ <dv-capsule-chart
+ :config="config"
+ style="width: 300px; height: 200px"
+ />
+ </div>
</div>
-
- <div class="rightContainer2" v-if="CourtyDisplay && currentProject =='鍏ㄥ浗椤圭洰'">
+ <div
+ class="rightContainer2"
+ v-if="CourtyDisplay && currentProject == '鍏ㄥ浗椤圭洰'"
+ >
<div class="current1">
<div class="aside-title">椤圭洰鏁伴噺鏌辩姸鍥�</div>
- <province-dimension-bar ref="barRef"></province-dimension-bar>
+ <!-- <province-dimension-bar ref="barRef"></province-dimension-bar> -->
+ <base-bar-chart :project="currentProject"></base-bar-chart>
</div>
<div class="current1">
<div class="aside-title">椤圭洰鏁伴噺楗肩姸鍥�</div>
@@ -62,6 +73,10 @@
import ProvinceDimensionBar from "../chart/CountryProvinceBar.vue"
import ProvinceDimensionPie from "../chart/CountryProvincePie.vue"
import ServiceGet from "../chart/ServiceGet.vue"
+import BaseBarChart from "../chart/BaseBarChart.vue"
+import BaseLineChart from "../chart/BaseLineChart.vue"
+import BasePieChart from "../chart/BasePieChart .vue"
+
import { countCountryDimension, countProvinceDimension } from "@/api/screen.js"
export default {
@@ -76,6 +91,9 @@
ProvinceDimensionBar,
ProvinceDimensionPie,
ServiceGet,
+ BaseBarChart,
+ BaseLineChart,
+ BasePieChart,
},
data() {
return {
@@ -86,6 +104,32 @@
currentProject: "鍏ㄧ悆椤圭洰",
countryData: [],
provinceData: [],
+ config: {
+ data: [
+ {
+ name: "鍗楅槼",
+ value: 167,
+ },
+ {
+ name: "鍛ㄥ彛",
+ value: 123,
+ },
+ {
+ name: "婕渤",
+ value: 98,
+ },
+ {
+ name: "閮戝窞",
+ value: 75,
+ },
+ {
+ name: "瑗垮场",
+ value: 66,
+ },
+ ],
+ unit: "鍗曚綅",
+ showValue: true,
+ },
}
},
--
Gitblit v1.9.3