lcw

package-lock.json

@@ -2043,51 +2043,6 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
         "ssri": {
           "version": "8.0.1",
           "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -2096,28 +2051,6 @@
           "requires": {
             "minipass": "^3.1.1"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
         }
       }
     },
@@ -14617,6 +14550,75 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-router": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",

src/App.vue

@@ -2,7 +2,9 @@
 <template>
     <router-view v-slot="{ Component }" v-if="isRouterAlive">
       <keep-alive :include="store.getters.keepLiiveRoute">
+        <Watermark :text="content" :color="'rgba(0, 0, 0, .15)'">
           <Component :is="Component"></Component>
+      </Watermark>
       </keep-alive>
     </router-view>
 </template>
@@ -10,6 +12,8 @@
 import { ref, nextTick, provide, onMounted } from "vue";
 import { useStore } from "vuex";
 import { getItem } from "@/utils/storage";
+import Watermark from "@/components/Watermark.vue";
+import { timeValidate } from "@/utils/tools.js";
 import { qcckPost, qcckGet, qcckPut, qcckDelete } from "@/api/qcckApi.js";
 import { generateNewStyle, writeNewStyle } from "@/utils/theme";
 const store = useStore();
@@ -26,9 +30,16 @@ const reload = () => {
 provide("reload", reload);
 onMounted(() => {
   let dept = getItem("deptId");
+  frashJs()
   document.title = "林芝";
 });
-
+const content=ref([])
+const frashJs = () => {
+ const sfzh= getItem("idEntityCard")
+const userName=  getItem("USERNAME")
+  const time = timeValidate()
+  content.value=[userName,sfzh,time,"智慧公交系统","禁止泄露公民个人信息和工作秘密"]
+}
 </script>
 <style lang="scss">
 @import "./styles/index.scss";

src/components/GdMap/index.vue

@@ -101,7 +101,7 @@ onMounted(() => {
   window.map = map;
   map.mapboxGLMap.on("load", () => {
     map.addWMTSLayer(
-      "http://89.0.23.24/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap"
+      "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap"
       ,
       {
         Service: "getImage",

src/permission.js

@@ -1,12 +1,16 @@
 import router from './router'
+import Base64 from "base-64";
 import store from './store'
+import {
+  unifiedLogin
+} from "@/api/user-manage";
 import {
   setItem,
   getItem,
   removeAllItem
 } from "@/utils/storage";
 // 白名单
-const whiteList = ['/login','/','/StationLevel', '/oatuh_login','/editPassword', '/404', '/401']
+const whiteList = ['/login', '/oatuh_login', '/404', '/401', '/focusExploration', '/clueVerification', '/deploymentApproval']
 /**
  * 路由前置守卫
  * to  去哪里
@@ -14,42 +18,43 @@ const whiteList = ['/login','/','/StationLevel', '/oatuh_login','/editPassword',
  *  next 往下走
  */
 let onRun = true;
-// router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from, next) => {
-//   // 存在 token ，进入主页
+  // 存在 token ，进入主页
-//   // if (store.state.user.token) {
+  // if (store.state.user.token) {
-//   // 快捷访问
+  // 快捷访问
-//   if (store.getters.token) {
+  if (store.getters.token) {
-//     // 判断用户资料是否获取
+    // 判断用户资料是否获取
-//     // 若不存在用户信息，则需要获取用户信息
+    // 若不存在用户信息，则需要获取用户信息
-//     // 触发获取用户信息的 action，并获取用户当前权限
+    // 触发获取用户信息的 action，并获取用户当前权限
-//     await store.commit('permission/setRouteReady', true)
+    await store.commit('permission/setRouteReady', true)
-//     // 添加完动态路由之后，需要在进行一次主动跳转
+    // 添加完动态路由之后，需要在进行一次主动跳转
-//     const afterMenuList = await getItem('menusPermission');
+    const afterMenuList = await getItem('menusPermission');
-//     // 处理用户权限，筛选出需要添加的权限
+    // 处理用户权限，筛选出需要添加的权限
-//     if (store.state.permission.routes == 0) {
+    if (store.state.permission.routes == 0) {
-//       const filterRoutes = await store.dispatch('permission/filterRoutes', afterMenuList)
+      const filterRoutes = await store.dispatch('permission/filterRoutes', afterMenuList)
-//       filterRoutes.forEach(item => {
+      filterRoutes.forEach(item => {
-//         router.addRoute(item)
+        router.addRoute(item)
-//       })
+      })
-//       next({
+      next({
-//         ...to,
+        ...to,
-//         replace: true
+        replace: true
-//       })
+      })
-//     } else {
+    } else {
-//       next()
+      next()
-//     }
+    }
-//     // 利用 addRoute 循环添加
+    // 利用 addRoute 循环添加
-//   } else {
+  } else {
-//     const isOatuh = getItem('isOatuh')
+    const isOatuh = getItem('isOatuh')
-//     // 没有token的情况下，可以进入白名单
+    // 没有token的情况下，可以进入白名单
-//     if (whiteList.indexOf(to.path) > -1) {
+    if (whiteList.indexOf(to.path) > -1) {
-//       next()
+      next()
-//     } else {
+    } else {
-//       if (isOatuh) {
+      if (isOatuh) {
-//         next('/oatuh_login')
+        const idEntityCard = getItem('idEntityCard')
-//       } else {
+        next(`/oatuh_login?token=${Base64.encode(idEntityCard)}`)
-//         next('/login')
+      } else {
-//       }
+        next('/login')
-//     }
+      }
-//   }
+    }
-// })
+  }
+})

src/router/index.js

@@ -22,6 +22,10 @@ export const privateRoutes = [];
  */
 export const publicRoutes = [
   {
+    path: "/oatuh_login",
+    name: "oatuh_login",
+    component: () => import("@/views/login/oatuh_login")
+  }, {
     path: "/login",
     name: "login",
     component: () => import("@/views/login/index")

src/store/modules/user.js

@@ -37,7 +37,7 @@ export default {
     isReady: 0,
     userName: getItem("USERNAME") || "",
     keepLiiveRoute: [], //需要缓存的路由
-    activeId:'',//警组点击的唯一标识
+    activeId: '',//警组点击的唯一标识
   }),
   mutations: {
     setToken(state, token) {
@@ -130,21 +130,15 @@ export default {
      *单点登录
      */
     oatuhLogin(ctx, userInfo) {
-      const {
+      const { token, systemId, } = userInfo;
-        token,
-        systemId,
-      } = userInfo;
       return new Promise((resolve, reject) => {
-        unifiedLogin({
+        unifiedLogin({ token, systemId }).then((data) => {
-            token,
-            systemId,
-          })
-          .then((data) => {
           if (data.deptList.length === 1) {
             this.commit("user/setToken", data.jwtToken);
             this.commit("user/setDeptId", data.deptList);
             this.commit("user/setUserName", data.userName);
             setItem("USERNAME", data.userName);
+            setItem('fzUserId', data.fzUserId)
             setItem("SFRH", data.sfrh);
             setItem("USERID", data.userId);
             setItem("PermissionsInfo", data.permissionsInfo);

src/utils/request.js

@@ -18,14 +18,12 @@ service.interceptors.request.use(
       if (isCheckTimeout()) {
         //超时 执行退出
         store.dispatch('user/logout');
-        router.push('/login');
+        // router.push('/login');
         return Promise.reject(new Error('token 失效'));
       }
       if (!config.url.startsWith("/jcApi")) {
         config.headers.Authorization = `${store.getters.token}`;
       }
-    } else {
-      router.push('/login');
     }
     //2.设置headers icode
     // config.headers.code = '';
@@ -57,7 +55,7 @@ service.interceptors.response.use(
       // return response.data;
     } else if (code === 401) {
       store.dispatch('user/logout');
-      router.push('/login');
+      // router.push('/login');
       ElMessage.error(message); // 提示错误信息
       ElMessage({
         message: message || msg,
@@ -83,7 +81,7 @@ service.interceptors.response.use(
       error.response.data.code === 401
     ) {
       store.dispatch('user/logout');
-      router.push('/login');
+      // router.push('/login');
     }
     // ElMessage({
     //   message: error.message,

src/views/login/oatuh_login.vue

@@ -0,0 +1,42 @@
+<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) {
+    token = token.replace(/\ +/g, "");
+    setItem("SSOTOKEN", token)
+    handleLogin({ token: token});
+  } else {
+    window.location.href = `http://155.240.22.102:40992`;
+  }
+}
+
+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>

vue.config.js

@@ -4,10 +4,10 @@ function resolve(dir) {
   return path.join(__dirname, dir);
 }
 const serverHost = "http://192.168.1.32:8066";
-// const serverHost = "http://127.0.0.1:8006"
+// const serverHost = "http://192.168.0.83:8006";
 module.exports = {
   publicPath: "./",
-  outputDir: "ylth",
+  outputDir: "zhgj",
   assetsDir: "static",
   lintOnSave: false, //process.env.NODE_ENV === 'development',
   productionSourceMap: false,