修复了一些环境问题

main
许宏杰 2 weeks ago
parent 8fdf92d6d8
commit 58b6bed19a

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 69 KiB

@ -20,7 +20,7 @@
@font-face { @font-face {
font-family: 'Alimama ShuHeiTi-Bold'; font-family: 'Alimama ShuHeiTi-Bold';
src: url("../font/ALIMAMASHUHEITI-BOLD.TTF"); src: url("../font/ALIMAMASHUHEITI-BOLD.ttf");
} }
@font-face { @font-face {
font-family: 'LESLIE'; font-family: 'LESLIE';

@ -21,6 +21,7 @@
import useUserStore from "@/store/modules/user"; import useUserStore from "@/store/modules/user";
const userStore = useUserStore(); const userStore = useUserStore();
import { ElMessageBox } from 'element-plus' import { ElMessageBox } from 'element-plus'
const router = useRouter();
const logout = () => { const logout = () => {
ElMessageBox.confirm("确定注销并退出系统吗?", "提示", { ElMessageBox.confirm("确定注销并退出系统吗?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -29,7 +30,7 @@ const logout = () => {
}) })
.then(() => { .then(() => {
userStore.logOut().then(() => { userStore.logOut().then(() => {
location.href = "/index"; router.replace("/login");
}); });
}) })
.catch(() => {}); .catch(() => {});

@ -204,7 +204,7 @@ export const dynamicRoutes = [
]; ];
const router = createRouter({ const router = createRouter({
history: createWebHistory(), history: createWebHashHistory(),
routes: constantRoutes, routes: constantRoutes,
scrollBehavior(to, from, savedPosition) { scrollBehavior(to, from, savedPosition) {
if (savedPosition) { if (savedPosition) {

@ -166,7 +166,7 @@ const props = defineProps({
const emit = defineEmits(["update:modelValue", "confirm"]); const emit = defineEmits(["update:modelValue", "confirm"]);
// //
const publicPath = window.basePathUrl || ""; const publicPath = window.basePathUrl || "";
const configUrl = publicPath + "/lib/config/config.json"; const configUrl = "lib/config/config.json";
let mapData = null; let mapData = null;
let mapLayer = {}; let mapLayer = {};
let entity = null; let entity = null;

@ -99,8 +99,8 @@ const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const loginForm = ref({ const loginForm = ref({
username: "admin", username: "",
password: "admin123", password: "",
rememberMe: false, rememberMe: false,
code: "", code: "",
uuid: "", uuid: "",

@ -86,7 +86,7 @@ const checkList = ref([]);
const dialogVisible = ref(false); const dialogVisible = ref(false);
const title = ref("现场视频"); const title = ref("现场视频");
// //
const configUrl = publicPath + "/lib/config/config.json"; const configUrl = "lib/config/config.json";
let mapData = null; let mapData = null;
let mapLayer = {}; let mapLayer = {};
@ -127,7 +127,7 @@ const initGd = () => {
// //
const initAreaCover = async () => { const initAreaCover = async () => {
const jsonData = await mars3d.Util.fetchJson({ const jsonData = await mars3d.Util.fetchJson({
url: `${publicPath}/lib/geoJson/xuhuiArea.json`, url: `lib/geoJson/xuhuiArea.json`,
}); });
const arr = mars3d.Util.geoJsonToGraphics(jsonData); // geojson const arr = mars3d.Util.geoJsonToGraphics(jsonData); // geojson
@ -317,7 +317,7 @@ const inintEntity = (data, fill = false, height) => {
*/ */
const initStyleFeatures = async () => { const initStyleFeatures = async () => {
const jsonData = await mars3d.Util.fetchJson({ const jsonData = await mars3d.Util.fetchJson({
url: `${publicPath}/lib/geoJson/park-rectangle.json`, url: `lib/geoJson/park-rectangle.json`,
}); });
const arr = mars3d.Util.geoJsonToGraphics(jsonData); // geojson const arr = mars3d.Util.geoJsonToGraphics(jsonData); // geojson
inintEntity(arr[0], false); inintEntity(arr[0], false);

Loading…
Cancel
Save