From a6301da7681d5d5a93b87386d05fda87deccff5f Mon Sep 17 00:00:00 2001 From: liuqimichale <123456lq> Date: Wed, 19 Aug 2020 15:06:35 +0800 Subject: [PATCH] 去掉丹阳 --- index.html | 2 +- src/api/api.js | 2 +- src/api/httpRequest.js | 2 +- src/api/variables.js | 5 +++-- src/components/berth/index.vue | 23 ++++++++++++++++++----- src/components/chinaMap/index.vue | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ src/components/device/index.vue | 31 +++++++++++++++++++++++-------- src/components/incomeOverview/index.vue | 25 +++++++++++++++++++------ src/components/memberNum/index.vue | 14 +++++++++++--- src/components/tollman/index.vue | 13 ++++++++++--- src/components/weather/index.vue | 6 +++--- src/components/weekAndDay/uDay.vue | 16 +++++++++++++--- src/components/weekAndDay/uWeek.vue | 17 ++++++++++++++--- 13 files changed, 208 insertions(+), 57 deletions(-) diff --git a/index.html b/index.html index da3ecaf..7f0f5d4 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - + 城市智慧停车大数据中心 diff --git a/src/api/api.js b/src/api/api.js index 621eb21..8f60a9e 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -1,6 +1,6 @@ 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) diff --git a/src/api/httpRequest.js b/src/api/httpRequest.js index 28ebbde..99f0778 100644 --- a/src/api/httpRequest.js +++ b/src/api/httpRequest.js @@ -79,7 +79,7 @@ axios.interceptors.response.use(response => { // 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) { diff --git a/src/api/variables.js b/src/api/variables.js index f7cae9e..fdb767f 100644 --- a/src/api/variables.js +++ b/src/api/variables.js @@ -1,3 +1,4 @@ -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} diff --git a/src/components/berth/index.vue b/src/components/berth/index.vue index 3d2ee74..d8f717e 100644 --- a/src/components/berth/index.vue +++ b/src/components/berth/index.vue @@ -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); diff --git a/src/components/chinaMap/index.vue b/src/components/chinaMap/index.vue index 7a1f9af..bd91962 100644 --- a/src/components/chinaMap/index.vue +++ b/src/components/chinaMap/index.vue @@ -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 { 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 + })) } diff --git a/src/components/incomeOverview/index.vue b/src/components/incomeOverview/index.vue index d6c0f2d..02dfbb8 100644 --- a/src/components/incomeOverview/index.vue +++ b/src/components/incomeOverview/index.vue @@ -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() { diff --git a/src/components/memberNum/index.vue b/src/components/memberNum/index.vue index d992d04..de6f7d5 100644 --- a/src/components/memberNum/index.vue +++ b/src/components/memberNum/index.vue @@ -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) })) diff --git a/src/components/tollman/index.vue b/src/components/tollman/index.vue index c593229..9967d14 100644 --- a/src/components/tollman/index.vue +++ b/src/components/tollman/index.vue @@ -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 })) } diff --git a/src/components/weather/index.vue b/src/components/weather/index.vue index 289dab0..3b5d4ae 100644 --- a/src/components/weather/index.vue +++ b/src/components/weather/index.vue @@ -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")//无参 diff --git a/src/components/weekAndDay/uDay.vue b/src/components/weekAndDay/uDay.vue index e7f021a..9545c38 100644 --- a/src/components/weekAndDay/uDay.vue +++ b/src/components/weekAndDay/uDay.vue @@ -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() diff --git a/src/components/weekAndDay/uWeek.vue b/src/components/weekAndDay/uWeek.vue index 6bf48fe..0f081e9 100644 --- a/src/components/weekAndDay/uWeek.vue +++ b/src/components/weekAndDay/uWeek.vue @@ -38,12 +38,23 @@ let WXdata = acctWX.data.data let DYdata = acctDY.data.data let xData=[],inNum=[],outNum=[],lastInNum + // for(let i=0;i