Skip to content

F
founder_vue
Commit 565deda3 by liujiani
Options

202109170925

parent 74122c68
Showing with 196 additions and 134 deletions
public/js/EzMapAPI.js
......@@ -74,47 +74,57 @@ var ezMap = {
// format:'tiles',
// style:'default'
// }]
[
"藏蓝色大屏",
"http://172.18.124.72:8082/vtserver/wmts",
// [
// "藏蓝色大屏",
// "http://172.18.124.72:8082/vtserver/wmts",
// {
// type: "group",
// subType: "wmts_sl",
// crs: "4326",
// wrapX: true,
// subLayer: [
// "http://172.18.124.72:8082/vtserver/wmts",
// {
// type: "group",
// subType: "wmts_sl",
// crs: "4326",
// wrapX: false,
// subLayer: [
// "http://172.18.124.72:8082/vtserver/wmts",
// {
// type: "wmts_sl",
// crs: "4326",
// wrapX: false,
// layer: "shangluo",
// styleType: "mapbox",
// styleUrl:
// "http://172.18.124.72:8082/FMapClient8.0.4/lib/shangluo_night.json",
// styleSource: "shangluo",
// },
// ],
// layer: "QG1W",
// styleType: "mapbox",
// styleUrl:
// "http://172.18.124.72:8082/FMapClient8.0.4/lib/qg1w_night.json",
// styleSource: "QG1W",
// },
// ],
// layer: "QQ400",
// styleType: "mapbox",
// styleUrl: "http://172.18.124.72:8082/FMapClient8.0.4/lib/qq_dpzl.json",
// imageSRC: "./FMapClient/images/layer_sldpzanglan.png",
// styleSource: "QQ400",
// },
// ],
['tdt',
"http://11.33.4.0:9001/tiles2/z-{z}/x-{x}/y-{y}.png",
{
type: "group",
subType: "wmts_sl",
crs: "4326",
wrapX: true,
subLayer: [
"http://172.18.124.72:8082/vtserver/wmts",
{
type: "group",
subType: "wmts_sl",
crs: "4326",
wrapX: false,
subLayer: [
"http://172.18.124.72:8082/vtserver/wmts",
{
type: "wmts_sl",
crs: "4326",
wrapX: false,
layer: "shangluo",
styleType: "mapbox",
styleUrl:
"http://172.18.124.72:8082/FMapClient8.0.4/lib/shangluo_night.json",
styleSource: "shangluo",
},
],
layer: "QG1W",
styleType: "mapbox",
styleUrl:
"http://172.18.124.72:8082/FMapClient8.0.4/lib/qg1w_night.json",
styleSource: "QG1W",
},
],
layer: "QQ400",
styleType: "mapbox",
styleUrl: "http://172.18.124.72:8082/FMapClient8.0.4/lib/qq_dpzl.json",
imageSRC: "./FMapClient/images/layer_sldpzanglan.png",
styleSource: "QQ400",
},
type: 'xyz',
crs: '4326',
format: 'tile',
imageSRC: '../images/layer_yingxiang.png',
tileSize:256
}
],
['yxtdt', 'http://172.18.71.238:8088/EzServer7/WMTS?SERVICE=WMTS', {
type: 'wmts',
......
src/api/proLevel.js
......@@ -7,6 +7,7 @@ const userApi = {
delMapServe: "/pgislwcenter/mapservice/delete", // 删除地图服务接口_省
getHis: "/pgislwcenter/mapservice/history/get", // 根据父ID查询地图服务历史日志
delHis: "/pgislwcenter/mapservice/delete/history", // 根据ID删除地图服务历史日志
getHisInfo: "/pgislwcenter/mapservice/get", // 根据ID查询地图服务接口
};
// 查询地图服务接口_省
......@@ -34,6 +35,11 @@ export function getHis(parameter) {
return getRequest(userApi.getHis, parameter);
}
// 根据ID查询地图服务接口
export function getHisInfo(parameter) {
return getRequest(userApi.getHisInfo, parameter);
}
// 根据ID删除地图服务历史日志
export function delHis(parameter) {
return getRequest(userApi.delHis, parameter);
......
src/assets/css/reset.css
......@@ -371,3 +371,6 @@ form .ant-select.levelBoxItem{
.ant-btn{
margin-right: 10px;
}
.ant-descriptions-row > th, .ant-descriptions-row > td {
padding-bottom: 10px;
}
src/components/MinLevel/minMonitor.vue
......@@ -51,7 +51,7 @@
</div>
</div>
<div class="min_monitor_r">
<div class="map" id="ezmap" :class="fullscreenFlag?'mapboxAct':''">
<div class="map" id="ezmapId" :class="fullscreenFlag?'mapboxAct':''">
<div class="fullScreenBtn"><a-icon :type="fullscreenFlag?'fullscreen-exit':'fullscreen'" @click="fullscreenFunc"/></div>
</div>
<div class="tipbox" v-if="tipboxFlag&&tipboxData" :style="{top: positT,left:positL,zIndex:10}">
......@@ -69,7 +69,7 @@
</div>
</div>
<div class="tabbox">
<div class="tabItem" v-for="item in typeList" :key="item.type" @click="getMapFunc(item.type)">
<div class="tabItem" :class="item.type == curType ? 'tabItemAct': ''" v-for="item in typeList" :key="item.type" @click="getMapFunc(item.type)">
<div style="font-size: 16px">{{item.title}}</div>
<div style="display: flex;justify-content: space-evenly">
<span style="color: #33e00a">正常 {{item.normal}} </span>
......@@ -138,7 +138,8 @@ export default {
error: 0
},
]
],
curType: '1'
}
},
methods: {
......@@ -149,11 +150,22 @@ export default {
})
},
initMap(){
// eslint-disable-next-line no-undef
window.ezmap = new EzMap('ezmap', {
mapInitLevel: 12
});
this.getMapFunc(1)
if(!window.ezmap){
// eslint-disable-next-line no-undef
window.ezmap = new EzMap('ezmapId', {
mapInitLevel: 7
});
window.ezmap.showSimpleZoomControl();
let tileLayers = window.ezmap.getTileLayers().getLayers()
tileLayers.clear();
// this.getMapFunc(1)
}else{
this.$nextTick(()=> {
window.ezmap.setTarget();
window.ezmap.setTarget('ezmapId');
})
}
this.getMapFunc(1)
// let tileLayers = window.ezmap.getTileLayers().getLayers()
// tileLayers.clear();
// // eslint-disable-next-line no-undef
......@@ -164,6 +176,7 @@ export default {
// });
},
getMapFunc(type){
this.curType = type
const that = this
getUrl({type}).then(res => {
if(res.result === 'SUCCESS'){
......@@ -371,6 +384,7 @@ export default {
this.initMap()
this.getProListFunc()
this.getStatusFunc()
// this.getMapFunc(1)
// this.getProStatusFunc()
}
}
......@@ -505,7 +519,7 @@ export default {
height: 100%;
top: 0;
left: 0;
/*background: #000000;*/
background: #000000;
z-index: 20;
box-sizing: border-box;
}
......@@ -539,6 +553,10 @@ export default {
flex-direction: column;
justify-content: space-evenly;
background: rgba(52, 111, 183, .2);
border: 1px solid rgba(52, 111, 183, .2);
}
.tabItemAct{
border: 1px solid #0ff;
}
}
.tipbox{
......
src/components/PlatformHead.vue
......@@ -2,7 +2,7 @@
<div class="head">
<div class="head_l">
<div class="logo">
<img src="@/assets/images/titleicon.png"/>
<img src="@/assets/images/titleicon4.png"/>
</div>
<slot name="tabs"></slot>
</div>
......@@ -134,7 +134,7 @@ export default {
height: 78px;
width: 43%;
line-height: 74px;
padding: 0 5%;
padding: 0 3%;
background: #00070f;
img{
width: 100%;
......
src/components/ProLevel/proManage.vue
......@@ -6,7 +6,7 @@
<a-table
class="tableClass"
bordered
:scroll="{x:1200,y:'calc(100vh - 230px)'}"
:scroll="{x:false,y:'calc(100vh - 230px)'}"
:loading="tableLoading"
:columns="tableColumns"
:pagination="false"
......@@ -170,16 +170,20 @@
</a-form-model-item>
<div style="color: #ccc;margin-left: -24px;margin-top: 30px">
<div>注意事项：</div>
<div style="text-indent: 0">1、服务地址：</div>
<div style="text-indent: 15px">WMTS类型格式：http://ip:port/项目名称/wmts?layer={地图名称}</div>
<div style="text-indent: 15px">EzMap类型格式：http://ip:port/项目名称/Maps/{地图名称}/EzMap</div>
<div style="text-indent: 0">1、服务地址说明：</div>
<div style="text-indent: 15px">WMTS格式（天地图）：http://ip:port/服务名称/wmts?layer={地图名称}</div>
<div style="text-indent: 15px">PGIS1.6格式（KVP）：http://ip:port/服务名称/Maps/{地图名称}/EzMap</div>
<div style="text-indent: 0">2、级别说明：</div>
<div style="text-indent: 15px">部级请选择1-12级，省级请选择13-20级</div>
<!-- <div style="text-indent: 15px">省级平台选择13-20级</div>-->
</div>
</a-form-model>
</a-modal>
<a-modal
:bodyStyle="{padding: '10px 20px'}"
title="服务详情"
:width="800"
:width="900"
centered
:visible="infoVisible"
:confirmLoading="loading"
......@@ -267,13 +271,13 @@
<script>
import { getProList, addMapServe, updateMapServe, delMapServe, getHis, delHis } from "@/api/proLevel"
import { getProList, addMapServe, updateMapServe, delMapServe, getHis, getHisInfo, delHis } from "@/api/proLevel"
export default {
name: 'proManage',
data() {
return {
tabList: ['历史信息','驳回信息'],
tabCur: 0,
tabList: ['历史信息','驳回信息'],
tabCur: 0,
tableLoading: false, // table加载
locale: {
emptyText: '暂无数据'
......@@ -350,7 +354,7 @@ export default {
ellipsis: true,
width: 80,
align: 'center',
fixed: 'right'
// fixed: 'right'
},
{
title: '审核状态',
......@@ -359,7 +363,7 @@ export default {
ellipsis: true,
width: 80,
align: 'center',
fixed: 'right'
// fixed: 'right'
},
{
title: '操作',
......@@ -367,7 +371,7 @@ export default {
scopedSlots: { customRender: 'action' },
width: 200,
align: 'center',
fixed: 'right'
// fixed: 'right'
}
], // table title
selectedRowKeys: [],
......@@ -504,13 +508,6 @@ export default {
ellipsis: true,
width: 150,
align: 'center'
},
{
title: '操作',
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
width: 80,
align: 'center'
}
]
}
......@@ -534,7 +531,8 @@ export default {
},
serveInfo(record){
this.infoVisible = true
this.curServeInfo = record
this.curServeInfo = this.deepCopy(record)
this.getHisInfoFunc(record.id)
this.getHisList(record.id)
},
testServeFunc(record){
......@@ -636,6 +634,16 @@ export default {
this.infoVisible = false
this.curServeInfo = null
},
getHisInfoFunc(id){
const that = this
let param = {
id: id
}
// eslint-disable-next-line no-unused-vars
getHisInfo(param).then(res => {
that.curServeInfo.borderRange = res.data.borderRange
})
},
getHisList(id){
const that = this
that.hisTableData = []
......
src/views/login.vue
......@@ -2,7 +2,7 @@
<div class="login" v-if="formFlag">
<div class="login-box">
<div class="title">
<img src="@/assets/images/logotitle1.png"/>
<img src="@/assets/images/logotitle2.png"/>
</div>
<a-form :form="form" class="login-form">
<div class="login-form-title">用户登录</div>
......@@ -231,7 +231,7 @@ export default {
align-items: center;
.title {
margin-top: -40px;
width: 50%;
width: 40%;
margin-bottom: 15px;
img{
width: 100%;
......
src/views/map.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/proMap.vue
......@@ -4,6 +4,8 @@
</div>
</template>
<script>
import {getHisInfo} from "@/api/proLevel";
export default {
name: 'mapTest',
data() {
......@@ -18,28 +20,29 @@
mapInitLevel: 4
});
window.testMap.showSimpleZoomControl();
var tileLayers = window.testMap.getTileLayers().getLayers();
tileLayers.clear();
var proj='EPSG:4326';
var layerName="Merge_1";
var resolutions = new Array(30);
var matrixIds = new Array(30);
for (var z = 0; z < 30; ++z) {
resolutions[z] = 360 / (512 * Math.pow(2, z-1));
matrixIds[z] = z;
}
var pointOpts = {
layer:layerName,
projection:proj,
resolutions:resolutions,
tileSize:512
};
// eslint-disable-next-line no-undef
var layer = new Ez.VectorLayer.WMTS_SL(layerName, "http://11.33.4.235/PGIS_S_VectorTileMap/mvt-layer?datasource=merge&z={z}&x={x}&y={y}&ez_service_token=fd4e74d9e2324f249b85bf891e2775fa&request=GetTile", pointOpts);
// eslint-disable-next-line no-undef,no-unused-vars
var json2Style=new Ez.Json2StyleMapbox(layer, 'http://11.33.4.235/PGIS_TL_VectorTileMap_jyl_ytt?service_token=fd4e74d9e2324f249b85bf891e2775fa&ez_service_token=156eb301152c437e9d4a9ec2ca7db274',layerName,function(){
window.testMap.addLayer(layer);
});
// window.testMap.showSimpleZoomControl();
// var tileLayers = window.testMap.getTileLayers().getLayers();
// tileLayers.clear();
// var proj='EPSG:4326';
// var layerName="Merge_1";
// var resolutions = new Array(30);
// var matrixIds = new Array(30);
// for (var z = 0; z < 30; ++z) {
// resolutions[z] = 360 / (512 * Math.pow(2, z-1));
// matrixIds[z] = z;
// }
// var pointOpts = {
// layer:layerName,
// projection:proj,
// resolutions:resolutions,
// tileSize:512
// };
// // eslint-disable-next-line no-undef
// var layer = new Ez.VectorLayer.WMTS_SL(layerName, "http://11.33.4.235/PGIS_S_VectorTileMap/mvt-layer?datasource=merge&z={z}&x={x}&y={y}&ez_service_token=fd4e74d9e2324f249b85bf891e2775fa&request=GetTile", pointOpts);
// // eslint-disable-next-line no-undef,no-unused-vars
// var json2Style=new Ez.Json2StyleMapbox(layer, 'http://11.33.4.235/PGIS_TL_VectorTileMap_jyl_ytt?service_token=fd4e74d9e2324f249b85bf891e2775fa&ez_service_token=156eb301152c437e9d4a9ec2ca7db274',layerName,function(){
// window.testMap.addLayer(layer);
// });
let wmtslayer = null
let serverUrl = this.record.serviceUrl
......@@ -70,44 +73,44 @@
// let lineStr = 'LINESTRING(110.1166485373685 33.71276920507975,109.9738262717435 33.74023502539225,109.9518536154935 33.65234440039225,109.8090313498685 33.63586490820475,109.7321270529935 33.69628971289225,109.649729592056 33.65234440039225,109.5893047873685 33.75122135351725,109.6002911154935 33.83361881445475,109.5014141623685 33.83361881445475,109.5014141623685 33.99292057226725,109.69367490455602 34.09042423437662,109.74448667213414 34.091797525392245,109.79529843971227 34.06570499609537,109.8406170432279 34.031372720704745,109.8900555197904 33.96957462500162,109.9449871604154 33.959961587892245,109.9394939963529 33.91189640234537,109.99854551002477 33.94210880468912,110.00403867408727 33.880310708985995,110.07544980689977 33.905029947267245,110.06309018775914 33.85147159765787,110.10566220924352 33.85696476172037,110.09742246314977 33.814392740235995,110.1166485373685 33.71276920507975)'
// let lineStr = this.record.borderRange
let lineStr = this.record.borderRange
// eslint-disable-next-line no-undef
// let format = new ol.format.WKT()
// let feature = format.readFeature(lineStr)
let format = new ol.format.WKT()
let feature = format.readFeature(lineStr)
//---------------------wkt格式
// ---------------------wkt格式
// eslint-disable-next-line no-undef
// let source = new ol.source.Vector()
// source.addFeature(feature)
// // eslint-disable-next-line no-undef
// let vectorLayer = new ol.layer.Vector({
// source: source,
// // eslint-disable-next-line no-undef
// style: new ol.style.Style({
// // fill: new ol.style.Fill({
// // color: '#083f6f'
// // }),
// // eslint-disable-next-line no-undef
// stroke: new ol.style.Stroke({
// color: '#075497',
// width: 2
// })
// })
// })
// window.testMap.addLayer(vectorLayer, true)
// window.testMap.getView().fit(feature.getGeometry().getExtent(), window.testMap.getSize());
let source = new ol.source.Vector()
source.addFeature(feature)
// eslint-disable-next-line no-undef
let vectorLayer = new ol.layer.Vector({
source: source,
// eslint-disable-next-line no-undef
style: new ol.style.Style({
// fill: new ol.style.Fill({
// color: '#083f6f'
// }),
// eslint-disable-next-line no-undef
stroke: new ol.style.Stroke({
color: '#075497',
width: 2
})
})
})
window.testMap.addLayer(vectorLayer, true)
window.testMap.getView().fit(feature.getGeometry().getExtent(), window.testMap.getSize());
//---------------------方正格式
// let newStr = feature.getGeometry().getCoordinates().join()
let newStr = this.record.borderRange
// eslint-disable-next-line no-undef
let line = new Ez.g.Polyline(newStr, {
strokeColor: "#ff0000",
strokeWidth: 2
});
window.testMap.addOverlay(line);
// eslint-disable-next-line no-undef
window.testMap.getView().fit(line.getGeometry().getExtent(), window.testMap.getSize());
// // let newStr = feature.getGeometry().getCoordinates().join()
// let newStr = this.record.borderRange
// // eslint-disable-next-line no-undef
// let line = new Ez.g.Polyline(newStr, {
// strokeColor: "#075497",
// strokeWidth: 2
// });
// window.testMap.addOverlay(line);
// // eslint-disable-next-line no-undef
// window.testMap.getView().fit(line.getGeometry().getExtent(), window.testMap.getSize());
// eslint-disable-next-line no-undef
......@@ -156,13 +159,26 @@
// );
// window.testMap.addLayer(wmtslayer);
}
},
getHisInfoFunc(id){
const that = this
let param = {
id: id
}
// eslint-disable-next-line no-unused-vars
getHisInfo(param).then(res => {
that.record.borderRange = res.data.wktBorderRange
}).finally(() => {
that.initMap()
})
},
},
mounted() {
this.initMap()
window.onbeforeunload = function () {
localStorage.removeItem('LW_MAP_INFO');
};
this.getHisInfoFunc(this.record.id)
// this.initMap()
// window.onbeforeunload = function () {
// localStorage.removeItem('LW_MAP_INFO');
// };
},
created (){
this.record = JSON.parse(localStorage.getItem('LW_MAP_INFO'))
......
vue.config.js
......@@ -5,7 +5,7 @@ function resolve(dir) {
module.exports = {
chainWebpack: config => {
config.plugin("html").tap(args => {
args[0].title = "地图联网服务管理平台";
args[0].title = "联网地图服务管理";
return args;
});
},
......@@ -20,7 +20,8 @@ module.exports = {
proxy: {
"/pgislwcenter": {
// target: "http://172.18.110.218:7676",
target: "http://172.18.116.38:7676",
target: "http://172.18.116.69:7676",
// target: "http://172.20.10.3:7676",
ws: true,
pathRewrite: {
"^/pgislwcenter": ""
......
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