Commit 3539c035 by 李萌萌

对接运维的登陆/二维地图底图显示隐藏按钮

parent 51eee0f6
......@@ -15,6 +15,7 @@
"element-ui": "^2.4.5",
"file-saver": "^2.0.5",
"js-cookie": "^2.2.1",
"js-md5": "^0.7.3",
"qs": "^6.9.4",
"sass-resources-loader": "^2.1.1",
"vue": "^2.6.11",
......
/*
* @Author: your name
* @Date: 2021-08-06 16:33:48
* @LastEditTime: 2021-08-06 16:37:21
* @LastEditTime: 2021-08-30 15:53:13
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\api\login.js
......@@ -10,7 +10,7 @@
import { get, post } from "@/utils/http.js";
const userApi = {
loginFunc: "/pgislwcenter/login", // 登录
loginMD5Func: "/pgislwcenter/login/byAccount", // MD5登录
loginMD5Func: "http://172.18.124.93:8787/fmanager/nuserlogin/oUserLogin", // MD5登录
logoutFunc: "/pgislwcenter/logout" // 登出
};
......
import axios from "axios";
// import { getToken } from "./auth.js";
import { Message,MessageBox } from "element-ui";
import { Message, MessageBox } from "element-ui";
import qs from "qs";
axios.defaults.timeout = 0;
axios.defaults.headers = {
"X-Requested-With": "XMLHttpRequest"
"X-Requested-With": "XMLHttpRequest",
};
axios.defaults.responseType = "json";
// axios.defaults.withCredentials = true;
var instance = axios.create({
headers: { "content-type": "multipart/form-data" }
headers: { "content-type": "multipart/form-data" },
});
var down = axios.create({
headers: { "content-type": "multipart/form-data" }
headers: { "content-type": "multipart/form-data" },
});
down.defaults.responseType = "arraybuffer";
var raw_json = axios.create({
headers: { "content-type": "application/json" },
});
// request 请求拦截器
axios.interceptors.request.use(
config => {
(config) => {
config.headers["Content-Type"] = "application/x-www-form-urlencoded";
return config;
},
error => {
(error) => {
return Promise.reject(error);
}
);
// response 响应拦截器
axios.interceptors.response.use(
response => {
(response) => {
const status = response.data.code;
const message = response.data.message;
var relUrlIp = window.location.host.substring(
0,
window.location.host.length - 5
);
var self = this
var self = this;
if (status == "202") {
MessageBox.confirm("系统登录超时,请重新登录", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
if(relUrlIp =='47.92.225.109' ){
// window.open('http://47.92.225.109:8300/#/login', '_blank')
window.location.href = 'http://47.92.225.109:8300/#/login';
}else if(relUrlIp =='26.3.13.120'){
window.location.href = 'http://26.3.13.120:8050/#/login';
}else if(relUrlIp =='10.142.16.177'){
window.location.href = 'http://10.142.16.177:8050/#/login';
} else{
// window.open('http://localhost:8080/#/login', '_blank')
window.location.href = 'http://localhost:8080/#/login';
}
})
}).then(() => {
if (relUrlIp == "47.92.225.109") {
// window.open('http://47.92.225.109:8300/#/login', '_blank')
window.location.href = "http://47.92.225.109:8300/#/login";
} else if (relUrlIp == "26.3.13.120") {
window.location.href = "http://26.3.13.120:8050/#/login";
} else if (relUrlIp == "10.142.16.177") {
window.location.href = "http://10.142.16.177:8050/#/login";
} else {
// window.open('http://localhost:8080/#/login', '_blank')
window.location.href = "http://localhost:8080/#/login";
}
});
}
if (status < 0) {
Message({
message: message,
type: "error"
type: "error",
});
return Promise.reject(new Error(message));
}
return response.data;
},
error => {
(error) => {
return Promise.reject(new Error(error));
}
);
instance.interceptors.response.use(
response => {
(response) => {
const status = response.data.code;
const message = response.data.message;
if (status < 0) {
Message({
message: message,
type: "error"
type: "error",
});
return Promise.reject(new Error(message));
}
return response.data;
},
error => {
(error) => {
return Promise.reject(new Error(error));
}
);
......@@ -103,12 +106,12 @@ export function get(url, params) {
return new Promise((resolve, reject) => {
axios
.get(url, {
params: params
params: params,
})
.then(res => {
.then((res) => {
resolve(res.data);
})
.catch(err => {
.catch((err) => {
reject(err.data);
});
});
......@@ -122,12 +125,12 @@ export function get(url, params) {
export function post(url, params) {
return new Promise((resolve, reject) => {
axios
.post(url, qs.stringify(params))
.then(response => {
raw_json
.post(url, params)
.then((response) => {
resolve(response);
})
.catch(err => {
.catch((err) => {
reject(err.data);
});
});
......@@ -141,10 +144,10 @@ export function post(url, params) {
*/
export function postform(url, data) {
return new Promise((resolve, reject) => {
instance.post(url, data).then(response => {
instance.post(url, data).then((response) => {
resolve(response);
});
}).catch(err => {
}).catch((err) => {
reject(err.data);
});
}
......@@ -157,10 +160,10 @@ export function postform(url, data) {
*/
export function postdown(url, data) {
return new Promise((resolve, reject) => {
down.post(url, data).then(response => {
down.post(url, data).then((response) => {
resolve(response);
});
}).catch(err => {
}).catch((err) => {
reject(err.data);
});
}
......
/*
* @Author: your name
* @Date: 2021-08-11 14:55:07
* @LastEditTime: 2021-08-27 17:33:26
* @LastEditTime: 2021-08-30 18:52:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\utils\map.js
......@@ -14,6 +14,7 @@ const addVectorLayer = function() {
const source = new ol.source.Vector();
const vector = new ol.layer.Vector({
source: source,
zIndex: Infinity,
style: function(fea) {
let offsetY = fea.get("type") === "Point" ? -20 : 0;
return new ol.style.Style({
......@@ -39,7 +40,8 @@ const addVectorLayer = function() {
});
},
});
window.map.addLayer(vector, true);
vector.setMap(window.map);
// window.map.addLayer(vector, true);
_source = source;
return vector;
};
......@@ -278,3 +280,17 @@ function add3DLayer(obj) {
tempLayer = window.viewer.imageryLayers.addImageryProvider(imgLayer);
return tempLayer;
}
export function changeMapBaselayerVisible(visible) {
var _layerArr = window.map.getLayers().getArray();
_layerArr.forEach((layer) => {
if (layer.getLayersArray().includes(_2dlayer)) {
layer.getLayersArray().forEach((childLayer) => {
if (childLayer !== _2dlayer) {
childLayer.setVisible(visible);
}
});
} else {
layer.setVisible(visible);
}
});
}
<!--
* @Author: LMM
* @Date: 2021-08-11 10:43:50
* @LastEditTime: 2021-08-26 10:48:20
* @LastEditTime: 2021-08-30 18:32:37
* @LastEditors: Please set LastEditors
* @Description: 右上角地图工具
* @FilePath: \founder_vue\src\views\block\mapTool.vue
......@@ -18,6 +18,10 @@
<div class="toolItem" @click="measureline">测距</div>
<img :src="shuxian" />
<div class="toolItem" @click="measurearea">测面</div>
<img :src="shuxian" />
<div class="toolItem" @click="hideBaseMap">
{{ idHideBaseMap ? "隐藏底图" : "显示底图" }}
</div>
</div>
<div v-show="isShowDrawToolBox" class="drawToolBox">
<div class="drawToolItem" @click="draw('Point')"></div>
......@@ -39,12 +43,17 @@
<script>
import img from "../../assets/img/shuxian.png";
import PopupOverlay from "../map/PopupOverlay.vue";
import { addDrawInteractions, removeInteraction } from "../../utils/map";
import {
addDrawInteractions,
removeInteraction,
changeMapBaselayerVisible,
} from "../../utils/map";
export default {
components: { PopupOverlay },
name: "mapToolBlk",
data() {
return {
idHideBaseMap: true,
shuxian: img,
isShowDrawToolBox: false,
offset: [],
......@@ -104,6 +113,10 @@ export default {
this.isInfo = false;
this.isShowPopup = false;
},
hideBaseMap() {
this.idHideBaseMap = !this.idHideBaseMap;
changeMapBaselayerVisible(this.idHideBaseMap);
},
},
};
</script>
......
......@@ -49,6 +49,7 @@
<script>
import { loginFunc, loginMD5Func } from "@/api/login";
import md5 from "js-md5";
export default {
name: "Login",
components: {},
......@@ -67,86 +68,55 @@ export default {
},
methods: {
init() {
this.formFlag = true;
return;
const that = this;
const accountMD5 = this.getQueryVariable("account");
const formType = this.getQueryVariable("type");
if (formType) {
if (formType === "form") {
this.form.account = this.getQueryVariable("username");
this.form.password = this.getQueryVariable("password");
this.handleSubmit("form");
}
} else if (accountMD5) {
const params = {
account: accountMD5,
};
loginMD5Func(params)
.then((res) => {
if (res.result === "SUCCESS") {
sessionStorage.setItem("userdata", JSON.stringify(res.data));
let platList = res.data.list.platList;
let flag = false;
let authList = res.data.list.authList;
for (let i = 0; i < platList.length; i++) {
if (platList[i].code == "DTLW-100-PT") {
flag = true;
}
const params = {
fLoginRequest: {
account: "wxx",
password: "123456",
},
};
loginMD5Func(params)
.then((res) => {
if (res.result === "SUCCESS") {
sessionStorage.setItem("userdata", JSON.stringify(res.data));
let platList = res.data.list.platList;
let flag = false;
let authList = res.data.list.authList;
for (let 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) {
that.$router.push({ path: "/403" });
}
if (!flag) {
that.$router.push({ path: "/403" });
}
for (let j = 0; j < authList.length; j++) {
if (authList[j].code === "DTLW-101") {
// that.$message.success("登录成功!")
that.$router.push({ path: "/home" });
return;
}
for (let j = 0; j < authList.length; j++) {
if (authList[j].code === "DTLW-101") {
// that.$message.success("登录成功!")
that.$router.push({ path: "/home" });
return;
}
if (authList[j].code === "DTLW-102") {
// that.$message.success("登录成功!")
that.$router.push({ path: "/index" });
return;
}
if (authList[j].code === "DTLW-102") {
// that.$message.success("登录成功!")
that.$router.push({ path: "/index" });
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 {
this.$router.push({ path: "/403" });
}
})
.catch(() => {
this.$message.error("登录失败");
})
.finally(() => {
this.loginBtn = false;
});
} else {
this.formFlag = true;
}
},
getQueryVariable(variable) {
const query = window.location.href.split("?")[1];
if (query) {
const vars = query.split("&");
for (let i = 0; i < vars.length; i++) {
let pair = vars[i].split("=");
if (pair[0] === variable) {
return pair[1];
} else {
this.$router.push({ path: "/403" });
}
}
}
return false;
})
.catch(() => {
this.$message.error("登录失败");
})
.finally(() => {
this.loginBtn = false;
});
},
handleSubmit(type) {
const that = this;
......@@ -160,18 +130,18 @@ export default {
this.loginBtn = false;
return false;
}
that.$router.push({ path: "/home" });
return;
loginFunc(this.form)
.then((res) => {
// that.$router.push({ path: "/home" });
// return;
this.form.password = md5(this.form.password);
loginMD5Func(this.form)
.then((result) => {
const res=result.data;
if (res.result === "SUCCESS") {
sessionStorage.setItem("userdata", JSON.stringify(res.data));
let platList = res.data.list.platList;
let platList = res.data.platList;
let flag = false;
let authList = res.data.list.authList;
let authList = res.data.authList;
for (let i = 0; i < platList.length; i++) {
if (platList[i].code == "DTLW-100-PT") {
flag = true;
......
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