From a2b8cd74e97dc784657710c46c4968c2e6f0af55 Mon Sep 17 00:00:00 2001
From: 13684185576 <2731628804@qq.com>
Date: Tue, 22 Jul 2025 09:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user-manage.js                        |  2 +-
 src/components/GdMap/index.vue                | 60 ++++++++++---------
 .../GdMap/{indexnw.vue => indexnw2.vue}       | 60 +++++++++----------
 src/router/index.js                           |  5 ++
 src/store/modules/user.js                     |  2 +-
 src/views/login/oatuh_login.vue               | 43 +++++++++++++
 vue.config.js                                 |  2 +-
 7 files changed, 111 insertions(+), 63 deletions(-)
 rename src/components/GdMap/{indexnw.vue => indexnw2.vue} (90%)
 create mode 100644 src/views/login/oatuh_login.vue

diff --git a/src/api/user-manage.js b/src/api/user-manage.js
index a28d311..a53a9b8 100644
--- a/src/api/user-manage.js
+++ b/src/api/user-manage.js
@@ -599,7 +599,7 @@ export const selectUserDeptPage = (data = {}) => {
 ///unifiedLogin
 export const unifiedLogin = (data) => {
   return request({
-    url: api + `/unifiedLogin`,
+    url: api + `/ssoLogin`,
     method: "POST",
     data
   });
diff --git a/src/components/GdMap/index.vue b/src/components/GdMap/index.vue
index 5e5ad06..e40ec40 100644
--- a/src/components/GdMap/index.vue
+++ b/src/components/GdMap/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div :id="mapid" class="map"></div>
   <div class="changeMap_box" v-if="props.isShow">
-    <el-switch v-model="conditionRoute" @change="handleSwitch" active-text="打开路况" inactive-text="关闭路况" style="--el-switch-color:#13ce66;--el-switch-off-color:#ff4949;" />
+    <el-switch v-model="conditionRoute" @change="handleSwitch" active-text="打开路况" inactive-text="关闭路况"
+      style="--el-switch-color: #13ce66; --el-switch-off-color: #ff4949" />
     <!-- <el-carousel type="card" height="75px" :autoplay="false" indicator-position="none" :initial-index="3"  @change="onMapImageChange">
       <el-carousel-item>
         <div class="mapImageItem">
@@ -74,7 +75,7 @@ const props = defineProps({
 });
 try {
   const userInfo = getItem("deptId")[0].deptCode;
-} catch (error) {}
+} catch (error) { }
 let map;
 let mapLayer;
 let mapLayer1;
@@ -88,27 +89,32 @@ onMounted(() => {
 
   map = new EliMap({
     id: props.mapid,
-    crs: "EPSG:3857",
+    crs: "EPSG:4490",
     style: {
       glyphs: "./fonts/{fontstack}/{range}.pbf",
-      center: [94.36,29.65],
-      zoom: 10
+      center: [94.36057012, 29.64276831],
+      zoom: 15
     },
-    transformRequest: (url) => {
-      if (url.indexOf("TileMatrix=") != -1) {
-        const arr = url.split("TileMatrix=");
-        const arr1 = arr[1].split("&");
-        const nurl = `${arr[0]}&TileMatrix=${Number(arr1[0])}&${arr1[1]}&${arr1[2]}`;
-
-      }
-    }
+    minZoom: 7,
+    maxZoom: 18,
   });
-
   window.map = map;
   map.mapboxGLMap.on("load", () => {
-     map.addGaudLayer({
-      url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-    })
+    map.addWMTSLayer(
+      "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap",
+      {
+        Service: "getImage",
+        Type: "RGB",
+        ZoomOffset: "0",
+        V: "0.3",
+        Zoom: "{z}",
+        Row: "{y}",
+        Col: "{x}"
+      },
+      {
+        tileSize: 300
+      }
+    );
     zoomTarget.value = map.mapboxGLMap.getZoom();
   });
   mapUtil.value = new MapUtil(map);
@@ -128,8 +134,6 @@ onMounted(() => {
   });
   // 撒点
   emitter.on("addPointArea", (obj) => {
-    console.log(obj);
-
     mapUtil.value.makerSki(obj);
   });
   // 鼠标滑过提示文字的点位
@@ -168,7 +172,7 @@ onMounted(() => {
   });
   // 回显线
   emitter.on("echoLine", (res) => {
-    mapUtil.value.createLine(res);
+    mapUtil.value.createLine(res, res.flag);
   });
   //创建边界面（geojson）
   emitter.on("setBoundarys", (res) => {
@@ -199,11 +203,6 @@ onMounted(() => {
     mapUtil.value.diffusionCircle(res);
   });
 
-  // 清除全部覆盖物
-  emitter.on("removeElementAll", () => {
-    mapUtil.value.removeElementAll();
-  });
-
   // 展示盘曲
   emitter.on("showGapText", (obj) => {
     mapUtil.value.gapText(obj);
@@ -302,7 +301,6 @@ onUnmounted(() => {
   emitter.off("diffusionCircle");
   emitter.off("SsCircle");
   emitter.off("ClearssCircle");
-  emitter.off("removeElementAll");
 });
 </script>
 
@@ -325,29 +323,35 @@ onUnmounted(() => {
   right: 398px;
   bottom: 4px;
   z-index: 9;
+
   .mapImageItem {
     border: 1px solid #08aae8;
     background: rgb(9, 26, 70);
-    & > img {
+
+    &>img {
       width: 100%;
       height: 50px;
     }
-    & > div {
+
+    &>div {
       text-align: center;
       position: relative;
       top: -3px;
     }
   }
+
   .zoomTargetBox {
     margin-top: 10px;
     margin-left: 23px;
   }
+
   ::v-deep .el-input-number__decrease,
   ::v-deep .el-input-number__increase {
     background: #133362;
     color: #fff;
     border: none;
   }
+
   ::v-deep .el-input__inner {
     background: #0c1641;
   }
diff --git a/src/components/GdMap/indexnw.vue b/src/components/GdMap/indexnw2.vue
similarity index 90%
rename from src/components/GdMap/indexnw.vue
rename to src/components/GdMap/indexnw2.vue
index e40ec40..5e5ad06 100644
--- a/src/components/GdMap/indexnw.vue
+++ b/src/components/GdMap/indexnw2.vue
@@ -1,8 +1,7 @@
 <template>
   <div :id="mapid" class="map"></div>
   <div class="changeMap_box" v-if="props.isShow">
-    <el-switch v-model="conditionRoute" @change="handleSwitch" active-text="打开路况" inactive-text="关闭路况"
-      style="--el-switch-color: #13ce66; --el-switch-off-color: #ff4949" />
+    <el-switch v-model="conditionRoute" @change="handleSwitch" active-text="打开路况" inactive-text="关闭路况" style="--el-switch-color:#13ce66;--el-switch-off-color:#ff4949;" />
     <!-- <el-carousel type="card" height="75px" :autoplay="false" indicator-position="none" :initial-index="3"  @change="onMapImageChange">
       <el-carousel-item>
         <div class="mapImageItem">
@@ -75,7 +74,7 @@ const props = defineProps({
 });
 try {
   const userInfo = getItem("deptId")[0].deptCode;
-} catch (error) { }
+} catch (error) {}
 let map;
 let mapLayer;
 let mapLayer1;
@@ -89,32 +88,27 @@ onMounted(() => {
 
   map = new EliMap({
     id: props.mapid,
-    crs: "EPSG:4490",
+    crs: "EPSG:3857",
     style: {
       glyphs: "./fonts/{fontstack}/{range}.pbf",
-      center: [94.36057012, 29.64276831],
-      zoom: 15
+      center: [94.36,29.65],
+      zoom: 10
     },
-    minZoom: 7,
-    maxZoom: 18,
+    transformRequest: (url) => {
+      if (url.indexOf("TileMatrix=") != -1) {
+        const arr = url.split("TileMatrix=");
+        const arr1 = arr[1].split("&");
+        const nurl = `${arr[0]}&TileMatrix=${Number(arr1[0])}&${arr1[1]}&${arr1[2]}`;
+
+      }
+    }
   });
+
   window.map = map;
   map.mapboxGLMap.on("load", () => {
-    map.addWMTSLayer(
-      "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap",
-      {
-        Service: "getImage",
-        Type: "RGB",
-        ZoomOffset: "0",
-        V: "0.3",
-        Zoom: "{z}",
-        Row: "{y}",
-        Col: "{x}"
-      },
-      {
-        tileSize: 300
-      }
-    );
+     map.addGaudLayer({
+      url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+    })
     zoomTarget.value = map.mapboxGLMap.getZoom();
   });
   mapUtil.value = new MapUtil(map);
@@ -134,6 +128,8 @@ onMounted(() => {
   });
   // 撒点
   emitter.on("addPointArea", (obj) => {
+    console.log(obj);
+
     mapUtil.value.makerSki(obj);
   });
   // 鼠标滑过提示文字的点位
@@ -172,7 +168,7 @@ onMounted(() => {
   });
   // 回显线
   emitter.on("echoLine", (res) => {
-    mapUtil.value.createLine(res, res.flag);
+    mapUtil.value.createLine(res);
   });
   //创建边界面（geojson）
   emitter.on("setBoundarys", (res) => {
@@ -203,6 +199,11 @@ onMounted(() => {
     mapUtil.value.diffusionCircle(res);
   });
 
+  // 清除全部覆盖物
+  emitter.on("removeElementAll", () => {
+    mapUtil.value.removeElementAll();
+  });
+
   // 展示盘曲
   emitter.on("showGapText", (obj) => {
     mapUtil.value.gapText(obj);
@@ -301,6 +302,7 @@ onUnmounted(() => {
   emitter.off("diffusionCircle");
   emitter.off("SsCircle");
   emitter.off("ClearssCircle");
+  emitter.off("removeElementAll");
 });
 </script>
 
@@ -323,35 +325,29 @@ onUnmounted(() => {
   right: 398px;
   bottom: 4px;
   z-index: 9;
-
   .mapImageItem {
     border: 1px solid #08aae8;
     background: rgb(9, 26, 70);
-
-    &>img {
+    & > img {
       width: 100%;
       height: 50px;
     }
-
-    &>div {
+    & > div {
       text-align: center;
       position: relative;
       top: -3px;
     }
   }
-
   .zoomTargetBox {
     margin-top: 10px;
     margin-left: 23px;
   }
-
   ::v-deep .el-input-number__decrease,
   ::v-deep .el-input-number__increase {
     background: #133362;
     color: #fff;
     border: none;
   }
-
   ::v-deep .el-input__inner {
     background: #0c1641;
   }
diff --git a/src/router/index.js b/src/router/index.js
index 6ec7450..c00e313 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,6 +21,11 @@ export const privateRoutes = [];
  * 公开路由表
  */
 export const publicRoutes = [
+   {
+    path: "/oatuh_login",
+    name: "oatuh_login",
+    component: () => import("@/views/login/oatuh_login")
+  },
   {
     path: "/login",
     name: "login",
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a251870..8d260e8 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -240,7 +240,7 @@ export default {
         removeAllItem();
         // 待补充 清理权限相关的配置
         if (isOatuh) {
-          window.location.href = `http://80.149.27.78:8001/login`;
+          window.location.href = `http://155.240.22.188:9020`;
         } else {
           router.push("/login");
         }
diff --git a/src/views/login/oatuh_login.vue b/src/views/login/oatuh_login.vue
new file mode 100644
index 0000000..ad1a162
--- /dev/null
+++ b/src/views/login/oatuh_login.vue
@@ -0,0 +1,43 @@
+<template></template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import { useStore } from "vuex";
+import { useRouter } from "vue-router";
+import {
+  setItem
+} from "@/utils/storage";
+const loginDialog = ref(false);
+const deptList = ref([]);
+const store = useStore();
+function redirectAuth() {
+
+  let token = location.hash.slice(20) || null;
+  if (token != null) {
+    debugger
+    token = token.replace(/\ +/g, "");
+    setItem("SSOTOKEN", token)
+    handleLogin({ token: token});
+  } else {
+    window.location.href = `http://155.240.22.188:9020`;
+  }
+}
+
+const handleLogin = (e) => {
+  store.dispatch("user/oatuhLogin", e).then((res) => {
+    // 登录后操作
+    if (res.deptList.length === 1) {
+      window.location.hash = "/";
+    } else {
+      deptList.value = [...res.deptList];
+      loginDialog.value = true;
+      authorization.value = res.jwtToken;
+    }
+  });
+};
+onMounted(() => {
+  redirectAuth();
+});
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 6929a8d..4b2de8d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,7 @@ const serverHost = "http://192.168.1.32:8066"
 // const serverHost = "http://127.0.0.1:8006"
 module.exports = {
   publicPath: "./",
-  outputDir: "ylth",
+  outputDir: "jcz",
   assetsDir: "static",
   lintOnSave: false, //process.env.NODE_ENV === 'development',
   productionSourceMap: false,