Commit 29b36332 authored by zhanglw's avatar zhanglw

调整

parent ba664dc9
...@@ -5,6 +5,7 @@ const prodEnv = require('./prod.env') ...@@ -5,6 +5,7 @@ const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API: '"http://192.168.3.23:8086"' BASE_API: '"http://192.168.3.23:8086"'
// BASE_API: '"http://117.34.103.191:8086"'
// BASE_API: '"http://jingkongyun.com:8000"' // BASE_API: '"http://jingkongyun.com:8000"'
// BASE_API: '"https://api.auauz.net"' // BASE_API: '"https://api.auauz.net"'
......
'use strict' 'use strict'
module.exports = { module.exports = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
BASE_API: '"http://jingkongyun.com:8000"' BASE_API: '"http://117.34.103.191:8086"'
// BASE_API: '"http://jingkongyun.com:8000"'
//BASE_API: '"http://39.103.149.47:8000"' //BASE_API: '"http://39.103.149.47:8000"'
// BASE_API: '"http://chendao.jingkongyun.com:8000"' // (old) // BASE_API: '"http://chendao.jingkongyun.com:8000"' // (old)
} }
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
</div> </div>
</div> </div>
<div class="box_div"> <div class="box_div">
<div class="box_title"><span class="touch" @click="visible=!visible">{{ currentBase.name }}设备实时监测<a style="font-size:16px;vertical-align: top"></a></span></div> <div class="box_title"><span class="touch" @click="visible=!visible">{{ currenIndex+1 }}号基地设备实时监测<a style="font-size:16px;vertical-align: top"></a></span></div>
<div class="select-box"> <div class="select-box">
<ul v-show="visible"> <ul v-show="visible">
<li v-for="(item,index) in baseList" :key="index" :class="currentBase===item?'active':''" class="touch" @click="currentBase=item;visible=false"> <li v-for="(item,index) in vDataMap.list" :key="index" :class="currentBase===item?'active':''" class="touch" @click="currentBase=item;currenIndex=index;visible=false">
{{ item.name }} {{ index+1 }}号基地
</li> </li>
</ul> </ul>
</div> </div>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<div class="map_bottom_box"> <div class="map_bottom_box">
<div>该地图上显示所有当前基地(点击选择查看):</div> <div>该地图上显示所有当前基地(点击选择查看):</div>
<div style="padding-top:3px;height:78px;overflow:auto"> <div style="padding-top:3px;height:78px;overflow:auto">
<div v-for="(item,index) in vDataMap.list" :key="'ml_'+index" class="btn touch">{{ item.name }}</div> <div v-for="(item,index) in vDataMap.list" :key="'ml_'+index" class="btn touch" @click="currentBase=item;currenIndex=index;visible=false">{{ index+1 }}号基地:{{ item.name }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -268,19 +268,10 @@ export default { ...@@ -268,19 +268,10 @@ export default {
imgSrc: enterpriseImg, imgSrc: enterpriseImg,
mapDom: null, mapDom: null,
visible: false, visible: false,
currenIndex: 0,
currentBase: { currentBase: {
name: '一号基地' name: '一号基地'
}, },
baseList: [
{ name: '一号基地' },
{ name: '二号基地' },
{ name: '三号基地' },
{ name: '四号基地' },
{ name: '五号基地' },
{ name: '六号基地' },
{ name: '七号基地' },
{ name: '八号基地' }
],
vData1: { vData1: {
xx: '7896' xx: '7896'
}, },
...@@ -307,14 +298,14 @@ export default { ...@@ -307,14 +298,14 @@ export default {
}, },
vDataMap: { vDataMap: {
list: [ list: [
{ name: '一号基地:种植农作物1' }, { name: '种植农作物1' },
{ name: '一号基地:种植农作物1' }, { name: '种植农作物1' },
{ name: '一号基地:种植农作物1' }, { name: '种植农作物1' },
{ name: '一号基地:种植农作物1' }, { name: '种植农作物1' },
{ name: '一号基地:种植农作物1' }, { name: '种植农作物1' },
{ name: '一号基地:种植农作物1' }, { name: '种植农作物1' },
{ name: '一号基地:种植农作物1' }, { name: '种植农作物1' },
{ name: '一号基地:种植农作物1' } { name: '种植农作物1' }
] ]
}, },
chart1: null, chart1: null,
...@@ -328,7 +319,7 @@ export default { ...@@ -328,7 +319,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.initMap() this.initMap()
this.loadData() this.loadData()
this.currentBase = this.baseList[0] this.currentBase = this.vDataMap.list[this.currenIndex]
}) })
}, },
methods: { methods: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment