diff --git a/.env.development b/.env.development index fd937c0d6..af4564f4b 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api -VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api # VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api diff --git a/src/assets/scss/modules/visual/command.scss b/src/assets/scss/modules/visual/command.scss index ee0138343..d827e4cb4 100644 --- a/src/assets/scss/modules/visual/command.scss +++ b/src/assets/scss/modules/visual/command.scss @@ -193,6 +193,13 @@ width: 360px; height: calc(825px - 15px); + .menu { + position: relative; + width: 100%; + margin-bottom: 20px; + // height: calc((825px - 15px - 20px) / 2); + } + .title { margin-bottom: 10px; padding: 4px 0; @@ -212,9 +219,9 @@ } } - .list { + .wrap { margin-right: -8px; - height: calc(825px - 120px); + height: calc(825px - 45px); overflow-y: auto; overflow-x: hidden; @include scrollBar; diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 4d3fe5195..cdde575ea 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -157,8 +157,8 @@ export default { areaCovered: '',//占地面积 capacity: 0,//容纳人数 address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519, //纬度 + longitude: null, //经度 + latitude: null, //纬度 principal: '', mobile: '' }, @@ -292,11 +292,15 @@ export default { initMap () { // 定义地图中心点坐标 let { latitude, longitude } = this.$store.state.user; + console.log('lat' + latitude + ',lon' + longitude) if (!latitude || latitude == "" || latitude == "0") { latitude = 39.9088810666821; longitude = 116.39743841556731; } + + this.formData.latitude = latitude + this.formData.longitude = longitude // 定义地图中心点坐标 var center = new window.TMap.LatLng(latitude, longitude); // var center = new window.TMap.LatLng(36.52799, 120.7553) diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 9bfc646b1..ceeb3ab97 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -138,8 +138,8 @@ export default { areaCovered: '',//占地面积 capacity: '',//容纳人数 address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519, //纬度 + longitude: null, //经度 + latitude: null, //纬度 principal: '', mobile: '' }, @@ -277,6 +277,8 @@ export default { latitude = 39.9088810666821; longitude = 116.39743841556731; } + this.formData.latitude = latitude + this.formData.longitude = longitude // 定义地图中心点坐标 var center = new window.TMap.LatLng(latitude, longitude); // 定义map变量,调用 TMap.Map() 构造函数创建地图