@@ -204,7 +204,7 @@
import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
import editEquipment from '@/views/rain/inspection/components/editEquipment'
import editSite from '@/views/rain/inspection/components/editSite'
- import mapShow from '@/views/rain/inspection/components/mapShow'
+ import maps from '@/views/rain/inspection/components/maps'
export default {
components: {
LxHeader,
@@ -212,7 +212,7 @@
showRainSiteInfo,
editEquipment,
editSite,
- mapShow
+ maps
},
data() {
return {
@@ -221,7 +221,7 @@
baseurl: "",
rainTypeVisible: false,
rainType: 1,
-
+ mapArr :[],
tableData: [],
paginations: {
page: 1,
@@ -411,10 +411,6 @@
}
},
methods: {
- showMap(){
- this.$refs.mapShow.isShow = true
- this.$refs.mapShow.getMap()
- },
initLoad() {
var that = this;
var clientHeight = document.documentElement.clientHeight
@@ -462,6 +458,7 @@
},
load(is_export) {
// return
+ this.mapArr = []
listall({
page: this.paginations.page,
page_size: this.paginations.page_size,
@@ -483,6 +480,14 @@
if (m.rain_equipment_info) {
m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail :
""
+ this.mapArr.push([
+ m.rain_equipment_info.longitude,m.rain_equipment_info.latitude,m.rain_equipment_info.address,m.id,m.type
+ ])
+ }
+ if (m.building_site_info) {
+ this.mapArr.push([
+ m.building_site_info.building_site.longitude,m.building_site_info.building_site.latitude,m.building_site_info.building_site.address,m.id,m.type
+ ])
}
}
this.tableData = response.data;
@@ -492,6 +497,43 @@
reject(error)
});
},
+
+ showMap(){
+ // this.loadMap()
+ console.log(this.mapArr)
+ // return
+ this.$refs.maps.pointArr = this.mapArr
+ this.$refs.maps.isShow = true
+ this.$refs.maps.showMaps()
+ this.$refs.maps.selects = this.selects
+ },
+ // 查询地图
+ loadMap(search) {
+ console.log(search)
+ // return
+ this.mapArr = []
+ listall({
+ // page: this.paginations.page,
+ // page_size: this.paginations.page_size,
+ ...this.searchFields
+ }).then(response => {
+ for (var m of response.data) {
+ if (m.rain_equipment_info) {
+ this.mapArr.push([
+ m.rain_equipment_info.longitude,m.rain_equipment_info.latitude,m.rain_equipment_info.address,m.id,m.type
+ ])
+ }
+ if (m.building_site_info) {
+ this.mapArr.push([
+ m.building_site_info.building_site.longitude,m.building_site_info.building_site.latitude,m.building_site_info.building_site.address,m.id,m.type
+ ])
+ }
+ }
+ }).catch(error => {
+ console.log(error)
+ reject(error)
+ });
+ },
handleCurrentChange(page) {
this.paginations.page = page;
this.load();
@@ -533,13 +575,6 @@
this.rainTypeVisible = false
this.rainType = 1
},
-
- showMapInfo(arr){
- console.log(arr)
- let obj = arr[0]
- let type = arr[1]
- this.showInfo(obj,type)
- },
// 审核 办结 查看
showInfo(obj, formtype) {
// 日常雨水设施
diff --git a/src/views/rain/inspection/maps.vue b/src/views/rain/inspection/maps.vue
index b889a1f..2643a5e 100644
--- a/src/views/rain/inspection/maps.vue
+++ b/src/views/rain/inspection/maps.vue
@@ -1,35 +1,393 @@
+
-
-
-
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/views/rain/maintain/components/showCirculationInfo.vue b/src/views/rain/maintain/components/showCirculationInfo.vue
index 5a49029..beaa595 100644
--- a/src/views/rain/maintain/components/showCirculationInfo.vue
+++ b/src/views/rain/maintain/components/showCirculationInfo.vue
@@ -496,5 +496,8 @@
right: 1%;
transform: translate(0%, -50%);
font-size: 60px;
+ }
+ .files_check .el-upload.el-upload--picture-card {
+ display: none;
}
diff --git a/src/views/rain/maintain/components/showDischargeInfo.vue b/src/views/rain/maintain/components/showDischargeInfo.vue
index d07b2eb..4ae5b66 100644
--- a/src/views/rain/maintain/components/showDischargeInfo.vue
+++ b/src/views/rain/maintain/components/showDischargeInfo.vue
@@ -460,5 +460,8 @@
right: 1%;
transform: translate(0%, -50%);
font-size: 60px;
+ }
+ .files_check .el-upload.el-upload--picture-card {
+ display: none;
}
diff --git a/src/views/rain/maintain/components/showMireInfo.vue b/src/views/rain/maintain/components/showMireInfo.vue
index bb1cce1..4bd9e67 100644
--- a/src/views/rain/maintain/components/showMireInfo.vue
+++ b/src/views/rain/maintain/components/showMireInfo.vue
@@ -417,5 +417,8 @@
right: 1%;
transform: translate(0%, -50%);
font-size: 60px;
+ }
+ .files_check .el-upload.el-upload--picture-card {
+ display: none;
}
diff --git a/vue.config.js b/vue.config.js
index ef1894a..1cbd703 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -45,14 +45,14 @@ module.exports = {
},
//before: require('./mock/mock-server.js')
proxy: {
- '^/mapapi': {
- //target: 'http://patrol.115.langye.net/',
- target: "http://192.168.60.22:6080",//'http://192.168.60.100:9001/',
- changeOrigin: true, //配置跨域
- pathRewrite: {
- ['^/mapapi']: 'http://192.168.60.22:6080'
- }
- },
+ // '^/mapapi': {
+ // //target: 'http://patrol.115.langye.net/',
+ // target: "http://172.17.50.65:6080",//'http://192.168.60.100:9001/',
+ // changeOrigin: true, //配置跨域
+ // pathRewrite: {
+ // ['^/mapapi']: 'http://172.17.50.65:6080'
+ // }
+ // },
[process.env.VUE_APP_BASE_API]: {
//target: 'http://patrol.115.langye.net/',
target: process.env.VUE_APP_DOMAIN,//'http://192.168.60.100:9001/',