Browse Source

一些改动

CzRger 2 weeks ago
parent
commit
b3849eb3ae

+ 1 - 0
.gitignore

@@ -20,3 +20,4 @@ yarn-error.log*
 *.sln
 *.sw*
 *.lock
+html/

+ 1 - 0
public/index.html

@@ -40,6 +40,7 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>window.SITE_CONFIG['apiURL'] = 'http://10.110.35.55:9900/api-idaas';</script>
     <!-- <script>window.SITE_CONFIG['apiURL'] = 'http://172.16.124.90:9900/api-idaas';</script> -->
+<!--  <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:3001/api-idaas';</script>-->
   <% } %>
   <!-- 集成测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>

+ 19 - 0
src/assets/scss/aui.scss

@@ -11,3 +11,22 @@
 @import "./modules/home.scss";
 // 社管项目
 @import "./smp.scss";
+
+// 登陆后的提示弹窗样式
+.login-msg {
+  width: 700px;
+  .el-message-box__title {
+    text-align: center;
+    color: red;
+    font-size: 30px;
+    margin-top: 10px;
+  }
+  .el-message-box__message {
+    margin-top: 20px;
+    color: red;
+    font-size: 30px;
+    >p {
+      line-height: 40px;
+    }
+  }
+}

+ 8 - 1
src/utils/request.js

@@ -4,6 +4,7 @@ import router from '@/router'
 import qs from 'qs'
 import { clearLoginInfo } from '@/utils'
 import isPlainObject from 'lodash/isPlainObject'
+import {MessageBox} from "element-ui";
 
 const http = axios.create({
   baseURL: window.SITE_CONFIG['apiURL'],
@@ -57,7 +58,13 @@ http.interceptors.response.use(response => {
       localStorage.setItem('pathCopyshow',true)
     }
     clearLoginInfo()
-    router.replace({ name: 'login' })
+    MessageBox.confirm(response.data.msg, '提示',{
+      showClose: false,
+      showCancelButton: false,
+      callback: () => {
+        router.replace({ name: 'login' })
+      }
+    })
     return Promise.reject(response.data.msg)
   }
   return response

+ 18 - 1
src/views/main/main.vue

@@ -113,11 +113,28 @@ export default {
     if (Cookies.get('loginMsg')) {
       this.$alert('本系统所有操作均有日志记录,非因工作原因,不得使用系统查询获取信息,不得随意泄漏、传播或出售通过系统查询获取的信息。', '温馨提示', {
         confirmButtonText: '确定',
+        showClose: false,
         callback: action => {
           Cookies.remove('loginMsg')
-        }
+        },
+        customClass: 'login-msg'
       });
     }
+    window.addEventListener('message', (e) => {
+      console.log('收到消息', e)
+      if (e.data.code === 401 || e.data.code === 402 || e.data.code === 403 || e.data.code === 10001) {
+        if(localStorage.getItem('pathCopy')) {
+          localStorage.setItem('pathCopyshow',true)
+        }
+        this.$alert(e.data.msg, '提示',{
+          showClose: false,
+          showCancelButton: false,
+          callback: () => {
+            this.tokenInvalid()
+          }
+        })
+      }
+    })
   },
   methods: {
     setWaterMarker () {

+ 4 - 4
src/views/modules/demo/basicComponent/basic-com.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="basic-com">
     <div class="bc-top-search">
-      <div class="bc-top-change" v-if="isSidebar" @click="changeSidebar">
-        <i class="icon-jczj-toggle"></i>
-        切换
-      </div>
+<!--      <div class="bc-top-change" v-if="isSidebar" @click="changeSidebar">-->
+<!--        <i class="icon-jczj-toggle"></i>-->
+<!--        切换-->
+<!--      </div>-->
       <div class="bc-search-in">
         <el-autocomplete ref="autocomplete" value-key="name" :trigger-on-focus="false" placeholder="请输入关键字" @select="gotoMenuTop" :fetch-suggestions="FindMenu" v-model="keyValue" class="smp-normal-input">
         </el-autocomplete>