合并代码

TreeWish

2023-02-27 12fa64d373a31f0f3d5d81fff3bfa67b11ec531f

合并代码

 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
    })

 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 {