补全内容

src/api/api.js

@@ -1,6 +1,6 @@
 import request from "./axios.js";
-// export const baseURL = "http://10.81.3.154:6015/";
-export const baseURL = "http://192.168.1.109:6015/";
+export const baseURL = "http://10.81.3.154:6015/";
+// export const baseURL = "http://192.168.1.109:6015/";
 import JSONBIG from "json-bigint";
 
 // 获取场站数据

src/components/Header.vue

@@ -5,7 +5,7 @@
       <i v-if="!collapse" class="el-icon-s-fold"></i>
       <i v-else class="el-icon-s-unfold"></i>
     </div>
-    <div class="logo">智能报警及预警系统</div>
+    <div class="logo">综合报警系统</div>
     <div class="header-right">
       <div class="header-user-con">
         <el-dropdown class="user-name" trigger="click" @command="handleCommand">
@@ -230,4 +230,4 @@ onMounted(() => {
 .el-dropdown-menu__item {
   text-align: center;
 }
-</style>
+</style>

src/pages/Login.vue

@@ -6,17 +6,10 @@
       draggable="false"
     /> -->
     <div class="login-content">
-      <!-- <div class="ms-title">
-        <div style="margin-bottom: 20px">智能预警系统</div>
-        <div style="padding-bottom: 40px; font-size: 30px">
-          Intelligent Early Warning
-        </div>
-      </div> -->
       <div class="ms-title">
-        <div style="margin-bottom: 20px">智能报警及预警系统</div>
+        <div style="margin-bottom: 20px">综合报警系统</div>
         <div style="padding-bottom: 40px; font-size: 24px">
-          <!-- Equipment Hidden Hazard Awareness System -->
-          Intelligent Alarms and Early Warnings System
+          Integrated alarm system
         </div>
       </div>
       <div class="ms-login">
@@ -208,4 +201,4 @@ const loginFun = async () => {
     }
   }
 }
-</style>
+</style>

src/pages/check/check.vue

@@ -1,13 +1,15 @@
 <template>
   <div>
-    <el-upload></el-upload>
+    <!-- <el-upload></el-upload> -->
   </div>
 </template>
 
 <script>
-import { JSEncrypt } from "jsencrypt";
-import { loginRequest, getPublickey } from "/@/api/api.js";
+import { decrypt } from "@/utils/jsencrypt.js";
+import { loginRequest, Login } from "/@/api/api.js";
 import { ElMessage } from "element-plus";
+import store from "@/store/index.js";
+import router from "@/router/index.js";
 export default {
   data() {
     return {
@@ -17,57 +19,67 @@ export default {
     };
   },
   created() {
-    this.getKey();
+    this.checkUser();
   },
   methods: {
     //先获取密钥，再去认证username和mark
-    async getKey() {
-      this.publickey = await getPublickey();
-      sessionStorage.setItem("publicKey", this.publickey);
-      this.checkUser();
-    },
+    // async getKey() {
+    //   this.publickey = await getPublickey();
+    //   sessionStorage.setItem("publicKey", this.publickey);
+    //   this.checkUser();
+    // },
 
-    checkUser() {
-      const userName = this.$route.query.userName;
-      const mark = this.$route.query.mark;
+    async checkUser() {
+      const username = this.$route.query.username;
+      const a = decodeURIComponent(this.$route.query.jiami).replace(/\s/g, "+");
+      //   console.log(a);
+      const password = decrypt(a);
       //判断传过来的username和mark是否为空值，如果是，则弹出身份验证不合法
-      if (userName == null || mark == null){
+      if (username == null || password == null) {
         ElMessage.error("身份验证不合法！");
       } else {
-        const params = {
-          publicKey: this.publickey,
-          data: this.encryptionByPublickey({
-            //   mark: "80a7916eef8f096d4d8b64f14b99c697",
-            userName,
-            mark,
-          }),
-        };
+        const {
+          data: res,
+          msg,
+          code,
+        } = await loginRequest({ username, password });
+        if (code == 0) {
+          store.commit("user/SET_TOKEN", res);
 
-        loginRequest(params).then((res) => {
-          if (res.status !== 20000) {
-            ElMessage.error("单点登录错误：" + res.msg);
-          } else {
-            ElMessage.success("登录成功");
-            sessionStorage.setItem("ms_username", res.data.userName);
-            sessionStorage.setItem("ms_chinesename", res.data.chineseName);
-            sessionStorage.setItem("ms_id", res.data.id);
-            sessionStorage.setItem("token", res.token);
-            sessionStorage.setItem("identity", res.data.identity);
-            this.$router.replace("/");
-          }
-        });
-      }
-    },
+          Login({ userId: res.userId, token: res.accessToken }).then((res) => {
+            if (res.code == 200) {
+              ElMessage.success("登录成功");
+              router.push("/");
+            }
+          });
+        } else {
+          ElMessage.error(msg);
+        }
 
-    // 利用jsencrypt.js进行RSA加密
-    encryptionByPublickey(formData) {
-      let key = sessionStorage.getItem("publicKey");
-      var encrypt = new JSEncrypt();
-      encrypt.setPublicKey(key);
+        // const params = {
+        //   publicKey: this.publickey,
+        //   data: this.encryptionByPublickey({
+        //     //   mark: "80a7916eef8f096d4d8b64f14b99c697",
+        //     userName,
+        //     mark,
+        //   }),
+        // };
 
-      var result = encrypt.encrypt(JSON.stringify(formData));
-      return result;
+        // loginRequest(params).then((res) => {
+        //   if (res.status !== 20000) {
+        //     ElMessage.error("单点登录错误：" + res.msg);
+        //   } else {
+        //     ElMessage.success("登录成功");
+        //     sessionStorage.setItem("ms_username", res.data.userName);
+        //     sessionStorage.setItem("ms_chinesename", res.data.chineseName);
+        //     sessionStorage.setItem("ms_id", res.data.id);
+        //     sessionStorage.setItem("token", res.token);
+        //     sessionStorage.setItem("identity", res.data.identity);
+        //     this.$router.replace("/");
+        //   }
+        // });
+      }
     },
   },
 };
-</script> 
+</script>

src/permission.js

@@ -1,6 +1,6 @@
 import router from "./router";
 import { getCookie } from "@/utils/auth"; // getToken from cookie
-const whiteList = ["/login", "/logout"]; // 不重定向白名单
+const whiteList = ["/login", "/logout", '/check']; // 不重定向白名单
 import store from "@/store";
 // router.beforeEach((to, from, next) => {
 //   if (getCookie("authToken")) {
@@ -36,26 +36,26 @@ import store from "@/store";
 
 // });
 router.beforeEach((to, from, next) => {
-  document.title = `${to.meta.title} | 综合报警系统`;
-  const token = getCookie("accessToken");
-  //   const role = sessionStorage.getItem("ms_chinesename");
-  if (token) {
-    if (to.path == "/login") {
-      next("/");
-    } else {
-      if (store.getters.roles.length == 0) {
-        store.dispatch("user/GetInfo").then(async () => {
-          next();
-        });
-      } else {
+    document.title = `${to.meta.title} | 综合报警系统`;
+    const token = getCookie("accessToken");
+    //   const role = sessionStorage.getItem("ms_chinesename");
+    if (token) {
+        if (to.path == "/login") {
+            next("/");
+        } else {
+            if (store.getters.roles.length == 0) {
+                store.dispatch("user/GetInfo").then(async() => {
+                    next();
+                });
+            } else {
+                next();
+            }
+        }
+    } else if (whiteList.indexOf(to.path) !== -1) {
         next();
-      }
+    } else {
+        next(`/login?redirect=${to.fullPath}`);
     }
-  } else if (whiteList.indexOf(to.path) !== -1) {
-    next();
-  } else {
-    next(`/login?redirect=${to.fullPath}`);
-  }
 });
 
-router.afterEach((to, from, next) => {});
+router.afterEach((to, from, next) => {});

src/router/index.js

@@ -378,13 +378,13 @@ const routes = [
     {
         icon: "iconfont iconxitongcaidan",
         path: "/check",
-        isshow: "admin",
+        // isshow: "admin",
         name: "check",
         meta: {
             title: "单点登录",
         },
         component: () =>
-            import ("../pages/check/check.vue"),
+            import ("@/pages/check/check.vue"),
     },
 ];
 const constantRoutes = [];

src/store/modules/user.js

@@ -1,94 +1,94 @@
 import {
-  getCookie,
-  setToken,
-  setUserId,
-  removeToken,
-  removeUserId,
-  setName,
-  removeName,
+    getCookie,
+    setToken,
+    setUserId,
+    removeToken,
+    removeUserId,
+    setName,
+    removeName,
 } from "@/utils/auth";
 // import { Message } from "element-plus";
 import { Login, loginRequest, getUserinfo, logout } from "@/api/api";
 const state = {
-  authToken: getCookie("accessToken") || "", //
-  username: getCookie("username") || "",
-  userId: getCookie("userId") || "",
-  roles: [],
-  permissions: [],
+    authToken: getCookie("accessToken") || "", //
+    username: getCookie("userName") || "",
+    userId: getCookie("userId") || "",
+    roles: [],
+    permissions: [],
 };
 const mutations = {
-  REMOVE_TOKEN(state) {
-    removeToken();
-    removeUserId();
-    removeName();
-    state.roles = [];
-    state.permissions = [];
-    state.username = "";
-    state.userId = "";
-    state.authToken = "";
-  },
-  SET_TOKEN: (state, data) => {
-    state.authToken = data.accessToken;
-    state.userId = data.userId;
-    setToken(data.accessToken);
-    setUserId(data.userId);
-  },
-  SET_LOGINSTATE: (state, login) => {
-    state.loginState = login;
-    setLoginState(login);
-  },
-  SET_NAME: (state, name) => {
-    state.username = name;
-    setName(name);
-  },
-  SET_ROLES: (state, roles) => {
-    state.roles = roles;
-  },
-  SET_PERMISSIONS: (state, permissions) => {
-    state.permissions = permissions;
-  },
+    REMOVE_TOKEN(state) {
+        removeToken();
+        removeUserId();
+        removeName();
+        state.roles = [];
+        state.permissions = [];
+        state.username = "";
+        state.userId = "";
+        state.authToken = "";
+    },
+    SET_TOKEN: (state, data) => {
+        state.authToken = data.accessToken;
+        state.userId = data.userId;
+        setToken(data.accessToken);
+        setUserId(data.userId);
+    },
+    SET_LOGINSTATE: (state, login) => {
+        state.loginState = login;
+        setLoginState(login);
+    },
+    SET_NAME: (state, name) => {
+        state.username = name;
+        setName(name);
+    },
+    SET_ROLES: (state, roles) => {
+        state.roles = roles;
+    },
+    SET_PERMISSIONS: (state, permissions) => {
+        state.permissions = permissions;
+    },
 };
 const actions = {
-  // 获取用户信息
-  GetInfo({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      getUserinfo()
-        .then((res) => {
-          if (res) {
-            if (res.data.roles && res.data.roles.length > 0) {
-              // 验证返回的roles是否是一个非空数组
-              commit("SET_ROLES", res.data.roles);
-              commit("SET_NAME", res.data.user.nickname);
-              commit("SET_PERMISSIONS", res.data.permissions);
-            } else {
-              commit("SET_ROLES", ["ROLE_DEFAULT"]);
-            }
-            resolve(res.data);
-          }
-        })
-        .catch((error) => {
-          reject(error);
+    // 获取用户信息
+    GetInfo({ commit, state }) {
+        return new Promise((resolve, reject) => {
+            getUserinfo()
+                .then((res) => {
+                    if (res) {
+                        if (res.data.roles && res.data.roles.length > 0) {
+                            // 验证返回的roles是否是一个非空数组
+                            commit("SET_ROLES", res.data.roles);
+                            commit("SET_NAME", res.data.user.nickname);
+                            commit("SET_PERMISSIONS", res.data.permissions);
+                        } else {
+                            commit("SET_ROLES", ["ROLE_DEFAULT"]);
+                        }
+                        resolve(res.data);
+                    }
+                })
+                .catch((error) => {
+                    reject(error);
+                });
         });
-    });
-  },
-  LogOut({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      logout({ token: state.authToken, userId: state.userId })
-        .then((res) => {
-          if (res.code == 200) {
-            commit("REMOVE_TOKEN");
-            resolve();
-          }
-        })
-        .catch((error) => {
-          reject(error);
+    },
+    LogOut({ commit, state }) {
+        return new Promise((resolve, reject) => {
+            logout({ token: state.authToken, userId: state.userId })
+                .then((res) => {
+                    if (res.code == 200) {
+                        commit("REMOVE_TOKEN");
+                        resolve();
+                    }
+                })
+                .catch((error) => {
+                    reject(error);
+                });
         });
-    });
-  },
+    },
 };
 export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions,
-};
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+};

src/utils/auth.js

@@ -4,101 +4,100 @@ const timeKey = "hrsaas-timestamp-key";
 // 设置时间戳的存储变量
 const TokenKey = "accessToken";
 const UserIdKey = "userId";
-const Username = "username";
+const Username = "userName";
 
 export function getCookie(name) {
-  return Cookies.get(name);
+    return Cookies.get(name);
 }
 
 export function setCookie(name, value) {
-  return Cookies.set(name, value);
+    return Cookies.set(name, value);
 }
 
 // cookie存储Username
 export function setName(name) {
-  return Cookies.set(Username, name);
+    return Cookies.set(Username, name);
 }
 // cookie存储token
 export function setToken(token) {
-  return Cookies.set(TokenKey, token);
+    return Cookies.set(TokenKey, token);
 }
 // cookie存储UserId
 export function setUserId(userId) {
-  return Cookies.set(UserIdKey, userId);
+    return Cookies.set(UserIdKey, userId);
 }
 
 // cookie删除token
 export function removeToken() {
-  return Cookies.remove(TokenKey);
+    return Cookies.remove(TokenKey);
 }
 // cookie删除UserId
 export function removeUserId() {
-  return Cookies.remove(UserIdKey);
+    return Cookies.remove(UserIdKey);
 }
 // cookie删除Username
 export function removeName() {
-  return Cookies.remove(Username);
+    return Cookies.remove(Username);
 }
 
 // 获取时间戳
 export function getTimeStamp() {
-  return Cookies.get(timeKey);
+    return Cookies.get(timeKey);
 }
 // 设置时间戳
 export function setTimeStamp() {
-  return Cookies.set(timeKey, Date.now());
+    return Cookies.set(timeKey, Date.now());
 }
 
 // 时间格式化
 export function parseTime() {
-  var myDate = new Date();
-  const formatObj = {
-    year: myDate.getFullYear(),
-    month:
-      myDate.getMonth() + 1 >= 10
-        ? myDate.getMonth() + 1
-        : "0" + (myDate.getMonth() + 1),
-    day: myDate.getDate() >= 10 ? myDate.getDate() : "0" + myDate.getDate(),
-  };
-  return formatObj.year + "-" + formatObj.month + "-" + formatObj.day;
+    var myDate = new Date();
+    const formatObj = {
+        year: myDate.getFullYear(),
+        month: myDate.getMonth() + 1 >= 10 ?
+            myDate.getMonth() + 1 :
+            "0" + (myDate.getMonth() + 1),
+        day: myDate.getDate() >= 10 ? myDate.getDate() : "0" + myDate.getDate(),
+    };
+    return formatObj.year + "-" + formatObj.month + "-" + formatObj.day;
 }
 //获取1天前时间
 export function getStampTime() {
-  let stamp1 = new Date(new Date().setHours(0, 0, 0, 0));
-  stamp1 = dayjs(stamp1).format("YYYY-MM-DD HH:mm:ss");
-  let stamp2 = new Date(new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000);
-  stamp2 = dayjs(stamp2).format("YYYY-MM-DD HH:mm:ss");
-  return {
-    startTime: stamp1,
-    endTime: stamp2,
-  };
+    let stamp1 = new Date(new Date().setHours(0, 0, 0, 0));
+    stamp1 = dayjs(stamp1).format("YYYY-MM-DD HH:mm:ss");
+    let stamp2 = new Date(new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000);
+    stamp2 = dayjs(stamp2).format("YYYY-MM-DD HH:mm:ss");
+    return {
+        startTime: stamp1,
+        endTime: stamp2,
+    };
 }
 
 export function transTreeData(arr, idStr, pidStr, chindrenStr) {
-  let r = [],
-    hash = {},
-    id = idStr,
-    pid = pidStr,
-    children = chindrenStr,
-    len = arr.length;
-  for (let i = 0; i < len; i++) {
-    hash[arr[i][id]] = arr[i];
-  }
-  for (let j = 0; j < len; j++) {
-    let aVal = arr[j],
-      hashVP = hash[aVal[pid]];
-    if (hashVP) {
-      !hashVP[children] && (hashVP[children] = []);
-      hashVP[children].push(aVal);
-    } else {
-      r.push(aVal);
+    let r = [],
+        hash = {},
+        id = idStr,
+        pid = pidStr,
+        children = chindrenStr,
+        len = arr.length;
+    for (let i = 0; i < len; i++) {
+        hash[arr[i][id]] = arr[i];
     }
-  }
-  return r;
+    for (let j = 0; j < len; j++) {
+        let aVal = arr[j],
+            hashVP = hash[aVal[pid]];
+        if (hashVP) {
+            !hashVP[children] && (hashVP[children] = []);
+            hashVP[children].push(aVal);
+        } else {
+            r.push(aVal);
+        }
+    }
+    return r;
 }
 export function checkIn(item, arr) {
-  const result = arr.find((value) => {
-    return value.name == item.meta.title;
-  });
-  return result;
-}
+    const result = arr.find((value) => {
+        return value.name == item.meta.title;
+    });
+    return result;
+}

src/utils/jsencrypt.js

@@ -3,27 +3,27 @@ import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
 // 密钥对生成 http://web.chacuo.net/netrsakeypair
 
 const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
-  'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
+    'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 
 const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
-  '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
-  'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
-  'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
-  'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
-  'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
-  'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
-  'UP8iWi1Qw0Y='
+    '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
+    'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
+    'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
+    'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
+    'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
+    'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
+    'UP8iWi1Qw0Y='
 
 // 加密
 export function encrypt(txt) {
-  const encryptor = new JSEncrypt()
-  encryptor.setPublicKey(publicKey) // 设置公钥
-  return encryptor.encrypt(txt) // 对数据进行加密
+    const encryptor = new JSEncrypt()
+    encryptor.setPublicKey(publicKey) // 设置公钥
+    return encryptor.encrypt(txt) // 对数据进行加密
 }
 
 // 解密
 export function decrypt(txt) {
-  const encryptor = new JSEncrypt()
-  encryptor.setPrivateKey(privateKey) // 设置私钥
-  return encryptor.decrypt(txt) // 对数据进行解密
+    const encryptor = new JSEncrypt()
+    encryptor.setPrivateKey(privateKey) // 设置私钥
+    return encryptor.decrypt(txt) // 对数据进行解密
 }