销售数据统计

src/App.vue

@@ -38,8 +38,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_988027_pm4p4dmbxwe.css';
-@import '//at.alicdn.com/t/font_635492_i78o4snnnqp.css';
+@import '//at.alicdn.com/t/font_988027_icjaw26gr1.css';
 @import './assets/global/global.css';
 body,html{
   padding: 0px;

src/components/viitto/dataLook.vue

@@ -586,18 +586,22 @@
         </el-col>
       </el-row>
       <el-row>
-        <lineChart v-if="chartShow" :zoom="zoom" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList"/>
+        <lineChart v-if="chartShow && (!RB_Branch_id || RB_Branch_id !== 0)" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList"/>
+        <lineChart2 v-if="chartShow && RB_Branch_id == 0" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList"/>
+        <!-- <lineChart2 v-if="chartShow" :zoom="zoom" :inquireList="inquireList" :preferpriceList="preferpriceList" :guestnumList="guestnumList" :clickcountList="clickcountList" :ordercountList="ordercountList" :unitpriceList="unitpriceList" :day_total_guestprice="day_total_guestprice" :dateList="dateList"/> -->
       </el-row>
     </div>
    
   </div>
 </template>
 <script>
-import lineChart from "./lineChart2";
+import lineChart from "./lineChart";
+import lineChart2 from "./lineChart2";
 import lineChartK from "./lineChartK";
 export default {
   components: {
     lineChart,
+    lineChart2,
     lineChartK
   },
   data(){
@@ -644,6 +648,7 @@ export default {
       day_order_statics: [],
       day_click_statics: [],
       day_history_preferprice: [],
+      inquireList: [],
       zoom: 1,
       day_line_statics: [],
       day_total_guestprice: {},
@@ -655,6 +660,7 @@ export default {
         Status:0,
       },
       companyList: [],
+      RB_Branch_id: null
     }
   },
   watch: {
@@ -662,6 +668,10 @@ export default {
       this.loadRegionChild(nv)
     },
   },created(){
+    let user = localStorage.user ? JSON.parse(localStorage.user) : ''
+    if (user) {
+      this.RB_Branch_id = user.RB_Branch_id
+    }
     this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
       if (res.data.resultCode == 1) {
         let data = res.data.data;
@@ -763,6 +773,8 @@ export default {
           this.ordercountList = data.day_guestprice.ordercountList
           // 时间
           this.dateList = data.day_guestprice.dateList
+           // 询价
+          this.inquireList = data.day_guestprice.inquireList
           // 合计
           this.day_total_guestprice = data.day_total_guestprice[0]
           this.chartShow = true;

src/components/viitto/lineChart2.vue

@@ -20,12 +20,12 @@
 .PINGFANG{
   font-family: "PINGFANG REGULAR";
 }
-.myecharts{
-  height: 100%;
+.myechartsS{
+  height: 1100px  !important;
 }
 </style>
 <template>
-  <div class="myecharts" ref="myecharts" >
+  <div class="myecharts myechartsS" ref="myecharts" >
    
   </div>
 </template>
@@ -39,6 +39,7 @@ export default {
     'unitpriceList',
     'day_total_guestprice',
     'dateList',
+    'inquireList',
     'zoom'
   ],
   data(){
@@ -79,7 +80,7 @@ export default {
                   realtime: true,
                   start: 90,
                   end: 100,
-                  xAxisIndex: [0, 1, 2, 3],
+                  xAxisIndex: [0, 1, 2, 3, 4],
                   textStyle: {
                     color: "#ffffff"
                   },
@@ -94,7 +95,7 @@ export default {
                   realtime: true,
                   start: 90,
                   end: 100,
-                  xAxisIndex: [0, 1, 2, 3],
+                  xAxisIndex: [0, 1, 2, 3, 4],
                   textStyle: {
                     color: "#ffffff"
                   },
@@ -113,23 +114,28 @@ export default {
           grid: [{
               left: 80,
               right: 10,
-              top: '5%',
-              height: '16%'
+              top: '40px',
+              height: '150px'
           }, {
               left: 80,
               right: 10,
-              top: '28%',
-              height: '16%'
+              top: '250px',
+              height: '150px'
           }, {
               left: 80,
               right: 10,
-              top: '51%',
-              height: '16%'
+              top: '460px',
+              height: '150px'
           }, {
               left: 80,
               right: 10,
-              top: '74%',
-              height: '16%'
+              top: '670px',
+              height: '150px'
+          }, {
+              left: 80,
+              right: 10,
+              top: '880px',
+              height: '150px'
           }
           ],
           xAxis : [
@@ -163,6 +169,14 @@ export default {
                   boundaryGap : false,
                   data: _this.dateList,
                   position: 'bottom',
+                  "show": false,
+              },
+               {
+                  gridIndex: 4,
+                  type : 'category',
+                  boundaryGap : false,
+                  data: _this.dateList,
+                  position: 'bottom',
                   "show": true,
                   axisLabel: {
                     color: '#fff',
@@ -212,7 +226,7 @@ export default {
               },
               {
                   gridIndex: 2,
-                  name : '收客人头数  '+ _this.day_total_guestprice.OrderCount,
+                  name : '收客人头数  '+ _this.day_total_guestprice.GuestNum,
                   type : 'value',
                   inverse: false,
                   splitLine: {
@@ -249,6 +263,26 @@ export default {
                   axisLabel: {
                     color: '#EE4454',
                   }
+              },
+              {
+                  gridIndex: 4,
+                  name : '询价统计  '+ _this.day_total_guestprice.InquireCount,
+                  type : 'value',
+                  inverse: false,
+                  splitLine: {
+                    lineStyle: {
+                      color: '#30374E',
+                      type: 'dashed'
+                    }
+                  },
+                   nameTextStyle: {
+                    color: '#ffffff',
+                    padding: [10, 0, 0, 110],
+                    fontSize: 18
+                  },
+                  axisLabel: {
+                    color: 'rgb(106, 176, 76)',
+                  }
               }
           ],
           series : [
@@ -377,6 +411,37 @@ export default {
                       ])
                     }
                   },
+              },
+              {
+                  name:'询价统计',
+                  type:'line',
+                  xAxisIndex: 4,
+                  yAxisIndex: 4,
+                  symbolSize: 2,
+                  hoverAnimation: true,
+                  smooth: true,
+                  showSymbol: false,
+                  data: _this.inquireList,
+                  itemStyle: {
+                    borderWidth: 2,
+                    color: "rgb(106, 176, 76)",
+                    shadowBlur: 5,
+                    shadowColor: 'rgba(255,250,0,1)'
+                  },
+                  lineStyle: {
+                    color: "rgb(106, 176, 76)",
+                    width: 1,
+                    shadowBlur: 2,
+                    shadowColor: "rgb(106, 176, 76)",
+                  },
+                  areaStyle: {
+                    normal: {
+                      color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                        { offset: 0, color: "rgba(106, 176, 76,1)" },
+                        { offset: .8, color: "rgba(106, 176, 76,0)" }
+                      ])
+                    }
+                  },
               }
           ]
       }

src/router.js

@@ -5,6 +5,7 @@ import index from './views/index'
 import viittoData from './components/viitto/viittoData'
 import viittoData2 from './components/viitto/viittoData2'
 import dataLook from './components/viitto/dataLook'
+import saleDataLook from './components/viitto/saleDataLook'
 import PerCompetition from './components/viitto/PerCompetition'
 
 Vue.use(Router)
@@ -43,6 +44,11 @@ export default new Router({
       name: 'dataLook',
       component: dataLook,
     },
+    {
+      path: '/saleDataLook',
+      name: 'saleDataLook',
+      component: saleDataLook,
+    },
     {
       path: '/PerCompetition',
       name: 'PerCompetition',