Compare commits
2 Commits
projects/l
...
projects/r
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a82167c23 | |||
| 790f158cdb |
3
.env.dev
3
.env.dev
@@ -14,9 +14,10 @@ VUE_APP_TITLE = 洛玻集团驾驶舱
|
||||
# 小田
|
||||
# VUE_APP_BASE_API = 'http://172.16.19.232:7070'
|
||||
# 测试
|
||||
VUE_APP_BASE_API = 'http://192.168.0.35:8080'
|
||||
# VUE_APP_BASE_API = 'http://192.168.0.35:8080'
|
||||
# 闫阳
|
||||
# VUE_APP_BASE_API = 'http://172.16.19.131:7070'
|
||||
VUE_APP_BASE_API = 'http://172.16.20.187:7070'
|
||||
|
||||
|
||||
# 路由懒加载
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
ENV = 'development'
|
||||
|
||||
# 页面标题
|
||||
VUE_APP_TITLE = 洛玻集团驾驶舱
|
||||
VUE_APP_TITLE = 智能MES系统驾驶舱
|
||||
|
||||
# 芋道管理系统/本地环境
|
||||
VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
|
||||
|
||||
@@ -3,7 +3,7 @@ NODE_ENV = production
|
||||
ENV = 'production'
|
||||
|
||||
# 页面标题
|
||||
VUE_APP_TITLE = 洛玻集团驾驶舱
|
||||
VUE_APP_TITLE = 智能MES系统驾驶舱
|
||||
|
||||
# 芋道管理系统/生产环境
|
||||
# VUE_APP_BASE_API = '/prod-api'
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
<!--
|
||||
* @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
|
||||
* @Date: 2024-08-02 16:36:49
|
||||
* @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
|
||||
* @LastEditTime: 2026-07-31 15:30:18
|
||||
* @FilePath: \yudao-dev\src\layout\components\Sidebar\Logo.vue
|
||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
-->
|
||||
<template>
|
||||
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
|
||||
<transition name="sidebarLogoFade">
|
||||
@@ -35,7 +43,7 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
title: '洛玻集团驾驶舱',
|
||||
title: '智能MES系统驾驶舱',
|
||||
logo: logoImg
|
||||
}
|
||||
}
|
||||
@@ -79,7 +87,7 @@ export default {
|
||||
color: #fff;
|
||||
font-weight: 600;
|
||||
line-height: 50px;
|
||||
font-size: 14px;
|
||||
font-size: 16px;
|
||||
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import store from './store'
|
||||
import { Message } from 'element-ui'
|
||||
import NProgress from 'nprogress'
|
||||
import 'nprogress/nprogress.css'
|
||||
import { getAccessToken, removeToken } from '@/utils/auth'
|
||||
import { getAccessToken, setToken, removeToken } from '@/utils/auth'
|
||||
import { isRelogin } from '@/utils/request'
|
||||
|
||||
NProgress.configure({ showSpinner: false })
|
||||
@@ -55,11 +55,22 @@ const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/regi
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
NProgress.start()
|
||||
// === MES SSO 跳转:URL 参数中携带 token,自动存储并登录 ===
|
||||
const searchParams = new URLSearchParams(window.location.search)
|
||||
const urlAccessToken = searchParams.get('accessToken') || searchParams.get('access_token')
|
||||
const urlRefreshToken = searchParams.get('refreshToken') || searchParams.get('refresh_token')
|
||||
if (urlAccessToken && urlRefreshToken && !getAccessToken()) {
|
||||
setToken({ accessToken: urlAccessToken, refreshToken: urlRefreshToken })
|
||||
next({ path: '/', replace: true })
|
||||
return
|
||||
}
|
||||
// ======
|
||||
if (getAccessToken()) {
|
||||
to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
|
||||
/* has token*/
|
||||
if (to.path === '/login') {
|
||||
next({ path: store.getters.defaultPath || '/' })
|
||||
const redirectPath = to.query.redirect ? decodeURIComponent(to.query.redirect) : undefined
|
||||
next({ path: redirectPath || store.getters.defaultPath || '/' })
|
||||
NProgress.done()
|
||||
} else {
|
||||
if (store.getters.roles.length === 0) {
|
||||
@@ -130,5 +141,14 @@ router.beforeEach((to, from, next) => {
|
||||
})
|
||||
|
||||
router.afterEach(() => {
|
||||
// 清理 MES SSO 跳转带入的 token 参数,避免暴露在地址栏
|
||||
var s = window.location.search
|
||||
if (s && (s.indexOf('access_token') > -1 || s.indexOf('refresh_token') > -1)) {
|
||||
var p = new URLSearchParams(s)
|
||||
p.delete('access_token'); p.delete('accessToken')
|
||||
p.delete('refresh_token'); p.delete('refreshToken')
|
||||
var ns = p.toString()
|
||||
history.replaceState(null, '', window.location.pathname + (ns ? '?' + ns : '') + window.location.hash)
|
||||
}
|
||||
NProgress.done()
|
||||
})
|
||||
|
||||
@@ -235,7 +235,7 @@ export default {
|
||||
.top-title {
|
||||
height: 55px;
|
||||
font-family: "YouSheBiaoTiHei", sans-serif;
|
||||
font-size: 42px;
|
||||
font-size: 36px;
|
||||
color: #1E1651;
|
||||
line-height: 55px;
|
||||
letter-spacing: 6px;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div id="dayReport" class="dayReport" :style="styles">
|
||||
<sidebar style="opacity: .9;" v-if="!sidebar.hide && openSider" class="sidebar-container" />
|
||||
<ReportHeader top-title="洛玻集团运营驾驶舱" :dateData="dateData" :openSider="openSider" :is-full-screen="isFullScreen" @screenfullChange="screenfullChange"
|
||||
<ReportHeader top-title="智能MES系统运营驾驶舱" :dateData="dateData" :openSider="openSider" :is-full-screen="isFullScreen" @screenfullChange="screenfullChange"
|
||||
@siderOpenChange="siderOpenChange" @timeRangeChange="handleTimeChange" />
|
||||
<div class="main-body"
|
||||
style="margin-top: -20px; flex: 1; display: flex;padding: 0px 16px 0;flex-direction: column;">
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
border-radius: 100%;
|
||||
background: #26b9de;
|
||||
"></span>
|
||||
洛玻集团
|
||||
智能MES系统
|
||||
</p>
|
||||
</div>
|
||||
<video src="/static/videos/login.webm" muted autoplay loop style="
|
||||
@@ -54,12 +54,12 @@
|
||||
<div class="field">
|
||||
<!-- [移动端]标题 -->
|
||||
<h2 class="mobile-title">
|
||||
<h3 class="title">洛玻集团</h3>
|
||||
<h3 class="title">智能MES系统</h3>
|
||||
</h2>
|
||||
<h2 class="pc-title" style="">
|
||||
<h3 class="title" style="">
|
||||
<img src="../assets/logo/cnbm.png" alt="cnbm_logo" style="" class="cnbm_logo" />
|
||||
<span>洛玻集团</span>
|
||||
<span>智能MES系统</span>
|
||||
</h3>
|
||||
<h3 class="sub-title" style=""></h3>
|
||||
</h2>
|
||||
|
||||
@@ -9,7 +9,7 @@ function resolve(dir) {
|
||||
const CompressionPlugin = require("compression-webpack-plugin");
|
||||
const TerserPlugin = require("terser-webpack-plugin");
|
||||
|
||||
const name = process.env.VUE_APP_TITLE || "洛玻集团驾驶舱"; // 网页标题
|
||||
const name = process.env.VUE_APP_TITLE || "智能MES系统驾驶舱"; // 网页标题
|
||||
|
||||
const port = process.env.port || process.env.npm_config_port || 80; // 端口
|
||||
|
||||
|
||||
Reference in New Issue
Block a user