diff --git a/src/views/capital/index.js b/src/views/capital/index.js
index 8f18a76..e610975 100644
--- a/src/views/capital/index.js
+++ b/src/views/capital/index.js
@@ -8,6 +8,13 @@ import Right11 from './comps/right/top/1/index.vue';
import Right21 from './comps/right/middle/1/index.vue';
import Right31 from './comps/right/bottom/1/index.vue';
+import Right12 from './comps/right/top/2/index.vue';
+
+import { getConfigKey } from "@/api/system/config";
+import { getInfo } from "@/api/login";
+import { treeselect, treeselectByDeptId } from "@/api/system/dept";
+
+import GisUnitls from '@/utils/gis.js';
import { comps } from './data.js'
export default {
@@ -19,12 +26,22 @@ export default {
Left31,
Right11,
Right21,
- Right31
+ Right31,
+ Right12
},
data () {
return {
tab: '1',
- comps
+ comps,
+ map: "", // 地图
+ mapGeoServerUrl: "", // geoserver地址
+ mapBorder: "", // 地图边界
+ deptLayer: "", // 坐标点图层
+ countyBorderLayerName: "", // 区县边界图层名称
+ townBorderLayerName: "", // 乡镇边界图层名称
+ villageBorderLayerName: "", // 村边界图层名称
+ groupBorderLayerName: "", // 组边界图层名称
+ addrOptions: [],
};
},
computed: {
@@ -35,7 +52,56 @@ export default {
created () {
},
mounted () {
+ // 获取geoserver的地址
+ this.getGeoServerUrl();
+ getInfo().then(res => {
+ // this.getData();
+ treeselectByDeptId({ deptId: res.user.deptId }).then((resp) => {
+ this.addrOptions = resp.data;
+ // 初始化地图
+ this.initMap();
+ });
+ });
},
methods: {
+ tabChange (info) {
+ this.tab = info.id;
+ },
+ // 初始化地图
+ initMap () {
+ let dept = this.addrOptions[0];
+ let mapCenterLocation;
+ if (dept.lng && dept.lat) {
+ mapCenterLocation = [dept.lng, dept.lat];
+ } else {
+ mapCenterLocation = [116.391461, 39.902359];
+ }
+
+ let gis = new GisUnitls('map')
+
+ },
+ // 获取geoserver的地址
+ getGeoServerUrl () {
+ // 获取geoserver的地址
+ getConfigKey("system.geoServer.url").then(response => {
+ this.mapGeoServerUrl = response.msg;
+ });
+ // 获取区县边界图层名称
+ getConfigKey("geoserver.layer.countyBorder").then(response => {
+ this.countyBorderLayerName = response.msg;
+ });
+ // 获取乡镇边界的图层名称
+ getConfigKey("geoserver.layer.townBorder").then(response => {
+ this.townBorderLayerName = response.msg;
+ });
+ // 获取村边界的图层名称
+ getConfigKey("geoserver.layer.villageBorder").then(response => {
+ this.villageBorderLayerName = response.msg;
+ });
+ // 获取组边界的图层名称
+ getConfigKey("geoserver.layer.groupBorder").then(response => {
+ this.groupBorderLayerName = response.msg;
+ });
+ }
}
};
diff --git a/vue.config.js b/vue.config.js
index 510ab40..e871203 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,10 +15,9 @@ module.exports = {
disableHostCheck: true,
proxy: {
'/api': {
- // target: 'http://test.credit.country.jilin.expo.loan.cacfintech.com',
- target: 'http://localhost:37300',
- // target: 'http://192.168.124.142:8090',
- logLevel: 'debug',
+ // target: `http://localhost:8080/`, // 本地开发环境
+ target: `http://218.59.175.43:92`, // 内网测试环境
+ // target: `http://116.255.223.226:8082/nsgk_test/`, // 公网测试环境
changeOrigin: true,
onProxyReq: function (proxyReq, req) {
console.log(