Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc
This commit is contained in:
commit
75a76790b8
|
@ -9,9 +9,9 @@ import "./assets/css/common.css";
|
||||||
import zhCn from "element-plus/dist/locale/zh-cn.mjs";
|
import zhCn from "element-plus/dist/locale/zh-cn.mjs";
|
||||||
|
|
||||||
// 引入 vConsole
|
// 引入 vConsole
|
||||||
// import VConsole from "vconsole";
|
import VConsole from "vconsole";
|
||||||
// 初始化 vConsole
|
// 初始化 vConsole
|
||||||
// const vConsole = new VConsole();
|
const vConsole = new VConsole();
|
||||||
|
|
||||||
createApp(App)
|
createApp(App)
|
||||||
.use(router)
|
.use(router)
|
||||||
|
|
|
@ -160,8 +160,8 @@ const login = () => {
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
// var token = getCookie("lytoken");
|
var token = getCookie("lytoken");
|
||||||
var token = "6b0e380b4a8f46baae4923f83faf670d";
|
// var token = "6b0e380b4a8f46baae4923f83faf670d";
|
||||||
|
|
||||||
// console.log('token', token)
|
// console.log('token', token)
|
||||||
if (!token) {
|
if (!token) {
|
||||||
|
|
|
@ -1842,7 +1842,13 @@ const markera = (e) => {
|
||||||
map.removeOverlay(currentMarker);
|
map.removeOverlay(currentMarker);
|
||||||
}
|
}
|
||||||
// 创建新标记
|
// 创建新标记
|
||||||
let icons = new BMapGL.Icon(AED, new BMapGL.Size(24, 62));
|
let sizeIcons = 62;
|
||||||
|
if (totalType.value == 1) {
|
||||||
|
sizeIcons = 48;
|
||||||
|
} else {
|
||||||
|
sizeIcons = 62;
|
||||||
|
}
|
||||||
|
let icons = new BMapGL.Icon(AED, new BMapGL.Size(24, sizeIcons));
|
||||||
var marker = new BMapGL.Marker(new BMapGL.Point(e.latlng.lng, e.latlng.lat), {
|
var marker = new BMapGL.Marker(new BMapGL.Point(e.latlng.lng, e.latlng.lat), {
|
||||||
icon: icons,
|
icon: icons,
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue