BJ_web_developers / cityOperationCenter

Commit a6301da7681d5d5a93b87386d05fda87deccff5f

Authored by liuqimichale
1 parent e86ba720

去掉丹阳

Inline Side-by-side
Showing 13 changed files with 208 additions and 57 deletions
index.html
  View file @a6301da
... ... @@ -4,7 +4,7 @@
4 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5 5 <meta name="viewport" content="width=device-width,initial-scale=1.0">
6 6 <meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
7   - <meta http-equiv="refresh" content="60">
  7 + <!--<meta http-equiv="refresh" content="60">-->
8 8 <title>城市智慧停车大数据中心</title>
9 9 <script src="<%= htmlWebpackPlugin.options.path %>static/config/config.js?t= + new Date().getTime()"></script>
10 10 </head>
... ...
src/api/api.js
  View file @a6301da
1 1 import { get, post} from './httpRequest'
2 2 const baseWX = 'http://bcp.service.renniting.cn/' //无锡
3   -const baseDY = 'http://106.15.191.5:8093/' //丹阳
  3 +const baseDY = 'http://bcp.service.renniting.cn/' //丹阳
4 4 //....用户数
5 5 export const memberAddress = p => post(baseWX+'urban/intelligence/appuser/queryUserPersonStatistic',p)
6 6 export const memberAddressDY = p => post(baseDY+'urban/intelligence/appuser/queryUserPersonStatistic',p)
... ...
src/api/httpRequest.js
  View file @a6301da
... ... @@ -79,7 +79,7 @@ axios.interceptors.response.use(response =&gt; {
79 79 // axios.defaults.withCredentials=true;//让ajax携带cookie
80 80  
81 81 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
82   -axios.defaults.timeout = 10000
  82 +axios.defaults.timeout = 30000
83 83  
84 84  
85 85 function post(url, params) {
... ...
src/api/variables.js
  View file @a6301da
1   -const paramsvariables = [10003,10005,10081,10083,10007,10025,10067]
2   -const variables = [10064]
  1 +// const paramsvariables = [10003,10005,10081,10083,10007,10025,10067]
  2 +const paramsvariables = [10003,10005]
  3 +const variables = [10003]
3 4 export default {paramsvariables, variables}
... ...
src/components/berth/index.vue
  View file @a6301da
... ... @@ -79,12 +79,25 @@
79 79 .then(this.$axios.spread((acctWX, acctDY) => {
80 80 let WXdata = acctWX.data.data
81 81 let DYdata = acctDY.data.data
82   - let num = Number(WXdata.allBerthNum)+Number(DYdata.allBerthNum)
  82 + // let num = Number(WXdata.allBerthNum)+Number(DYdata.allBerthNum)
  83 + // this.berthTotal = common.formatNumToStr(Number(num))
  84 + // this.free = WXdata.freeBerthNum+DYdata.freeBerthNum
  85 + // this.have = WXdata.isOccupyBertnNum+DYdata.isOccupyBertnNum
  86 + // this.pieChartOption.seriesData[0].value = WXdata.isOccupyBertnNum+DYdata.isOccupyBertnNum
  87 + // this.pieChartOption.seriesData[1].value = WXdata.freeBerthNum+DYdata.freeBerthNum
  88 +
  89 +
  90 +
  91 + let num = Number(WXdata.allBerthNum)
83 92 this.berthTotal = common.formatNumToStr(Number(num))
84   - this.free = WXdata.freeBerthNum+DYdata.freeBerthNum
85   - this.have = WXdata.isOccupyBertnNum+DYdata.isOccupyBertnNum
86   - this.pieChartOption.seriesData[0].value = WXdata.isOccupyBertnNum+DYdata.isOccupyBertnNum
87   - this.pieChartOption.seriesData[1].value = WXdata.freeBerthNum+DYdata.freeBerthNum
  93 + this.free = WXdata.freeBerthNum
  94 + this.have = WXdata.isOccupyBertnNum
  95 + this.pieChartOption.seriesData[0].value = WXdata.isOccupyBertnNum
  96 + this.pieChartOption.seriesData[1].value = WXdata.freeBerthNum
  97 +
  98 +
  99 +
  100 +
88 101 let pieChartOption = this.pieChartOption
89 102 //占有率
90 103 this.pieChart=this.createPie(pieChartOption);
... ...
src/components/chinaMap/index.vue
  View file @a6301da
... ... @@ -86,9 +86,10 @@
86 86 .then(this.$axios.spread((acctWX, acctDY) => {
87 87 let WXdata = acctWX.data.data
88 88 let DYdata = acctDY.data.data
89   - // console.log(WXdata)
90   - // console.log(DYdata)
91   - this.parkParams.endVal=WXdata.allNum+DYdata.allNum
  89 +
  90 +
  91 + // this.parkParams.endVal=WXdata.allNum+DYdata.allNum
  92 + this.parkParams.endVal=WXdata.allNum
92 93  
93 94 }))
94 95 },
... ... @@ -115,13 +116,44 @@
115 116 this.coordinateData[WXdata[i].orgName] = [WXdata[i].lonId,WXdata[i].latId]
116 117 }
117 118  
118   - for (let i=0;i<DYdata.length;i++){
119   - this.mapData.push({
120   - name:DYdata[i].orgName,
121   - value:DYdata[i].allBerthNum
122   - })
123   - this.coordinateData[DYdata[i].orgName] = [DYdata[i].lonId,DYdata[i].latId]
124   - }
  119 + // for (let i=0;i<DYdata.length;i++){
  120 + // this.mapData.push({
  121 + // name:DYdata[i].orgName,
  122 + // value:DYdata[i].allBerthNum
  123 + // })
  124 + // this.coordinateData[DYdata[i].orgName] = [DYdata[i].lonId,DYdata[i].latId]
  125 + // }
  126 +
  127 + this.mapData.push({
  128 + name:'丹阳',
  129 + value:12312
  130 + })
  131 + this.coordinateData['丹阳'] = [119.677183,32.022778]
  132 +
  133 +
  134 +
  135 + this.mapData.push({
  136 + name:'北京',
  137 + value:1234
  138 + })
  139 + this.coordinateData['北京'] = [116.298116,39.91845]
  140 +
  141 +
  142 + this.mapData.push({
  143 + name:'黄石',
  144 + value:1234
  145 + })
  146 + this.coordinateData['黄石'] = [115.214842,30.32798]
  147 +
  148 +
  149 + this.mapData.push({
  150 + name:'兰州',
  151 + value:1234
  152 + })
  153 + this.coordinateData['兰州'] = [103.671786,36.153543]
  154 +
  155 +
  156 +
125 157 //'双流': [103.912493, 30.586969]
126 158 this.mapChart= this.createPie();
127 159 window.addEventListener('resize', function() {
... ... @@ -221,7 +253,7 @@
221 253 switch (name) {
222 254 case '赤峰': window.open('http://www.renniting.cn/cfmonitor/index.html')
223 255 break;
224   - case '丹阳': window.open('http://www.renniting.cn/dymonitor/index.html')
  256 + case '黄石': window.open('http://www.renniting.cn/dymonitor/index.html')
225 257 break;
226 258  
227 259 }
... ... @@ -233,15 +265,25 @@
233 265 //this.coordinateData;
234 266 const geoCoordMap = this.coordinateData;
235 267 const dataFrom = '无锡';
  268 + this.mapData = [
  269 + {name: '赤峰',value: 95},
  270 + {name: '兰州',value: 70},
  271 + // {name: '丹阳',value: 90},
  272 + {name: '北京',value: 190},
  273 + {name: '黄石',value: 290},
  274 + ]
  275 + const data = this.mapData;
  276 + // console.log(data1)
236 277 // const data = [
237 278 // {name: '赤峰',value: 95},
238   - // {name: '双流',value: 70},
239   - // {name: '北京',value: 70},
240   - // {name: '丹阳', value: 30}
  279 + // {name: '无锡',value: 70},
  280 + // {name: '丹阳',value: 70},
  281 + // // {name: '丹阳', value: 30}
241 282 // ];
242   - const data = this.mapData;
  283 +
243 284 console.log(data)
244   - let tmpSeries=[{
  285 + let tmpSeries=[
  286 + {
245 287 //name: '无锡',
246 288 type: 'lines',
247 289 zlevel: 1,
... ... @@ -251,7 +293,7 @@
251 293 trailLength: 0.2, //0-1
252 294 color: '#fff',
253 295 //shadowBlur: 3,
254   - symbolSize: 2
  296 + symbolSize: 6
255 297 },
256 298 lineStyle: {
257 299 normal: {
... ... @@ -303,6 +345,37 @@
303 345 })
304 346 },
305 347 {
  348 + //name: '无锡',
  349 + type: 'lines',
  350 + //zlevel: 2,
  351 + symbol: 'none',//['none', 'pin'],
  352 + symbolSize: 8,
  353 + effect: {
  354 + show: true,
  355 + period: 6,
  356 + trailLength: 0,
  357 + color: '#fff',
  358 + },
  359 + lineStyle: {
  360 + normal: {
  361 + color: '#FFAB00', //线颜色
  362 + width: 1,
  363 + opacity: 0.6,
  364 + curveness: 0.2
  365 + }
  366 + },
  367 + data: data.map(function(dataItem) {
  368 + return {
  369 + fromName: dataFrom,
  370 + toName: dataItem.name,
  371 + coords: [
  372 + geoCoordMap[dataFrom],
  373 + geoCoordMap[dataItem.name]
  374 + ]
  375 + }
  376 + })
  377 + },
  378 + {
306 379 name: '城市',
307 380 type: 'effectScatter',
308 381 coordinateSystem: 'geo',
... ... @@ -336,7 +409,7 @@
336 409 })
337 410 },
338 411 {
339   - name: '无锡',
  412 + name: '丹阳',
340 413 type: 'scatter',
341 414 coordinateSystem: 'geo',
342 415 label: {
... ...
src/components/device/index.vue
  View file @a6301da
... ... @@ -71,24 +71,39 @@ import { deviceAddress, deviceAddressDY } from &#39;../../api/api&#39;
71 71 .then(this.$axios.spread((acctWX, acctDY) => {
72 72 let WXdata = acctWX.data.data
73 73 let DYdata = acctDY.data.data
74   - this.PDANum = WXdata[0].num+DYdata[0].num
  74 +
  75 +
  76 + // this.PDANum = WXdata[0].num+DYdata[0].num
  77 + // this.PDAName = WXdata[0].deviceName
  78 + //
  79 + // this.diCiNum = WXdata[1].num+DYdata[1].num
  80 + // this.diCiName = WXdata[1].deviceName
  81 + //
  82 + // this.daoZhaNum = WXdata[2].num+DYdata[2].num
  83 + // this.daoZhaName = WXdata[2].deviceName
  84 + //
  85 + // this.youDaoNum = WXdata[3].num+DYdata[3].num
  86 + // if(this.youDaoNum == 0){
  87 + // this.youDaoNum = '-'
  88 + // }
  89 + // this.youDaoName = WXdata[3].deviceName
  90 +
  91 +
  92 + this.PDANum = WXdata[0].num
75 93 this.PDAName = WXdata[0].deviceName
76 94  
77   - this.diCiNum = WXdata[1].num+DYdata[1].num
  95 + this.diCiNum = WXdata[1].num
78 96 this.diCiName = WXdata[1].deviceName
79 97  
80   - this.daoZhaNum = WXdata[2].num+DYdata[2].num
  98 + this.daoZhaNum = WXdata[2].num
81 99 this.daoZhaName = WXdata[2].deviceName
82 100  
83   - this.youDaoNum = WXdata[3].num+DYdata[3].num
  101 + this.youDaoNum = WXdata[3].num
84 102 if(this.youDaoNum == 0){
85 103 this.youDaoNum = '-'
86 104 }
87 105 this.youDaoName = WXdata[3].deviceName
88   - // this.tollmanTotal = WXdata.allTollCollector+DYdata.allTollCollector
89   - // this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
90   - // this.onDutyNum = WXdata.signInTollCollector+DYdata.signInTollCollector
91   - // this.noDutyNum = WXdata.unSignInTollCollector+DYdata.unSignInTollCollector
  106 +
92 107  
93 108 }))
94 109 }
... ...
src/components/incomeOverview/index.vue
  View file @a6301da
... ... @@ -64,23 +64,36 @@
64 64  
65 65 this.$axios.all(
66 66 [
67   - incomeAddress({ orgIds: [10003,10005]}),
  67 + incomeAddress({ orgIds: [10003]}),
68 68 incomeAddressDY({ orgIds: this.GLOBAL.variables})
69 69 ]
70 70 )
71 71 .then(this.$axios.spread((acctWX, acctDY) => {
  72 +
72 73 console.log('1')
73 74 console.log(acctWX)
74 75 console.log(acctDY)
75 76 let WXdata = acctWX.data.data
76   - let DYdata = acctDY.data.data
  77 + let DYdata = acctWX.data.data
  78 +
  79 + // this.incomeTotal = WXdata.totalPay+DYdata.totalPay
  80 + // this.incomeTotal = common.formatNumToStr(Math.round(this.incomeTotal/100))
  81 + //
  82 + // this.barChartOption.barColor[0].value = Math.round((WXdata.aliPay+DYdata.aliPay)/100)
  83 + // this.barChartOption.barColor[1].value = Math.round((WXdata.wxPay+DYdata.wxPay)/100)
  84 + // this.barChartOption.barColor[2].value = Math.round((WXdata.otherPay+DYdata.otherPay)/100)
77 85  
78   - this.incomeTotal = WXdata.totalPay+DYdata.totalPay
  86 +
  87 + this.incomeTotal = WXdata.totalPay
79 88 this.incomeTotal = common.formatNumToStr(Math.round(this.incomeTotal/100))
80 89  
81   - this.barChartOption.barColor[0].value = Math.round((WXdata.aliPay+DYdata.aliPay)/100)
82   - this.barChartOption.barColor[1].value = Math.round((WXdata.wxPay+DYdata.wxPay)/100)
83   - this.barChartOption.barColor[2].value = Math.round((WXdata.otherPay+DYdata.otherPay)/100)
  90 + this.barChartOption.barColor[0].value = Math.round((WXdata.aliPay)/100)
  91 + this.barChartOption.barColor[1].value = Math.round((WXdata.wxPay)/100)
  92 + this.barChartOption.barColor[2].value = Math.round((WXdata.otherPay)/100)
  93 +
  94 +
  95 +
  96 +
84 97 let barChartOption = this.barChartOption
85 98 this.barChart=this.createBar(barChartOption);
86 99 window.addEventListener('resize', function() {
... ...
src/components/memberNum/index.vue
  View file @a6301da
... ... @@ -64,11 +64,19 @@ export default {
64 64 // });
65 65 this.$axios.all([memberAddress(), memberAddressDY()])
66 66 .then(this.$axios.spread((acctWX, acctDY) => {
  67 + console.log(acctWX)
  68 + console.log(acctDY)
67 69 let WXdata = acctWX.data.data
68 70 let DYdata = acctDY.data.data
69   - this.registerNum = WXdata.registerNum+DYdata.registerNum
70   - this.activeUserNum = WXdata.todayActiveNum+DYdata.todayActiveNum
71   - this.newUerNum = WXdata.todayRegisterNum+DYdata.todayRegisterNum
  71 + // this.registerNum = WXdata.registerNum+DYdata.registerNum
  72 + // this.activeUserNum = WXdata.todayActiveNum+DYdata.todayActiveNum
  73 + // this.newUerNum = WXdata.todayRegisterNum+DYdata.todayRegisterNum
  74 +
  75 + this.registerNum = WXdata.registerNum
  76 + this.activeUserNum = WXdata.todayActiveNum
  77 + this.newUerNum = WXdata.todayRegisterNum
  78 +
  79 +
72 80 this.memberNumTotal = common.formatNumToStr(this.registerNum)
73 81 this.$store.dispatch('transferParkingTotal', this.registerNum)
74 82 }))
... ...
src/components/tollman/index.vue
  View file @a6301da
... ... @@ -73,10 +73,17 @@
73 73 console.log(acctDY)
74 74 let WXdata = acctWX.data.data
75 75 let DYdata = acctDY.data.data
76   - this.tollmanTotal = WXdata.allTollCollector+DYdata.allTollCollector
  76 + // this.tollmanTotal = WXdata.allTollCollector+DYdata.allTollCollector
  77 + // this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
  78 + // this.onDutyNum = WXdata.signInTollCollector+DYdata.signInTollCollector
  79 + // this.noDutyNum = WXdata.unSignInTollCollector+DYdata.unSignInTollCollector
  80 +
  81 +
  82 +
  83 + this.tollmanTotal = WXdata.allTollCollector
77 84 this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
78   - this.onDutyNum = WXdata.signInTollCollector+DYdata.signInTollCollector
79   - this.noDutyNum = WXdata.unSignInTollCollector+DYdata.unSignInTollCollector
  85 + this.onDutyNum = WXdata.signInTollCollector
  86 + this.noDutyNum = WXdata.unSignInTollCollector
80 87  
81 88 }))
82 89 }
... ...
src/components/weather/index.vue
  View file @a6301da
... ... @@ -36,9 +36,9 @@
36 36 let params={regionId:130200,indicatorCode:126};
37 37 let url='indicator_exhibition/compare/v1/queryCompareIndicator.json';
38 38 const tmp=this.$store;
39   - setTimeout(function () {
40   - tmp.dispatch('weatherModule/act_set_weather_news', '333')
41   - },2000);
  39 + // setTimeout(function () {
  40 + // tmp.dispatch('weatherModule/act_set_weather_news', '333')
  41 + // },2000);
42 42 //示例
43 43 //this.$store.dispatch("login/changeName", "Jason")//有参
44 44 // this.$store.dispatch("login/alertName")//无参
... ...
src/components/weekAndDay/uDay.vue
  View file @a6301da
... ... @@ -60,13 +60,23 @@ export default {
60 60 let WXdata = acctWX.data.data
61 61 let DYdata = acctDY.data.data
62 62 let xData = [], inNum = [], outNum = []
  63 + // for (let i = 0; i < WXdata.length; i++) {
  64 + // xData.push(WXdata[i].queryDate)
  65 + // inNum.push(WXdata[i].inNum + DYdata[i].inNum)
  66 + // outNum.push(WXdata[i].outNum + DYdata[i].outNum)
  67 + // //lastInNum = WXdata[WXdata.length-1].inNum+DYdata[WXdata.length-1].inNum
  68 + // }
  69 +
63 70 for (let i = 0; i < WXdata.length; i++) {
64 71 xData.push(WXdata[i].queryDate)
65   - inNum.push(WXdata[i].inNum + DYdata[i].inNum)
66   - outNum.push(WXdata[i].outNum + DYdata[i].outNum)
  72 + inNum.push(WXdata[i].inNum )
  73 + outNum.push(WXdata[i].outNum )
67 74 //lastInNum = WXdata[WXdata.length-1].inNum+DYdata[WXdata.length-1].inNum
68 75 }
69   - //this.$store.dispatch('transferOrderTotal',lastInNum)
  76 +
  77 +
  78 +
  79 +
70 80 this.weekChart = this.createLine(xData, inNum, outNum);
71 81 window.addEventListener('resize', function () {
72 82 this.weekChart.resize()
... ...
src/components/weekAndDay/uWeek.vue
  View file @a6301da
... ... @@ -38,12 +38,23 @@
38 38 let WXdata = acctWX.data.data
39 39 let DYdata = acctDY.data.data
40 40 let xData=[],inNum=[],outNum=[],lastInNum
  41 + // for(let i=0;i<WXdata.length;i++){
  42 + // xData.push(WXdata[i].queryDate)
  43 + // inNum.push(WXdata[i].inNum+DYdata[i].inNum)
  44 + // outNum.push(WXdata[i].outNum+DYdata[i].outNum)
  45 + // lastInNum = WXdata[WXdata.length-1].inNum+DYdata[WXdata.length-1].inNum
  46 + // }
  47 +
  48 +
41 49 for(let i=0;i<WXdata.length;i++){
42 50 xData.push(WXdata[i].queryDate)
43   - inNum.push(WXdata[i].inNum+DYdata[i].inNum)
44   - outNum.push(WXdata[i].outNum+DYdata[i].outNum)
45   - lastInNum = WXdata[WXdata.length-1].inNum+DYdata[WXdata.length-1].inNum
  51 + inNum.push(WXdata[i].inNum)
  52 + outNum.push(WXdata[i].outNum)
  53 + lastInNum = WXdata[WXdata.length-1].inNum
46 54 }
  55 +
  56 +
  57 +
47 58 this.$store.dispatch('transferOrderTotal',lastInNum)
48 59 this.weekChart=this.createLine(xData,inNum,outNum);
49 60 window.addEventListener('resize', function() {
... ...