Commit 759509fe by liujiani

202111171657

parent 565deda3
const a = 1 const PGISCenterUrl = 'http://pgis.ga'
console.log(a) window.PGISCenterUrl = PGISCenterUrl
...@@ -163,6 +163,7 @@ var ezMap = { ...@@ -163,6 +163,7 @@ var ezMap = {
MapInitLevel: 5, MapInitLevel: 5,
// MapInitLevel: 12, // MapInitLevel: 12,
MapMinLevel: 2, MapMinLevel: 2,
MapMaxLevel: 20,
isTitleArea: true, isTitleArea: true,
loadTilesWhileAnimating: false loadTilesWhileAnimating: false
}; };
......
...@@ -13,8 +13,14 @@ const userApi = { ...@@ -13,8 +13,14 @@ const userApi = {
getTypeSum: "/pgislwcenter/mapservice/province/status/type/sum/get", // 获取省厅服务状态分类统计接口 getTypeSum: "/pgislwcenter/mapservice/province/status/type/sum/get", // 获取省厅服务状态分类统计接口
getStatus: "/pgislwcenter/mapservice/status/type/sum/get", // 获取服务状态分类统计接口 getStatus: "/pgislwcenter/mapservice/status/type/sum/get", // 获取服务状态分类统计接口
updateSort1: '/pgislwcenter/mapservice/weight/update', // 更新权重值接口 updateSort1: '/pgislwcenter/mapservice/weight/update', // 更新权重值接口
getBorder: '/pgislwcenter/mapservice/border/get', // 获取边界
}; };
// 获取边界
export function getBorder(parameter) {
return getRequest(userApi.getBorder, parameter);
}
// 查询地图服务接口_省 // 查询地图服务接口_省
export function getOrgList(parameter) { export function getOrgList(parameter) {
return getRequest(userApi.getOrgList, parameter); return getRequest(userApi.getOrgList, parameter);
......
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
} }
.overflowDiv{ .overflowDiv{
width: 99%; width: 99%;
max-height: 100px; max-height: 80px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
word-break: break-all; word-break: break-all;
......
...@@ -301,6 +301,10 @@ ...@@ -301,6 +301,10 @@
<a-descriptions-item label="最大级别"> <a-descriptions-item label="最大级别">
{{curServeInfo.maxValue}} {{curServeInfo.maxValue}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="日期">
{{curServeInfo.createTime}}
</a-descriptions-item>
<a-descriptions-item label=""></a-descriptions-item>
<a-descriptions-item label="边界值"> <a-descriptions-item label="边界值">
<div class="overflowDiv">{{curServeInfo.borderRange}}</div> <div class="overflowDiv">{{curServeInfo.borderRange}}</div>
<div class="clear"></div> <div class="clear"></div>
...@@ -319,7 +323,7 @@ ...@@ -319,7 +323,7 @@
<a-table <a-table
class="tableClass" class="tableClass"
bordered bordered
:scroll="{x:false,y:'calc(100vh - 500px)'}" :scroll="{x:false,y:'calc(100vh - 570px)'}"
:loading="hisTableLoading" :loading="hisTableLoading"
:columns="hisTableColumns" :columns="hisTableColumns"
:pagination="false" :pagination="false"
...@@ -1014,6 +1018,10 @@ export default { ...@@ -1014,6 +1018,10 @@ export default {
} }
}) })
} }
if(params.ids.length < 1) {
this.$message.info('请至少选择一个要发布的服务')
return
}
this.spinning = true this.spinning = true
syncServe(params).then(res => { syncServe(params).then(res => {
if (res.result === 'SUCCESS') { if (res.result === 'SUCCESS') {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<!-- </div>--> <!-- </div>-->
<div class="con1"> <div class="con1">
<div class="con1Title"> <div class="con1Title">
<div class="con1TitleItem" style="width: 60px;">开关</div>
<div class="con1TitleItem">省名称</div> <div class="con1TitleItem">省名称</div>
<div class="con1TitleItem">矢量栅格</div> <div class="con1TitleItem">矢量栅格</div>
<div class="con1TitleItem">影像栅格</div> <div class="con1TitleItem">影像栅格</div>
...@@ -29,6 +30,9 @@ ...@@ -29,6 +30,9 @@
</div> </div>
<div class="con1Con"> <div class="con1Con">
<div class="con1ConItem" v-for="item in proList" :key="item.orgCode"> <div class="con1ConItem" v-for="item in proList" :key="item.orgCode">
<div class="con1ConItemCon" style="width: 60px;">
<a-switch @change="onChange($event,item)"/>
</div>
<div class="con1ConItemCon">{{item.orgName}}</div> <div class="con1ConItemCon">{{item.orgName}}</div>
<div class="con1ConItemCon"> <div class="con1ConItemCon">
<span v-if="item['1']==0" style="display:inline-block;width:80%;border-bottom: 5px solid #fd0d03;"></span> <span v-if="item['1']==0" style="display:inline-block;width:80%;border-bottom: 5px solid #fd0d03;"></span>
...@@ -83,7 +87,7 @@ ...@@ -83,7 +87,7 @@
</template> </template>
<script> <script>
import { getProStatus, getUrl, getTypeSum, getStatus } from "@/api/minLevel" import { getProStatus, getUrl, getTypeSum, getStatus, getBorder } from "@/api/minLevel"
export default { export default {
name: 'minMonitor', name: 'minMonitor',
data(){ data(){
...@@ -143,6 +147,61 @@ export default { ...@@ -143,6 +147,61 @@ export default {
} }
}, },
methods: { methods: {
randomRgbaColor() { //随机生成RGBA颜色
var r = Math.floor(Math.random() * 256); //随机生成256以内r值
var g = Math.floor(Math.random() * 256); //随机生成256以内g值
var b = Math.floor(Math.random() * 256); //随机生成256以内b值
return {
border: `rgb(${r},${g},${b},0.8)`,
fill: `rgba(${r},${g},${b},0.1)`
}
},
onChange(e,item) {
const that = this
if(e){
const params = {
orgCode: item.orgCode
}
getBorder(params).then(res =>{
if(res.result === 'SUCCESS'){
let color = that.randomRgbaColor()
let lineStr = res.data
// eslint-disable-next-line no-undef
let format = new ol.format.WKT()
let feature = format.readFeature(lineStr)
// eslint-disable-next-line no-undef
let source = new ol.source.Vector()
source.addFeature(feature)
// eslint-disable-next-line no-undef
item.polygonObj = new ol.layer.Vector({
source: source,
// eslint-disable-next-line no-undef
style: new ol.style.Style({
// eslint-disable-next-line no-undef
fill: new ol.style.Fill({
color: color.fill
}),
// eslint-disable-next-line no-undef
stroke: new ol.style.Stroke({
color: color.border,
width: 1
})
})
})
window.ezmap.addLayer(item.polygonObj, true)
var ext= feature.getGeometry().getExtent();
var center=[(ext[0]+ext[2])/2,(ext[1]+ext[3])/2];
window.ezmap.getView().setCenter(center)
}else{
that.$message.info(res.msg)
}
})
}else {
if(item.polygonObj){
window.ezmap.removeLayer(item.polygonObj, true)
}
}
},
fullscreenFunc(){ fullscreenFunc(){
this.fullscreenFlag = !this.fullscreenFlag this.fullscreenFlag = !this.fullscreenFlag
this.$nextTick(()=> { this.$nextTick(()=> {
...@@ -386,6 +445,9 @@ export default { ...@@ -386,6 +445,9 @@ export default {
this.getStatusFunc() this.getStatusFunc()
// this.getMapFunc(1) // this.getMapFunc(1)
// this.getProStatusFunc() // this.getProStatusFunc()
},
destroyed() {
window.ezmap.clear()
} }
} }
</script> </script>
...@@ -512,6 +574,7 @@ export default { ...@@ -512,6 +574,7 @@ export default {
.map{ .map{
width: 100%; width: 100%;
height: calc(100% - 100px); height: calc(100% - 100px);
background: #fff;
} }
.mapboxAct{ .mapboxAct{
position: fixed; position: fixed;
...@@ -519,7 +582,7 @@ export default { ...@@ -519,7 +582,7 @@ export default {
height: 100%; height: 100%;
top: 0; top: 0;
left: 0; left: 0;
background: #000000; background: #fff;
z-index: 20; z-index: 20;
box-sizing: border-box; box-sizing: border-box;
} }
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<span class="test" @click="testServeFunc(record)">测试</span> <span class="test" @click="testServeFunc(record)">测试</span>
</span> </span>
</a-table> </a-table>
<div style="position: fixed;bottom: 0;color: #fff;">@Copyright © 公安部科技信息化局版权所有 技术支持电话:010-66262536 13581616486 </div>
<a-modal <a-modal
:title="title" :title="title"
:width="600" :width="600"
...@@ -220,6 +221,10 @@ ...@@ -220,6 +221,10 @@
<a-descriptions-item label="最大级别"> <a-descriptions-item label="最大级别">
{{curServeInfo.maxValue}} {{curServeInfo.maxValue}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="日期">
{{curServeInfo.createTime}}
</a-descriptions-item>
<a-descriptions-item label=""></a-descriptions-item>
<a-descriptions-item label="边界值"> <a-descriptions-item label="边界值">
<div class="overflowDiv">{{curServeInfo.borderRange}}</div> <div class="overflowDiv">{{curServeInfo.borderRange}}</div>
<div class="clear"></div> <div class="clear"></div>
...@@ -238,7 +243,7 @@ ...@@ -238,7 +243,7 @@
<a-table <a-table
class="tableClass" class="tableClass"
bordered bordered
:scroll="{x:false,y:'calc(100vh - 500px)'}" :scroll="{x:false,y:'calc(100vh - 570px)'}"
:loading="hisTableLoading" :loading="hisTableLoading"
:columns="hisTableColumns" :columns="hisTableColumns"
:pagination="false" :pagination="false"
......
...@@ -41,6 +41,7 @@ const routes = [ ...@@ -41,6 +41,7 @@ const routes = [
} }
] ]
console.log(window.PGISCenterUrl)
const router = new VueRouter({ const router = new VueRouter({
base: process.env.BASE_URL, base: process.env.BASE_URL,
routes routes
...@@ -53,7 +54,8 @@ router.beforeEach((to, from, next) => { ...@@ -53,7 +54,8 @@ router.beforeEach((to, from, next) => {
next(); next();
} else { } else {
if (token === null || token === "" || token === "null") { if (token === null || token === "" || token === "null") {
next("/login"); // next("/login");
window.location.href = window.PGISCenterUrl
} else { } else {
next(); next();
} }
......
...@@ -17,7 +17,7 @@ const request = axios.create({ ...@@ -17,7 +17,7 @@ const request = axios.create({
baseURL: url baseURL: url
// timeout: 20000 // 请求超时时间 // timeout: 20000 // 请求超时时间
}); });
console.log(window.PGISCenterUrl)
// 异常拦截处理器 // 异常拦截处理器
const errorHandler = error => { const errorHandler = error => {
if (error.response) { if (error.response) {
...@@ -34,7 +34,8 @@ const errorHandler = error => { ...@@ -34,7 +34,8 @@ const errorHandler = error => {
description: "请登录后重试或联系系统管理员。" description: "请登录后重试或联系系统管理员。"
}); });
sessionStorage.removeItem("userdata"); sessionStorage.removeItem("userdata");
window.location.reload(); // window.location.reload();
window.location.href = window.PGISCenterUrl
} }
if (error.response.status === 500) { if (error.response.status === 500) {
notification.error({ notification.error({
......
...@@ -97,20 +97,6 @@ export default { ...@@ -97,20 +97,6 @@ export default {
return return
} }
} }
// sessionStorage.setItem("userdata", JSON.stringify(res.data));
// var platList = res.data.platList;
// var flag = false;
// for (var i = 0; i < platList.length; i++) {
// if (platList[i].code == "DTLW-100-PT") {
// flag = true;
// this.$message.success("登录成功!");
// this.$router.push({ path: "/home" });
// return;
// }
// }
// if (!flag) {
// this.$router.push({ path: "/403" });
// }
} else { } else {
this.$router.push({ path: "/403" }); this.$router.push({ path: "/403" });
} }
...@@ -163,9 +149,6 @@ export default { ...@@ -163,9 +149,6 @@ export default {
for (let i = 0; i < platList.length; i++) { for (let i = 0; i < platList.length; i++) {
if (platList[i].code == "DTLW-100-PT") { if (platList[i].code == "DTLW-100-PT") {
flag = true; flag = true;
// that.$message.success("登录成功!")
// that.$router.push({ path: "/home" })
// return true
} }
} }
if (!flag) { if (!flag) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<template> <template>
<div class="mapbox"> <div class="mapbox">
<div id="testMap"></div> <div id="testMap"></div>
<div class="toolbox">
<div class="showLayer" style="margin-right: 10px">
底图开关:
<a-switch @change="showLayerFunc"/>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -14,6 +20,13 @@ ...@@ -14,6 +20,13 @@
} }
}, },
methods: { methods: {
showLayerFunc(checked){
if(checked){
window.testMap.getLayers().array_[0].getLayers().array_[0].setMaxZoom(20)
}else{
window.testMap.getLayers().array_[0].getLayers().array_[0].setMaxZoom(12)
}
},
initMap() { initMap() {
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
window.testMap = new EzMap('testMap', { window.testMap = new EzMap('testMap', {
...@@ -53,6 +66,7 @@ ...@@ -53,6 +66,7 @@
crs: '4326', crs: '4326',
layer: serverUrlArr[1].split('=')[1] layer: serverUrlArr[1].split('=')[1]
}); });
wmtslayer.setMinZoom(12)
window.testMap.addLayer(wmtslayer); window.testMap.addLayer(wmtslayer);
}else{ }else{
let serverUrlarr = serverUrl.split('/EzMap') let serverUrlarr = serverUrl.split('/EzMap')
...@@ -63,15 +77,12 @@ ...@@ -63,15 +77,12 @@
// layer: serverUrlarr1 // layer: serverUrlarr1
// }); // });
// window.testMap.addLayer(wmtslayer); // window.testMap.addLayer(wmtslayer);
// eslint-disable-next-line no-irregular-whitespace,no-undef // eslint-disable-next-line no-irregular-whitespace,no-undef
let _2dlayer = new Ez.TileLayer.TDT(serverUrlarr1, serverUrlarr[0]) let _2dlayer = new Ez.TileLayer.TDT(serverUrlarr1, serverUrlarr[0])
_2dlayer.setMinZoom(12)
window.testMap.addLayer(_2dlayer) window.testMap.addLayer(_2dlayer)
} }
// 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 = '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 // eslint-disable-next-line no-undef
...@@ -99,6 +110,7 @@ ...@@ -99,6 +110,7 @@
}) })
window.testMap.addLayer(vectorLayer, true) window.testMap.addLayer(vectorLayer, true)
window.testMap.getView().fit(feature.getGeometry().getExtent(), window.testMap.getSize()); window.testMap.getView().fit(feature.getGeometry().getExtent(), window.testMap.getSize());
window.testMap.zoomTo(parseInt(window.testMap.getZoom()))
//---------------------方正格式 //---------------------方正格式
// // let newStr = feature.getGeometry().getCoordinates().join() // // let newStr = feature.getGeometry().getCoordinates().join()
...@@ -158,7 +170,7 @@ ...@@ -158,7 +170,7 @@
// } // }
// ); // );
// window.testMap.addLayer(wmtslayer); // window.testMap.addLayer(wmtslayer);
window.testMap.getLayers().array_[0].getLayers().array_[0].setMaxZoom(12)
}, },
getHisInfoFunc(id){ getHisInfoFunc(id){
const that = this const that = this
......
...@@ -20,8 +20,9 @@ module.exports = { ...@@ -20,8 +20,9 @@ module.exports = {
proxy: { proxy: {
"/pgislwcenter": { "/pgislwcenter": {
// target: "http://172.18.110.218:7676", // target: "http://172.18.110.218:7676",
target: "http://172.18.116.69:7676", target: "http://172.20.10.3:7676",
// target: "http://172.20.10.3:7676", // target: "http://172.18.124.36:7676",
// target: "http://59.109.37.252:7676",
ws: true, ws: true,
pathRewrite: { pathRewrite: {
"^/pgislwcenter": "" "^/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