Merge branch 'dev_2026-03-27'

fix(login): 切换回生产环境的统一身份认证地址
- 在 login.vue 中将认证地址从本地开发地址切换回生产地址 - 在 Navbar.vue 中将登出跳转地址从本地开发地址切换回生产地址 - 移除本地测试配置，启用正确的认证服务器地址 - 确保单点登录功能在生产环境中正常工作 (cherry picked from commit 281c6d71b2)
2026-03-30 11:20:40 +08:00 · 2026-03-30 11:13:46 +08:00 · 2026-03-30 11:13:17 +08:00 · 2026-03-27 16:53:06 +08:00 · 2026-03-27 16:25:31 +08:00
8 changed files with 2622 additions and 2112 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,19 +1,22 @@
 <template>
  <div id="app" style="background-color:#0e2e87" v-if="$route.meta.bigScreen">
    <router-view />
+    <global-loading ref="globalLoading" />
  </div>
  <div id="app" v-else>
    <router-view :key="language"/>
    <theme-picker />
+    <global-loading ref="globalLoading" />
  </div>
 </template>

 <script>
 import ThemePicker from "@/components/ThemePicker";
+import GlobalLoading from '@/components/GlobalLoading'

 export default {
  name: "App",
-  components: { ThemePicker },
+  components: { ThemePicker, GlobalLoading },
  metaInfo() {
    return {
      title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
@@ -26,9 +29,14 @@ export default {
    language(){
      return this.$store.state.settings.language
    }
+  },
+  mounted() {
+    // 将loading方法挂载到全局，方便在任何组件中调用
+    this.$root.$loading = this.$refs.globalLoading
  }
 };
 </script>
+
 <style scoped>
 #app .theme-picker {
  display: none;
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -186,3 +186,24 @@ export function changeLanguage(lang) {
        },
    });
 }
+export function logincas (data) {
+  return request({
+    url: '/logincas',
+    headers: {
+      isToken: false,
+    },
+    method: 'post',
+    data
+  })
+}
+
+export function outlogcas (data) {
+  return request({
+    url: '/outlogcas',
+    headers: {
+      isToken: false,
+    },
+    method: 'post',
+    data
+  })
+}
--- a/src/components/GlobalLoading/index.vue
+++ b/src/components/GlobalLoading/index.vue
@@ -0,0 +1,83 @@
+<template>
+  <div v-if="visible" class="global-loading">
+    <div class="loading-mask">
+      <div class="loading-content">
+        <div class="loading-spinner"></div>
+        <p class="loading-text">{{ text }}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'GlobalLoading',
+  data() {
+    return {
+      visible: false,
+      text: '加载中...'
+    }
+  },
+  methods: {
+    show(text = '加载中...') {
+      this.text = text
+      this.visible = true
+    },
+    hide() {
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+.global-loading {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+}
+
+.loading-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.loading-content {
+  background: white;
+  padding: 20px 30px;
+  border-radius: 8px;
+  text-align: center;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.15);
+}
+
+.loading-spinner {
+  width: 40px;
+  height: 40px;
+  margin: 0 auto 10px;
+  border: 3px solid #f3f3f3;
+  border-top: 3px solid #0f73ee;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+.loading-text {
+  margin: 0;
+  font-size: 14px;
+  color: #666;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+</style>
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -39,6 +39,7 @@ import TopNav from '@/components/TopNav';
 import Hamburger from '@/components/Hamburger';
 import SizeSelect from '@/components/SizeSelect';
 import langSelect from '@/layout/components/langSelect';
+import {outlogcas} from "@/api/login";

 export default {
    components: {
@@ -72,18 +73,43 @@ export default {
            this.$store.dispatch('app/toggleSideBar');
        },
      async logout() {
-            this.$confirm(this.$t('login.989807-31'), this.$t('login.989807-32'), {
+  try {
+    await this.$confirm(this.$t('login.989807-31'), this.$t('login.989807-32'), {
      confirmButtonText: this.$t('confirm'),
      cancelButtonText: this.$t('cancel'),
      type: 'warning',
-            })
-                .then(() => {
-                    this.$store.dispatch('LogOut').then(() => {
-                        location.href = '/index';
    });
-                })
-                .catch(() => {});
+
+    // 先调用 CAS 退出接口
+    await this.outlogincasapi();
+
+    // 再执行 Store 退出
+    await this.$store.dispatch('LogOut');
+
+    // 清理本地存储
+    sessionStorage.clear();
+    localStorage.clear();
+     localStorage.setItem('is_logging_out', 'true');
+    // 跳转
+    // location.href = '/index';
+     window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A9000%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
+     // window.location.href = 'http://localhost:81/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2Flocalhost%3A80%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
+
+
+  } catch (error) {
+    // 用户取消或出错时的处理
+    console.log('退出取消或失败', error);
+  }
+},
+  async outlogincasapi() {
+      const obj = {
+        loginName: "admin",
+        password: "demo",
+        verifyCode: "",
+      };
+      const { code, data } = await outlogcas(obj);
    },
+
    },
 };
 </script>
--- a/src/main.js
+++ b/src/main.js
@@ -47,6 +47,7 @@ import 'video.js/dist/video-js.css';
 import BaiduMap from 'vue-baidu-map'; // 百度地图

 import Contextmenu from 'vue-contextmenujs';
+import GlobalLoading from '@/components/GlobalLoading';
 Vue.use(Contextmenu);

 import ItemWrap from './views/bigScreen/components/item-wrap/item-wrap.vue';
@@ -98,6 +99,7 @@ Vue.component('ImageUpload', ImageUpload);
 Vue.component('ImagePreview', ImagePreview);
 Vue.component('DictTag', DictTag);
 Vue.component('MonacoEditor', MonacoEditor);
+Vue.component('GlobalLoading', GlobalLoading);
 Vue.use(plugins);
 Vue.use(directive);
 Vue.use(VueMeta);
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,7 +2,7 @@ import Cookies from 'js-cookie'

 const TokenKey = 'Admin-Token'
 const UserId = 'userId'
-
+const AccessUserKey = 'AJReportUser'
 export function getToken() {
  return Cookies.get(TokenKey)
 }
@@ -26,3 +26,16 @@ export function setUserId(userId) {
 export function removeUserId() {
  return Cookies.remove(UserId)
 }
+
+
+export function setAccessUser(accessUser) {
+   if(typeof(accessUser) == "undefined" || accessUser== null){
+    return;
+  }
+
+  let val = accessUser;
+  if(typeof(accessUser) == "object"){
+    val = JSON.stringify(accessUser);
+  }
+  return localStorage.setItem(AccessUserKey, val)
+}
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 路由跳转 Loading 遮罩，解决闪屏 -->
  <div class="login">
    <div class="main">
      <div v-if="acountLogin" class="container a-container" :class="{ 'is-txl': isATxl }">
@@ -9,7 +10,7 @@
          <el-form-item v-if="loginForm.bindId != null">
            <div class="alert-box-wrap">
              <div v-if="loginForm.bindId != null" class="alert-message-wrap">
-                                <i class="el-icon-warning" />
+                <i class="el-icon-warning"/>
                {{ $t('login.989807-10') }}
              </div>
              <el-row>
@@ -32,24 +33,27 @@
          <el-form-item prop="username">
            <div class="username">
              <i class="el-icon-user icon"></i>
-                            <input class="form__input" v-model="loginForm.username" auto-complete="off" type="text" :placeholder="$t('login.989807-4')" />
+              <input class="form__input" v-model="loginForm.username" auto-complete="off" type="text"
+                     :placeholder="$t('login.989807-4')"/>
            </div>
          </el-form-item>

          <el-form-item prop="password" :class="{ 'is-null': isacount }">
            <div class="password">
-                            <svg-icon icon-class="password" class="icon left" />
-                            <input class="form__input" v-model="loginForm.password" auto-complete="off" :type="pwdtype" :placeholder="$t('login.989807-5')" @keyup.enter="handleLogin" />
+              <svg-icon icon-class="password" class="icon left"/>
+              <input class="form__input" v-model="loginForm.password" auto-complete="off" :type="pwdtype"
+                     :placeholder="$t('login.989807-5')" @keyup.enter="handleLogin"/>
              <span class="el-icon-view icon right" @click="changetype()"></span>
            </div>
          </el-form-item>

          <el-form-item v-if="captchaOnOff" prop="code" :class="{ 'is-null': ispwd }">
            <div style="width: 350px" class="check">
-                            <svg-icon icon-class="auth-code" class="icon" />
-                            <input v-model="loginForm.code" auto-complete="off" class="form__input__code" type="text" :placeholder="$t('login.989807-6')" />
+              <svg-icon icon-class="auth-code" class="icon"/>
+              <input v-model="loginForm.code" auto-complete="off" class="form__input__code" type="text"
+                     :placeholder="$t('login.989807-6')"/>
              <div class="login-code">
-                                <img :src="codeUrl" @click="getCode" style="float: right" />
+                <img :src="codeUrl" @click="getCode" style="float: right"/>
              </div>
            </div>
          </el-form-item>
@@ -63,7 +67,8 @@
          </el-form-item>

          <!-- <button class="form__button button submit">登录</button> -->
-                    <el-button class="form__button button submit" v-if="!bindAccount" :loading="loading" type="primary" @click.native.prevent="handleLogin">
+          <el-button class="form__button button submit" v-if="!bindAccount" :loading="loading" type="primary"
+                     @click.native.prevent="handleLogin">
            <span v-if="!loading">{{ $t('login.989807-3') }}</span>
            <span v-else>{{ $t('login.989807-13') }}</span>
          </el-button>
@@ -81,8 +86,9 @@
          <!-- <span class="form__span">没有账号？立即注册</span> -->
          <el-form-item prop="phonenumber">
            <div class="telphone" style="width: 350px">
-                            <svg-icon icon-class="phone" class="icon" />
-                            <input v-model="smsLoginForm.phonenumber" class="form__input__code" type="text" auto-complete="off" :placeholder="$t('login.989807-8')" @input="validatePhoneNumber" />
+              <svg-icon icon-class="phone" class="icon"/>
+              <input v-model="smsLoginForm.phonenumber" class="form__input__code" type="text" auto-complete="off"
+                     :placeholder="$t('login.989807-8')" @input="validatePhoneNumber"/>
              <div class="sendcode">
                <el-button
                  slot="append"
@@ -100,26 +106,33 @@

          <el-form-item prop="smsCode">
            <div class="smscode" :class="{ 'is-null': isphone }">
-                            <svg-icon icon-class="password" class="icon" />
-                            <input class="form__input" type="password" v-model="smsLoginForm.smsCode" auto-complete="off" :placeholder="$t('login.989807-9')" />
+              <svg-icon icon-class="password" class="icon"/>
+              <input class="form__input" type="password" v-model="smsLoginForm.smsCode" auto-complete="off"
+                     :placeholder="$t('login.989807-9')"/>
            </div>
          </el-form-item>

          <div class="other_login">
            <div class="wechat-login">
-                            <el-button v-if="loginForm.bindId == null" type="text" :wxloading="loading" @click.native.prevent="weChatLogin">
-                                <svg-icon icon-class="wechat" style="color: #07c160" />
+              <el-button v-if="loginForm.bindId == null" type="text" :wxloading="loading"
+                         @click.native.prevent="weChatLogin">
+                <svg-icon icon-class="wechat" style="color: #07c160"/>
                {{ $t('login.989807-34') }}
              </el-button>
            </div>
            <div class="other-opt">
-                            <router-link v-if="!bindAccount" style="font-size: 14px" :to="{ path: '/register', query: this.$route.query }">{{ $t('login.989807-35') }}</router-link>
-                            <router-link v-else style="font-size: 14px" :to="{ path: '/register', query: this.$route.query }">{{ $t('login.989807-36') }}</router-link>
+              <router-link v-if="!bindAccount" style="font-size: 14px"
+                           :to="{ path: '/register', query: this.$route.query }">{{ $t('login.989807-35') }}
+              </router-link>
+              <router-link v-else style="font-size: 14px" :to="{ path: '/register', query: this.$route.query }">
+                {{ $t('login.989807-36') }}
+              </router-link>
              <langSelect style="margin-left: 12px"></langSelect>
            </div>
          </div>

-                    <el-button class="form__button button submit" type="primary" :smsLoading="loading" @click.native.prevent="handleSmsLogin">
+          <el-button class="form__button button submit" type="primary" :smsLoading="loading"
+                     @click.native.prevent="handleSmsLogin">
            <span v-if="!loading">{{ $t('login.989807-3') }}</span>
            <span v-else>{{ $t('login.989807-13') }}</span>
          </el-button>
@@ -133,7 +146,7 @@
            <h2 class="switch__title title" style="margin-left: 10px">{{ $t('login.989807-37') }}</h2>
          </div>
          <p class="switch__description description">{{ $t('login.989807-38') }}</p>
-                    <img src="../assets/images/login3.jpeg" alt="logo" style="width: 220px; height: 220px" />
+          <img src="../assets/images/login3.jpeg" alt="logo" style="width: 220px; height: 220px"/>
        </div>
      </div>
    </div>
@@ -143,20 +156,30 @@
 <script>
 import 'element-ui/lib/theme-chalk/display.css';
 import logo from '@/assets/logo/logo.gif';
-import { getCodeImg, checkBindId, getErrorMsg, socialLogin, bindLogin, getSmsLoginCaptcha, smsLogin } from '@/api/login';
+import {
+  getCodeImg,
+  checkBindId,
+  getErrorMsg,
+  socialLogin,
+  bindLogin,
+  getSmsLoginCaptcha,
+  smsLogin,
+  logincas
+} from '@/api/login';
 import Cookies from 'js-cookie';
-import { encrypt, decrypt } from '@/utils/jsencrypt';
-import { setToken } from '@/utils/auth';
+import {encrypt, decrypt} from '@/utils/jsencrypt';
+import {setToken, getToken, setAccessUser} from '@/utils/auth';
 import langSelect from '@/layout/components/langSelect';

+
 export default {
  name: 'Login',
-    components: { langSelect },
+  components: {langSelect},
  data() {
    return {
      windowWidth: window.innerWidth,
      acountLogin: true,
-            phoneLogin: true,
+      phoneLogin: false,
      //控制密码可见
      pwdtype: 'password',
      isGx: false,
@@ -202,20 +225,7 @@ export default {
          },
        ],
        password: [
-                    { required: true, message: this.$t('login.989807-21'), trigger: 'blur' },
-                    // { min: 5, max: 20, message: this.$t('user.index.098976-35'), trigger: 'blur' },
-                    // {
-                    //     trigger: 'blur',
-                    //     validator: (rule, value, callback) => {
-                    //         // 两种及以上
-                    //         var passwordreg = /(?![A-Z]*$)(?![a-z]*$)(?![0-9]*$)(?![^a-zA-Z0-9]*$)/;
-                    //         if (!passwordreg.test(value)) {
-                    //             callback(new Error(this.$t('system.dept.780956-30')));
-                    //         } else {
-                    //             callback();
-                    //         }
-                    //     },
-                    // },
+          {required: true, message: this.$t('login.989807-21'), trigger: 'blur'},
        ],
        code: [
          {
@@ -227,7 +237,7 @@ export default {
      },
      smsRules: {
        phonenumber: [
-                    { required: true, message: this.$t('login.989807-23'), trigger: 'blur' },
+          {required: true, message: this.$t('login.989807-23'), trigger: 'blur'},
          {
            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
            message: this.$t('login.989807-24'),
@@ -242,13 +252,15 @@ export default {
          },
        ],
      },
-            loading: false,
      // 验证码开关
      captchaOnOff: true,
      bindAccount: false,
      // 注册开关
      register: true,
      redirect: undefined,
+      rememberPsw: false,
+      otherQuery: {},
+      loading: false, // 控制系统loading框
    };
  },
  watch: {
@@ -262,6 +274,7 @@ export default {
  created() {
    const loginId = this.$route.query.loginId;
    if (loginId === undefined || loginId === null) {
+      // 延迟执行这些方法，确保loading先显示
      this.checkBind();
      this.getCode();
      this.checkErrorMsg();
@@ -271,14 +284,100 @@ export default {
    }
  },
  mounted() {
+    // 优化：延迟执行登录相关逻辑，避免阻塞页面渲染
+    this.handleLoginFocus();
+    this.handleCASLogin();
    this.checkDevice(); // 组件加载时检查设备
    window.addEventListener('resize', this.checkDevice); // 添加resize事件监听
  },
  beforeDestroy() {
    window.removeEventListener('resize', this.checkDevice); // 清除事件监听
  },
-
  methods: {
+    // 优化：提取CAS登录逻辑到单独方法
+    handleCASLogin() {
+      const ticket = this.$route.query.ticket;
+      const isLoggingOut = localStorage.getItem('is_logging_out') === 'true';
+      const token = getToken();
+
+      if (!ticket && !token) {
+        // 如果是登出后返回，清除标记并停止
+        if (isLoggingOut) {
+          localStorage.removeItem('is_logging_out');
+          return;
+        }
+        // 没有ticket且没有token，跳转统一身份认证
+        const isTs = true;
+        if (isTs) {
+          window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A9000%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
+          // window.location.href = 'http://localhost:81/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2Flocalhost%3A80%2Flogin' + (this.redirect ? '&ssUrl=' + this.redirect : '');
+        }
+      } else if (ticket && !token) {
+        // 有ticket但没有token，请求登录
+        this.logincasapi();
+      } else {
+
+      }
+    },
+    handleLoginFocus() {
+      if (this.loginForm.loginName === "") {
+        if (this.$refs.loginName) {
+          this.$refs.loginName.focus();
+        }
+      } else if (this.loginForm.password === "") {
+        if (this.$refs.password) {
+          this.$refs.password.focus();
+        }
+      }
+    },
+    // 优化：CAS登录方法
+    async logincasapi() {
+      const ticket = this.$route.query.ticket;
+      if (!ticket) {
+        return;
+      }
+
+      const obj = {
+        loginName: ticket,
+        password: "demo",
+        verifyCode: "",
+      };
+
+      try {
+        const {code, data, token} = await logincas(obj);
+
+        if (code !== 200) {
+          this.$message.error('CAS登录失败: ' + (data?.msg || '未知错误'));
+          // 清除ticket参数，避免循环跳转
+          this.$router.push({
+            path: '/login',
+            query: {redirect: this.redirect}
+          });
+          return;
+        }
+
+        setToken(token || data.token);
+        setAccessUser(data);
+
+        // 跳转到目标页面，清除ticket参数
+        const targetPath = this.redirect || "/";
+        this.$router.push({
+          path: targetPath,
+          query: this.otherQuery,
+        });
+      } catch (error) {
+        // 优化：移除不必要的console.error
+        /* console.error('CAS登录错误:', error);
+        console.error('错误详情:', error.response || error.message); */
+        this.$message.error('CAS登录失败，请检查后端CAS配置');
+        // 清除ticket参数，避免循环跳转
+        this.$router.push({
+          path: '/login',
+          query: {redirect: this.redirect}
+        });
+      }
+    },
+
    changesmsForm() {
      this.acountLogin = !this.acountLogin;
      this.phoneLogin = !this.phoneLogin;
@@ -331,7 +430,8 @@ export default {
          .push({
            path: this.redirect || '/',
          })
-                    .catch(() => {});
+          .catch(() => {
+          });
        if (this.captchaOnOff) {
          this.getCode();
          this.loading = false;
@@ -362,9 +462,10 @@ export default {
      const errorId = this.$route.query.errorId;
      if (errorId !== undefined && errorId !== null) {
        getErrorMsg(errorId)
-                    .then((res) => {})
+          .then((res) => {
+          })
          .catch((err) => {
-                        this.$router.push({ query: {} });
+            this.$router.push({query: {}});
            console.log(err);
          });
      }
@@ -453,7 +554,8 @@ export default {
              .push({
                path: '/',
              })
-                            .catch(() => {});
+              .catch(() => {
+              });
          });
        }
      });
@@ -486,7 +588,8 @@ export default {
                .push({
                  path: '/',
                })
-                                .catch(() => {});
+                .catch(() => {
+                });
            })
            .catch(() => {
              this.loading = false;
@@ -541,7 +644,8 @@ export default {
                .push({
                  path: this.redirect || '/',
                })
-                                .catch(() => {});
+                .catch(() => {
+                });
            })
            .catch(() => {
              this.loading = false;
@@ -1192,4 +1296,6 @@ export default {
    }
  }
 }
+
+/* 路由跳转 Loading 样式 */
 </style>
--- a/src/views/scada/picture/screen.vue
+++ b/src/views/scada/picture/screen.vue
Author	SHA1	Message	Date
Gjm	7a81a41c78	Merge branch 'dev_2026-03-27'	2026-03-30 11:20:40 +08:00
Gjm	feb1b2e8e9	fix(login): 切换回生产环境的统一身份认证地址 - 在 login.vue 中将认证地址从本地开发地址切换回生产地址 - 在 Navbar.vue 中将登出跳转地址从本地开发地址切换回生产地址 - 移除本地测试配置，启用正确的认证服务器地址 - 确保单点登录功能在生产环境中正常工作 (cherry picked from commit `281c6d71b2`)	2026-03-30 11:13:46 +08:00
Gjm	281c6d71b2	fix(login): 切换回生产环境的统一身份认证地址 - 在 login.vue 中将认证地址从本地开发地址切换回生产地址 - 在 Navbar.vue 中将登出跳转地址从本地开发地址切换回生产地址 - 移除本地测试配置，启用正确的认证服务器地址 - 确保单点登录功能在生产环境中正常工作	2026-03-30 11:13:17 +08:00
Gjm	adc41d5918	style(scada): 格式化代码并优化布局结构 - 标准化缩进和代码格式 - 修复表格结构中的缩进问题 - 调整CSS样式以改善响应式布局 - 优化组件模板结构提升可读性 - 统一代码风格提高维护性 - 改进HTML标签嵌套结构	2026-03-27 16:53:06 +08:00
NewName	3c0b29333c	feat(app): 添加全局加载组件和CAS单点登录功能 - 在App.vue中引入GlobalLoading组件并挂载到全局 - 新增src/components/GlobalLoading/index.vue组件文件 - 在auth.js中添加AccessUserKey常量和相关存储方法 - 在login.js中添加logincas和outlogcas接口函数 - 在main.js中注册GlobalLoading全局组件 - 修改Navbar.vue实现CAS登出逻辑和跳转处理 - 增加sessionStorage和localStorage清理机制 Signed-off-by: NewName <1048783178@qq.com>	2026-03-27 16:25:31 +08:00