From 12fa64d373a31f0f3d5d81fff3bfa67b11ec531f Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期一, 27 二月 2023 19:19:38 +0800
Subject: [PATCH] 合并代码
---
src/components/Screen/left.vue | 26 ++++++++++++--------------
src/components/Screen/right.vue | 5 +----
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/components/Screen/left.vue b/src/components/Screen/left.vue
index 5c583eb..eb15e3c 100644
--- a/src/components/Screen/left.vue
+++ b/src/components/Screen/left.vue
@@ -7,9 +7,6 @@
<div class="current1" id="leftCurrent1">
<div class="aside-title">鏁版嵁鐢宠娆℃暟</div>
<count-data-apply></count-data-apply>
- <!-- <projectintroduction></projectintroduction> -->
- <!-- <projectState></projectState> -->
- <!-- <projectTime></projectTime> -->
</div>
<div class="current1" id="leftCurrent2">
<div class="aside-title">鐢ㄦ埛璁块棶閲�</div>
@@ -54,17 +51,17 @@
</div>
<!-- 鍗曚釜宸ョ▼灞曠ず -->
<div class="leftContainer" v-if="currentDisplay == '宸ョ▼'">
- <div class="current1" >
+ <div class="current1">
<div class="aside-title">宸ョ▼绠�浠�</div>
-
+ <projectintroduction></projectintroduction>
</div>
- <div class="current1" >
+ <div class="current1">
<div class="aside-title">椤圭洰鐘舵��</div>
-
+ <projectState></projectState>
</div>
<div class="current1">
<div class="aside-title">寤鸿宸ユ湡</div>
-
+ <projectTime></projectTime>
</div>
</div>
<!-- <div class="leftContainer" v-if="ProjectreeDisplay">
@@ -80,11 +77,9 @@
import BaseBarChart from "../chart/BaseBarChart.vue"
import BaseLineChart from "../chart/BaseLineChart.vue"
import BasePieChart from "../chart/BasePieChart .vue"
-// import projectintroduction from "../chart/projectintroduction.vue"
-// import projectState from "../chart/projectState.vue"
-// import projectTime from "../chart/projectTime.vue"
-
-
+import projectintroduction from "../chart/projectintroduction.vue"
+import projectState from "../chart/projectState.vue"
+import projectTime from "../chart/projectTime.vue"
export default {
components: {
@@ -95,6 +90,9 @@
BaseBarChart,
BaseLineChart,
BasePieChart,
+ projectintroduction,
+ projectState,
+ projectTime,
},
data() {
return {
@@ -118,7 +116,7 @@
} else if (name.includes("鍏ㄧ悆椤圭洰") || name.includes("鍏ㄥ浗椤圭洰")) {
this.currentDisplay = "椤圭洰"
} else {
- this.currentDisplay = '宸ョ▼'
+ this.currentDisplay = "宸ョ▼"
}
this.currentProject = name
})
diff --git a/src/components/Screen/right.vue b/src/components/Screen/right.vue
index 99d9bac..4251443 100644
--- a/src/components/Screen/right.vue
+++ b/src/components/Screen/right.vue
@@ -76,10 +76,6 @@
</div>
</div>
<file-format></file-format>
- <!-- <dv-conical-column-chart
- :config="config"
- style="width: 377px; height: 85"
- /> -->
</div>
</div>
@@ -103,6 +99,7 @@
import BaseLineChart from "../chart/BaseLineChart.vue"
import BasePieChart from "../chart/BasePieChart .vue"
import VisitCount from "../chart/VisitCount.vue"
+
import { countCountryDimension, countProvinceDimension } from "@/api/screen.js"
export default {
--
Gitblit v1.9.3