Merge branch 'main' of http://8.130.49.250:3000/admin/gr_bi_web

# Conflicts:
#	config/dev.env.js
#	src/views/login.vue

config/dev.env.js

@@ -5,5 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   BASE_API: '"http://127.0.0.1:48090"'
+
   // BASE_API: '"http://192.168.1.241:8080/prod-api"'
+
 })

src/api/login/index.js

@@ -23,6 +23,18 @@ export function logout () {
   })
 }
 
+
+export function outlogcas (data) {
+  console.log(data)
+  return request({
+    url: 'accessUser/outlogcas',
+    method: 'post',
+    data
+  })
+}
+
+
+
 // 登录之后   根据旧修改密码
 export function reqUpdatePassword (data) {
   return request({

src/store/modules/user.js

@@ -32,6 +32,7 @@ const user = {
           const repCode = response.repCode
           const repData = response.repData
           if (repCode === '0000') {
+
             commit('SET_TOKEN', repData.token)
             commit('SET_ACCESSUSER', repData.accessUser)
             resolve(response)

src/utils/request.js

@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 200000 // 请求超时时间
+  timeout: 20000 // 请求超时时间
 })
 
 // request拦截器

src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue

@@ -5,7 +5,7 @@
       <div class="title">
         <div 
          v-if="isIndex"
-         :style="[headerTableStyle, tableRowHeight()]">
+         :style="[headerTableStyle,{width:'50px',flexShrink: 0}, tableRowHeight()]">
           序号
         </div>
         <div v-for="(item, index) in header" :key="index"
@@ -18,9 +18,11 @@
         <ul class="infoList">
           <li v-for="(item, index) in list" :key="index"  :style="tableRowHeight()">
             <div 
+                @mouseenter="handleMouseSeen(index, -1)" @mouseleave="handleMouseLeave"
                  v-if="isIndex"
                  :style="[
                 bodyTableStyle,
+                tableReadColor(index, -1),{width:'50px',flexShrink: 0},
                 bodyTable(index),
                 tableRowHeight()
               ]"
@@ -376,8 +378,9 @@ export default {
     tableReadColor(index, idx){
       let styleJson = {};
       if (this.optionsSetUp.is_read_mode && (this.hoverIndex.index === index || this.hoverIndex.idx === idx)) {
-        styleJson["background-color"] = this.optionsSetUp.read_color;
+        styleJson["background-color"] = this.optionsSetUp.read_color;console.log(styleJson["background-color"],this.hoverIndex,1231231)
       }
+      
       return styleJson;
     },
     // 添加的方法 - 设备类型检测

src/views/layout/components/Navbar.vue

@@ -82,6 +82,8 @@ import Hamburger from "@/components/Hamburger";
 import { getStorageItem } from "@/utils/storage";
 import { reqUpdatePassword } from "@/api/login";
 import { transPsw } from "@/utils/encrypted";
+import {getAccessUser} from "@/utils/auth";
+import {outlogcas} from "@/api/login";
 
 export default {
   data() {
@@ -156,11 +158,34 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        sessionStorage.clear();
-        localStorage.clear();
-        this.$router.push("/login");
+       debugger
+        //获取登录人
+        let user = getAccessUser()
+        console.log(user.loginName)
+        debugger
+   
+
+          this.outlogincasapi();
+       debugger
+ console.log(user.loginName)
+        // sessionStorage.clear();
+        // localStorage.clear();
+        // this.$router.push("/login");
       });
     },
+  async outlogincasapi() {
+      debugger
+      const obj = {
+        loginName: "admin",
+        password: "demo",
+        verifyCode: "",
+      };
+      const { code, data } = await outlogcas(obj);
+      sessionStorage.clear();
+      localStorage.clear();
+      this.$router.push("/login");
+      
+    },
     // 修改密码
     updatePassword() {
       this.wordVisible = true;

src/views/login.vue

@@ -146,13 +146,14 @@ export default {
     //获取url传参 ticket url
      const ticket = this.$route.query.ticket;
      let token = getToken();
+     console.log(ticket);
+     console.log(token);
      if (ticket == undefined && token == null) {
        //跳转统一身份认证
        var isTs = true;
        if (isTs) {
-          console.log(this.redirect );
-         window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A8080%2F%23'+this.redirect;
-        //  window.location.href = 'http://localhost:8099/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2Flocalhost%3A9528%2F%23'+this.redirect;
+          window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A8080%2F%23%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
+          // window.location.href = 'http://localhost/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2Flocalhost%3A9528%2F%23%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
    
        }
      } else if (ticket != undefined && token == null) {
@@ -160,7 +161,7 @@ export default {
        this.logincasapi();
      } else {
 
-     }
+    }
   },
   created() {},
   methods: {
@@ -241,6 +242,7 @@ export default {
       if (code != "200") return;
       setToken(data.token);
       setAccessUser(data);
+      debugger
       // 选中记住密码时 把密码存到cookie里,时效15天
       this.rememberPsw &&
         cookies.set(