From e52cf1d6ae8e7291752fe363ebd567b90ddc0934 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 18 Jun 2019 11:04:31 +0800
Subject: [PATCH] 添加丹阳

---
 dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map |   2 +-
 src/api/api.js                                      |  42 ++++++++++++++++++++++--------------------
 src/api/httpRequest.js                              |   2 +-
 src/components/berth/index.vue                      |  27 ++++++++++++++++++++++++++-
 src/components/chinaMap/index.vue                   |  74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 src/components/device/index.vue                     |  41 ++++++++++++++++++++++++++---------------
 src/components/incomeOverview/index.vue             |  49 +++++++++++++++++++++++++++++++++++++------------
 src/components/memberNum/index.vue                  | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/orderMessage/index.vue               |  40 ++++++++++++++++++++++++++++++----------
 src/components/tollman/index.vue                    |  41 ++++++++++++++++++++++++++++++-----------
 src/components/weekAndDay/uDay.vue                  | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/weekAndDay/uWeek.vue                 |  30 +++++++++++++++++-------------
 src/main.js                                         |   2 ++
 13 files changed, 636 insertions(+), 431 deletions(-)

diff --git a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
index 9493112..746fa0c 100644
--- a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap 3252dcfca6d866f8d6bd"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 3252dcfca6d866f8d6bd"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///webpack/bootstrap 5610c80c2badb037245d"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 5610c80c2badb037245d"],"sourceRoot":""}
\ No newline at end of file
diff --git a/src/api/api.js b/src/api/api.js
index e48e8b0..fee723c 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,31 +1,33 @@
 import { get, post} from './httpRequest'
-
+const baseWX = 'http://bcp.service.renniting.cn/'  //无锡
+const baseDY = 'http://test.renniting.cn/bcp/'  //丹阳
 //....用户数
-export const memberAddress = p => post('urban/intelligence/appuser/queryUserPersonStatistic',p)
-
+export const memberAddress = p => post(baseWX+'urban/intelligence/appuser/queryUserPersonStatistic',p)
+export const memberAddressDY = p => post(baseDY+'urban/intelligence/appuser/queryUserPersonStatistic',p)
 //....收费员
-export const tollmanAddress = p => post('urban/intelligence/employee/queryEmployeeStaByOrgIds',p)
-
+export const tollmanAddress = p => post(baseWX+'urban/intelligence/employee/queryEmployeeStaByOrgIds',p)
+export const tollmanAddressDY = p => post(baseDY+'urban/intelligence/employee/queryEmployeeStaByOrgIds',p)
 //....收入
-export const incomeAddress = p => post('urban/intelligence/income/queryIncomeStaByOrgIds',p)
-
+export const incomeAddress = p => post(baseWX+'urban/intelligence/income/queryIncomeStaByOrgIds',p)
+export const incomeAddressDY = p => post(baseDY+'urban/intelligence/income/queryIncomeStaByOrgIds',p)
 //....泊位
-export const berthAddress = p => post('urban/intelligence/berth/queryBerthStatisticByOrgIds',p)
-
+export const berthAddress = p => post(baseWX+'urban/intelligence/berth/queryBerthStatisticByOrgIds',p)
+export const berthAddressDY = p => post(baseDY+'urban/intelligence/berth/queryBerthStatisticByOrgIds',p)
 //....设备
-export const deviceAddress = p => post('urban/intelligence/device/queryDeviceStatistic',p)
-
+export const deviceAddress = p => post(baseWX+'urban/intelligence/device/queryDeviceStatistic',p)
+export const deviceAddressDY = p => post(baseDY+'urban/intelligence/device/queryDeviceStatistic',p)
 //....消息
-export const msgAddress = p => post('urban/intelligence/orderPark/queryLastOrderPark',p)
-
+export const msgAddress = p => post(baseWX+'urban/intelligence/orderPark/queryLastOrderPark',p)
+export const msgAddressDY = p => post(baseDY+'urban/intelligence/orderPark/queryLastOrderPark',p)
 //....今日车流量
-export const dayAddress = p => post('urban/intelligence/orderPark/queryOrderParkNumForToday',p)
-
+export const dayAddress = p => post(baseWX+'urban/intelligence/orderPark/queryOrderParkNumForToday',p)
+export const dayAddressDY = p => post(baseDY+'urban/intelligence/orderPark/queryOrderParkNumForToday',p)
 //....周出场
-export const weekAddress = p => post('urban/intelligence/orderPark/queryOrderParkNumForLastWeek',p)
-
+export const weekAddress = p => post(baseWX+'urban/intelligence/orderPark/queryOrderParkNumForLastWeek',p)
+export const weekAddressDY = p => post(baseDY+'urban/intelligence/orderPark/queryOrderParkNumForLastWeek',p)
 //....停车场总数
-export const parkAddress = p => post('urban/intelligence/park/queryParkNumStatisticByOrgIds',p)
-
+export const parkAddress = p => post(baseWX+'urban/intelligence/park/queryParkNumStatisticByOrgIds',p)
+export const parkAddressDY = p => post(baseDY+'urban/intelligence/park/queryParkNumStatisticByOrgIds',p)
 //....地图
-export const baiduMapAddress = p => post('urban/intelligence/berth/queryBerthStatisticForOrgId',p)
+export const baiduMapAddress = p => post(baseWX+'urban/intelligence/berth/queryBerthStatisticForOrgId',p)
+export const baiduMapAddressDY = p => post(baseDY+'urban/intelligence/berth/queryBerthStatisticForOrgId',p)
diff --git a/src/api/httpRequest.js b/src/api/httpRequest.js
index 0648918..3715829 100644
--- a/src/api/httpRequest.js
+++ b/src/api/httpRequest.js
@@ -73,7 +73,7 @@ axios.interceptors.response.use(response => {
 })
 //基础url前缀
 //axios.defaults.baseURL = '/api'
-axios.defaults.baseURL = 'http://bcp.service.renniting.cn/';
+// axios.defaults.baseURL = 'http://bcp.service.renniting.cn/';
 //设置默认请求头
 // axios.defaults.withCredentials=true;//让ajax携带cookie
 
diff --git a/src/components/berth/index.vue b/src/components/berth/index.vue
index c40976a..3b013d4 100644
--- a/src/components/berth/index.vue
+++ b/src/components/berth/index.vue
@@ -24,7 +24,7 @@
 <script>
   import common from '../../api/common';
   import echarts from 'echarts'
-  import { berthAddress } from '../../api/api'
+  import { berthAddress, berthAddressDY } from '../../api/api'
   export default {
     name: "berth",
     data() {
@@ -68,6 +68,31 @@
         }).catch((response)=>{
           console.log(response);
         })
+
+
+        this.$axios.all(
+          [
+            berthAddress({ orgIds: this.GLOBAL.paramsvariables}),
+            berthAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+          ]
+        )
+        .then(this.$axios.spread((acctWX, acctDY) => {
+          let WXdata = acctWX.data.data
+          let DYdata = acctDY.data.data
+          this.berthTotal = common.formatNumToStr(WXdata.allBerthNum+DYdata.allBerthNum)
+          this.free = WXdata.freeBerthNum+DYdata.freeBerthNum
+          this.have = WXdata.isOccupyBertnNum+DYdata.isOccupyBertnNum
+          this.pieChartOption.seriesData[0].value = WXdata.isOccupyBertnNum+DYdata.isOccupyBertnNum
+          this.pieChartOption.seriesData[1].value = WXdata.freeBerthNum+DYdata.freeBerthNum
+          let pieChartOption = this.pieChartOption
+          //占有率
+          this.pieChart=this.createPie(pieChartOption);
+          window.addEventListener('resize', function() {
+            this.pieChart.resize()
+          }.bind(this));
+
+        }))
+
       },
       /*
        * 泊位占比
diff --git a/src/components/chinaMap/index.vue b/src/components/chinaMap/index.vue
index 441a1a9..ba16f45 100644
--- a/src/components/chinaMap/index.vue
+++ b/src/components/chinaMap/index.vue
@@ -33,7 +33,7 @@
   import echarts from 'echarts'
   import countTo from 'vue-count-to';//通过设置：endVall 和 ：startVall 会自动判断计数和倒数，:duration='3000'是指完成动画的时间。
   import {mapGetters} from 'vuex' //use commit
-  import { parkAddress, baiduMapAddress } from '../../api/api'
+  import { parkAddress, baiduMapAddress, baiduMapAddressDY, parkAddressDY } from '../../api/api'
 
   export default {
     name: "chinaMap",
@@ -67,16 +67,70 @@
     },
     methods: {
       parkInit() {
-        parkAddress({
-          orgIds: this.GLOBAL.paramsvariables
-        }).then((response)=>{
-          let  data = response.data.data
-          this.parkParams.endVal=data
-        }).catch((response)=>{
-          console.log(response);
-        })
+        // parkAddress({
+        //   orgIds: this.GLOBAL.paramsvariables
+        // }).then((response)=>{
+        //   let  data = response.data.data
+        //   console.log(response)
+        //   this.parkParams.endVal=data
+        // }).catch((response)=>{
+        //   console.log(response);
+        // })
+
+        this.$axios.all(
+          [
+            parkAddress({ orgIds: this.GLOBAL.paramsvariables}),
+            parkAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+          ]
+        )
+        .then(this.$axios.spread((acctWX, acctDY) => {
+          let WXdata = acctWX.data.data
+          let DYdata = acctDY.data.data
+          console.log(WXdata)
+          console.log(DYdata)
+          this.parkParams.endVal=WXdata+DYdata
+
+        }))
       },
       baiduMapInit() {
+
+
+        this.$axios.all(
+          [
+            baiduMapAddress({ orgIds: this.GLOBAL.paramsvariables}),
+            baiduMapAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+          ]
+        )
+        .then(this.$axios.spread((acctWX, acctDY) => {
+          let WXdata = acctWX.data.data
+          let DYdata = acctDY.data.data
+          console.log(WXdata)
+          console.log(DYdata)
+          //let mapData = [];
+          for (let i=0;i<WXdata.length;i++){
+            this.mapData.push({
+              name:WXdata[i].orgName,
+              value:WXdata[i].allBerthNum
+            })
+            this.coordinateData[WXdata[i].orgName] = [WXdata[i].lonId,WXdata[i].latId]
+          }
+
+          for (let i=0;i<DYdata.length;i++){
+            this.mapData.push({
+              name:DYdata[i].orgName,
+              value:DYdata[i].allBerthNum
+            })
+            this.coordinateData[DYdata[i].orgName] = [DYdata[i].lonId,DYdata[i].latId]
+          }
+          //'双流': [103.912493, 30.586969]
+          this.mapChart= this.createPie();
+          window.addEventListener('resize', function() {
+            this.mapChart.resize()
+          }.bind(this));
+
+        }))
+
+
         baiduMapAddress({
           orgIds: this.GLOBAL.paramsvariables
         }).then((response)=>{
@@ -98,6 +152,8 @@
         }).catch((response)=>{
           console.log(response);
         })
+
+
       },
       /*
        * china地图
diff --git a/src/components/device/index.vue b/src/components/device/index.vue
index 5bc6421..f70616d 100644
--- a/src/components/device/index.vue
+++ b/src/components/device/index.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { deviceAddress } from '../../api/api'
+import { deviceAddress, deviceAddressDY } from '../../api/api'
   export default {
     name: "device",
     data() {
@@ -62,24 +62,35 @@ import { deviceAddress } from '../../api/api'
     },
     methods: {
       onLoad() {
-        deviceAddress({orgIds: this.GLOBAL.paramsvariables}).then((response)=>{
-          let  data = response.data.data
-          console.log(data)
-          this.PDANum = data[0].num
-          this.PDAName = data[0].deviceName
-          this.diCiNum = data[1].num
-          this.diCiName = data[1].deviceName
-          this.daoZhaNum = data[2].num
+        this.$axios.all(
+          [
+            deviceAddress({ orgIds: this.GLOBAL.paramsvariables}),
+            deviceAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+          ]
+        )
+        .then(this.$axios.spread((acctWX, acctDY) => {
+          let WXdata = acctWX.data.data
+          let DYdata = acctDY.data.data
+          this.PDANum = WXdata[0].num+DYdata[0].num
+          this.PDAName = WXdata[0].deviceName
 
-          this.daoZhaName = data[2].deviceName
-          this.youDaoNum = data[3].num
+          this.diCiNum = WXdata[1].num+DYdata[1].num
+          this.diCiName = WXdata[1].deviceName
+
+          this.daoZhaNum = WXdata[2].num+DYdata[2].num
+          this.daoZhaName = WXdata[2].deviceName
+
+          this.youDaoNum = WXdata[3].num+DYdata[3].num
           if(this.youDaoNum == 0){
             this.youDaoNum = '-'
           }
-          this.youDaoName = data[3].deviceName
-        }).catch((response)=>{
-          console.log(response);
-        })
+          this.youDaoName = WXdata[3].deviceName
+          // this.tollmanTotal = WXdata.allTollCollector+DYdata.allTollCollector
+          // this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
+          // this.onDutyNum = WXdata.signInTollCollector+DYdata.signInTollCollector
+          // this.noDutyNum = WXdata.unSignInTollCollector+DYdata.unSignInTollCollector
+
+        }))
       }
     },
   }
diff --git a/src/components/incomeOverview/index.vue b/src/components/incomeOverview/index.vue
index a1f1501..a8e39cb 100644
--- a/src/components/incomeOverview/index.vue
+++ b/src/components/incomeOverview/index.vue
@@ -19,7 +19,7 @@
 <script>
   import common from '../../api/common';
   import echarts from 'echarts'
-  import { incomeAddress } from '../../api/api'
+  import { incomeAddress, incomeAddressDY } from '../../api/api'
     export default {
       name: "incomeOverview",
       data() {
@@ -43,23 +43,48 @@
       },
       methods: {
         onLoad() {
-          incomeAddress({
-            orgIds: this.GLOBAL.paramsvariables
-          }).then((response)=>{
-            let  data = response.data.data
-            this.incomeTotal = data.totalPay
+          // incomeAddress({
+          //   orgIds: this.GLOBAL.paramsvariables
+          // }).then((response)=>{
+          //   let  data = response.data.data
+          //   this.incomeTotal = data.totalPay
+          //   this.incomeTotal = common.formatNumToStr(Math.round(this.incomeTotal/100))
+          //   this.barChartOption.barColor[0].value = Math.round(data.aliPay/100)
+          //   this.barChartOption.barColor[1].value = Math.round(data.wxPay/100)
+          //   this.barChartOption.barColor[2].value = Math.round(data.otherPay/100)
+          //   let barChartOption = this.barChartOption
+          //   this.barChart=this.createBar(barChartOption);
+          //   window.addEventListener('resize', function() {
+          //     this.barChart.resize()
+          //   }.bind(this));
+          // }).catch((response)=>{
+          //   console.log(response);
+          // })
+
+
+          this.$axios.all(
+            [
+              incomeAddress({ orgIds: this.GLOBAL.paramsvariables}),
+              incomeAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+            ]
+          )
+          .then(this.$axios.spread((acctWX, acctDY) => {
+            let WXdata = acctWX.data.data
+            let DYdata = acctDY.data.data
+            this.incomeTotal = WXdata.totalPay+DYdata.totalPay
             this.incomeTotal = common.formatNumToStr(Math.round(this.incomeTotal/100))
-            this.barChartOption.barColor[0].value = Math.round(data.aliPay/100)
-            this.barChartOption.barColor[1].value = Math.round(data.wxPay/100)
-            this.barChartOption.barColor[2].value = Math.round(data.otherPay/100)
+
+            this.barChartOption.barColor[0].value = Math.round((WXdata.aliPay+DYdata.aliPay)/100)
+            this.barChartOption.barColor[1].value = Math.round((WXdata.wxPay+DYdata.wxPay)/100)
+            this.barChartOption.barColor[2].value = Math.round((WXdata.otherPay+DYdata.otherPay)/100)
             let barChartOption = this.barChartOption
             this.barChart=this.createBar(barChartOption);
             window.addEventListener('resize', function() {
               this.barChart.resize()
             }.bind(this));
-          }).catch((response)=>{
-            console.log(response);
-          })
+
+          }))
+
         },
         /*
          * 创建收入Bar
diff --git a/src/components/memberNum/index.vue b/src/components/memberNum/index.vue
index ff89548..d992d04 100644
--- a/src/components/memberNum/index.vue
+++ b/src/components/memberNum/index.vue
@@ -1,188 +1,205 @@
 <template>
-  <div class="app-memberNumBox">
-    <div class="theme-card">
-      <div class="title"><span>用户数</span></div>
-      <div class="content">
-        <div class="topBox eleVerHorCenter-flex">
-          <span class="eleText">总计</span>
-          <div class="eleMarginLeft" v-html="memberNumTotal"></div>
+    <div class="app-memberNumBox">
+        <div class="theme-card">
+            <div class="title"><span>用户数</span></div>
+            <div class="content">
+                <div class="topBox eleVerHorCenter-flex">
+                    <span class="eleText">总计</span>
+                    <div class="eleMarginLeft" v-html="memberNumTotal"></div>
+                </div>
+                <div class="bottomBox">
+                    <table class="memberNumTb">
+                        <tr>
+                            <td>
+                                <div class="activeUserBox"><span class="activeUserNum">{{activeUserNum}}</span>
+                                    <div class="activeUserText">日活跃</div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="memberRadarBox">
+                                    <div class="memberRadar eleRotation"></div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="newUerBox"><span class="newUerNum">{{newUerNum}}</span>
+                                    <div class="newUerNumText">新增用户</div>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
         </div>
-        <div class="bottomBox">
-          <table class="memberNumTb">
-            <tr>
-              <td> <div class="activeUserBox"> <span class="activeUserNum">{{activeUserNum}}</span><div class="activeUserText">日活跃</div> </div> </td>
-              <td><div class="memberRadarBox"><div class="memberRadar eleRotation"></div></div>  </td>
-              <td> <div class="newUerBox"> <span class="newUerNum">{{newUerNum}}</span><div class="newUerNumText">新增用户</div></div> </td>
-            </tr>
-          </table>
-        </div>
-      </div>
     </div>
-  </div>
 </template>
 
 <script>
-  import { mapActions } from 'vuex'
-  import common from '../../api/common';
-  import { memberAddress } from '../../api/api'
-    export default {
-      name: "memberNum",
-      data() {
-        return {
-          demo:'',//示例 总数
-          memberNumTotal:"",//会员总数html
-          activeUserNum:'',//日活跃
-          newUerNum:'',//新增用户
-          name: '会员数'
-        }
-      },
-      mounted() {
-        //会员总数
-       this.onLoad()
-      },
-      methods: {
-        ...mapActions([
-          'transferParkingTotal'
-        ]),
-        onLoad() {
-          memberAddress().then((response)=>{
-            let  data = response.data.data
-            this.registerNum = data.registerNum
-            this.memberNumTotal = common.formatNumToStr(this.registerNum);
-            this.activeUserNum = data.todayActiveNum
-            this.newUerNum = data.todayRegisterNum
-            this.$store.dispatch('transferParkingTotal', data.registerNum)
-            //this.$store.dispatch('transferParkingTotal',10000);
-            //this.transferParkingTotal( data.registerNum);
-            console.log(this.$store.state.ParkingTotal)
-          }).catch((response)=>{
-            console.log(response);
-          })
-        }
-        /*
-         * 格式化会员总数
-        //  * */
-        // formatNumToStr:function(){
-        //   return common.formatNumToStr(this.$options.data().demo);
-        // },
+import {mapActions} from 'vuex'
+import common from '../../api/common';
+import {memberAddress, memberAddressDY} from '../../api/api'
+// import axios from 'axios'
+export default {
+  name: "memberNum",
+  data() {
+    return {
+      demo: '',//示例 总数
+      memberNumTotal: "",//会员总数html
+      activeUserNum: '',//日活跃
+      newUerNum: '',//新增用户
+      name: '会员数'
+    }
+  },
+  mounted() {
+    //会员总数
+    this.onLoad()
+  },
+  methods: {
+    ...mapActions([
+      'transferParkingTotal'
+    ]),
+    onLoad() {
+      // Promise.all([memberAddress(), memberAddressDY()]).then(function(values) {
+      //   console.log(values);//values为一个数组
+      //   ///进行你的下一步操作
+      // });
+      this.$axios.all([memberAddress(), memberAddressDY()])
+      .then(this.$axios.spread((acctWX, acctDY) => {
+        let WXdata = acctWX.data.data
+        let DYdata = acctDY.data.data
+        this.registerNum = WXdata.registerNum+DYdata.registerNum
+        this.activeUserNum = WXdata.todayActiveNum+DYdata.todayActiveNum
+        this.newUerNum = WXdata.todayRegisterNum+DYdata.todayRegisterNum
+        this.memberNumTotal = common.formatNumToStr(this.registerNum)
+        this.$store.dispatch('transferParkingTotal', this.registerNum)
+      }))
 
-      }
     }
-</script>
+    /*
+     * 格式化会员总数
+    //  * */
+    // formatNumToStr:function(){
+    //   return common.formatNumToStr(this.$options.data().demo);
+    // },
 
-<style scoped  lang="scss">
-  .app-memberNumBox {
-    width: 100%;
-  .theme-card{
-    height: 100%;
-  }
-  .topBox,.bottomBox{
-    border:0px solid red;
-  }
-  .memberNumTb{
-    margin: 0 auto;
-    width: 100%;
-    height: 100%;
   }
-  .memberNumTb >tr{
-    width: 100%;height: 100%;
-  }
-  .memberNumTb >tr>td{
-   height: 100%;width:33.333%;
-  }
-  /*.memberNumTb >tr>td:first-child{*/
-    /*width:25%;*/
-  /*}*/
-  /*.memberNumTb >tr>td:last-child{*/
-    /*width:25%;*/
-  /*}*/
-  .memberNumTb >tr>td:nth-child(2){
-    vertical-align: middle;
-    text-align: center;
-    position:relative;
+}
+</script>
 
-  }
-  .memberNumTb >tr>td:first-child{
-    vertical-align: middle;
-    text-align: right;
-    padding-right: 5px;
-  }
-  .memberNumTb >tr>td:last-child{
-    vertical-align: middle;
-    text-align: left;
-    padding-left:5px;
-  }
-  .memberRadar{
-    background: url(../../images/com/memberRadar.png) no-repeat;
-    background-size: 100% 100%;
-    width:90%;
-    height:0;
-    padding-bottom: 90%;
-    margin: auto;
+<style scoped lang="scss">
+    .app-memberNumBox {
+        width: 100%;
+        .theme-card {
+            height: 100%;
+        }
+        .topBox, .bottomBox {
+            border: 0px solid red;
+        }
+        .memberNumTb {
+            margin: 0 auto;
+            width: 100%;
+            height: 100%;
+        }
+        .memberNumTb > tr {
+            width: 100%;
+            height: 100%;
+        }
+        .memberNumTb > tr > td {
+            height: 100%;
+            width: 33.333%;
+        }
+        /*.memberNumTb >tr>td:first-child{*/
+        /*width:25%;*/
+        /*}*/
+        /*.memberNumTb >tr>td:last-child{*/
+        /*width:25%;*/
+        /*}*/
+        .memberNumTb > tr > td:nth-child(2) {
+            vertical-align: middle;
+            text-align: center;
+            position: relative;
 
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    -webkit-background-size: cover;
-    -moz-background-size: cover;
-  }
-  .memberRadarBox:before{
-    content: " ";
-    display: block;
-    height: 30px;
-    width: 30px;
-    background: url(../../images/com/memberactiveUser.svg) no-repeat;
-    background-size: 100%;
-    position: absolute;
-    left: 0px;
-    top: 15px;
-    z-index: 8;
-  }
-  .memberRadarBox:after{
-    content: " ";
-    display: block;
-    height: 30px;
-    width: 30px;
-    background: url(../../images/com/membernewUer.svg) no-repeat;
-    background-size: 100%;
-    position: absolute;
-    right: 0px;
-    bottom: 15px;
-    z-index: 8;
-  }
-  .activeUserNum{
-    background-image: -webkit-linear-gradient(bottom, #67F967, #05C405);
-    -webkit-background-clip:text;
-    -webkit-text-fill-color:transparent;
-    font-size: 24px;
-  }
-  .newUerNum{
-    background-image: -webkit-linear-gradient(bottom, #FFBA00, #FF8100);
-    -webkit-background-clip:text;
-    -webkit-text-fill-color:transparent;
-    font-size: 24px;
-  }
-  .activeUserText,.newUerNumText{
-    font-size: 12px;
-  }
-  .activeUserText:after{
-    content: " ";
-    display: inline-block;
-    height: 12px;
-    width: 13px;
-    background: url(../../images/com/activeUser.png) no-repeat;
-    background-size: 100%;
-    margin-left:5px;
-  }
-  .newUerNumText:before{
-    content: " ";
-    display: inline-block;
-    height: 12px;
-    width: 13px;
-    background: url(../../images/com/newUser.png) no-repeat;
-    background-size: 100%;
-    margin-right:5px;
-  }
+        }
+        .memberNumTb > tr > td:first-child {
+            vertical-align: middle;
+            text-align: right;
+            padding-right: 5px;
+        }
+        .memberNumTb > tr > td:last-child {
+            vertical-align: middle;
+            text-align: left;
+            padding-left: 5px;
+        }
+        .memberRadar {
+            background: url(../../images/com/memberRadar.png) no-repeat;
+            background-size: 100% 100%;
+            width: 90%;
+            height: 0;
+            padding-bottom: 90%;
+            margin: auto;
 
-  }
+            background-position: center center;
+            background-repeat: no-repeat;
+            background-size: cover;
+            -webkit-background-size: cover;
+            -moz-background-size: cover;
+        }
+        .memberRadarBox:before {
+            content: " ";
+            display: block;
+            height: 30px;
+            width: 30px;
+            background: url(../../images/com/memberactiveUser.svg) no-repeat;
+            background-size: 100%;
+            position: absolute;
+            left: 0px;
+            top: 15px;
+            z-index: 8;
+        }
+        .memberRadarBox:after {
+            content: " ";
+            display: block;
+            height: 30px;
+            width: 30px;
+            background: url(../../images/com/membernewUer.svg) no-repeat;
+            background-size: 100%;
+            position: absolute;
+            right: 0px;
+            bottom: 15px;
+            z-index: 8;
+        }
+        .activeUserNum {
+            background-image: -webkit-linear-gradient(bottom, #67F967, #05C405);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            font-size: 24px;
+        }
+        .newUerNum {
+            background-image: -webkit-linear-gradient(bottom, #FFBA00, #FF8100);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            font-size: 24px;
+        }
+        .activeUserText, .newUerNumText {
+            font-size: 12px;
+        }
+        .activeUserText:after {
+            content: " ";
+            display: inline-block;
+            height: 12px;
+            width: 13px;
+            background: url(../../images/com/activeUser.png) no-repeat;
+            background-size: 100%;
+            margin-left: 5px;
+        }
+        .newUerNumText:before {
+            content: " ";
+            display: inline-block;
+            height: 12px;
+            width: 13px;
+            background: url(../../images/com/newUser.png) no-repeat;
+            background-size: 100%;
+            margin-right: 5px;
+        }
+
+    }
 </style>
diff --git a/src/components/orderMessage/index.vue b/src/components/orderMessage/index.vue
index 175786d..9694fdb 100644
--- a/src/components/orderMessage/index.vue
+++ b/src/components/orderMessage/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-  import { msgAddress } from '../../api/api'
+  import { msgAddress, msgAddressDY } from '../../api/api'
   export default {
     name: "orderMessage",
     data() {
@@ -47,20 +47,40 @@
     },
     methods: {
       onLoad() {
-        msgAddress({
-          orgIds: this.GLOBAL.paramsvariables
-        }).then((response)=>{
-          let  data = response.data.data
-          console.log(data)
-          this.list = data;
+        // msgAddress({
+        //   orgIds: this.GLOBAL.paramsvariables
+        // }).then((response)=>{
+        //   let  data = response.data.data
+        //   console.log(data)
+        //   this.list = data;
+        //   var that = this
+        //   this.intnum = setInterval(_ => {
+        //     that.list.push(that.list[this.activeIndex]);
+        //     this.activeIndex += 1;
+        //   }, 1000);
+        // }).catch((response)=>{
+        //   console.log(response);
+        // })
+
+
+        this.$axios.all(
+          [
+            msgAddress({ orgIds: this.GLOBAL.paramsvariables}),
+            msgAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+          ]
+        )
+        .then(this.$axios.spread((acctWX, acctDY) => {
+          let WXdata = acctWX.data.data
+          let DYdata = acctDY.data.data
+          this.list = WXdata.concat(DYdata);
           var that = this
           this.intnum = setInterval(_ => {
             that.list.push(that.list[this.activeIndex]);
             this.activeIndex += 1;
           }, 1000);
-        }).catch((response)=>{
-          console.log(response);
-        })
+
+
+        }))
       },
       scroll() {
         this.animate = !this.animate;
diff --git a/src/components/tollman/index.vue b/src/components/tollman/index.vue
index 6b0fc8a..9d8f828 100644
--- a/src/components/tollman/index.vue
+++ b/src/components/tollman/index.vue
@@ -27,7 +27,7 @@
 
 <script>
   import common from '../../api/common';
-  import { tollmanAddress } from '../../api/api'
+  import { tollmanAddress, tollmanAddressDY } from '../../api/api'
     export default {
       name: "tollman",
       data() {
@@ -49,17 +49,36 @@
          * 格式化会员总数
          * */
         onLoad() {
-          tollmanAddress({
-            orgIds: this.GLOBAL.paramsvariables
-          }).then((response)=>{
-            let  data = response.data.data
-            this.tollmanTotal = data.allTollCollector
+          // tollmanAddress({
+          //   orgIds: this.GLOBAL.paramsvariables
+          // }).then((response)=>{
+          //   let  data = response.data.data
+          //   this.tollmanTotal = data.allTollCollector
+          //   this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
+          //   this.onDutyNum = data.signInTollCollector
+          //   this.noDutyNum = data.unSignInTollCollector
+          // }).catch((response)=>{
+          //   console.log(response);
+          // })
+
+
+          this.$axios.all(
+            [
+              tollmanAddress({ orgIds: this.GLOBAL.paramsvariables}),
+              tollmanAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+            ]
+          )
+          .then(this.$axios.spread((acctWX, acctDY) => {
+            console.log(acctWX)
+            console.log(acctDY)
+            let WXdata = acctWX.data.data
+            let DYdata = acctDY.data.data
+            this.tollmanTotal = WXdata.allTollCollector+DYdata.allTollCollector
             this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
-            this.onDutyNum = data.signInTollCollector
-            this.noDutyNum = data.unSignInTollCollector
-          }).catch((response)=>{
-            console.log(response);
-          })
+            this.onDutyNum = WXdata.signInTollCollector+DYdata.signInTollCollector
+            this.noDutyNum = WXdata.unSignInTollCollector+DYdata.unSignInTollCollector
+
+          }))
         }
       },
 
diff --git a/src/components/weekAndDay/uDay.vue b/src/components/weekAndDay/uDay.vue
index f1c2ea2..0e12af3 100644
--- a/src/components/weekAndDay/uDay.vue
+++ b/src/components/weekAndDay/uDay.vue
@@ -1,181 +1,205 @@
 <template>
-  <div class="app-uDayBox">
-    <div class="theme-card2">
-      <div class="title"><span>今日车流量</span></div>
-      <div class="content" style="padding: 10px;box-sizing:border-box;padding-left: 0px;">
-        <div class="contentBox">
-          <div class="lineChart"></div>
+    <div class="app-uDayBox">
+        <div class="theme-card2">
+            <div class="title"><span>今日车流量</span></div>
+            <div class="content" style="padding: 10px;box-sizing:border-box;padding-left: 0px;">
+                <div class="contentBox">
+                    <div class="lineChart"></div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </template>
 
 <script>
-  import echarts from 'echarts'
-  import { dayAddress } from '../../api/api'
-    export default {
-      name: "uDay",
-      data() {
-        return {
-          name: '进出场折线图',
-          lineChart: {},
+import echarts from 'echarts'
+import {dayAddress, dayAddressDY} from '../../api/api'
+
+export default {
+  name: "uDay",
+  data() {
+    return {
+      name: '进出场折线图',
+      lineChart: {},
+    }
+  },
+  /*
+   * 进出场折线图
+   * */
+  mounted() {
+    this.onLoad()
+  },
+  methods: {
+    onLoad() {
+      // dayAddress({
+      //   orgIds: this.GLOBAL.paramsvariables
+      // }).then((response)=>{
+      //   let  data = response.data.data
+      //   let  xData=[],inNum=[],outNum=[]
+      //   for(let i=0;i<data.length;i++){
+      //     xData.push(data[i].queryDate)
+      //     inNum.push(data[i].inNum)
+      //     outNum.push(data[i].outNum)
+      //   }
+      //
+      //   this.lineChart=this.createLine(xData,inNum,outNum);
+      //   window.addEventListener('resize', function() {
+      //     this.lineChart.resize()
+      //   }.bind(this));
+      // }).catch((response)=>{
+      //   console.log(response);
+      // })
+
+      this.$axios.all(
+        [
+          dayAddress({ orgIds: this.GLOBAL.paramsvariables }),
+          dayAddressDY({ orgIds: this.GLOBAL.paramsvariables })
+        ]
+      )
+      .then(this.$axios.spread((acctWX, acctDY) => {
+        let WXdata = acctWX.data.data
+        let DYdata = acctDY.data.data
+        let xData = [], inNum = [], outNum = []
+        for (let i = 0; i < WXdata.length; i++) {
+          xData.push(WXdata[i].queryDate)
+          inNum.push(WXdata[i].inNum + DYdata[i].inNum)
+          outNum.push(WXdata[i].outNum + DYdata[i].outNum)
+          //lastInNum = WXdata[WXdata.length-1].inNum+DYdata[WXdata.length-1].inNum
         }
-      },
-      /*
-       * 进出场折线图
-       * */
-      mounted() {
-        this.onLoad()
-      },
-      methods: {
-        onLoad() {
-          dayAddress({
-            orgIds: this.GLOBAL.paramsvariables
-          }).then((response)=>{
-            let  data = response.data.data
-            let  xData=[],inNum=[],outNum=[]
-            for(let i=0;i<data.length;i++){
-              xData.push(data[i].queryDate)
-              inNum.push(data[i].inNum)
-              outNum.push(data[i].outNum)
+        //this.$store.dispatch('transferOrderTotal',lastInNum)
+        this.weekChart = this.createLine(xData, inNum, outNum);
+        window.addEventListener('resize', function () {
+          this.weekChart.resize()
+        }.bind(this));
+      }))
+    },
+    createLine(xAxis_data, series_in, series_out) {
+      // 基于准备好的dom，初始化echarts实例
+      let lineChart = echarts.init(document.querySelector('.lineChart'));
+      let axisLineColor = "#10377c";
+      let axisLabelColor = "#7c8799";
+      let legend_data = ['进场', '出场'];
+      // let xAxis_data=['06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00'];
+      // let series_in=[220, 182, 191, 134, 150, 120,100];
+      // let series_out=[120, 82, 125, 145, 122, 191,150];
+      const option = {
+        grid: {
+          top: 13, left: 10,
+          right: 10, bottom: 20,
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            lineStyle: {
+              color: '#072d6e',
+              fontSize: 12,
             }
-
-            this.lineChart=this.createLine(xData,inNum,outNum);
-            window.addEventListener('resize', function() {
-              this.lineChart.resize()
-            }.bind(this));
-          }).catch((response)=>{
-            console.log(response);
-          })
+          },
+          formatter: this._formatTooltip
         },
-        createLine(xAxis_data,series_in,series_out){
-          // 基于准备好的dom，初始化echarts实例
-          let lineChart = echarts.init(document.querySelector('.lineChart'));
-          let axisLineColor="#10377c";
-          let axisLabelColor="#7c8799";
-          let legend_data=['进场', '出场'];
-          // let xAxis_data=['06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00'];
-          // let series_in=[220, 182, 191, 134, 150, 120,100];
-          // let series_out=[120, 82, 125, 145, 122, 191,150];
-          const option={
-            grid: {
-              top: 13,left: 10,
-              right: 10,bottom: 20,
-              containLabel: true
-            },
-            tooltip: {
-              trigger: 'axis',
-              axisPointer: {
-                lineStyle: {
-                  color: '#072d6e',
-                  fontSize: 12,
-                }
-              },
-              formatter:this._formatTooltip
-            },
-            legend: {
-              itemWidth: 15,itemHeight: 8,
-              itemGap: 13,
-              data:legend_data ,bottom: 0,
-              textStyle: {fontSize: 12,color: '#59AAF7'}
+        legend: {
+          itemWidth: 15, itemHeight: 8,
+          itemGap: 13,
+          data: legend_data, bottom: 0,
+          textStyle: { fontSize: 12, color: '#59AAF7' }
+        },
+        xAxis: [{
+          type: "category",
+          boundaryGap: true,
+          axisTick: { show: false },
+          axisLine: {
+            lineStyle: { color: axisLineColor }
+          },
+          axisLabel: {
+            margin: 5,
+            textStyle: {
+              color: axisLabelColor, fontSize: 12
+            }
+          },
+          splitLine: {
+            lineStyle: { color: '#57617B' }
+          },
+          data: xAxis_data
+        }],
+        yAxis: [{
+          type: 'value',
+          //name: '单位（%）',
+          axisTick: { show: false },
+          axisLine: { lineStyle: { color: axisLineColor } },
+          axisLabel: {
+            margin: 5,
+            textStyle: { color: axisLabelColor, fontSize: 12 }
+          },
+          splitLine: { lineStyle: { color: '#10377c' } }
+        }],
+        series: [
+          {
+            name: '进场', type: 'line', symbol: 'circle', symbolSize: 5,
+            // smooth: true,// showSymbol: false,
+            lineStyle: { normal: { width: 0.8 } },
+            itemStyle: {
+              normal: {
+                color: 'rgb(255,177,48)',
+                borderColor: 'rgba(216,152,57,0.17)',
+                borderWidth: 8
+              }
             },
-            xAxis: [{
-              type: "category",
-              boundaryGap: true,
-              axisTick: {show: false},
-              axisLine: {
-                lineStyle: {color: axisLineColor}
-              },
-              axisLabel: {
-                margin: 5,
-                textStyle: {
-                  color:axisLabelColor,fontSize: 12
-                }
-              },
-              splitLine: {
-                lineStyle: {color: '#57617B'}
-              },
-              data: xAxis_data
-            }],
-            yAxis: [{
-              type: 'value',
-              //name: '单位（%）',
-              axisTick: {show: false},
-              axisLine: {lineStyle: { color: axisLineColor}},
-              axisLabel: {
-                margin: 5,
-                textStyle: {color:axisLabelColor,fontSize: 12}
-              },
-              splitLine: {lineStyle: {color: '#10377c'}}
-            }],
-            series: [
-              {
-                name: '进场',type: 'line',symbol: 'circle',symbolSize: 5,
-                // smooth: true,// showSymbol: false,
-                lineStyle: {normal: { width: 0.8}},
-                itemStyle: {
-                  normal: {
-                    color: 'rgb(255,177,48)',
-                    borderColor: 'rgba(216,152,57,0.17)',
-                    borderWidth: 8
-                  }
-                },
-                data:series_in//[220, 182, 191, 134, 150, 120]
-              },
-              {
-                name: '出场',type: 'line',symbol: 'circle',symbolSize: 5,
-                // showSymbol: false, // smooth: true,
-                lineStyle: {normal: { width: 0.8}},
-                itemStyle: {
-                  normal: {
-                    color: 'rgb(8,185,252)',
-                    borderColor: 'rgba(8,185,252,0.2)',
-                    borderWidth: 8
-                  }
-                },
-                data: series_out
+            data: series_in//[220, 182, 191, 134, 150, 120]
+          },
+          {
+            name: '出场', type: 'line', symbol: 'circle', symbolSize: 5,
+            // showSymbol: false, // smooth: true,
+            lineStyle: { normal: { width: 0.8 } },
+            itemStyle: {
+              normal: {
+                color: 'rgb(8,185,252)',
+                borderColor: 'rgba(8,185,252,0.2)',
+                borderWidth: 8
               }
-            ]
-          };
-          lineChart.setOption(option);
-          return lineChart;
-        },
-        _formatTooltip:function(ticket,html){
-          //debugger;
-          let tmpHtml=ticket[0].name;
-          for(let i=0;i<ticket.length;i++){
-            let tmpObj=ticket[i];
-            tmpHtml +="<br />"+tmpObj.seriesName+" : "+tmpObj.data+" (辆)";
+            },
+            data: series_out
           }
-          return tmpHtml;
-        }
-      },
-
+        ]
+      };
+      lineChart.setOption(option);
+      return lineChart;
+    },
+    _formatTooltip: function (ticket, html) {
+      //debugger;
+      let tmpHtml = ticket[0].name;
+      for (let i = 0; i < ticket.length; i++) {
+        let tmpObj = ticket[i];
+        tmpHtml += "<br />" + tmpObj.seriesName + " : " + tmpObj.data + " (辆)";
+      }
+      return tmpHtml;
     }
+  },
+
+}
 </script>
 
-<style scoped  lang="scss">
-  .app-uDayBox {
-    width: 100%;
-    .theme-card2{
-      height: 100%;
-    }
-    .lineChart{
-      position: absolute;
-      margin:auto;
-      top:0;
-      bottom: 0;
-      left:0;
-      width: 100%;
-      height: 100%;
+<style scoped lang="scss">
+    .app-uDayBox {
+        width: 100%;
+        .theme-card2 {
+            height: 100%;
+        }
+        .lineChart {
+            position: absolute;
+            margin: auto;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+        }
+        .contentBox {
+            background: url(../../images/com/border.svg) no-repeat;
+            background-size: 100% 100%;
+            width: 100%;
+            height: 100%;
+            position: relative;
+        }
     }
-  .contentBox{
-    background: url(../../images/com/border.svg) no-repeat;
-    background-size: 100% 100%;
-    width: 100%;
-    height: 100%;
-    position: relative;
-  }
-  }
 </style>
diff --git a/src/components/weekAndDay/uWeek.vue b/src/components/weekAndDay/uWeek.vue
index 52929fc..932c049 100644
--- a/src/components/weekAndDay/uWeek.vue
+++ b/src/components/weekAndDay/uWeek.vue
@@ -14,7 +14,7 @@
 
 <script>
   import echarts from 'echarts'
-  import { weekAddress } from '../../api/api'
+  import { weekAddress, weekAddressDY } from '../../api/api'
     export default {
       name: "uWeek",
       data() {
@@ -28,25 +28,29 @@
       },
       methods: {
         onLoad() {
-          weekAddress({
-            orgIds: this.GLOBAL.paramsvariables
-          }).then((response)=>{
-            let  data = response.data.data
+          this.$axios.all(
+            [
+              weekAddress({ orgIds: this.GLOBAL.paramsvariables}),
+              weekAddressDY({ orgIds: this.GLOBAL.paramsvariables})
+            ]
+          )
+          .then(this.$axios.spread((acctWX, acctDY) => {
+            let WXdata = acctWX.data.data
+            let DYdata = acctDY.data.data
             let  xData=[],inNum=[],outNum=[],lastInNum
-            for(let i=0;i<data.length;i++){
-              xData.push(data[i].queryDate)
-              inNum.push(data[i].inNum)
-              outNum.push(data[i].outNum)
-              lastInNum = data[data.length-1].inNum
+            for(let i=0;i<WXdata.length;i++){
+              xData.push(WXdata[i].queryDate)
+              inNum.push(WXdata[i].inNum+DYdata[i].inNum)
+              outNum.push(WXdata[i].outNum+DYdata[i].outNum)
+              lastInNum = WXdata[WXdata.length-1].inNum+DYdata[WXdata.length-1].inNum
             }
             this.$store.dispatch('transferOrderTotal',lastInNum)
             this.weekChart=this.createLine(xData,inNum,outNum);
             window.addEventListener('resize', function() {
               this.weekChart.resize()
             }.bind(this));
-          }).catch((response)=>{
-            console.log(response);
-          })
+
+          }))
         },
         createLine(xAxis_data,series_in,series_out){
           // 基于准备好的dom，初始化echarts实例
diff --git a/src/main.js b/src/main.js
index 7eb8c87..46b04b3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,6 +13,8 @@ Vue.prototype.qs = Qs
 //import { powerRouter } from './router';
 import store from './store';
 import ElementUI from 'element-ui'
+
+Vue.prototype.$axios = axios
 //import 'element-ui/lib/theme-chalk/index.css'
 Vue.use(ElementUI)
 require('element-ui/lib/theme-chalk/index.css')
--
libgit2 0.21.4