From 8db05be80e4c98cd8e44a51d205dcdd898e4541b Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Thu, 4 Jan 2024 18:57:17 +0800
Subject: [PATCH] update

---
 pages/index/components/menus.js               |   4 +-
 pages/index/components/numberScroll.vue       | 171 +++++++++++++++++
 pages/index/index.vue                         |  12 +-
 .../components/carPortrait.vue                |  40 ++--
 .../components/components/car/carTypeTime.vue |  82 +++++++-
 .../components/components/car/homePlace.vue   |  66 ++++++-
 .../components/components/car/monthTotal.vue  | 139 ++++++++++++--
 .../components/car/timeAnalysis.vue           |  88 +++++++--
 .../components/guest/businessType.vue         |  63 +++++-
 .../components/guest/consumPrefer.vue         |  53 +++++-
 .../components/guest/customerSecond.vue       |  76 +++++++-
 .../components/manager/moneyCompare.vue       |  72 ++++++-
 .../components/manager/revenueTrends.vue      |  74 ++++++-
 .../components}/qiun-data-charts/changelog.md |   0
 .../qiun-data-charts/qiun-data-charts.vue     |   0
 .../components/qiun-error/qiun-error.vue      |   0
 .../components/qiun-loading/loading1.vue      |   0
 .../components/qiun-loading/loading2.vue      |   0
 .../components/qiun-loading/loading3.vue      |   0
 .../components/qiun-loading/loading4.vue      |   0
 .../components/qiun-loading/loading5.vue      |   0
 .../components/qiun-loading/qiun-loading.vue  |   0
 .../js_sdk/u-charts/config-echarts.js         |  39 +++-
 .../js_sdk/u-charts/config-ucharts.js         | 180 +++++++++++++++++-
 .../js_sdk/u-charts/readme.md                 |   0
 .../js_sdk/u-charts/u-charts.js               |   0
 .../js_sdk/u-charts/u-charts.min.js           |   0
 .../components}/qiun-data-charts/license.md   |   0
 .../components}/qiun-data-charts/package.json |   0
 .../components}/qiun-data-charts/readme.md    |   0
 .../static/app-plus/echarts.min.js            |   0
 .../qiun-data-charts/static/h5/echarts.min.js |   0
 .../components/guestPortrait.vue              |   8 +-
 .../components/managePortrait.vue             |  18 +-
 pages/summaryOfPortraits/index.vue            |   6 +-
 static/images/index/spsp-no.png               | Bin 4155 -> 0 bytes
 static/images/index/tsjy.png                  | Bin 4156 -> 0 bytes
 37 files changed, 1073 insertions(+), 118 deletions(-)
 create mode 100644 pages/index/components/numberScroll.vue
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/changelog.md (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-error/qiun-error.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-loading/loading1.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-loading/loading2.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-loading/loading3.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-loading/loading4.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-loading/loading5.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/components/qiun-loading/qiun-loading.vue (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/js_sdk/u-charts/config-echarts.js (83%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/js_sdk/u-charts/config-ucharts.js (66%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/js_sdk/u-charts/readme.md (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/js_sdk/u-charts/u-charts.js (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/js_sdk/u-charts/u-charts.min.js (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/license.md (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/package.json (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/readme.md (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/static/app-plus/echarts.min.js (100%)
 rename {uni_modules => pages/summaryOfPortraits/components/components}/qiun-data-charts/static/h5/echarts.min.js (100%)
 delete mode 100644 static/images/index/spsp-no.png
 delete mode 100644 static/images/index/tsjy.png

diff --git a/pages/index/components/menus.js b/pages/index/components/menus.js
index 76fffb2..4a3b2f7 100644
--- a/pages/index/components/menus.js
+++ b/pages/index/components/menus.js
@@ -85,7 +85,7 @@ const scene = [{
 		"name": "投诉建议",
 		"id": "d405ae13-3388-41c0-a5f6-d11194d0a943",
 		"modelName": "Suggestion",
-		"imagePath": "/static/images/index/tsjy.png",
+		"imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/tsjy.png",
 		"noImagePath": "/static/images/index/tsjy-no.png",
 		"homeUrl": "/pages/suggestion/suggestion"
 	},
@@ -142,7 +142,7 @@ const management = [{
 		"id": "056b29d7-4721-47ee-ad25-660814e1f3a9",
 		"modelName": "CommodityApproval",
 		"imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/spsp.png",
-		"noImagePath": "/static/images/index/spsp-no.png",
+		"noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/spsp-no.png",
 		"homeUrl": "/pages/businessApproval/businessApproval"
 	},
 	{
diff --git a/pages/index/components/numberScroll.vue b/pages/index/components/numberScroll.vue
new file mode 100644
index 0000000..e14fb00
--- /dev/null
+++ b/pages/index/components/numberScroll.vue
@@ -0,0 +1,171 @@
+<template>
+  <view class="content">
+    <!-- num 是字符串，会被切成片渲染 -->
+    <view class="l-num" v-for="(key,value) in num" :key="value">
+      <template v-if="key !== '.' && key !== ','">
+        <view class="l-son" :style="'transform: translateY(-'+(key*52)+'rpx);'" >
+          <view class="l-num l-posi" v-for="(s,i) in range" :style="'transform: translateY('+(i*52)+'rpx);'" :key="i">
+            {{s}}
+          </view>
+        </view>
+      </template>
+      <!-- 小数点 -->
+      <view class="l-num l-posi" v-else>{{key}}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+
+let range = new Array(10).fill(0).map((e,i) => i);
+
+export default {
+  data() {
+    return {
+      num:'0.00',	//当前显示数字
+      value:'',	//当前数字
+      range:range,//0-9
+      turnTime: 100//定时器时间 单位毫秒  可控制数字滚动快慢 数字越高滚动频率越慢
+    }
+  },
+  props:{
+    number:{
+      type: String,
+      default:''
+    }
+  },
+  watch:{
+    number:{
+      handler(value){
+        this.value = value;
+        this._getNumber();
+      },
+      immediate:true,
+      deep:true
+    }
+  },
+  onLoad() {},
+  methods: {
+
+    // 这里是保留两位小数的
+    _getNumber(){
+      let value = this.value
+      let num = this.num;
+
+      if(num == value){
+        return
+      }
+      // 我的思路是把数字切成一个数组，每个字符对应一个下标
+      this.showNumber = num.toString().split('');
+      this.nowNumber = value.toString().split('');
+      let newShowNumber = []
+      let newNowNumber = []
+
+      this.showNumber.forEach(item=>{
+        if (item!==',' && item!=='.'){
+          newShowNumber.push(Number(item))
+        }else{
+          newShowNumber.push(item)
+        }
+      })
+      this.nowNumber.forEach(item=>{
+        if (item!==',' && item!=='.'){
+          newNowNumber.push(Number(item))
+        }else{
+          newNowNumber.push(item)
+        }
+      })
+      this.showNumber = newShowNumber
+      this.nowNumber = newNowNumber
+
+      let sl = this.showNumber.length;
+      let ol = this.nowNumber.length;
+
+      let key = sl > ol ? 'nowNumber' : 'showNumber';
+
+      // 这个函数是用来补位的，例如原来是1，新数字是100，那么要给位数少的补位 1 ==> 001
+      this._formatNumber(key,sl,ol);
+
+      // 这个是数字变化滚动的具体函数
+      this._turnNumber();
+    },
+
+    _formatNumber(key,oldV,newV){
+      let length = Math.abs(oldV - newV);
+      let arr = new Array(length).fill(0);
+      this[key] = arr.concat(this[key]);
+    },
+
+    _turnNumber(){
+
+      let _this = this;
+      // 循环数字数组，
+      _this.showNumber.forEach((e,i) => {
+          // 判断对应位数的值，如果相等就跳过
+          if(e == _this.nowNumber[i]) return;
+
+          let inter = setInterval(() => {
+            // 数值相等后清除定时器
+            if(e == _this.nowNumber[_this._index(i)]){
+              clearInterval(inter);
+            }else{
+              if (e!==',' && e!=='.'){
+                // 如果大于就 --  小于就 ++
+                _this.showNumber[_this._index(i)] = e > _this.nowNumber[_this._index(i)] ? --e : ++e;
+                // 每次值变化都更新到视图上，这样看上去就像是滚动了一下。好吧，其实就是滚动了
+                _this.num = parseFloat(_this.showNumber.join('')).toFixed(2);
+                _this.num = _this.$util.fmoney(_this.num,2)
+              }else{
+                clearInterval(inter);
+              }
+            }
+          },_this.turnTime);
+      })
+    },
+    // 保留当前i的值
+    _index(i){
+      return i
+    }
+  }
+}
+</script>
+
+<style>
+.content{
+  width: 100%;
+  text-align: center;
+}
+
+.l-input{
+  padding: 30rpx;
+}
+
+.l-num{
+  font-size: 44rpx;
+  font-family: DINAlternate, DINAlternate;
+  font-weight: bold;
+  color: #160002;
+  line-height: 52rpx;
+  display: inline-block;
+  width: 30rpx;
+  text-align: center;
+  height: 52rpx;
+  overflow: hidden;
+  position: relative;
+}
+
+.l-son{
+  width: 100%;
+  height: calc(100% * 10);
+  position: relative;
+  transition:all 0.5s;
+}
+
+.l-posi{
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin: 0;
+  border: none;
+}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d38f4a0..8e66fb0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -898,7 +898,8 @@
           </view>
 
           <view class="revenueMoney">
-            <text class="moneyText">{{currentMoney}}</text>
+            <NumberScroll :number="currentMoney"/>
+<!--            <text class="moneyText">{{currentMoney}}</text>-->
             <text class="moneyLabel">实时营收/元</text>
           </view>
         </view>
@@ -1309,9 +1310,10 @@ import MonthCharts from "./components/monthCharts.vue";
 import RateCharts from "./components/rateCharts.vue";
 import SliderPage from "./components/sliderPage.vue";
 import UniDataSelect from "../../components/uni-data-select/uni-data-select.vue";
+import NumberScroll from "./components/numberScroll.vue";
 var rincanvas = {};
 export default {
-  components: {SliderPage, RateCharts, MonthCharts, Tabbar,uniPopup,UniDataSelect},
+  components: {SliderPage, RateCharts, MonthCharts, Tabbar,uniPopup,UniDataSelect,NumberScroll},
   data() {
     const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1)
     // const lastDay = '2024-01-01'
@@ -2041,7 +2043,9 @@ export default {
       }
       request.$webGet('CommercialApi/Revenue/GetCurRevenue',req).then(res=>{
         console.log('res',res)
-        this.currentMoney = this.$util.fmoney(res.Result_Data.CurRevenueAmount,2)
+        // this.currentMoney = this.$util.fmoney(res.Result_Data.CurRevenueAmount,2)
+        this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2)
+
       })
     },
     handleGetWarningList(){
@@ -2200,7 +2204,7 @@ export default {
       request.$webGet('CommercialApi/Revenue/GetRevenueBudget',monthDate).then(res=>{
         // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
         this.plan = res.Result_Data
-        this.plan.percentageMonth = res.Result_Data.MonthBudget_Degree
+        this.plan.percentageMonth = res.Result_Data.MonthBudget_Degree || ''
         this.plan.percentageYear =  res.Result_Data.YearBudget_Degree
 
         this.monthAdd = this.plan.MonthGrowth_Rate>0?`+${this.plan.MonthGrowth_Rate}`:`${this.plan.MonthGrowth_Rate}`
diff --git a/pages/summaryOfPortraits/components/carPortrait.vue b/pages/summaryOfPortraits/components/carPortrait.vue
index 5627613..e85b957 100644
--- a/pages/summaryOfPortraits/components/carPortrait.vue
+++ b/pages/summaryOfPortraits/components/carPortrait.vue
@@ -132,10 +132,10 @@
         </div>
       </view>
       <view class="swiperBox" v-else>
-        <view class="swiperItem">
+        <view class="swiperItem" >
 <!--          :style="{height:`calc(100vh - ${menu.bottom + 62}px)`}"-->
-          <view :style="{paddingTop:menu.bottom + 62+'px',height:`calc(100vh - ${menu.bottom + 62}px)`,overflowY: 'scroll'}">
-            <div class="header" :style="{backgroundImage: 'url('+ 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/car.svg' +')',height:324-menu.bottom - 62 + 'px'}">
+          <scroll-view scroll-y="true" style="height: 100vh" @scroll="handleScroll">
+            <div class="header" :style="{backgroundImage: 'url('+ 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/car.svg' +')',height:648+'rpx'}">
               <div class="analyse" v-if="analyseText">
                 <text class="title">分析</text>
                 <text class="content">{{analyseText}}</text>
@@ -166,7 +166,7 @@
                   <div class="seize"></div>
                 </div>
               </div>
-              <div class="serviceArea" :style="{top : 8 + 'px'}" >
+              <div class="serviceArea" :style="{top : menu.bottom + 70 + 'px'}" >
                 <div class="detailBox">
                   <div class="detailTop">
                     <div class="topLeft">{{serviceTypeObj[serviceInfoObj.SERVERPART_TYPE]}}</div>
@@ -196,7 +196,7 @@
                 </div>
               </div>
             </div>
-            <div class="charts">
+            <div class="charts" @click.stop="handleClick($event)">
               <div class="chartsItem">
                 <div style="display: flex;align-items: center;justify-content: space-between">
                   <p class="title">昨日入区车流</p>
@@ -219,7 +219,7 @@
                 </div>
               </div>
 
-              <div class="chartsItem" style="margin-top: 32px">
+              <div class="chartsItem" style="margin-top: 32px;height: 620px">
                 <div class="time">
                   <text class="thisTime"></text>
                   <div class="select">
@@ -235,7 +235,7 @@
                   <view v-for="(item,index) in tabList" :key="index" :class="selectTab===item.value?'tabItem tabItemActive':'tabItem'" @click="handleChangeTab(item.value)">{{item.name}}</view>
                 </view>
 
-                <p class="title">{{thisMonth?thisMonth:'-'}}月车辆归属地</p>
+                <p class="title" style="margin-bottom: 32px">车辆归属地</p>
                 <div v-if="homePlace && homePlace.length>0">
                   <home-place :selectProvinceName="selectProvinceName" :selectValue="selectValue" :homeData="homePlace" :homeCity="cityPlace" @getHomeDate="getHomeData"/>
                   <div style="display: flex">
@@ -251,11 +251,13 @@
 
                   <analyse :analyseInfo="{analysisins_type: 1103,analysisins_format: 2000}"  />
                 </div>
-                <no-data v-if="!homePlace"  :type="'car'"/>
+                <div style="height: 450px" v-if="!homePlace" >
+                  <no-data :type="'car'"/>
+                </div>
               </div>
 
-              <div class="chartsItem" style="margin-top: 32px">
-                <p class="title">{{thisMonth?thisMonth:'-'}}月车型停留分析/日均</p>
+              <div class="chartsItem" style="margin-top: 32px;height:280px">
+                <p class="title">车型停留分析/日均</p>
                 <div v-if="carTypeTimeData.series && carTypeTimeData.series.length>0">
                   <car-type-time :data="carTypeTimeData"/>
                   <analyse :analyseInfo="{analysisins_type: 1104,analysisins_format: 2000}"  />
@@ -263,18 +265,18 @@
                 <no-data v-if="!carTypeTimeData.series"  :type="'car'"/>
               </div>
 
-              <div class="chartsItem" style="margin-top: 32px">
-                <p class="title">{{thisMonth?thisMonth:'-'}}月车型停留分布图/日均</p>
-                <div v-if="timeAnalysisData.series && timeAnalysisData.series.length>0">
+              <div class="chartsItem" style="margin-top: 32px;height:280px">
+                <p class="title" style="margin-bottom: 16px">车型停留分布图/日均</p>
+                <div>
                   <time-analysis :data="timeAnalysisData"/>
                   <analyse :analyseInfo="{analysisins_type: 1105,analysisins_format: 2000}"  />
                 </div>
-                <no-data v-if="!timeAnalysisData.series"  :type="'car'"/>
+<!--                <no-data v-if="!timeAnalysisData.series"  :type="'car'"/>-->
               </div>
 
               <div class="chartsItem" style="margin-top: 32px">
                 <div class="topItem" >
-                  <p class="title">{{thisMonth?thisMonth:'-'}}月入区车型占比</p>
+                  <p class="title">入区车型占比</p>
                   <div class="box" v-if="allEntry">
                     <text class="value">{{allEntry?allEntry:'-'}}%</text>
                     <view class="right" v-if="addAllEntry">
@@ -291,7 +293,7 @@
                 <no-data v-if="!percentEntryData "  :type="'car'"/>
               </div>
             </div>
-          </view>
+          </scroll-view>
         </view>
       </view>
 
@@ -516,8 +518,11 @@ export default {
       this.searchTextMonth = ''
     },
     methods:{
+      handleClick(e){
+        // console.log('click',e)
+      },
       handleScroll(e){
-        console.log('e',e)
+        // console.log('e',e)
         this.scrollTop = e.detail.scrollTop
       },
       // 修改排序字段
@@ -1982,7 +1987,6 @@ export default {
     width: 100%;
     .swiperItem{
       width: 100%;
-      height: 100vh;
       .header{
         width: 100%;
         //height: calc(1.056 * 100vw);
diff --git a/pages/summaryOfPortraits/components/components/car/carTypeTime.vue b/pages/summaryOfPortraits/components/components/car/carTypeTime.vue
index de80a98..75c1065 100644
--- a/pages/summaryOfPortraits/components/components/car/carTypeTime.vue
+++ b/pages/summaryOfPortraits/components/components/car/carTypeTime.vue
@@ -1,8 +1,16 @@
 <template>
-    <div style="min-height: 100px;">
+    <div >
             <div class="carTypeTime" >
-                <canvas style="width: 100vw;height: 252px;position: fixed;left: 100vw"  class="canvas" canvas-id="carTypeTime" id="carTypeTime" @tap="handleTap"/>
-                <image style="width: 100vw;height: 252px;" v-if="carTypeTimePath" class="canvas" :src="carTypeTimePath"></image>
+              <qiunDataCharts
+                type="column"
+                :opts="opts"
+                :chartData="res"
+                :animation="false"
+                :inScrollView="true"
+                tooltipFormat="carTypeTime"
+              />
+<!--                <canvas style="width: 100vw;height: 252px;position: fixed;left: 100vw"  class="canvas" canvas-id="carTypeTime" id="carTypeTime" @tap="handleTap"/>-->
+<!--                <image style="width: 100vw;height: 252px;" v-if="carTypeTimePath" class="canvas" :src="carTypeTimePath"></image>-->
             </div>
     </div>
 </template>
@@ -11,10 +19,11 @@
 import uCharts from '@/components/u-charts.js';
 import NoData from "../noData.vue";
 import Analyse from "../analyse.vue";
+import qiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 var uChartsInstance = {};
 export default {
     name: "carTypeTime",
-    components: {Analyse, NoData},
+    components: {Analyse, NoData,qiunDataCharts},
     data() {
         return {
             width:0,
@@ -25,7 +34,9 @@ export default {
                 analysisins_type: 1104,
                 analysisins_format: 2000
             },
-            num:0
+            num:0,
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -70,7 +81,64 @@ export default {
             let config = {
                 max:this.getSplitNumber(value.series[1].max)
             }
-            this.drawCharts('carTypeTime', res,config)
+            this.res = res
+          this.opts = {
+            categories:res.categories,
+            series: res.series,
+            animation: false,
+            canvas2d: true,
+            rotate: false,
+            rotateLock: false,
+            background: "#FFFFFF",
+            color: ["#1E80FF","#00B6FF"],
+            padding: [30,30,0,0],
+            dataLabel: false,
+            enableScroll: false,
+            legend: {
+              show: true,
+              position: "bottom",
+              lineHeight: 25,
+              float: 'center'
+
+            },
+            xAxis:{
+              disableGrid: true,
+              axisLineColor:"#F2F2F5"
+            },
+            yAxis:{
+              showTitle:true,
+              gridColor:'#F2F2F5',
+              data: [
+                {
+                  title:'单位: %',
+                  min: 0,
+                  max: 100,
+                  titleOffsetY: -5,
+                  axisLineColor:"#F2F2F5"
+                },
+                {
+                  title:'单位: 分钟',
+                  min: 0,
+                  max: config.max,
+                  position: 'right',
+                  titleOffsetY: -5,
+                  titleOffsetX: 5,
+                  axisLineColor:"#F2F2F5"
+                },
+              ]
+            },
+            extra: {
+              column: {
+                type: "group",
+                width: 12,
+                seriesGap:2,
+                categoryGap: 24,
+                activeBgColor: "#000000",
+                activeBgOpacity: 0.08,
+              }
+            }
+          }
+            // this.drawCharts('carTypeTime', res,config)
         },
         getSplitNumber(value){
             if (value === 0){
@@ -171,7 +239,7 @@ export default {
 
 <style scoped lang="scss">
 .carTypeTime{
-    width: 100%;
+  width: calc(100vw - 16px);
     height: 252px;
     .canvas{
         width: 100%;
diff --git a/pages/summaryOfPortraits/components/components/car/homePlace.vue b/pages/summaryOfPortraits/components/components/car/homePlace.vue
index 4536214..c504c20 100644
--- a/pages/summaryOfPortraits/components/components/car/homePlace.vue
+++ b/pages/summaryOfPortraits/components/components/car/homePlace.vue
@@ -1,9 +1,18 @@
 <template>
-    <div style="min-height: 100px;">
+    <div >
             <div class="main" >
                 <div class="homePlace">
-                    <canvas style="height: 160px;width: 100%;position: fixed;left: 100%"  canvas2d="true" class="carNum" canvas-id="homePlace" id="homePlace" @tap="handleTap"/>
-                    <image style="height: 160px;width: 100%;" v-if="homePlacePath" class="carNum" :src="homePlacePath"></image>
+                  <QiunDataCharts
+                    type="ring"
+                    :opts="opts"
+                    :animation="false"
+                    :chartData="res"
+                    :inScrollView="true"
+                    tooltipFormat="homePlace"
+                    :ontap="handleTap"
+                  />
+<!--                    <canvas style="height: 160px;width: 100%;position: fixed;left: 100%"  canvas2d="true" class="carNum" canvas-id="homePlace" id="homePlace" @tap="handleTap"/>-->
+<!--                    <image style="height: 160px;width: 100%;" v-if="homePlacePath" class="carNum" :src="homePlacePath"></image>-->
                 </div>
                 <div class="homeCity">
 <!--                    <div class="dashed box1"></div>-->
@@ -41,10 +50,11 @@
 import uCharts from '@/components/u-charts.js';
 import NoData from "../noData.vue";
 import Analyse from "../analyse.vue";
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 var uChartsInstance = {};
 export default {
     name: "homePlace",
-    components: {Analyse, NoData},
+    components: {Analyse, NoData,QiunDataCharts},
     data() {
         return {
             isShowData:false,
@@ -59,7 +69,9 @@ export default {
             textList:[],
             selectIndex:7,
             provinceName:'',
-            selectValueNumber:''
+            selectValueNumber:'',
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -163,7 +175,45 @@ export default {
                     }
                 ]
             }
-            this.drawCharts('homePlace', res,this.provinceName)
+
+            this.res = res
+          this.opts = {
+            series: res.series,
+            animation: false,
+            rotate: false,
+            rotateLock: false,
+            canvas2d: true,
+            background: "#FFFFFF",
+            color: ["#1E80FF", "#00B6FF","#38C275","#6B6FFF","#6B85AE"],
+            padding: [5, 5, 5, 5],
+            dataLabel: false,
+            enableScroll: false,
+            title:{
+              name: ''
+            },
+            subtitle:{
+              name: ''
+            },
+            legend: {
+              show: true,
+              position: "right",
+              lineHeight: 25
+            },
+            extra: {
+              ring: {
+                ringWidth: 12,
+                activeOpacity: 0.5,
+                activeRadius: 10,
+                offsetAngle: -45,
+                labelWidth: 15,
+                border: false,
+                borderWidth: 3,
+                borderColor: "#FFFFFF"
+              }
+            }
+          }
+
+            // this.drawCharts('homePlace', res,this.provinceName)
         },
         drawCharts(id, data,provinceName) {
             const ctx = uni.createCanvasContext(id, this);
@@ -233,10 +283,10 @@ export default {
 
 <style scoped lang="scss">
 .main{
-  width: 100%;
+  width: calc(100vw - 32px);
     .homePlace{
         height: 160px;
-        width: 100%;
+      width: calc(100vw - 16px);
         .carNum{
           position: absolute;
 
diff --git a/pages/summaryOfPortraits/components/components/car/monthTotal.vue b/pages/summaryOfPortraits/components/components/car/monthTotal.vue
index 8e084d7..9695dfc 100644
--- a/pages/summaryOfPortraits/components/components/car/monthTotal.vue
+++ b/pages/summaryOfPortraits/components/components/car/monthTotal.vue
@@ -1,18 +1,32 @@
 <template>
     <div class="main">
-        <canvas  style="height: 300px;width: 100vw;position:fixed;left: 100vw" class="canvas" canvas-id="monthTotal" id="monthTotal" @tap="handleTap"/>
-      <image style="height: 300px;width: 100vw" v-if="preferPath" class="canvas" :src="preferPath"/>
+      <qiunDataCharts
+          type="mix"
+          :opts="opts"
+          :chartData="monthData"
+          :animation="false"
+          :inScrollView="true"
+          tooltipFormat="monthTotal"
+      />
+<!--        <canvas class="canvas" canvas-id="monthTotal" id="monthTotal" @tap="handleTap" />-->
+<!--      <image style="height: 300px;width: 100vw" v-if="preferPath" class="canvas" :src="preferPath"/>-->
     </div>
 </template>
 
 <script>
 import uCharts from '@/components/u-charts.js';
 var uChartsInstance = {};
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 export default {
     name: "monthTotal",
+    components: {QiunDataCharts},
     data(){
         return {
-          preferPath:''
+          preferPath:'',
+          opts:{
+
+          },
+
         }
     },
     props: {
@@ -20,6 +34,10 @@ export default {
           type: Object,
           default: () => {}
         },
+        scrollTop:{
+          type:Number,
+          default:0
+        }
     },
     watch: {
         monthData: {
@@ -27,17 +45,46 @@ export default {
               console.log('val1111ue',value)
               this.handleCarData(value)
             },
-        }
+        },
+      scrollTop:{
+        handler(value){
+          }
+      }
     },
     methods:{
+      tooltip(item, category, index, opts){
+        let text = ''
+        let type = item.name.slice(5,10)
+        let time = opts.series[0].info[index].year
+        if (type === '车流量'){
+          if (`${time}年车流量` === item.name){
+            let showTime = opts.series[0].info[index].year.toString().slice(2,5)
+            text = `${showTime}年入区 ${opts.series[0].info[index].allCarCount?this.$util.fmoney(opts.series[0].info[index].allCarCount):''} 辆`
+          }else{
+            let showTime = opts.series[1].info[index].year.toString().slice(2,5)
+            text = `${showTime}年入区 ${opts.series[1].info[index].allCarCount?this.$util.fmoney(opts.series[1].info[index].allCarCount):''} 辆`
+          }
+          return text
+        }else{
+          if (`${time}年交易额` === item.name){
+            let showTime = opts.series[2].year.toString().slice(2,5)
+            console.log('showTime',showTime)
+            text = `${showTime}年金额 ${opts.series[2].info[index].money?this.$util.fmoney(opts.series[2].info[index].money):''} 元, 单车消费 ${opts.series[0].info[index].allCarCount?((opts.series[0].info[index].money) / opts.series[0].info[index].allCarCount).toFixed(2):''} 元`
+          }else{
+            let showTime = opts.series[3].year.toString().slice(2,5)
+            text = `${showTime}年金额 ${opts.series[3].info[index].money?this.$util.fmoney(opts.series[3].info[index].money):''} 元, 单车消费 ${opts.series[1].info[index].allCarCount?((opts.series[1].info[index].money) / opts.series[1].info[index].allCarCount).toFixed(2):''} 元`
+          }
+          return text
+        }
+      },
         handleTap(e){
+          console.log('e1',e)
+          console.log('offset',{x: e.detail.x, y: e.detail.y + this.scrollTop - e.currentTarget.offsetTop})
             uChartsInstance[e.target.id].showToolTip(e,{
+                // offset: {x: e.detail.x, y: e.target.offsetTop - e.currentTarget.offsetTop},
+                offset: {x: e.detail.x, y: e.detail.y + this.scrollTop - e.currentTarget.offsetTop},
                 formatter: (item, category, index, opts) => {
-                    console.log('item',item)
-                    console.log('index',index)
-                    console.log('opts',opts)
                     let text = ''
-                    console.log('item.name.slice(5,10)',item.name.slice(5,10))
                     let type = item.name.slice(5,10)
                     let time = opts.series[0].info[index].year
                     if (type === '车流量'){
@@ -99,7 +146,77 @@ export default {
                 moneyMax:value.series[2].max > value.series[3].max ? this.getSplitNumber(value.series[2].max):this.getSplitNumber(value.series[3].max)
               }
             }
-            this.drawCharts('monthTotal', res, config)
+          let phoneInfo = uni.getStorageSync('phoneInfo')
+          let width = phoneInfo.screenWidth-32
+            this.opts={
+              type: "mix",
+              categories: res.categories,
+              series: res.series,
+              animation: false,
+              rotate: false,
+              rotateLock: false,
+              canvas2d: true,
+              background: "#FFFFFF",
+              color: ["#1E80FF", "#00B6FF","#38C275","#6B6FFF","#6B85AE"],
+              padding: [35, 10, 5, 5],
+              dataLabel: false,
+              enableScroll: false,
+              xAxis: {
+                disabled: false,
+                disableGrid: true,
+                axisLine: false,
+                fontColor: '#777777',
+                fontSize:res.categories && res.categories.length<10 ? 13 : 11
+              },
+              yAxis:{
+                showTitle:true,
+                data:[{
+                  position: "left",
+                  title: '车流量 / 万辆 ',
+                  disabled: false,
+                  axisLine: false,
+                  titleOffsetY: -5,
+                  titleOffsetX: 25,
+                  min: 0,
+                  max:config.carMax
+                },
+                  {
+                    position: "right",
+                    title: '交易金额 / 万元',
+                    disabled: false,
+                    axisLine: false,
+                    titleOffsetY: -5,
+                    titleOffsetX: -15,
+                    min: 0,
+                    max:config.moneyMax
+                  }]
+              },
+              legend: {
+                show: true,
+                position: "bottom",
+                lineHeight: 25,
+                float:'center',
+                itemGap: 30
+              },
+              extra: {
+                mix:{
+                  column:{
+                    type: "group",
+                    width: 12,
+                    activeBgColor: "#000000",
+                    activeBgOpacity: 0.08
+                  },
+                  line:{
+                    type: "curve",
+                    width: 2,
+                    activeType: "hollow"
+                  }
+                }
+              }
+            }
+
+
+            // this.drawCharts('monthTotal', res, config)
         },
         getSplitNumber(value){
             if (value === 0){
@@ -187,7 +304,7 @@ export default {
                 }
             });
           setTimeout( ()=>{
-            this.canvasToTempImage('monthTotal')
+            // this.canvasToTempImage('monthTotal')
           },500)
         },
       canvasToTempImage(id){
@@ -213,7 +330,7 @@ export default {
 
 <style scoped lang="scss">
 .main{
-    width: 100%;
+    width: calc(100vw - 16px);
     height: 300px;
     .canvas{
         width: 100%;
diff --git a/pages/summaryOfPortraits/components/components/car/timeAnalysis.vue b/pages/summaryOfPortraits/components/components/car/timeAnalysis.vue
index d204bed..c02ba7d 100644
--- a/pages/summaryOfPortraits/components/components/car/timeAnalysis.vue
+++ b/pages/summaryOfPortraits/components/components/car/timeAnalysis.vue
@@ -1,10 +1,16 @@
 <template>
-    <div style="min-height: 100px;">
-            <div class="timeAnalysis" >
-                <canvas  style="width:100vw;height:220px;position:fixed;left:100vw" class="timeAnalysis" canvas-id="timeAnalysis" id="timeAnalysis" @tap="handleTap"/>
-              <image v-if="preferPath" style="width: 100vw;height: 220px;" :src="preferPath"></image>
+    <div class="timeAnalysis">
+              <QiunDataCharts
+                  type="line"
+                  :opts="opts"
+                  :chartData="res"
+                  :inScrollView="true"
+                  :animation="false"
+                  tooltipFormat="timeAnalysis"
+              />
+<!--                <canvas  style="width:100vw;height:220px;position:fixed;left:100vw" class="timeAnalysis" canvas-id="timeAnalysis" id="timeAnalysis" @tap="handleTap"/>-->
+<!--              <image v-if="preferPath" style="width: 100vw;height: 220px;" :src="preferPath"></image>-->
 
-            </div>
     </div>
 </template>
 
@@ -12,10 +18,11 @@
 import uCharts from '@/components/u-charts.js';
 import NoData from "../noData.vue";
 import Analyse from "../analyse.vue";
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 var uChartsInstance = {};
 export default {
     name: "timeAnalysis",
-    components: {Analyse, NoData},
+    components: {Analyse, NoData,QiunDataCharts},
     data() {
         return {
             width:0,
@@ -24,7 +31,9 @@ export default {
                 analysisins_type: 1105,
                 analysisins_format: 2000
             },
-          preferPath:''
+          preferPath:'',
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -73,7 +82,61 @@ export default {
                 series:value.series
             }
             let max = this.getSplitNumber(value.max)
-            this.drawCharts('timeAnalysis', res,max)
+            this.res = res
+            this.opts = {
+            categories: res.categories,
+            series: res.series,
+            animation: false,
+            rotate: false,
+            canvas2d: true,
+            rotateLock: false,
+            background: "#FFFFFF",
+            color: ["#1E80FF", "#00B6FF","#0FC862"],
+            padding: [15, 30, 5, 5],
+            dataLabel: false,
+            enableScroll: false,
+            xAxis: {
+              disableGrid: true,
+              formatter:(val)=>{
+                if (val===0 || val===4 || val===8 || val===12 || val===16 || val===20 || val===23){
+                  if (val===23){
+                    return '24:00'
+                  }else{
+                    return `${val}:00`
+                  }
+                }else{
+                  return ''
+                }
+              }
+            },
+            yAxis: {
+              gridType: "dash",
+              dashLength: 2,
+              showTitle:true,
+              data:[{
+                title:'单位: 分钟',
+                titleOffsetY: -5,
+                min:0,
+                max:max,
+              }]
+            },
+            legend: {
+              show: true,
+              position: "bottom",
+              lineHeight: 25,
+              float: 'center'
+
+            },
+            extra: {
+              line: {
+                type: "curve",
+                width: 2,
+                activeType: "hollow"
+              }
+            }
+          }
+
+            // this.drawCharts('timeAnalysis', res,max)
         },
         drawCharts(id, data,max) {
             const ctx = uni.createCanvasContext(id, this);
@@ -163,11 +226,8 @@ export default {
 
 <style scoped lang="scss">
 .timeAnalysis{
-    width: 100%;
-    .timeAnalysis{
-        width: 100%;
-        height: 220px;
-        margin-top: 12px;
-    }
+  width: calc(100vw - 16px);
+  height: 220px;
+  margin-top: 12px;
 }
 </style>
diff --git a/pages/summaryOfPortraits/components/components/guest/businessType.vue b/pages/summaryOfPortraits/components/components/guest/businessType.vue
index a1e91c1..871ade7 100644
--- a/pages/summaryOfPortraits/components/components/guest/businessType.vue
+++ b/pages/summaryOfPortraits/components/components/guest/businessType.vue
@@ -1,20 +1,32 @@
 <template>
     <div class="businessType">
-        <canvas class="business" style=" width: 100vw;height: 170px;position: fixed;left: 100vw" canvas-id="businessType" id="businessType" @tap="handleTap"/>
-      <image v-if="preferPath" style="width: 100vw;height: 170px" :src="preferPath"></image>
+      <QiunDataCharts
+          type="ring"
+          :opts="opts"
+          :chartData="res"
+          :animation="false"
+          :inScrollView="true"
+          tooltipFormat="businessType"
+      />
+<!--        <canvas class="business" style=" width: 100vw;height: 170px;position: fixed;left: 100vw" canvas-id="businessType" id="businessType" @tap="handleTap"/>-->
+<!--      <image v-if="preferPath" style="width: 100vw;height: 170px" :src="preferPath"></image>-->
 
     </div>
 </template>
 
 <script>
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 import uCharts from '@/components/u-charts.js';
 var uChartsInstance = {};
 export default {
     name: "businessType",
+  components:{QiunDataCharts},
     data() {
         return {
             width:0,
-          preferPath:''
+          preferPath:'',
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -45,7 +57,44 @@ export default {
             let res = {
                 series:value
             }
-            this.drawCharts('businessType', res)
+            this.res = res
+          this.opts = {
+            series: res.series,
+            animation: false,
+            rotate: false,
+            rotateLock: false,
+            background: "#FFFFFF",
+            color: ["#1E80FF", "#00C2FF","#6B6FFF","#38C275","#74839D","#B8C7DE"],
+            padding: [5, 5, 5, 5],
+            dataLabel: false,
+            enableScroll: false,
+            title:{
+              name:''
+            },
+            subtitle:{
+              name:''
+            },
+            legend: {
+              show: true,
+              position: "right",
+              lineHeight: 25,
+              float: 'center'
+
+            },
+            extra: {
+              ring: {
+                ringWidth: 20,
+                activeOpacity: 0.5,
+                activeRadius: 10,
+                offsetAngle: -45,
+                labelWidth: 15,
+                border: false,
+                borderWidth: 3,
+                borderColor: "#FFFFFF"
+              }
+            }
+          }
+            // this.drawCharts('businessType', res)
         },
         drawCharts(id, data) {
             const ctx = uni.createCanvasContext(id, this);
@@ -73,6 +122,7 @@ export default {
                     float: 'center'
 
                 },
+
                 extra: {
                     ring: {
                         ringWidth: 20,
@@ -113,10 +163,11 @@ export default {
 
 <style scoped lang="scss">
 .businessType{
-    width: 100%;
+  width: calc(100vw - 32px);
+  height: 190px;
     .business{
         width: 100%;
-        height: 170px;
+        height: 190px;
     }
 }
 </style>
diff --git a/pages/summaryOfPortraits/components/components/guest/consumPrefer.vue b/pages/summaryOfPortraits/components/components/guest/consumPrefer.vue
index 850a450..ae89fa2 100644
--- a/pages/summaryOfPortraits/components/components/guest/consumPrefer.vue
+++ b/pages/summaryOfPortraits/components/components/guest/consumPrefer.vue
@@ -1,19 +1,31 @@
 <template>
     <div class="consumPrefer">
-        <canvas style="width: 100vw;height: 274px;position: fixed;left: 100vw"  class="prefer" canvas-id="prefer" id="prefer" @tap="tap"/>
-        <image style="width: 100vw;height: 274px;" v-if="preferPath" class="prefer" :src="preferPath"></image>
+      <QiunDataCharts
+          type="radar"
+          :opts="opts"
+          :chartData="res"
+          :animation="false"
+          :inScrollView="true"
+          tooltipFormat="consumPrefer"
+      />
+<!--        <canvas style="width: 100vw;height: 274px;position: fixed;left: 100vw"  class="prefer" canvas-id="prefer" id="prefer" @tap="tap"/>-->
+<!--        <image style="width: 100vw;height: 274px;" v-if="preferPath" class="prefer" :src="preferPath"></image>-->
     </div>
 </template>
 
 <script>
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 import uCharts from '@/components/u-charts.js';
 var uChartsInstance = {};
 export default {
     name: "consumPrefer",
+  components:{QiunDataCharts},
     data() {
         return {
             width:0,//手机宽度
-            preferPath:''//路径
+            preferPath:'',//路径
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -37,7 +49,38 @@ export default {
         // 处理传入的数据
         handleCarData(value) {
             let res = value
-            this.drawCharts('prefer', res)
+          this.res = value
+            this.opts = {
+              categories: res.categories,
+              series: res.series,
+              animation: false,
+              rotate: false,
+              rotateLock: false,
+              background: "#FFFFFF",
+              color: ["#1E80FF", "#00C2FF"],
+              padding: [5, 5, 5, 5],
+              dataLabel: false,
+              enableScroll: false,
+              legend: {
+                show: true,
+                position: "bottom",
+                lineHeight: 25,
+                float: 'center'
+
+              },
+              extra: {
+                radar: {
+                  gridType: "radar",
+                  gridColor: "#CCCCCC",
+                  gridCount: 3,
+                  opacity: 0.2,
+                  max: res.max,
+                  labelShow: true,
+                  border: true
+                }
+              }
+            }
+          // this.drawCharts('prefer', res)
         },
         drawCharts(id, data) {
             const ctx = uni.createCanvasContext(id, this);
@@ -105,7 +148,7 @@ export default {
 
 <style scoped lang="scss">
 .consumPrefer{
-    width: 100%;
+    width: calc(100vw - 32px);
     height: 274px;
     .prefer{
         width: 100%;
diff --git a/pages/summaryOfPortraits/components/components/guest/customerSecond.vue b/pages/summaryOfPortraits/components/components/guest/customerSecond.vue
index b127d5f..836b3d5 100644
--- a/pages/summaryOfPortraits/components/components/guest/customerSecond.vue
+++ b/pages/summaryOfPortraits/components/components/guest/customerSecond.vue
@@ -26,17 +26,27 @@
           </div>
       </div>
       <div class="charts">
-          <canvas  class="sexRatio" style=" width: 100vw;height: 220px;position: fixed;left: 100vw" canvas-id="gender" id="gender" @tap="tap"/>
-          <image class="sexRatio" style=" width: 100vw;height: 220px;" v-if="customerSecondPath" :src="customerSecondPath"></image>
+        <QiunDataCharts
+            type="bubble"
+            :opts="opts"
+            :chartData="res"
+            :animation="false"
+            :inScrollView="true"
+            tooltipFormat="customerSecond"
+        />
+<!--          <canvas  class="sexRatio" style=" width: 100vw;height: 220px;position: fixed;left: 100vw" canvas-id="gender" id="gender" @tap="tap"/>-->
+<!--          <image class="sexRatio" style=" width: 100vw;height: 220px;" v-if="customerSecondPath" :src="customerSecondPath"></image>-->
       </div>
   </div>
 </template>
 
 <script>
 import uCharts from '@/components/u-charts.js';
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 var uChartsInstance = {};
 export default {
     name: "customerSecond",
+  components: {QiunDataCharts},
     data() {
         return {
             man:0,
@@ -44,6 +54,8 @@ export default {
             width:0,//手机宽度
             customerSecondPath:'',//路径
             genderList:[false,false],
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -80,7 +92,63 @@ export default {
             let res = {
                 series: value.res
             }
-            this.drawCharts('gender', res)
+            this.res = res
+          this.opts = {
+            type: "bubble",
+            series: res.series,
+            animation: false,
+            rotate: false,
+            rotateLock: false,
+            background: "#FFFFFF",
+            color: ["#1E80FF", "#00C2FF"],
+            padding: [15, 5, 5, 5],
+            dataLabel: false,
+            enableScroll: false,
+            legend: {
+              show: true,
+              position: "bottom",
+              lineHeight: 25,
+              float: 'center'
+
+            },
+            xAxis: {
+              disableGrid: true,
+              gridType: "solid",
+              splitNumber: 5,
+              boundaryGap: "justify",
+              title:'年龄: /岁',
+              titleOffsetY: 15,
+              titleOffsetX: -30,
+              min: 10,
+              max: 60,
+              axisLineColor:'#F2F2F5'
+            },
+            yAxis: {
+              disableGrid: false,
+              gridType: "solid",
+              showTitle:true,
+              splitNumber:6,
+              gridColor:'#F2F2F5',
+              data: [
+                {
+                  title:'单位: /元',
+                  min: 0,
+                  max: 120,
+                  titleOffsetY:-5,
+                  titleOffsetX:0,
+                  fontColor:'#786B6C',
+                  axisLineColor:'#F2F2F5'
+                }
+              ]
+            },
+            extra: {
+              bubble: {
+                border: 1,
+                opacity: 0.25
+              }
+            }
+          }
+            // this.drawCharts('gender', res)
         },
         drawCharts(id, data) {
             const ctx = uni.createCanvasContext(id, this);
@@ -288,7 +356,7 @@ export default {
       width: 100%;
       height: 220px;
       .sexRatio{
-          width: 100%;
+        width: calc(100vw - 32px);
           height: 100%;
       }
   }
diff --git a/pages/summaryOfPortraits/components/components/manager/moneyCompare.vue b/pages/summaryOfPortraits/components/components/manager/moneyCompare.vue
index 992bd93..c096655 100644
--- a/pages/summaryOfPortraits/components/components/manager/moneyCompare.vue
+++ b/pages/summaryOfPortraits/components/components/manager/moneyCompare.vue
@@ -1,21 +1,33 @@
 <template>
     <div class="moneyCompare">
-        <canvas style="width: calc(100vw - 32px);height: 200px;position: fixed;left: 100%"  class="compare" canvas-id="compare" id="compare"  @tap="tap"/>
-        <image style="width: calc(100vw - 32px);height: 200px;" v-if="comparePath" class="compare" :src="comparePath"></image>
+      <qiunDataCharts
+          type="column"
+          :opts="opts"
+          :chartData="res"
+          :animation="false"
+          :inScrollView="true"
+          tooltipFormat="moneyCompare"
+      />
+<!--        <canvas style="width: calc(100vw - 32px);height: 200px;position: fixed;left: 100%"  class="compare" canvas-id="compare" id="compare"  @tap="tap"/>-->
+<!--        <image style="width: calc(100vw - 32px);height: 200px;" v-if="comparePath" class="compare" :src="comparePath"></image>-->
     </div>
 </template>
 
 <script>
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 import uCharts from '@/components/u-charts.js';
 var uChartsInstance = {};
 export default {
     name: "moneyCompare",
+  components:{QiunDataCharts},
     data() {
         return {
           width:0,
           comparePath:'',
           dataList: [],
-          selectIndex:0
+          selectIndex:0,
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -141,7 +153,56 @@ export default {
             let config  = {
                 max:this.getSplitNumber(max)
             }
-            this.drawCharts('compare', res,config)
+            this.res = res
+            this.opts = {
+              categories: res.categories,
+              series: res.series,
+              animation: false,
+              rotate: false,
+              rotateLock: false,
+              background: "#FFFFFF",
+              color: ["#1E80FF", "#00B6FF","#ACB9CD"],
+              padding: [15, 40, 5, 0],
+              dataLabel: false,
+              enableScroll: false,
+              legend: {
+                show: true,
+                position: "bottom",
+                lineHeight: 25,
+                float: 'center'
+              },
+              xAxis: {
+                disableGrid: true,
+                axisLineColor:'#F2F2F5'
+              },
+              yAxis: {
+                showTitle:false,
+                splitNumber:4,
+                gridColor:'#F2F2F5',
+                data: [
+                  {
+                    min: 0,
+                    max:config.max,
+                    titleOffsetX:15,
+                    titleOffsetY:-5,
+                    fontSize:12,
+                    axisLineColor:'#F2F2F5'
+                  }
+                ],
+              },
+              extra: {
+                column: {
+                  type: "group",
+                  width: 5,
+                  seriesGap:4,
+                  activeBgColor: "#000000",
+                  activeBgOpacity: 0.08,
+                  barBorderRadius:[3,3,0,0]
+                }
+              }
+            }
+
+            // this.drawCharts('compare', res,config)
         },
         getSplitNumber(value){
             if (value === 0){
@@ -234,7 +295,8 @@ export default {
 
 <style scoped lang="scss">
 .moneyCompare{
-    width: 100%;
+  width: 100vw;
+  height: 200px;
     .compare{
         width: calc(100vw - 32px);
         height: 200px;
diff --git a/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue b/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue
index 1993cab..98d6b6d 100644
--- a/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue
+++ b/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue
@@ -1,20 +1,32 @@
 <template>
     <div class="revenueTrends">
-        <canvas style=" width: 100vw;height: 208px;position: fixed;left: 100%"  class="trends" canvas-id="trends" id="trends" @tap="handleTap"/>
-      <image v-if="preferPath" style="width: 100vw;height: 208px;" :src="preferPath"></image>
+      <QiunDataCharts
+          type="area"
+          :opts="opts"
+          :chartData="res"
+          :animation="false"
+          :inScrollView="true"
+          tooltipFormat="revenueTrends"
+      />
+<!--        <canvas style=" width: 100vw;height: 208px;position: fixed;left: 100%"  class="trends" canvas-id="trends" id="trends" @tap="handleTap"/>-->
+<!--      <image v-if="preferPath" style="width: 100vw;height: 208px;" :src="preferPath"></image>-->
 
     </div>
 </template>
 
 <script>
+import QiunDataCharts from "../qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 import uCharts from '@/components/u-charts.js';
 var uChartsInstance = {};
 export default {
     name: "revenueTrends",
+  components:{QiunDataCharts},
     data() {
         return {
           trendsPath:'',
-          preferPath:''
+          preferPath:'',
+          opts:{},
+          res:{}
         }
     },
     props: {
@@ -56,9 +68,58 @@ export default {
         // 处理传入的数据
         handleCarData(value) {
             let res = value
-          if (value && value.series && value.series.length>0){
-            this.drawCharts('trends', res)
+          this.res = res
+          this.opts = {
+            categories: res.categories,
+            series: res.series,
+            animation: false,
+            rotate: false,
+            rotateLock: false,
+            background: "#FFFFFF",
+            color: ["#1E80FF","#00B6FF"],
+            padding: [15, 15, 5, 5],
+            dataLabel: false,
+            enableScroll: false,
+            legend: {
+              show: true,
+              position: "bottom",
+              lineHeight: 25,
+              float: 'center'
+
+            },
+            xAxis: {
+              disableGrid: true,
+              axisLineColor:'#F2F2F5'
+            },
+            yAxis: {
+              splitNumber:4,
+              showTitle:false,
+              gridColor:'#F2F2F5',
+              data:[
+                {
+                  min:0,
+                  max:this.getNumber(data.max),
+                  titleOffsetY:-5,
+                  titleOffsetX:-5,
+                  fontSize:12,
+                  axisLineColor:'#F2F2F5'
+                }
+              ]
+            },
+            extra: {
+              area: {
+                type: "curve",
+                opacity: 0.8,
+                addLine: true,
+                width: 2,
+                gradient: true,
+                activeType: "hollow"
+              }
+            }
           }
+          // if (value && value.series && value.series.length>0){
+          //   this.drawCharts('trends', res)
+          // }
         },
         getNumber(value){
             let number = value / 40
@@ -149,7 +210,8 @@ export default {
 
 <style scoped lang="scss">
 .revenueTrends{
-    width: 100%;
+  width: 100vw;
+  height: 210px;
     .trends{
         width: calc(100vw - 32px);
         height: 208px;
diff --git a/uni_modules/qiun-data-charts/changelog.md b/pages/summaryOfPortraits/components/components/qiun-data-charts/changelog.md
similarity index 100%
rename from uni_modules/qiun-data-charts/changelog.md
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/changelog.md
diff --git a/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-error/qiun-error.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-error/qiun-error.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading1.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading1.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading2.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading2.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading3.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading3.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading4.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading4.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading5.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/loading5.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue b/pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/qiun-loading.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/components/qiun-loading/qiun-loading.vue
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-echarts.js
similarity index 83%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-echarts.js
index 7b8168f..4cd6aaa 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
+++ b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-echarts.js
@@ -4,16 +4,16 @@
  * Copyright (c) 2021 QIUN®秋云 https://www.ucharts.cn All rights reserved.
  * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
  * 复制使用请保留本段注释，感谢支持开源！
- * 
+ *
  * uCharts®官方网站
  * https://www.uCharts.cn
- * 
+ *
  * 开源地址:
  * https://gitee.com/uCharts/uCharts
- * 
+ *
  * uni-app插件市场地址：
  * http://ext.dcloud.net.cn/plugin?id=271
- * 
+ *
  */
 
 // 通用配置项
@@ -44,13 +44,38 @@ const cfe = {
       	// #ifdef H5
       	result += '\n' + res[i].seriesName + '：' + value + ' 万元'
       	// #endif
-      	
+
       	// #ifdef APP-PLUS
       	result += '<br/>' + res[i].marker + res[i].seriesName + '：' + value + ' 万元'
       	// #endif
       }
       return result;
     },
+	monthTotal:function (item, category, index, opts){
+		let text = ''
+		let type = item.name.slice(5,10)
+		let time = opts.series[0].info[index].year
+		if (type === '车流量'){
+			if (`${time}年车流量` === item.name){
+				let showTime = opts.series[0].info[index].year.toString().slice(2,5)
+				text = `${showTime}年入区 ${opts.series[0].info[index].allCarCount?this.$util.fmoney(opts.series[0].info[index].allCarCount):''} 辆`
+			}else{
+				let showTime = opts.series[1].info[index].year.toString().slice(2,5)
+				text = `${showTime}年入区 ${opts.series[1].info[index].allCarCount?this.$util.fmoney(opts.series[1].info[index].allCarCount):''} 辆`
+			}
+			return text
+		}else{
+			if (`${time}年交易额` === item.name){
+				let showTime = opts.series[2].year.toString().slice(2,5)
+				console.log('showTime',showTime)
+				text = `${showTime}年金额 ${opts.series[2].info[index].money?this.$util.fmoney(opts.series[2].info[index].money):''} 元, 单车消费 ${opts.series[0].info[index].allCarCount?((opts.series[0].info[index].money) / opts.series[0].info[index].allCarCount).toFixed(2):''} 元`
+			}else{
+				let showTime = opts.series[3].year.toString().slice(2,5)
+				text = `${showTime}年金额 ${opts.series[3].info[index].money?this.$util.fmoney(opts.series[3].info[index].money):''} 元, 单车消费 ${opts.series[1].info[index].allCarCount?((opts.series[1].info[index].money) / opts.series[1].info[index].allCarCount).toFixed(2):''} 元`
+			}
+			return text
+		}
+	},
     legendFormat:function(name){
       return "自定义图例+"+name;
     },
@@ -65,7 +90,7 @@ const cfe = {
   "demotype":{
     "color": color,
     //在这里填写echarts的option即可
-    
+
   },
   //下面是自定义配置，请添加项目所需的通用配置
 	"column": {
@@ -419,4 +444,4 @@ const cfe = {
 	}
 }
 
-export default cfe;
\ No newline at end of file
+export default cfe;
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
similarity index 66%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
index 17b28b3..c544f97 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
+++ b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
@@ -4,21 +4,62 @@
  * Copyright (c) 2021 QIUN®秋云 https://www.ucharts.cn All rights reserved.
  * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
  * 复制使用请保留本段注释，感谢支持开源！
- * 
+ *
  * uCharts®官方网站
  * https://www.uCharts.cn
- * 
+ *
  * 开源地址:
  * https://gitee.com/uCharts/uCharts
- * 
+ *
  * uni-app插件市场地址：
  * http://ext.dcloud.net.cn/plugin?id=271
- * 
+ *
  */
 
 // 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
 const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
 
+const fmoney = (s, n) => {
+	/*
+	 * 参数说明：
+	 * s：要格式化的数字
+	 * n：保留几位小数
+	 * */
+	n = n > 0 && n <= 20 ? n : 2;
+	var fuhao = ''; //如果数字小于零则值为-
+	if (s < 0) {
+		s = Math.abs(s);
+		fuhao = '-'
+	}
+	s = parseFloat((s + "").replace(/[^\d\.-]/g, "")).toFixed(n) + "";
+	var l = s.split(".")[0].split("").reverse(),
+		r = s.split(".")[1];
+	let t = "";
+	for (let i = 0; i < l.length; i++) {
+		t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
+	}
+	if (n===0){
+		return s
+	}else{
+		return fuhao + [...t].reverse().join("") + "." + r;
+	}
+}
+
+const noDecimal = (s) =>{
+	let fuhao = ''; //如果数字小于零则值为-
+	if (s < 0) {
+		s = Math.abs(s);
+		fuhao = '-'
+	}
+	s = parseFloat((s + "").replace(/[^\d\.-]/g, "")) + ""
+	let  l = s.split(".")[0].split("").reverse(), r = s.split(".")[1];
+	let t = ''
+	for (let i = 0; i < l.length; i++) {
+		t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
+	}
+	return fuhao + [...t].reverse().join("")
+}
+
 //事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
 const formatDateTime = (timeStamp, returnType)=>{
   var date = new Date();
@@ -71,6 +112,135 @@ const cfu = {
         return series[index].name+'：'+series[index].data+'元'
       }
     },
+	  monthTotal:function (item, category, index, opts){
+		  let text = ''
+		  let type = item.name.slice(5,10)
+		  let time = opts.series[0].info[index].year
+		  if (type === '车流量'){
+			  if (`${time}年车流量` === item.name){
+				  let showTime = opts.series[0].info[index].year.toString().slice(2,5)
+				  text = `${showTime}年入区 ${opts.series[0].info[index].allCarCount?fmoney(opts.series[0].info[index].allCarCount):''} 辆`
+			  }else{
+				  let showTime = opts.series[1].info[index].year.toString().slice(2,5)
+				  text = `${showTime}年入区 ${opts.series[1].info[index].allCarCount?fmoney(opts.series[1].info[index].allCarCount):''} 辆`
+			  }
+			  return text
+		  }else{
+			  if (`${time}年交易额` === item.name){
+				  let showTime = opts.series[2].year.toString().slice(2,5)
+				  console.log('showTime',showTime)
+				  text = `${showTime}年金额 ${opts.series[2].info[index].money?fmoney(opts.series[2].info[index].money):''} 元, 单车消费 ${opts.series[0].info[index].allCarCount?((opts.series[0].info[index].money) / opts.series[0].info[index].allCarCount).toFixed(2):''} 元`
+			  }else{
+				  let showTime = opts.series[3].year.toString().slice(2,5)
+				  text = `${showTime}年金额 ${opts.series[3].info[index].money?fmoney(opts.series[3].info[index].money):''} 元, 单车消费 ${opts.series[1].info[index].allCarCount?((opts.series[1].info[index].money) / opts.series[1].info[index].allCarCount).toFixed(2):''} 元`
+			  }
+			  return text
+		  }
+	  },
+	  homePlace:function (item, category, index, opts){
+		  if (item.name.split(' ')[0] === '其他'){
+			  let str = ''
+			  this.homeData.forEach(item=>{
+				  if (item.name.split(' ')[0]!=='其他'){
+					  if (str===''){
+						  str = item.name.split(' ')[0]
+					  }else{
+						  str+=`,${item.name.split(' ')[0]}`
+					  }
+				  }
+			  })
+			  // this.$parent.handleGetHome(str,item.value)
+		  }else{
+			  // this.$parent.handleGetHome(item.name.split(' ')[0],item.value)
+		  }
+		  return item.name + ":" + item.data + '辆';
+	  },
+	  carTypeTime:function (item, category, index, opts){
+		  if (this.num===0){
+			  this.num++
+			  return '日均车辆' + ":" + opts.series[0].valueList[index] + '辆,占比' + item.data + '%';
+		  }else{
+			  this.num=0
+			  return '平均停留' + ":" + item.data + '分钟';
+		  }
+	  },
+	  timeAnalysis:function (item, category, index, opts){
+		  return item.name + ":" + item.data + '分钟'
+	  },
+	  businessType:function (item, category, index, opts){
+		  return item.name;
+	  },
+	  moneyCompare:function (item, category, index, opts){
+		  const date = new Date()
+		  let m = date.getMonth()
+		  if (index >m){
+			  if (this.selectIndex===0){
+				  if (item.name === '工作日平均'){
+					  return item.name + "：" + item.data + '万元'
+				  }else if(item.name === '周末平均'){
+					  return item.name + "：" + item.data + '万元'
+				  }else {
+					  return item.name + "：" + item.data + '万元'
+				  }
+			  }else if(this.selectIndex === 1){
+				  if (item.name === '工作日平均'){
+					  return item.name + "：" + noDecimal(item.data) + '笔'
+				  }else if(item.name === '周末平均'){
+					  return item.name + "：" + noDecimal(item.data) + '笔'
+				  }else {
+					  return item.name + "：" +noDecimal(item.data) + '笔'
+				  }
+			  }else if(this.selectIndex === 2){
+				  if (item.name === '工作日平均'){
+					  return item.name + "：" + item.data + '元'
+				  }else if(item.name === '周末平均'){
+					  return item.name + "：" + item.data + '元'
+				  }else {
+					  return item.name + "：" + item.data + '元'
+				  }
+			  }
+
+		  }else{
+			  if (this.selectIndex===0){
+				  if (item.name === '工作日平均'){
+					  return item.name + "：" + item.data + '万元，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
+				  }else if(item.name === '周末平均'){
+					  return item.name + "：" + item.data + '万元，' + '较工作日：'+ opts.series[1].qoqAdd[index] + '%'
+				  }else {
+					  // 判断有节假日就显示括号 没有就不显示
+					  if (opts.series[2].holiday[index][1]){
+						  return item.name + "：" + item.data + '万元' + '(' +  opts.series[2].holiday[index][1] + ')'
+					  }else{
+						  return item.name + "：" + item.data + '万元'
+					  }
+				  }
+			  }else if (this.selectIndex === 1){
+				  if (item.name === '工作日平均'){
+					  return item.name + "：" + noDecimal(item.data) + '笔，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
+				  }else if(item.name === '周末平均'){
+					  return item.name + "：" + noDecimal(item.data) + '笔，' + '较工作日：'+ opts.series[1].qoqAdd[index] + '%'
+				  }else {
+					  if (opts.series[2].holiday[index][1]){
+						  return item.name + "：" + noDecimal(item.data) + '笔' + '(' +  opts.series[2].holiday[index][1] + ')'
+					  }else{
+						  return item.name + "：" + noDecimal(item.data) + '笔'
+					  }
+				  }
+			  }else if(this.selectIndex === 2){
+				  if (item.name === '工作日平均'){
+					  return item.name + "：" + item.data + '元，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
+				  }else if(item.name === '周末平均'){
+					  return item.name + "：" + item.data + '元，' + '较工作日：'+ opts.series[1].qoqAdd[index] + '%'
+				  }else {
+					  if (opts.series[2].holiday[index][1]){
+						  return item.name + "：" + item.data + '元' + '(' +  opts.series[2].holiday[index][1] + ')'
+					  }else{
+						  return item.name + "：" + item.data + '元'
+					  }
+				  }
+			  }
+		  }
+	  }
   },
   //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
   "demotype":{
@@ -603,4 +773,4 @@ const cfu = {
 	}
 }
 
-export default cfu;
\ No newline at end of file
+export default cfu;
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/readme.md
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/readme.md
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/u-charts.js
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/u-charts.js
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
diff --git a/uni_modules/qiun-data-charts/license.md b/pages/summaryOfPortraits/components/components/qiun-data-charts/license.md
similarity index 100%
rename from uni_modules/qiun-data-charts/license.md
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/license.md
diff --git a/uni_modules/qiun-data-charts/package.json b/pages/summaryOfPortraits/components/components/qiun-data-charts/package.json
similarity index 100%
rename from uni_modules/qiun-data-charts/package.json
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/package.json
diff --git a/uni_modules/qiun-data-charts/readme.md b/pages/summaryOfPortraits/components/components/qiun-data-charts/readme.md
similarity index 100%
rename from uni_modules/qiun-data-charts/readme.md
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/readme.md
diff --git a/uni_modules/qiun-data-charts/static/app-plus/echarts.min.js b/pages/summaryOfPortraits/components/components/qiun-data-charts/static/app-plus/echarts.min.js
similarity index 100%
rename from uni_modules/qiun-data-charts/static/app-plus/echarts.min.js
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/static/app-plus/echarts.min.js
diff --git a/uni_modules/qiun-data-charts/static/h5/echarts.min.js b/pages/summaryOfPortraits/components/components/qiun-data-charts/static/h5/echarts.min.js
similarity index 100%
rename from uni_modules/qiun-data-charts/static/h5/echarts.min.js
rename to pages/summaryOfPortraits/components/components/qiun-data-charts/static/h5/echarts.min.js
diff --git a/pages/summaryOfPortraits/components/guestPortrait.vue b/pages/summaryOfPortraits/components/guestPortrait.vue
index 39b72e8..b40e96f 100644
--- a/pages/summaryOfPortraits/components/guestPortrait.vue
+++ b/pages/summaryOfPortraits/components/guestPortrait.vue
@@ -56,13 +56,13 @@
               </div>
               <no-data v-else />
           </div>
-          <div class="chartsItem" style="margin-top: 32px">
-              <p class="title">业态客单偏好</p>
-              <div v-if="businessTypeList && businessTypeList.length>0">
+          <div class="chartsItem" style="margin-top: 32px;height: 210px">
+              <p class="title" style="margin-bottom: 32px">业态客单偏好</p>
+              <div >
                   <business-type :data="businessTypeList"></business-type>
                   <analyse :analyseInfo="{analysisins_type: 1206,analysisins_format: 2000}" />
               </div>
-              <no-data v-else />
+<!--              <no-data v-else />-->
           </div>
       </div>
   </scroll-view>
diff --git a/pages/summaryOfPortraits/components/managePortrait.vue b/pages/summaryOfPortraits/components/managePortrait.vue
index adbad42..3ac6fac 100644
--- a/pages/summaryOfPortraits/components/managePortrait.vue
+++ b/pages/summaryOfPortraits/components/managePortrait.vue
@@ -138,24 +138,24 @@
                         </div>
                     </div>
                 </div>
-                <div class="subItem">
-                    <div style="display: flex;align-items: center;justify-content: space-between">
-                        <p class="title" style="margin-top: 20px">{{selectTab===0?'营收特征分析':selectTab===1?'客单对比':selectTab===2?'均价对比':''}}</p>
+                <div class="subItem" style="height: 270px;margin-top: 20px;">
+                    <div style="margin-bottom: 30px;display: flex;align-items: center;justify-content: space-between">
+                        <p class="title">{{selectTab===0?'营收特征分析':selectTab===1?'客单对比':selectTab===2?'均价对比':''}}</p>
                         <text v-if="selectTab===0" style="margin-top: 12px">单位: 万元</text>
                         <text v-if="selectTab===1" style="margin-top: 12px">单位: 笔</text>
                         <text v-if="selectTab===2" style="margin-top: 12px">单位: 元</text>
                     </div>
-                    <div v-if="moneyCompareList.series && moneyCompareList.series.length>0">
+                    <div>
                         <money-compare :data="moneyCompareList"/>
                     </div>
-                    <no-data v-else/>
+<!--                    <no-data v-else/>-->
                 </div>
-                <div class="subItem ">
-                    <div style="display: flex;align-items: center;justify-content: space-between">
-                        <p class="title" style="margin-top: 20px">营收同比分析</p>
+                <div class="subItem" style="height: 270px;margin-top: 20px;">
+                    <div style="margin-bottom: 30px;display: flex;align-items: center;justify-content: space-between">
+                        <p class="title">营收同比分析</p>
                         <text  style="margin-top: 12px">单位: 万元</text>
                     </div>
-                    <div v-if="trendsList && trendsList.series && trendsList.series.length>0">
+                    <div>
                         <revenue-trends :data="trendsList"/>
                     </div>
                     <no-data v-else/>
diff --git a/pages/summaryOfPortraits/index.vue b/pages/summaryOfPortraits/index.vue
index 15d17ed..14f21eb 100644
--- a/pages/summaryOfPortraits/index.vue
+++ b/pages/summaryOfPortraits/index.vue
@@ -33,13 +33,13 @@
       <sliderPage  :index="selectPortrait" @handleChangeIndex="handleChangeIndex"/>
     </view>
 
-    <swiper v-if="isShowSwiper" class="summaryOfPortraitsBox" @change="handleChangeSelect" :current="selectPortrait">
+    <swiper v-if="isShowSwiper" class="summaryOfPortraitsBox" @change="handleChangeSelect" :current="selectPortrait" >
       <!-- 服务区基本信息 0-->
       <swiper-item class="swiperItem">
         <mapDetail :selectIndex="selectPortrait"/>
       </swiper-item>
       <!-- 车流预警 1-->
-      <swiper-item class="swiperItem">
+      <swiper-item class="swiperItem" >
         <carPortrait :selectIndex="selectPortrait" :serviceInfo="serviceInfo"/>
       </swiper-item>
       <!-- 客群画像 2-->
@@ -110,7 +110,6 @@ export default {
     this.isShowSwiper = false
   },
   methods:{
-
     // 商业汇总的滑动方法
     handleChangeSelect(e){
       console.log('e',e)
@@ -234,6 +233,7 @@ export default {
     height: 100%;
     .swiperItem{
       width: 100%;
+      height: 100vh;
     }
   }
 }
diff --git a/static/images/index/spsp-no.png b/static/images/index/spsp-no.png
deleted file mode 100644
index 3f9ee7f6be74dd6388daa98dc9c8204221ed28a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4155
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
F{{ZBsN|68n

diff --git a/static/images/index/tsjy.png b/static/images/index/tsjy.png
deleted file mode 100644
index 9f9cb337574a2aa8bfe085625f056810b416c4a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4156
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
E1DcCr&Hw-a