统一登录平台

liujun001
1 parent 3a100eef
Showing 23 changed files with 148 additions and 43 deletions
.env.devTest
.env.development
.env.production
.env.staging
index.html
package.json
src/api/login.js
src/api/scheduling/keyWorkLocation/keyWorkLocation.js
src/components/FileUpload/index.vue
src/components/ImageUpload/index.vue
src/layout/components/Navbar.vue
src/layout/components/Sidebar/Logo.vue
src/permission.js
src/router/index.js
src/store/modules/user.js
src/utils/request.js
src/views/equipment/carinfo/carInfo.vue
src/views/equipment/equipment_keyinfo/keyInfo.vue
src/views/home/index.vue
src/views/login.vue
 # 页面标题
-VITE_APP_TITLE = 临港巴士岗前检测系统
+VITE_APP_TITLE = 岗前检查流程信息管理
  
 # 测试
 VITE_APP_ENV = 'devTest'
  
 # 签到机系统/测试
-VITE_APP_BASE_API = 'http://61.169.120.202:8100'
+VITE_APP_BASE_API = 'http://192.168.169.100:8100'
+#VITE_APP_BASE_API = 'http://127.0.0.1:8100'
 # VITE_APP_BASE_API = 'http://101.95.136.202:8100'
  
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 # 页面标题
-VITE_APP_TITLE = 临港巴士岗前检测系统
+VITE_APP_TITLE = 岗前检查流程信息管理系统
  
 # 开发环境配置
 VITE_APP_ENV = 'development'
 # 页面标题
-VITE_APP_TITLE = "临港巴士岗前检测系统"
+VITE_APP_TITLE = "岗前检查流程信息管理系统"
  
 # 生产环境配置
 VITE_APP_ENV = 'production'
  
 # 签到机系统/生产环境
 # VITE_APP_BASE_API = 'http://101.95.136.202:8100'
-VITE_APP_BASE_API = 'http://61.169.120.202:8102'
+VITE_APP_BASE_API = 'http://10.10.150.173:8102'
 # VITE_APP_BASE_API = 'http://1.14.107.94:8100'
  
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 # 页面标题
-VITE_APP_TITLE = 临港巴士岗前检测系统
+VITE_APP_TITLE = 岗前检查流程信息管理系统
  
 # 测试
 VITE_APP_ENV = 'staging'
@@ -9,7 +9,7 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
     <link rel="icon" href="public/favicon.ico" />
-    <title>临港巴士岗前检测系统</title>
+    <title>岗前检查流程信息管理系统</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = "/html/ie.html";
 {
   "name": "bsth",
   "version": "3.8.5",
-  "description": "临港巴士岗前检测系统",
+  "description": "岗前检查流程信息管理系统",
   "author": "bsth",
   "license": "MIT",
   "scripts": {
@@ -18,6 +18,14 @@ export function login(username, password, code, uuid) {
   })
 }
  
+export function getInfo(token) {
+  
+  return request({
+    url: '/getInfo?token='+token,
+    method: 'get'
+  })
+}
+
 // 注册方法
 export function register(data) {
   return request({
@@ -30,13 +38,13 @@ export function register(data) {
   })
 }
  
-// 获取用户详细信息
-export function getInfo() {
-  return request({
-    url: '/getInfo',
-    method: 'get'
-  })
-}
+// // 获取用户详细信息
+// export function getInfo() {
+//   return request({
+//     url: '/getInfo',
+//     method: 'get'
+//   })
+// }
  
 // 退出方法
 export function logout() {
@@ -3,7 +3,6 @@ import request from &#39;@/utils/request&#39;
  
 // 分页查询列表
 export function listLimitOfLinggangKeyWorkLocation(params,page,limit) {
-    console.log("page------------------------->"+page);
  
     return request({
         url: '/linggang/key/work/location/list/limit/'+page+'/'+limit,
@@ -165,7 +165,6 @@ function uploadedSuccessfully() {
  
 // 获取文件名称
 function getFileName(name) {
-  console.log(name);
   try {
     if (name.lastIndexOf("/") > -1) {
       return name.slice(name.lastIndexOf("/") + 1);
@@ -73,14 +73,12 @@ const showTip = computed(
 );
  
 watch(() => props.modelValue, val => {
-  console.log("value=========>"+val);
  
   if (val) {
     // 首先将值转为数组
     const list = Array.isArray(val) ? val : props.modelValue.split(",");
     // 然后将数组转为对象数组
     fileList.value = list.map(item => {
-      console.log("111111111111111111111111");
  
       if (typeof item === "string") {
         item = { name: item, url: item };
@@ -91,7 +91,8 @@ function logout() {
     type: 'warning'
   }).then(() => {
     userStore.logOut().then(() => {
-      location.href = '/index';
+       location.href = '/login';
+      //window.open('','_self').close()
     })
   }).catch(() => { });
 }
@@ -30,7 +30,7 @@ defineProps({
   }
 })
  
-const title = ref('临港巴士岗前检测系统');
+const title = ref('岗前检查流程信息管理');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>
 import usePermissionStore from '@/store/modules/permission'
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
-import { getToken } from '@/utils/auth'
+import { getToken,setToken } from '@/utils/auth'
 import { isRelogin } from '@/utils/request'
 import { isHttp } from '@/utils/validate'
 import { ElMessage } from 'element-plus'
@@ -11,11 +11,12 @@ import router from &#39;./router&#39;
  
 NProgress.configure({ showSpinner: false });
  
-const whiteList = ['/login', '/register','/in','/home/index'];
+const whiteList = ['/login', '/register','/in','/home/index','/getInfo'];
  
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {
+    
     to.meta.title && useSettingsStore().setTitle(to.meta.title)
     /* has token*/
     if (to.path === '/login') {
@@ -37,10 +38,20 @@ router.beforeEach((to, from, next) =&gt; {
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
         }).catch(err => {
+          // useUserStore().logOut().then(() => {
+          //   ElMessage.error(err)
+          //   next({ path: '/' })
+          // })
           useUserStore().logOut().then(() => {
-            ElMessage.error(err)
-            next({ path: '/' })
-          })
+           // Message.error(err)
+            // next({ path: '/' })
+           let index =  to.path.indexOf("?");
+           let length = to.path.length;
+           let param = to.path.substring(index,length);
+           
+           location.href = '/';
+         })
+         
         })
       } else {
         next()
@@ -52,12 +63,46 @@ router.beforeEach((to, from, next) =&gt; {
       // 在免登录白名单，直接进入
       next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      let params = getURLParams1();
+      let url = null;
+      if(params && params.token){
+        setToken(params.token)
+        
+        url = "/?token="+params.token;
+      }else{
+        url = `${to.fullPath}`;
+        if(url.indexOf("redirect") == -1){
+          if(url.indexOf(url,"?") > -1){
+            url =url.replace("?", "&");
+          }
+          url =  `/login?redirect=`+url;
+        }else{
+          url =  `/login`+url;
+        }
+      }
+      
+      next(url) // 否则全部重定向到登录页
       NProgress.done()
     }
   }
 })
  
+
+function getURLParams1() {
+  const searchParams = window.location.search.substring(1).split('&');
+  const params = {
+   
+   };
+
+  for (const param of searchParams) {
+    const [key, value] = param.split('=');
+    params[key] = value;
+  }
+
+  return params;
+}
+
+
 router.afterEach(() => {
   NProgress.done()
 })
@@ -37,6 +37,12 @@ export const constantRoutes = [
       }
     ]
   },
+  //单点开始
+  {
+    path: '/getInfo',
+    component: (resolve) => require(['@/views/getInfo'], resolve),
+    hidden: true
+  },
   {
     path: '/login',
     component: () => import('@/views/login'),
@@ -19,18 +19,30 @@ const useUserStore = defineStore(
         const password = userInfo.password
         const code = userInfo.code
         const uuid = userInfo.uuid
+        let that = this;
         return new Promise((resolve, reject) => {
           login(username, password, code, uuid).then(res => {
-            setToken(res.token)
-            this.token = res.token
-            resolve()
+            
+            that.refreshTokenFun(res.token,resolve);
           }).catch(error => {
             reject(error)
           })
         })
       },
+
+      refreshTokenFun(token,resolve){
+        setToken(token)
+        this.token = token
+        try{
+          resolve()
+        }catch(e){
+
+        }
+       
+      },
       // 获取用户信息
       getInfo() {
+      
         return new Promise((resolve, reject) => {
           getInfo().then(res => {
             const user = res.user
@@ -86,9 +86,17 @@ service.interceptors.response.use(res =&gt; {
       if (!isRelogin.show) {
         isRelogin.show = true;
         ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
-          isRelogin.show = false;
-          useUserStore().logOut().then(() => {
-            location.href = '/index';
+          // isRelogin.show = false;
+          // useUserStore().logOut().then(() => {
+          //   location.href = '/index';
+          // })
+          store.dispatch('LogOut').then(() => {
+            // location.href = '/index';
+            //单点开始
+            console.log("================================>7");
+            
+            location.href = '/getInfo';
+            //单点结束
           })
       }).catch(() => {
         isRelogin.show = false;
@@ -63,7 +63,7 @@
             </el-table-column>
         </el-table>
  
-        <pagination v-show="totalOfCarInfo > 0" :total="totalOfCarInfo" v-model:pageOfCarInfo="queryParamsOfCarInfo.pageNum" v-model:limit="queryParamsOfCarInfo.pageSize"
+        <pagination v-show="totalOfCarInfo > 0" :total="totalOfCarInfo" v-model:page="queryParamsOfCarInfo.pageNum" v-model:limit="queryParamsOfCarInfo.pageSize"
                     @pagination="getListOfCarInfo" />
  
         <el-dialog :title="titleOfCarInfo" v-model="openOfCarInfo" width="500px" append-to-body>
@@ -58,7 +58,7 @@
             </el-table-column>
         </el-table>
  
-        <pagination v-show="totalOfKeyInfo > 0" :total="totalOfKeyInfo" v-model:pageOfKeyInfo="queryParamsOfKeyInfo.pageNum" v-model:limit="queryParamsOfKeyInfo.pageSize"
+        <pagination v-show="totalOfKeyInfo > 0" :total="totalOfKeyInfo" v-model:page="queryParamsOfKeyInfo.pageNum" v-model:limit="queryParamsOfKeyInfo.pageSize"
                     @pagination="getListOfKeyInfo" />
  
         <el-dialog :title="titleOfKeyInfo" v-model="openOfKeyInfo" width="500px" append-to-body>
@@ -7,7 +7,7 @@
       <div class="big-view-container-title">
         <!-- 标题 -->
         <div class="big-view-container-box">
-          临港巴士岗前检查
+          岗前检查流程信息管理系统
         </div>
         <div class="big-view-container-time">
           <text>
@@ -248,8 +248,6 @@ const startUpdateDataTaskScheduler = () =&gt; {
   }, 1000);
 }
  
-
-
 /** 监听数据更新日期 */
 watch(() => timeTaskObject.updateDateObject, (val1, val2) => {
   //  发送请求更新数据
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">临港巴士岗前检测系统</h3>
+      <h3 class="title">岗前检查流程信息管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@@ -85,6 +85,7 @@ function handleLogin() {
       }
       // 调用action的登录方法
       userStore.login(loginForm.value).then(() => {
+        
         router.push({ path: redirect.value || "/" });
       }).catch(() => {
         loading.value = false;
@@ -118,8 +119,37 @@ function getCookie() {
   };
 }
  
+function getURLParams() {
+   const searchParams = window.location.search.substring(1).split('&');
+   const params = {
+    
+    };
+ 
+   for (const param of searchParams) {
+     const [key, value] = param.split('=');
+     params[key] = value;
+   }
+ 
+   return params;
+ }
+
+function singleSignOn(fun){
+  let params = getURLParams();
+  console.log(params);
+  
+  if(params.token && params.redirect){
+    
+    userStore.refreshTokenFun(params.token);
+    console.log(params.token);
+    router.push("/index?token="+params.token);
+  }
+}
+
+singleSignOn()
 getCode();
 getCookie();
+
+
 </script>
  
 <style lang='scss' scoped>
@@ -19,8 +19,8 @@
     import { refreshScheduling, refreshKeyInfoLocal, refreshDriver, refreshDriverImageByJob,refreshDriverImageByName } from "@/api/refresh/page";
     const { proxy } = getCurrentInstance();
  
-    const imagePath=ref();
-    const device =ref("/data/lingang/images");
+    const imagePath=ref("/images");
+    const device =ref();
  
     function refreshSchedulingFun(){
         refreshScheduling().then(res=>{
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">临港巴士岗前检测系统</h3>
+      <h3 class="title">岗前检查流程信息管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@@ -54,7 +54,7 @@
             </el-table-column>
         </el-table>
  
-        <pagination v-show="totalOfVenueInfo > 0" :total="totalOfVenueInfo" v-model:pageOfVenueInfo="queryParamsOfVenueInfo.pageNum" v-model:limit="queryParamsOfVenueInfo.pageSize"
+        <pagination v-show="totalOfVenueInfo > 0" :total="totalOfVenueInfo" v-model:page="queryParamsOfVenueInfo.pageNum" v-model:limit="queryParamsOfVenueInfo.pageSize"
                     @pagination="getListOfVenueInfo" />
  
         <el-dialog :title="titleOfVenueInfo" v-model="openOfVenueInfo" width="500px" append-to-body>