去掉丹阳

liuqimichale
1 parent e86ba720
Showing 13 changed files with 208 additions and 57 deletions
index.html
src/api/api.js
src/api/httpRequest.js
src/api/variables.js
src/components/berth/index.vue
src/components/chinaMap/index.vue
src/components/device/index.vue
src/components/incomeOverview/index.vue
src/components/memberNum/index.vue
src/components/tollman/index.vue
src/components/weather/index.vue
src/components/weekAndDay/uDay.vue
src/components/weekAndDay/uWeek.vue
@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
-    <meta http-equiv="refresh" content="60">
+    <!--<meta http-equiv="refresh" content="60">-->
     <title>城市智慧停车大数据中心</title>
     <script src="<%= htmlWebpackPlugin.options.path %>static/config/config.js?t= + new Date().getTime()"></script>
   </head>
 import { get, post} from './httpRequest'
 const baseWX = 'http://bcp.service.renniting.cn/'  //无锡
-const baseDY = 'http://106.15.191.5:8093/'  //丹阳
+const baseDY = 'http://bcp.service.renniting.cn/'  //丹阳
 //....用户数
 export const memberAddress = p => post(baseWX+'urban/intelligence/appuser/queryUserPersonStatistic',p)
 export const memberAddressDY = p => post(baseDY+'urban/intelligence/appuser/queryUserPersonStatistic',p)
@@ -79,7 +79,7 @@ axios.interceptors.response.use(response =&gt; {
 // axios.defaults.withCredentials=true;//让ajax携带cookie
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-axios.defaults.timeout = 10000
+axios.defaults.timeout = 30000
 function post(url, params) {
-const paramsvariables = [10003,10005,10081,10083,10007,10025,10067]
-const variables = [10064]
+// const paramsvariables = [10003,10005,10081,10083,10007,10025,10067]
+const paramsvariables = [10003,10005]
+const variables = [10003]
 export default {paramsvariables, variables}
@@ -79,12 +79,25 @@
         .then(this.$axios.spread((acctWX, acctDY) => {
           let WXdata = acctWX.data.data
           let DYdata = acctDY.data.data
-          let num =  Number(WXdata.allBerthNum)+Number(DYdata.allBerthNum)
+          // let num =  Number(WXdata.allBerthNum)+Number(DYdata.allBerthNum)
+          // this.berthTotal = common.formatNumToStr(Number(num))
+          // 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 num =  Number(WXdata.allBerthNum)
           this.berthTotal = common.formatNumToStr(Number(num))
-          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
+          this.free = WXdata.freeBerthNum
+          this.have = WXdata.isOccupyBertnNum
+          this.pieChartOption.seriesData[0].value = WXdata.isOccupyBertnNum
+          this.pieChartOption.seriesData[1].value = WXdata.freeBerthNum
+
+
+
+
           let pieChartOption = this.pieChartOption
           //占有率
           this.pieChart=this.createPie(pieChartOption);
@@ -86,9 +86,10 @@
         .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.allNum+DYdata.allNum
+
+
+          // this.parkParams.endVal=WXdata.allNum+DYdata.allNum
+          this.parkParams.endVal=WXdata.allNum
         }))
       },
@@ -115,13 +116,44 @@
             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]
-          }
+          // 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]
+          // }
+
+          this.mapData.push({
+            name:'丹阳',
+            value:12312
+          })
+          this.coordinateData['丹阳'] = [119.677183,32.022778]
+
+
+
+          this.mapData.push({
+            name:'北京',
+            value:1234
+          })
+          this.coordinateData['北京'] = [116.298116,39.91845]
+
+
+          this.mapData.push({
+            name:'黄石',
+            value:1234
+          })
+          this.coordinateData['黄石'] = [115.214842,30.32798]
+
+
+          this.mapData.push({
+            name:'兰州',
+            value:1234
+          })
+          this.coordinateData['兰州'] = [103.671786,36.153543]
+
+
+
           //'双流': [103.912493, 30.586969]
           this.mapChart= this.createPie();
           window.addEventListener('resize', function() {
@@ -221,7 +253,7 @@
           switch (name) {
             case '赤峰': window.open('http://www.renniting.cn/cfmonitor/index.html')
               break;
-            case '丹阳': window.open('http://www.renniting.cn/dymonitor/index.html')
+            case '黄石': window.open('http://www.renniting.cn/dymonitor/index.html')
               break;
           }
@@ -233,15 +265,25 @@
         //this.coordinateData;
         const geoCoordMap = this.coordinateData;
         const dataFrom = '无锡';
+        this.mapData = [
+            {name: '赤峰',value: 95},
+            {name: '兰州',value: 70},
+            // {name: '丹阳',value: 90},
+          {name: '北京',value: 190},
+          {name: '黄石',value: 290},
+        ]
+        const data = this.mapData;
+        // console.log(data1)
         // const data = [
         //   {name: '赤峰',value: 95},
-        //   {name: '双流',value: 70},
-        //   {name: '北京',value: 70},
-        //   {name: '丹阳', value: 30}
+        //   {name: '无锡',value: 70},
+        //   {name: '丹阳',value: 70},
+        //   // {name: '丹阳', value: 30}
         // ];
-        const data = this.mapData;
+
         console.log(data)
-        let tmpSeries=[{
+        let tmpSeries=[
+          {
           //name: '无锡',
           type: 'lines',
           zlevel: 1,
@@ -251,7 +293,7 @@
             trailLength: 0.2, //0-1
             color: '#fff',
             //shadowBlur: 3,
-            symbolSize: 2
+            symbolSize: 6
           },
           lineStyle: {
             normal: {
@@ -303,6 +345,37 @@
             })
           },
           {
+            //name: '无锡',
+            type: 'lines',
+            //zlevel: 2,
+            symbol: 'none',//['none', 'pin'],
+            symbolSize: 8,
+            effect: {
+              show: true,
+              period: 6,
+              trailLength: 0,
+              color: '#fff',
+            },
+            lineStyle: {
+              normal: {
+                color: '#FFAB00', //线颜色
+                width: 1,
+                opacity: 0.6,
+                curveness: 0.2
+              }
+            },
+            data: data.map(function(dataItem) {
+              return {
+                fromName: dataFrom,
+                toName: dataItem.name,
+                coords: [
+                  geoCoordMap[dataFrom],
+                  geoCoordMap[dataItem.name]
+                ]
+              }
+            })
+          },
+          {
             name: '城市',
             type: 'effectScatter',
             coordinateSystem: 'geo',
@@ -336,7 +409,7 @@
             })
           },
           {
-            name: '无锡',
+            name: '丹阳',
             type: 'scatter',
             coordinateSystem: 'geo',
             label: {
@@ -71,24 +71,39 @@ import { deviceAddress, deviceAddressDY } from &#39;../../api/api&#39;
         .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.PDANum = WXdata[0].num+DYdata[0].num
+          // this.PDAName = WXdata[0].deviceName
+          //
+          // 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 = WXdata[3].deviceName
+
+
+          this.PDANum = WXdata[0].num
           this.PDAName = WXdata[0].deviceName
-          this.diCiNum = WXdata[1].num+DYdata[1].num
+          this.diCiNum = WXdata[1].num
           this.diCiName = WXdata[1].deviceName
-          this.daoZhaNum = WXdata[2].num+DYdata[2].num
+          this.daoZhaNum = WXdata[2].num
           this.daoZhaName = WXdata[2].deviceName
-          this.youDaoNum = WXdata[3].num+DYdata[3].num
+          this.youDaoNum = WXdata[3].num
           if(this.youDaoNum == 0){
             this.youDaoNum = '-'
           }
           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
+
         }))
       }
@@ -64,23 +64,36 @@
           this.$axios.all(
             [
-              incomeAddress({ orgIds: [10003,10005]}),
+              incomeAddress({ orgIds: [10003]}),
               incomeAddressDY({ orgIds: this.GLOBAL.variables})
             ]
           )
           .then(this.$axios.spread((acctWX, acctDY) => {
+
             console.log('1')
             console.log(acctWX)
             console.log(acctDY)
             let WXdata = acctWX.data.data
-            let DYdata = acctDY.data.data
+            let DYdata = acctWX.data.data
+
+            // this.incomeTotal = WXdata.totalPay+DYdata.totalPay
+            // this.incomeTotal = common.formatNumToStr(Math.round(this.incomeTotal/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)
-            this.incomeTotal = WXdata.totalPay+DYdata.totalPay
+
+            this.incomeTotal = WXdata.totalPay
             this.incomeTotal = common.formatNumToStr(Math.round(this.incomeTotal/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)
+            this.barChartOption.barColor[0].value = Math.round((WXdata.aliPay)/100)
+            this.barChartOption.barColor[1].value = Math.round((WXdata.wxPay)/100)
+            this.barChartOption.barColor[2].value = Math.round((WXdata.otherPay)/100)
+
+
+
+
             let barChartOption = this.barChartOption
             this.barChart=this.createBar(barChartOption);
             window.addEventListener('resize', function() {
@@ -64,11 +64,19 @@ export default {
       // });
       this.$axios.all([memberAddress(), memberAddressDY()])
       .then(this.$axios.spread((acctWX, acctDY) => {
+        console.log(acctWX)
+        console.log(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.registerNum = WXdata.registerNum+DYdata.registerNum
+        // this.activeUserNum = WXdata.todayActiveNum+DYdata.todayActiveNum
+        // this.newUerNum = WXdata.todayRegisterNum+DYdata.todayRegisterNum
+
+        this.registerNum = WXdata.registerNum
+        this.activeUserNum = WXdata.todayActiveNum
+        this.newUerNum = WXdata.todayRegisterNum
+
+
         this.memberNumTotal = common.formatNumToStr(this.registerNum)
         this.$store.dispatch('transferParkingTotal', this.registerNum)
       }))
@@ -73,10 +73,17 @@
             console.log(acctDY)
             let WXdata = acctWX.data.data
             let DYdata = acctDY.data.data
-            this.tollmanTotal = WXdata.allTollCollector+DYdata.allTollCollector
+            // this.tollmanTotal = WXdata.allTollCollector+DYdata.allTollCollector
+            // this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
+            // this.onDutyNum = WXdata.signInTollCollector+DYdata.signInTollCollector
+            // this.noDutyNum = WXdata.unSignInTollCollector+DYdata.unSignInTollCollector
+
+
+
+            this.tollmanTotal = WXdata.allTollCollector
             this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
-            this.onDutyNum = WXdata.signInTollCollector+DYdata.signInTollCollector
-            this.noDutyNum = WXdata.unSignInTollCollector+DYdata.unSignInTollCollector
+            this.onDutyNum = WXdata.signInTollCollector
+            this.noDutyNum = WXdata.unSignInTollCollector
           }))
         }
@@ -36,9 +36,9 @@
         let params={regionId:130200,indicatorCode:126};
         let url='indicator_exhibition/compare/v1/queryCompareIndicator.json';
         const tmp=this.$store;
-        setTimeout(function () {
-          tmp.dispatch('weatherModule/act_set_weather_news', '333')
-        },2000);
+        // setTimeout(function () {
+        //   tmp.dispatch('weatherModule/act_set_weather_news', '333')
+        // },2000);
         //示例
         //this.$store.dispatch("login/changeName", "Jason")//有参
         // this.$store.dispatch("login/alertName")//无参
@@ -60,13 +60,23 @@ export default {
         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
+        // }
+
         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)
+          inNum.push(WXdata[i].inNum )
+          outNum.push(WXdata[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()
@@ -38,12 +38,23 @@
             let WXdata = acctWX.data.data
             let DYdata = acctDY.data.data
             let  xData=[],inNum=[],outNum=[],lastInNum
+            // 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
+            // }
+
+
             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
+              inNum.push(WXdata[i].inNum)
+              outNum.push(WXdata[i].outNum)
+              lastInNum = WXdata[WXdata.length-1].inNum
             }
+
+
+
             this.$store.dispatch('transferOrderTotal',lastInNum)
             this.weekChart=this.createLine(xData,inNum,outNum);
             window.addEventListener('resize', function() {