-
+
@@ -31,7 +27,6 @@
-
@@ -67,6 +62,7 @@ import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
import { getLanguage, setLanguage, languageOptions } from '@/utils/language'
+import { getBrandedLoginPath } from '@/utils/brand'
export default {
emits: ['setLayout'],
@@ -90,7 +86,8 @@ export default {
'sidebar',
'avatar',
'device',
- 'nickName'
+ 'nickName',
+ 'brandBusinessNo'
]),
setting: {
get() {
@@ -110,7 +107,7 @@ export default {
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
- setLayout(event) {
+ setLayout() {
this.$emit('setLayout')
},
logout() {
@@ -120,7 +117,7 @@ export default {
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
- location.href = '/index'
+ location.href = getBrandedLoginPath(this.brandBusinessNo)
})
}).catch(() => {})
},
@@ -150,7 +147,7 @@ export default {
float: left;
cursor: pointer;
transition: background .3s;
- -webkit-tap-highlight-color:transparent;
+ -webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
@@ -221,7 +218,7 @@ export default {
border-radius: 50%;
}
- .user-nickname{
+ .user-nickname {
position: relative;
bottom: 10px;
font-size: 14px;
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 17e2f48..d2ede83 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,5 +1,5 @@
-
-
+
+
- ![]()
+ ![]()
import logoImg from '@/assets/logo/logo.png'
import variables from '@/assets/styles/variables.scss'
-
-const SIDEBAR_TITLE_MAP = {
- 'zh-CN': '客户 GeoTag管理系统',
- 'en-US': 'GeoTag Customer Management System',
- 'fr-FR': 'Systeme de gestion client GeoTag',
- 'es-ES': 'Sistema de gestion de clientes GeoTag',
- 'pt-BR': 'Sistema de gestao de clientes GeoTag'
-}
+import { resolveBrandAsset } from '@/utils/brand'
export default {
name: 'SidebarLogo',
@@ -42,6 +35,13 @@ export default {
required: true
}
},
+ data() {
+ return {
+ defaultTitle: process.env.VUE_APP_TITLE,
+ defaultLogo: logoImg,
+ logoLoadError: false
+ }
+ },
computed: {
variables() {
return variables
@@ -49,8 +49,8 @@ export default {
sideTheme() {
return this.$store.state.settings.sideTheme
},
- currentLanguage() {
- return this.$store.state.settings.language || 'zh-CN'
+ currentBrand() {
+ return this.$store.getters.brand || {}
},
logoLinkStyle() {
if (this.collapse) {
@@ -93,18 +93,27 @@ export default {
}
},
logoTitle() {
- const directTitle = SIDEBAR_TITLE_MAP[this.currentLanguage]
- if (directTitle) {
- return directTitle
+ if (this.currentBrand.appSystemName) {
+ return this.currentBrand.appSystemName
}
const translated = this.$t('app.sidebarTitle')
- return translated && translated !== 'app.sidebarTitle' ? translated : this.title
+ return translated && translated !== 'app.sidebarTitle' ? translated : this.defaultTitle
+ },
+ logoSrc() {
+ if (this.logoLoadError) {
+ return this.defaultLogo
+ }
+ return resolveBrandAsset(this.currentBrand.appLogoUrl) || this.defaultLogo
}
},
- data() {
- return {
- title: process.env.VUE_APP_TITLE,
- logo: logoImg
+ watch: {
+ 'currentBrand.appLogoUrl'() {
+ this.logoLoadError = false
+ }
+ },
+ methods: {
+ handleLogoError() {
+ this.logoLoadError = true
}
}
}
@@ -144,6 +153,7 @@ export default {
width: 32px;
height: 32px;
vertical-align: middle;
+ object-fit: contain;
}
& .sidebar-title {
diff --git a/src/main.js b/src/main.js
index ddcc3e6..053e7e5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,5 @@
-import Vue from "vue";
-
+import Vue from "vue";
import Cookies from "js-cookie";
-
import Element from "element-ui";
import ElementLocale from "element-ui/lib/locale";
import elementZhCN from "element-ui/lib/locale/lang/zh-CN";
@@ -12,17 +10,41 @@ import elementEs from "element-ui/lib/locale/lang/es";
import elementPtBr from "element-ui/lib/locale/lang/pt-br";
import "./assets/styles/element-variables.scss";
-import "@/assets/styles/index.scss"; // global css
-import "@/assets/styles/ruoyi.scss"; // ruoyi css
+import "@/assets/styles/index.scss";
+import "@/assets/styles/ruoyi.scss";
import App from "./App";
import store from "./store";
import router from "./router";
-import directive from "./directive"; // directive
-import plugins from "./plugins"; // plugins
+import directive from "./directive";
+import plugins from "./plugins";
import { download } from "@/utils/ruoyi";
import { math, warmupMathjs } from "@/utils/math.js";
import I18nPlugin, { t as i18nT } from "@/lang";
import { getLanguage } from "@/utils/language";
+import { applyBrandPresentation } from "@/utils/brand";
+import "./assets/icons";
+import "./permission";
+import { getDicts } from "@/api/system/dict/data";
+import { getConfigKey } from "@/api/system/config";
+import {
+ parseTime,
+ resetForm,
+ addDateRange,
+ selectDictLabel,
+ selectDictLabels,
+ handleTree,
+ addSESDateRange,
+ handleCopy,
+ formatAddress,
+} from "@/utils/ruoyi";
+import Pagination from "@/components/Pagination";
+import RightToolbar from "@/components/RightToolbar";
+import Editor from "@/components/Editor";
+import FileUpload from "@/components/FileUpload";
+import ImageUpload from "@/components/ImageUpload";
+import ImagePreview from "@/components/ImagePreview";
+import DictTag from "@/components/DictTag";
+import DictData from "@/components/DictData";
const ELEMENT_LOCALE_MAP = {
"zh-CN": elementZhCN,
@@ -52,38 +74,7 @@ Vue.prototype.msgError = function (msg) {
Vue.prototype.msgInfo = function (msg) {
this.$message.info(msg);
};
-import "./assets/icons"; // icon
-import "./permission"; // permission control
-import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
-import {
- parseTime,
- resetForm,
- addDateRange,
- selectDictLabel,
- selectDictLabels,
- handleTree,
- addSESDateRange,
- handleCopy,
- formatAddress,
-} from "@/utils/ruoyi";
-// 分页组件
-import Pagination from "@/components/Pagination";
-// 自定义表格工具组件
-import RightToolbar from "@/components/RightToolbar";
-// 富文本组件
-import Editor from "@/components/Editor";
-// 文件上传组件
-import FileUpload from "@/components/FileUpload";
-// 图片上传组件
-import ImageUpload from "@/components/ImageUpload";
-// 图片预览组件
-import ImagePreview from "@/components/ImagePreview";
-// 字典标签组件
-import DictTag from "@/components/DictTag";
-// 字典数据组件
-import DictData from "@/components/DictData";
-// 全局方法挂载
+
Vue.prototype.getDicts = getDicts;
Vue.prototype.getConfigKey = getConfigKey;
Vue.prototype.parseTime = parseTime;
@@ -96,7 +87,7 @@ Vue.prototype.handleTree = handleTree;
Vue.prototype.addSESDateRange = addSESDateRange;
Vue.prototype.handleCopy = handleCopy;
Vue.prototype.formatAddress = formatAddress;
-// 全局组件挂载
+
Vue.component("DictTag", DictTag);
Vue.component("Pagination", Pagination);
Vue.component("RightToolbar", RightToolbar);
@@ -110,17 +101,8 @@ Vue.use(plugins);
Vue.use(I18nPlugin);
DictData.install();
-/**
- * If you don't want to use mock-server
- * you want to use MockJs for mock api
- * you can execute: mockXHR()
- *
- * Currently MockJs will be used in the production environment,
- * please remove it before going online! ! !
- */
-
Vue.use(Element, {
- size: Cookies.get("size") || "medium", // set element-ui default size
+ size: Cookies.get("size") || "medium",
});
Vue.config.productionTip = false;
@@ -128,9 +110,12 @@ Vue.config.productionTip = false;
if (typeof document !== "undefined") {
document.documentElement.setAttribute("lang", currentLanguage);
const appTitle = i18nT("app.sidebarTitle");
- document.title = appTitle && appTitle !== "app.sidebarTitle"
- ? appTitle
- : process.env.VUE_APP_TITLE;
+ applyBrandPresentation({
+ brand: store.state.brand.current,
+ fallbackTitle: appTitle && appTitle !== "app.sidebarTitle" ? appTitle : process.env.VUE_APP_TITLE,
+ pageTitle: store.state.settings.title,
+ dynamicTitle: store.state.settings.dynamicTitle,
+ });
}
const app = new Vue({
diff --git a/src/permission.js b/src/permission.js
index b5a33ef..27e7942 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,4 +1,4 @@
-import router from "./router";
+import router from "./router";
import store from "./store";
import { Message } from "element-ui";
import NProgress from "nprogress";
@@ -6,27 +6,32 @@ import "nprogress/nprogress.css";
import { getToken } from "@/utils/auth";
import { isPathMatch } from "@/utils/validate";
import { isRelogin } from "@/utils/request";
+import { extractBusinessNoFromPath, getBrandedLoginPath } from "@/utils/brand";
NProgress.configure({ showSpinner: false });
-const whiteList = ["/login", "/register"];
+const whiteList = ["/login", "/:businessNo/login", "/register"];
const HOME_PATH = "/index";
-const isWhiteList = (path) => {
- return whiteList.some((pattern) => isPathMatch(pattern, path));
-};
+const isWhiteList = (path) => whiteList.some((pattern) => isPathMatch(pattern, path));
+const isLoginPath = (path) => isPathMatch("/login", path) || isPathMatch("/:businessNo/login", path);
const hasHomeRoute = (routes) => {
return Array.isArray(routes) && routes.some((route) => route && route.path === "/" && route.redirect === HOME_PATH);
};
+const resolveLoginPath = (path) => {
+ const businessNo = extractBusinessNoFromPath(path) || store.getters.brandBusinessNo;
+ return getBrandedLoginPath(businessNo);
+};
+
router.beforeEach((to, from, next) => {
NProgress.start();
if (getToken()) {
if (to.meta.title) {
store.dispatch("settings/setTitle", to.meta.title);
}
- if (to.path === "/login") {
+ if (isLoginPath(to.path)) {
next({ path: HOME_PATH, replace: true });
NProgress.done();
return;
@@ -39,6 +44,8 @@ router.beforeEach((to, from, next) => {
isRelogin.show = true;
store.dispatch("GetInfo").then(() => {
isRelogin.show = false;
+ return store.dispatch("brand/loadCurrentBrand").catch(() => null);
+ }).then(() => {
store.dispatch("GenerateRoutes").then((accessRoutes) => {
router.addRoutes(accessRoutes);
if (!hasHomeRoute(accessRoutes) && to.path !== "/no-permission") {
@@ -58,7 +65,7 @@ router.beforeEach((to, from, next) => {
.catch(() => {})
.finally(() => {
Message.error(errorText);
- next({ path: "/login", replace: true });
+ next({ path: resolveLoginPath(to.path), replace: true });
});
});
return;
@@ -70,10 +77,11 @@ router.beforeEach((to, from, next) => {
if (isWhiteList(to.path)) {
next();
} else {
+ const loginPath = resolveLoginPath(to.path);
if (to.path === "/no-permission") {
- next("/login");
+ next(loginPath);
} else {
- next(`/login?redirect=${encodeURIComponent(to.fullPath)}`);
+ next(`${loginPath}?redirect=${encodeURIComponent(to.fullPath)}`);
}
NProgress.done();
}
diff --git a/src/router/index.js b/src/router/index.js
index 1f3aa92..c50f8cc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,34 +1,10 @@
-import Vue from 'vue'
+import Vue from 'vue'
import Router from 'vue-router'
Vue.use(Router)
-/* Layout */
import Layout from '@/layout'
-/**
- * Note: 路由配置项
- *
- * hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
- * alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- * // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
- * // 若你想不管路由下面的 children 声明的个数都显示你的根路由
- * // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
- * redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- * name:'router-name' // 设定路由的名字，一定要填写不然使用
-
import logoImg from '@/assets/logo/logo.png'
import variables from '@/assets/styles/variables.scss'
-
-const SIDEBAR_TITLE_MAP = {
- 'zh-CN': '客户 GeoTag管理系统',
- 'en-US': 'GeoTag Customer Management System',
- 'fr-FR': 'Systeme de gestion client GeoTag',
- 'es-ES': 'Sistema de gestion de clientes GeoTag',
- 'pt-BR': 'Sistema de gestao de clientes GeoTag'
-}
+import { resolveBrandAsset } from '@/utils/brand'
export default {
name: 'SidebarLogo',
@@ -42,6 +35,13 @@ export default {
required: true
}
},
+ data() {
+ return {
+ defaultTitle: process.env.VUE_APP_TITLE,
+ defaultLogo: logoImg,
+ logoLoadError: false
+ }
+ },
computed: {
variables() {
return variables
@@ -49,8 +49,8 @@ export default {
sideTheme() {
return this.$store.state.settings.sideTheme
},
- currentLanguage() {
- return this.$store.state.settings.language || 'zh-CN'
+ currentBrand() {
+ return this.$store.getters.brand || {}
},
logoLinkStyle() {
if (this.collapse) {
@@ -93,18 +93,27 @@ export default {
}
},
logoTitle() {
- const directTitle = SIDEBAR_TITLE_MAP[this.currentLanguage]
- if (directTitle) {
- return directTitle
+ if (this.currentBrand.appSystemName) {
+ return this.currentBrand.appSystemName
}
const translated = this.$t('app.sidebarTitle')
- return translated && translated !== 'app.sidebarTitle' ? translated : this.title
+ return translated && translated !== 'app.sidebarTitle' ? translated : this.defaultTitle
+ },
+ logoSrc() {
+ if (this.logoLoadError) {
+ return this.defaultLogo
+ }
+ return resolveBrandAsset(this.currentBrand.appLogoUrl) || this.defaultLogo
}
},
- data() {
- return {
- title: process.env.VUE_APP_TITLE,
- logo: logoImg
+ watch: {
+ 'currentBrand.appLogoUrl'() {
+ this.logoLoadError = false
+ }
+ },
+ methods: {
+ handleLogoError() {
+ this.logoLoadError = true
}
}
}
@@ -144,6 +153,7 @@ export default {
width: 32px;
height: 32px;
vertical-align: middle;
+ object-fit: contain;
}
& .sidebar-title {
diff --git a/src/main.js b/src/main.js
index ddcc3e6..053e7e5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,5 @@
-import Vue from "vue";
-
+import Vue from "vue";
import Cookies from "js-cookie";
-
import Element from "element-ui";
import ElementLocale from "element-ui/lib/locale";
import elementZhCN from "element-ui/lib/locale/lang/zh-CN";
@@ -12,17 +10,41 @@ import elementEs from "element-ui/lib/locale/lang/es";
import elementPtBr from "element-ui/lib/locale/lang/pt-br";
import "./assets/styles/element-variables.scss";
-import "@/assets/styles/index.scss"; // global css
-import "@/assets/styles/ruoyi.scss"; // ruoyi css
+import "@/assets/styles/index.scss";
+import "@/assets/styles/ruoyi.scss";
import App from "./App";
import store from "./store";
import router from "./router";
-import directive from "./directive"; // directive
-import plugins from "./plugins"; // plugins
+import directive from "./directive";
+import plugins from "./plugins";
import { download } from "@/utils/ruoyi";
import { math, warmupMathjs } from "@/utils/math.js";
import I18nPlugin, { t as i18nT } from "@/lang";
import { getLanguage } from "@/utils/language";
+import { applyBrandPresentation } from "@/utils/brand";
+import "./assets/icons";
+import "./permission";
+import { getDicts } from "@/api/system/dict/data";
+import { getConfigKey } from "@/api/system/config";
+import {
+ parseTime,
+ resetForm,
+ addDateRange,
+ selectDictLabel,
+ selectDictLabels,
+ handleTree,
+ addSESDateRange,
+ handleCopy,
+ formatAddress,
+} from "@/utils/ruoyi";
+import Pagination from "@/components/Pagination";
+import RightToolbar from "@/components/RightToolbar";
+import Editor from "@/components/Editor";
+import FileUpload from "@/components/FileUpload";
+import ImageUpload from "@/components/ImageUpload";
+import ImagePreview from "@/components/ImagePreview";
+import DictTag from "@/components/DictTag";
+import DictData from "@/components/DictData";
const ELEMENT_LOCALE_MAP = {
"zh-CN": elementZhCN,
@@ -52,38 +74,7 @@ Vue.prototype.msgError = function (msg) {
Vue.prototype.msgInfo = function (msg) {
this.$message.info(msg);
};
-import "./assets/icons"; // icon
-import "./permission"; // permission control
-import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
-import {
- parseTime,
- resetForm,
- addDateRange,
- selectDictLabel,
- selectDictLabels,
- handleTree,
- addSESDateRange,
- handleCopy,
- formatAddress,
-} from "@/utils/ruoyi";
-// 分页组件
-import Pagination from "@/components/Pagination";
-// 自定义表格工具组件
-import RightToolbar from "@/components/RightToolbar";
-// 富文本组件
-import Editor from "@/components/Editor";
-// 文件上传组件
-import FileUpload from "@/components/FileUpload";
-// 图片上传组件
-import ImageUpload from "@/components/ImageUpload";
-// 图片预览组件
-import ImagePreview from "@/components/ImagePreview";
-// 字典标签组件
-import DictTag from "@/components/DictTag";
-// 字典数据组件
-import DictData from "@/components/DictData";
-// 全局方法挂载
+
Vue.prototype.getDicts = getDicts;
Vue.prototype.getConfigKey = getConfigKey;
Vue.prototype.parseTime = parseTime;
@@ -96,7 +87,7 @@ Vue.prototype.handleTree = handleTree;
Vue.prototype.addSESDateRange = addSESDateRange;
Vue.prototype.handleCopy = handleCopy;
Vue.prototype.formatAddress = formatAddress;
-// 全局组件挂载
+
Vue.component("DictTag", DictTag);
Vue.component("Pagination", Pagination);
Vue.component("RightToolbar", RightToolbar);
@@ -110,17 +101,8 @@ Vue.use(plugins);
Vue.use(I18nPlugin);
DictData.install();
-/**
- * If you don't want to use mock-server
- * you want to use MockJs for mock api
- * you can execute: mockXHR()
- *
- * Currently MockJs will be used in the production environment,
- * please remove it before going online! ! !
- */
-
Vue.use(Element, {
- size: Cookies.get("size") || "medium", // set element-ui default size
+ size: Cookies.get("size") || "medium",
});
Vue.config.productionTip = false;
@@ -128,9 +110,12 @@ Vue.config.productionTip = false;
if (typeof document !== "undefined") {
document.documentElement.setAttribute("lang", currentLanguage);
const appTitle = i18nT("app.sidebarTitle");
- document.title = appTitle && appTitle !== "app.sidebarTitle"
- ? appTitle
- : process.env.VUE_APP_TITLE;
+ applyBrandPresentation({
+ brand: store.state.brand.current,
+ fallbackTitle: appTitle && appTitle !== "app.sidebarTitle" ? appTitle : process.env.VUE_APP_TITLE,
+ pageTitle: store.state.settings.title,
+ dynamicTitle: store.state.settings.dynamicTitle,
+ });
}
const app = new Vue({
diff --git a/src/permission.js b/src/permission.js
index b5a33ef..27e7942 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,4 +1,4 @@
-import router from "./router";
+import router from "./router";
import store from "./store";
import { Message } from "element-ui";
import NProgress from "nprogress";
@@ -6,27 +6,32 @@ import "nprogress/nprogress.css";
import { getToken } from "@/utils/auth";
import { isPathMatch } from "@/utils/validate";
import { isRelogin } from "@/utils/request";
+import { extractBusinessNoFromPath, getBrandedLoginPath } from "@/utils/brand";
NProgress.configure({ showSpinner: false });
-const whiteList = ["/login", "/register"];
+const whiteList = ["/login", "/:businessNo/login", "/register"];
const HOME_PATH = "/index";
-const isWhiteList = (path) => {
- return whiteList.some((pattern) => isPathMatch(pattern, path));
-};
+const isWhiteList = (path) => whiteList.some((pattern) => isPathMatch(pattern, path));
+const isLoginPath = (path) => isPathMatch("/login", path) || isPathMatch("/:businessNo/login", path);
const hasHomeRoute = (routes) => {
return Array.isArray(routes) && routes.some((route) => route && route.path === "/" && route.redirect === HOME_PATH);
};
+const resolveLoginPath = (path) => {
+ const businessNo = extractBusinessNoFromPath(path) || store.getters.brandBusinessNo;
+ return getBrandedLoginPath(businessNo);
+};
+
router.beforeEach((to, from, next) => {
NProgress.start();
if (getToken()) {
if (to.meta.title) {
store.dispatch("settings/setTitle", to.meta.title);
}
- if (to.path === "/login") {
+ if (isLoginPath(to.path)) {
next({ path: HOME_PATH, replace: true });
NProgress.done();
return;
@@ -39,6 +44,8 @@ router.beforeEach((to, from, next) => {
isRelogin.show = true;
store.dispatch("GetInfo").then(() => {
isRelogin.show = false;
+ return store.dispatch("brand/loadCurrentBrand").catch(() => null);
+ }).then(() => {
store.dispatch("GenerateRoutes").then((accessRoutes) => {
router.addRoutes(accessRoutes);
if (!hasHomeRoute(accessRoutes) && to.path !== "/no-permission") {
@@ -58,7 +65,7 @@ router.beforeEach((to, from, next) => {
.catch(() => {})
.finally(() => {
Message.error(errorText);
- next({ path: "/login", replace: true });
+ next({ path: resolveLoginPath(to.path), replace: true });
});
});
return;
@@ -70,10 +77,11 @@ router.beforeEach((to, from, next) => {
if (isWhiteList(to.path)) {
next();
} else {
+ const loginPath = resolveLoginPath(to.path);
if (to.path === "/no-permission") {
- next("/login");
+ next(loginPath);
} else {
- next(`/login?redirect=${encodeURIComponent(to.fullPath)}`);
+ next(`${loginPath}?redirect=${encodeURIComponent(to.fullPath)}`);
}
NProgress.done();
}
diff --git a/src/router/index.js b/src/router/index.js
index 1f3aa92..c50f8cc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,34 +1,10 @@
-import Vue from 'vue'
+import Vue from 'vue'
import Router from 'vue-router'
Vue.use(Router)
-/* Layout */
import Layout from '@/layout'
-/**
- * Note: 路由配置项
- *
- * hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
- * alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- * // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
- * // 若你想不管路由下面的 children 声明的个数都显示你的根路由
- * // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
- * redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- * name:'router-name' // 设定路由的名字，一定要填写不然使用时会出现各种问题
- * query: '{"id": 1, "name": "ry"}' // 访问路由的默认传递参数
- * roles: ['admin', 'common'] // 访问路由的角色权限
- * permissions: ['a:a:a', 'b:b:b'] // 访问路由的菜单权限
- * meta : {
- noCache: true // 如果设置为true，则不会被 缓存(默认 false)
- title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
- icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
- breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
- activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。
- }
- */
-
-// 公共路由
export const constantRoutes = [
{
path: '/redirect',
@@ -46,6 +22,11 @@ export const constantRoutes = [
component: () => import('@/views/login'),
hidden: true
},
+ {
+ path: '/:businessNo/login',
+ component: () => import('@/views/login'),
+ hidden: true
+ },
{
path: '/register',
component: () => import('@/views/register'),
@@ -66,19 +47,6 @@ export const constantRoutes = [
component: () => import('@/views/error/noPermission'),
hidden: true
},
- // {
- // path: '',
- // component: Layout,
- // redirect: 'index',
- // children: [
- // {
- // path: 'index',
- // component: () => import('@/views/index'),
- // name: 'Index',
- // meta: { title: '首页', icon: 'dashboard', affix: true }
- // }
- // ]
- // },
{
path: '/user',
component: Layout,
@@ -108,9 +76,7 @@ export const constantRoutes = [
}
]
-// 动态路由，基于用户权限动态去加载
export const dynamicRoutes = [
-
{
path: '/system/dict-data',
component: Layout,
@@ -138,24 +104,22 @@ export const dynamicRoutes = [
meta: { title: '调度日志', activeMenu: '/monitor/job' }
}
]
- },
-
+ }
]
-// 防止连续点击多次路由报错
let routerPush = Router.prototype.push
let routerReplace = Router.prototype.replace
-// push
+
Router.prototype.push = function push(location) {
return routerPush.call(this, location).catch(err => err)
}
-// replace
-Router.prototype.replace = function push(location) {
+
+Router.prototype.replace = function replace(location) {
return routerReplace.call(this, location).catch(err => err)
}
export default new Router({
- mode: 'history', // 去掉url中的#
+ mode: 'history',
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})
diff --git a/src/store/getters.js b/src/store/getters.js
index 3680f95..200de1f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,8 +1,10 @@
-const getters = {
+const getters = {
sidebar: state => state.app.sidebar,
size: state => state.app.size,
device: state => state.app.device,
dict: state => state.dict.dict,
+ brand: state => state.brand.current,
+ brandBusinessNo: state => state.brand.current.businessNo,
visitedViews: state => state.tagsView.visitedViews,
cachedViews: state => state.tagsView.cachedViews,
token: state => state.user.token,
diff --git a/src/store/index.js b/src/store/index.js
index 97aaef8..75af919 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,6 +1,7 @@
-import Vue from 'vue'
+import Vue from 'vue'
import Vuex from 'vuex'
import app from './modules/app'
+import brand from './modules/brand'
import dict from './modules/dict'
import user from './modules/user'
import tagsView from './modules/tagsView'
@@ -13,6 +14,7 @@ Vue.use(Vuex)
const store = new Vuex.Store({
modules: {
app,
+ brand,
dict,
user,
tagsView,
diff --git a/src/store/modules/brand.js b/src/store/modules/brand.js
new file mode 100644
index 0000000..58a7741
--- /dev/null
+++ b/src/store/modules/brand.js
@@ -0,0 +1,64 @@
+import { getBrandConfig } from "@/api/brand";
+import {
+ applyBrandPresentation,
+ clearPersistedBrand,
+ getDefaultBrand,
+ normalizeBrandConfig,
+ persistBrand,
+ readPersistedBrand
+} from "@/utils/brand";
+
+const state = {
+ current: readPersistedBrand()
+};
+
+const mutations = {
+ SET_BRAND(state, brand) {
+ state.current = normalizeBrandConfig(brand);
+ },
+ CLEAR_BRAND(state) {
+ state.current = getDefaultBrand();
+ }
+};
+
+function syncBrandPresentation(brand, rootState) {
+ applyBrandPresentation({
+ brand,
+ fallbackTitle: process.env.VUE_APP_TITLE,
+ pageTitle: rootState.settings.title,
+ dynamicTitle: rootState.settings.dynamicTitle
+ });
+}
+
+function saveBrand(commit, rootState, brand) {
+ const normalized = normalizeBrandConfig(brand);
+ commit("SET_BRAND", normalized);
+ persistBrand(normalized);
+ syncBrandPresentation(normalized, rootState);
+ return normalized;
+}
+
+const actions = {
+ loadBrandByBusinessNo({ commit, rootState }, businessNo) {
+ return getBrandConfig(businessNo).then((response) => saveBrand(commit, rootState, response));
+ },
+ loadCurrentBrand({ commit, rootState }) {
+ return getBrandConfig().then((response) => saveBrand(commit, rootState, response));
+ },
+ setBrand({ commit, rootState }, brand) {
+ return Promise.resolve(saveBrand(commit, rootState, brand));
+ },
+ clearBrand({ commit, rootState }) {
+ commit("CLEAR_BRAND");
+ clearPersistedBrand();
+ syncBrandPresentation(getDefaultBrand(), rootState);
+ return Promise.resolve();
+ }
+};
+
+export default {
+ namespaced: true,
+ state,
+ mutations,
+ actions
+};
diff --git a/src/utils/brand.js b/src/utils/brand.js
new file mode 100644
index 0000000..6ebb724
--- /dev/null
+++ b/src/utils/brand.js
@@ -0,0 +1,125 @@
+const BRAND_STORAGE_KEY = "geotag-customer-brand";
+
+const DEFAULT_BRAND = {
+ businessNo: "",
+ appLogoUrl: "",
+ loginSystemName: "",
+ appSystemName: "",
+ loginLeftImageUrl: "",
+ faviconUrl: "",
+ copyrightText: ""
+};
+
+function safeDecodeURIComponent(value) {
+ if (!value) {
+ return "";
+ }
+ try {
+ return decodeURIComponent(value);
+ } catch (error) {
+ return value;
+ }
+}
+
+export function getDefaultBrand() {
+ return { ...DEFAULT_BRAND };
+}
+
+export function normalizeBrandConfig(payload = {}) {
+ const source = payload && payload.data ? payload.data : payload;
+ return {
+ ...DEFAULT_BRAND,
+ businessNo: source.businessNo || source.business_no || "",
+ appLogoUrl: source.appLogoUrl || source.app_logo_url || "",
+ loginSystemName: source.loginSystemName || source.login_system_name || "",
+ appSystemName: source.appSystemName || source.app_system_name || "",
+ loginLeftImageUrl: source.loginLeftImageUrl || source.login_left_image_url || "",
+ faviconUrl: source.faviconUrl || source.favicon_url || "",
+ copyrightText: source.copyrightText || source.copyright_text || ""
+ };
+}
+
+export function resolveBrandAsset(url) {
+ if (!url) {
+ return "";
+ }
+ if (/^(https?:)?\/\//.test(url) || /^data:/.test(url)) {
+ return url;
+ }
+ if (url.startsWith("/")) {
+ return `${process.env.VUE_APP_BASE_API}${url}`;
+ }
+ return url;
+}
+
+export function extractBusinessNoFromPath(path) {
+ if (!path || path === "/login") {
+ return "";
+ }
+ const match = path.match(/^\/([^/]+)\/login\/?$/);
+ return match ? safeDecodeURIComponent(match[1]) : "";
+}
+
+export function getBrandedLoginPath(businessNo) {
+ return businessNo ? `/${encodeURIComponent(businessNo)}/login` : "/login";
+}
+
+export function persistBrand(brand) {
+ if (typeof window === "undefined") {
+ return;
+ }
+ window.localStorage.setItem(BRAND_STORAGE_KEY, JSON.stringify(normalizeBrandConfig(brand)));
+}
+
+export function readPersistedBrand() {
+ if (typeof window === "undefined") {
+ return getDefaultBrand();
+ }
+ const raw = window.localStorage.getItem(BRAND_STORAGE_KEY);
+ if (!raw) {
+ return getDefaultBrand();
+ }
+ try {
+ return normalizeBrandConfig(JSON.parse(raw));
+ } catch (error) {
+ window.localStorage.removeItem(BRAND_STORAGE_KEY);
+ return getDefaultBrand();
+ }
+}
+
+export function clearPersistedBrand() {
+ if (typeof window === "undefined") {
+ return;
+ }
+ window.localStorage.removeItem(BRAND_STORAGE_KEY);
+}
+
+function getDefaultFaviconHref() {
+ const baseUrl = process.env.BASE_URL || "/";
+ return `${baseUrl}favicon.ico`;
+}
+
+export function applyBrandFavicon(iconUrl) {
+ if (typeof document === "undefined") {
+ return;
+ }
+ const href = iconUrl ? resolveBrandAsset(iconUrl) : getDefaultFaviconHref();
+ let link = document.querySelector("link[rel*='icon']");
+ if (!link) {
+ link = document.createElement("link");
+ link.rel = "shortcut icon";
+ document.head.appendChild(link);
+ }
+ link.type = "image/x-icon";
+ link.href = href;
+}
+
+export function applyBrandPresentation({ brand, fallbackTitle, pageTitle = "", dynamicTitle = false } = {}) {
+ if (typeof document === "undefined") {
+ return;
+ }
+ const normalized = normalizeBrandConfig(brand);
+ const baseTitle = normalized.appSystemName || fallbackTitle || process.env.VUE_APP_TITLE;
+ document.title = dynamicTitle && pageTitle ? `${pageTitle} - ${baseTitle}` : baseTitle;
+ applyBrandFavicon(normalized.faviconUrl);
+}
diff --git a/src/utils/dynamicTitle.js b/src/utils/dynamicTitle.js
index 10574da..2db4e46 100644
--- a/src/utils/dynamicTitle.js
+++ b/src/utils/dynamicTitle.js
@@ -1,6 +1,7 @@
-import store from '@/store'
+import store from '@/store'
import defaultSettings from '@/settings'
import { t as i18nT } from '@/lang'
+import { applyBrandPresentation } from '@/utils/brand'
function resolveAppTitle() {
const translated = i18nT('app.sidebarTitle')
@@ -9,16 +10,11 @@ function resolveAppTitle() {
: defaultSettings.title
}
-/**
- * 动态修改标题
- */
export function useDynamicTitle() {
- const appTitle = resolveAppTitle()
- if (store.state.settings.dynamicTitle) {
- document.title = store.state.settings.title
- ? (store.state.settings.title + ' - ' + appTitle)
- : appTitle
- } else {
- document.title = appTitle
- }
+ applyBrandPresentation({
+ brand: store.state.brand.current,
+ fallbackTitle: resolveAppTitle(),
+ pageTitle: store.state.settings.title,
+ dynamicTitle: store.state.settings.dynamicTitle
+ })
}
diff --git a/src/utils/request.js b/src/utils/request.js
index ed2a22f..20aa4bc 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,24 +8,19 @@ import { tansParams } from "@/utils/ruoyi";
import { getAcceptLanguage } from "@/utils/language";
import cache from "@/plugins/cache";
import { t } from "@/lang";
+import { getBrandedLoginPath } from "@/utils/brand";
-// 是否显示重新登录
export let isRelogin = { show: false };
axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
-// 创建 axios 实例
const service = axios.create({
- // axios 中请求配置有 baseURL 选项，表示请求 URL 公共部分
baseURL: process.env.VUE_APP_BASE_API,
- // 超时
timeout: 10000,
});
-// request 拦截器
service.interceptors.request.use(
(config) => {
- // 接口密码加密
const encryptUrls = [
"/merchant/merchantInfo",
"/merchant/merchantInfo/updateMerchantPwdAdmin",
@@ -51,18 +46,12 @@ service.interceptors.request.use(
});
}
- // 是否需要设置 token
const isToken = (config.headers || {}).isToken === false;
- // 是否需要防止数据重复提交
const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
if (getToken() && !isToken) {
config.headers["Authorization"] = "Bearer " + getToken();
}
- console.log(`语言：${getAcceptLanguage()}`)
- console.log("navigator.language =", navigator.language);
-console.log("navigator.languages =", navigator.languages);
-console.log("localStorage.language =", localStorage.getItem("language"));
config.headers["Accept-Language"] = getAcceptLanguage();
const clientTimeZone =
@@ -71,8 +60,7 @@ console.log("localStorage.language =", localStorage.getItem("language"));
Intl.DateTimeFormat().resolvedOptions().timeZone) ||
"Asia/Shanghai";
config.headers["X-Timezone"] = clientTimeZone;
- console.log(`时区：${clientTimeZone}`)
- // get 请求映射 params 参数
+
if (config.method === "get" && config.params) {
let url = config.url + "?" + tansParams(config.params);
url = url.slice(0, -1);
@@ -80,50 +68,33 @@ console.log("localStorage.language =", localStorage.getItem("language"));
config.url = url;
}
- if (
- !isRepeatSubmit &&
- (config.method === "post" || config.method === "put")
- ) {
+ if (!isRepeatSubmit && (config.method === "post" || config.method === "put")) {
const requestObj = {
url: config.url,
- data:
- typeof config.data === "object"
- ? JSON.stringify(config.data)
- : config.data,
+ data: typeof config.data === "object" ? JSON.stringify(config.data) : config.data,
time: new Date().getTime(),
};
- const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
- const limitSize = 5 * 1024 * 1024; // 限制存放数据 5M
+ const requestSize = JSON.stringify(requestObj).length;
+ const limitSize = 5 * 1024 * 1024;
if (requestSize >= limitSize) {
- console.warn(
- `[${config.url}]: ` +
- "请求数据大小超出允许的 5M 限制，无法进行防重复提交验证。"
- );
+ console.warn(`[${config.url}]: request data size exceeds 5MB, skip repeat-submit check.`);
return config;
}
const sessionObj = cache.session.getJSON("sessionObj");
- if (
- sessionObj === undefined ||
- sessionObj === null ||
- sessionObj === ""
- ) {
+ if (sessionObj === undefined || sessionObj === null || sessionObj === "") {
cache.session.setJSON("sessionObj", requestObj);
} else {
- const s_url = sessionObj.url; // 请求地址
- const s_data = sessionObj.data; // 请求数据
- const s_time = sessionObj.time; // 请求时间
- const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
-
- if (
- s_data === requestObj.data &&
- requestObj.time - s_time < interval &&
- s_url === requestObj.url
- ) {
+ const sUrl = sessionObj.url;
+ const sData = sessionObj.data;
+ const sTime = sessionObj.time;
+ const interval = 1000;
+
+ if (sData === requestObj.data && requestObj.time - sTime < interval && sUrl === requestObj.url) {
const message = "数据正在处理，请勿重复提交";
- console.warn(`[${s_url}]: ` + message);
+ console.warn(`[${sUrl}]: ` + message);
return Promise.reject(new Error(message));
}
@@ -139,19 +110,12 @@ console.log("localStorage.language =", localStorage.getItem("language"));
}
);
-// 响应拦截器
service.interceptors.response.use(
(res) => {
- // 未设置状态码则默认成功状态
const code = res.data.code || 200;
- // 获取错误信息（优先后端返回，支持 i18n）
const msg = res.data.msg || errorCode[code] || errorCode["default"];
- // 二进制数据则直接返回
- if (
- res.request.responseType === "blob" ||
- res.request.responseType === "arraybuffer"
- ) {
+ if (res.request.responseType === "blob" || res.request.responseType === "arraybuffer") {
return res.data;
}
@@ -170,7 +134,7 @@ service.interceptors.response.use(
.then(() => {
isRelogin.show = false;
store.dispatch("LogOut").then(() => {
- location.href = "/index";
+ location.href = getBrandedLoginPath(store.getters.brandBusinessNo);
});
})
.catch(() => {
@@ -213,4 +177,4 @@ service.interceptors.response.use(
}
);
-export default service;
+export default service;
\ No newline at end of file
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 6a4c0c5..1db08ae 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,20 +1,23 @@
-/**
- * 路径匹配器
- * @param {string} pattern
- * @param {string} path
- * @returns {Boolean}
- */
-export function isPathMatch(pattern, path) {
- const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*')
- const regex = new RegExp(`^${regexPattern}$`)
+export function isPathMatch(pattern, path) {
+ const patternSegments = pattern.split('/').map((segment) => {
+ if (!segment) {
+ return ''
+ }
+ if (segment === '**') {
+ return '.*'
+ }
+ if (segment === '*') {
+ return '[^/]+'
+ }
+ if (segment.startsWith(':')) {
+ return '[^/]+'
+ }
+ return segment.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+ })
+ const regex = new RegExp(`^${patternSegments.join('\\/')}$`)
return regex.test(path)
}
-/**
- * 判断value字符串是否为空
- * @param {string} value
- * @returns {Boolean}
- */
export function isEmpty(value) {
if (value == null || value == "" || value == undefined || value == "undefined") {
return true
@@ -22,90 +25,48 @@ export function isEmpty(value) {
return false
}
-/**
- * 判断url是否是http或https
- * @param {string} url
- * @returns {Boolean}
- */
export function isHttp(url) {
return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
-/**
- * 判断path是否为外链
- * @param {string} path
- * @returns {Boolean}
- */
export function isExternal(path) {
return /^(https?:|mailto:|tel:)/.test(path)
}
-/**
- * @param {string} str
- * @returns {Boolean}
- */
export function validUsername(str) {
const valid_map = ['admin', 'editor']
return valid_map.indexOf(str.trim()) >= 0
}
-/**
- * @param {string} url
- * @returns {Boolean}
- */
export function validURL(url) {
const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
return reg.test(url)
}
-/**
- * @param {string} str
- * @returns {Boolean}
- */
export function validLowerCase(str) {
const reg = /^[a-z]+$/
return reg.test(str)
}
-/**
- * @param {string} str
- * @returns {Boolean}
- */
export function validUpperCase(str) {
const reg = /^[A-Z]+$/
return reg.test(str)
}
-/**
- * @param {string} str
- * @returns {Boolean}
- */
export function validAlphabets(str) {
const reg = /^[A-Za-z]+$/
return reg.test(str)
}
-/**
- * @param {string} email
- * @returns {Boolean}
- */
export function validEmail(email) {
const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
return reg.test(email)
}
-/**
- * @param {string} str
- * @returns {Boolean}
- */
export function isString(str) {
return typeof str === 'string' || str instanceof String
}
-/**
- * @param {Array} arg
- * @returns {Boolean}
- */
export function isArray(arg) {
if (typeof Array.isArray === 'undefined') {
return Object.prototype.toString.call(arg) === '[object Array]'
diff --git a/src/views/device/device/index.vue b/src/views/device/device/index.vue
index a39586f..c307589 100644
--- a/src/views/device/device/index.vue
+++ b/src/views/device/device/index.vue
@@ -80,6 +80,9 @@
{{ $t("device.button.claim") }}
+
+ 待激活设备
+
{{ $t("device.button.batchEnable") }}
@@ -320,6 +323,7 @@
/>
{{ $t('fenceDevice.button.selectDevice') }}
@@ -266,9 +266,11 @@
-
+
{{ $t('fenceDevice.button.selectDevice') }}
@@ -266,9 +266,11 @@
-
- {{ $t('fenceDevice.button.add') }}
+
+
+
+ {{ $t('fenceDevice.button.add') }}
+
{{ $t('fenceDevice.button.resetEditor') }}
{{ $t('fenceDevice.button.save') }}
@@ -518,7 +520,7 @@ const FOCUS_ZOOM = 14
const MAP_SERIES_COLORS = ['#2563eb', '#16a34a', '#d97706', '#7c3aed', '#0f766e', '#db2777']
const MAPTILER_TILE_URL = 'https://api.maptiler.com/maps/streets/{z}/{x}/{y}.png?key='
const GOOGLE_TILE_URL = 'https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}'
-const AMAP_TILE_URL = 'https://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}'
+const AMAP_TILE_URL = 'https://wprd0{s}.is.autonavi.com/appmaptile?style=7&x={x}&y={y}&z={z}'
function clone(obj) {
return JSON.parse(JSON.stringify(obj))
@@ -597,6 +599,7 @@ export default {
editorDeviceOptions: [],
currentFenceId: null,
editorFocusedFence: null,
+ editorFenceDeviceStatusMap: {},
fenceForm: this.getDefaultFenceForm(),
handleDialogVisible: false,
selectedAlarmId: null,
@@ -620,6 +623,8 @@ export default {
editorDrawControl: null,
editorPulseWaveSets: [],
editorPulseTimer: null,
+ editorPreferredCenter: null,
+ editorLocateRequestSeq: 0,
resizeTimer: null,
selectedDeviceRequestSeq: 0,
alarmLocateDialogVisible: false,
@@ -750,8 +755,26 @@ export default {
}
},
selectedDevice() {
- return this.monitorDevices.find(item => item.deviceId === this.selectedDeviceId)
- || null
+ if (!this.selectedDeviceId) {
+ return null
+ }
+ const selectedFenceId = this.normalizeFenceId(this.selectedMonitorFenceId)
+ if (selectedFenceId) {
+ const groups = this.fenceGroupedMonitorDevices || []
+ for (let i = 0; i < groups.length; i++) {
+ const devices = (groups[i] && groups[i].devices) || []
+ for (let j = 0; j < devices.length; j++) {
+ const row = devices[j]
+ if (!this.isSameDeviceId(row && row.deviceId, this.selectedDeviceId)) {
+ continue
+ }
+ if (this.isSameFenceId(row && row._groupFenceId, selectedFenceId)) {
+ return row
+ }
+ }
+ }
+ }
+ return this.monitorDevices.find(item => this.isSameDeviceId(item && item.deviceId, this.selectedDeviceId)) || null
},
selectedFenceDevices() {
const selectedIds = new Set((this.fenceForm.deviceIds || []).map(id => this.normalizeDeviceId(id)))
@@ -1609,6 +1632,51 @@ export default {
this.editorDeviceOptions = rows
return rows
},
+ buildFenceDeviceStatusKey(fenceId, deviceId) {
+ const normalizedFenceId = this.normalizeFenceId(fenceId)
+ const normalizedDeviceId = this.normalizeDeviceId(deviceId)
+ if (!normalizedFenceId || !normalizedDeviceId) {
+ return ''
+ }
+ return `${normalizedFenceId}_${normalizedDeviceId}`
+ },
+ async loadEditorFenceDeviceStatuses(fence, deviceIds) {
+ const normalizedFenceId = this.normalizeFenceId(fence && fence.id)
+ const normalizedFenceName = String((fence && fence.fenceName) || '').trim()
+ const normalizedDeviceIds = this.normalizeDeviceIds(deviceIds)
+ this.editorFenceDeviceStatusMap = {}
+ if (!normalizedFenceId || !normalizedFenceName || !normalizedDeviceIds.length) {
+ return {}
+ }
+ const response = await listFenceMonitorDevices({
+ fenceName: normalizedFenceName,
+ pageNum: 1,
+ pageSize: Math.max(normalizedDeviceIds.length, 100)
+ })
+ const rows = this.normalizeRows(response)
+ const nextStatusMap = {}
+ rows.forEach(row => {
+ const rowDeviceId = this.normalizeDeviceId(row && row.deviceId)
+ if (!rowDeviceId || !normalizedDeviceIds.some(id => this.isSameDeviceId(id, rowDeviceId))) {
+ return
+ }
+ const statuses = this.parseFenceStatuses(row && row.fenceStatuses)
+ const matchedStatus = statuses.find(status =>
+ this.isSameFenceId(status && status.id, normalizedFenceId) ||
+ String((status && status.name) || '').trim() === normalizedFenceName
+ )
+ const statusText = String((matchedStatus && matchedStatus.status) || '').trim().toLowerCase()
+ if (!statusText) {
+ return
+ }
+ const statusKey = this.buildFenceDeviceStatusKey(normalizedFenceId, rowDeviceId)
+ if (statusKey) {
+ nextStatusMap[statusKey] = statusText
+ }
+ })
+ this.editorFenceDeviceStatusMap = nextStatusMap
+ return nextStatusMap
+ },
collectDeviceRowsByIds(deviceIds) {
const used = new Set()
return (deviceIds || []).map(id => {
@@ -1766,13 +1834,18 @@ export default {
this.loadAlarmList({ pageNum: 1, pageSize: this.alarmPageSize })
},
async startCreateFence() {
+ const locateRequestSeq = ++this.editorLocateRequestSeq
this.editorFocusedFence = null
await this.switchTab('fence')
this.resetEditor(true)
this.editorNotice = this.$t('fenceDevice.editor.createHint')
+ this.locateEditorOnCreate(locateRequestSeq)
},
async startEditFence(row) {
+ this.editorLocateRequestSeq += 1
this.editorFocusedFence = null
+ this.editorPreferredCenter = null
+ this.editorFenceDeviceStatusMap = {}
await this.switchTab('fence')
const response = await getFence(row.id)
const data = this.normalizeObject(response)
@@ -1797,6 +1870,10 @@ export default {
if (this.fenceForm.deviceIds.length) {
try {
await this.loadEditorMapDeviceOptions(this.fenceForm.deviceIds)
+ await this.loadEditorFenceDeviceStatuses({
+ id: this.currentFenceId,
+ fenceName: this.fenceForm.fenceName
+ }, this.fenceForm.deviceIds)
this.renderEditorMap()
} catch (error) {
this.$message.warning((error && error.message) || this.$t('fenceDevice.message.devicePointLoadFailed'))
@@ -1805,6 +1882,8 @@ export default {
},
resetEditor(renderMap = true) {
this.editorFocusedFence = null
+ this.editorPreferredCenter = null
+ this.editorFenceDeviceStatusMap = {}
this.fenceForm = this.getDefaultFenceForm()
this.editorDeviceOptions = []
this.currentFenceId = null
@@ -1812,6 +1891,52 @@ export default {
if (this.editorDrawGroup) this.editorDrawGroup.clearLayers()
if (renderMap) this.renderEditorMap()
},
+ locateEditorOnCreate(requestSeq) {
+ this.resolveCurrentLocation().then(async center => {
+ if (!center) {
+ return
+ }
+ if (requestSeq !== this.editorLocateRequestSeq) {
+ return
+ }
+ if (this.activeTab !== 'fence' || this.currentFenceId || this.editorFocusedFence) {
+ return
+ }
+ if (this.collectEditorBounds().length) {
+ return
+ }
+ this.editorPreferredCenter = center
+ await this.ensureEditorMap()
+ if (!this.editorMap || this.collectEditorBounds().length) {
+ return
+ }
+ this.editorMap.setView(center, FOCUS_ZOOM)
+ }).catch(() => {})
+ },
+ resolveCurrentLocation() {
+ if (typeof window === 'undefined' || !window.navigator || !window.navigator.geolocation) {
+ return Promise.resolve(null)
+ }
+ return new Promise(resolve => {
+ window.navigator.geolocation.getCurrentPosition(
+ position => {
+ const lat = Number(position && position.coords && position.coords.latitude)
+ const lng = Number(position && position.coords && position.coords.longitude)
+ if (!this.hasCoordinatePair(lat, lng)) {
+ resolve(null)
+ return
+ }
+ resolve([lat, lng])
+ },
+ () => resolve(null),
+ {
+ enableHighAccuracy: true,
+ timeout: 8000,
+ maximumAge: 60000
+ }
+ )
+ })
+ },
async submitFenceForm() {
if (!this.fenceForm.fenceName) {
this.$message.warning(this.$t('fenceDevice.message.nameRequired'))
@@ -1821,6 +1946,10 @@ export default {
this.$message.warning(this.$t('fenceDevice.message.ruleRequired'))
return
}
+ if (!this.normalizeDeviceIds(this.fenceForm.deviceIds).length) {
+ this.$message.warning(this.$t('fenceDevice.message.deviceRequired'))
+ return
+ }
if (!this.validateShape()) return
const payload = clone(this.fenceForm)
payload.scheduleType = this.normalizeScheduleTypeValue(payload.scheduleType)
@@ -2203,9 +2332,7 @@ export default {
const selectedLat = this.resolveOptionLat(this.selectedDevice)
const selectedLng = this.resolveOptionLng(this.selectedDevice)
if (this.selectedDevice && this.hasCoordinatePair(selectedLat, selectedLng)) {
- const markerColor = this.selectedDevice.lastAlarmLevel
- ? this.getAlarmLevelColor(this.selectedDevice.lastAlarmLevel)
- : '#ef4444'
+ const markerColor = this.resolveMonitorMapPointColor(this.selectedDevice)
const coreMarker = this.monitorLeaflet.circleMarker([selectedLat, selectedLng], {
radius: 10,
color: '#ffffff',
@@ -2306,13 +2433,16 @@ export default {
const lat = this.resolveOptionLat(item)
const lng = this.resolveOptionLng(item)
if (!this.hasCoordinatePair(lat, lng)) return
- const seriesColor = this.getSeriesColor(index)
- pulsePoints.push({ lat: Number(lat), lng: Number(lng), color: seriesColor })
+ const markerColor = this.getFenceMapDeviceColor(item, targetFence, {
+ focused: isFocusedMode,
+ index
+ })
+ pulsePoints.push({ lat: Number(lat), lng: Number(lng), color: markerColor })
const marker = this.editorLeaflet.circleMarker([lat, lng], {
radius: 7,
color: '#ffffff',
weight: 2,
- fillColor: seriesColor,
+ fillColor: markerColor,
fillOpacity: 0.95
})
marker.bindTooltip(item.alias || item.sn || '-', { direction: 'top' })
@@ -2458,12 +2588,50 @@ export default {
return
}
}
+ if (map === this.editorMap && Array.isArray(this.editorPreferredCenter) && this.editorPreferredCenter.length === 2) {
+ const lat = Number(this.editorPreferredCenter[0])
+ const lng = Number(this.editorPreferredCenter[1])
+ if (!this.currentFenceId && !this.editorFocusedFence && this.hasCoordinatePair(lat, lng)) {
+ map.setView([lat, lng], FOCUS_ZOOM)
+ return
+ }
+ }
map.setView(DEFAULT_CENTER, DEFAULT_ZOOM)
},
getSeriesColor(index) {
if (!Number.isFinite(index) || index < 0) return MAP_SERIES_COLORS[0]
return MAP_SERIES_COLORS[index % MAP_SERIES_COLORS.length]
},
+ getFenceMapDeviceColor(item, fence, options = {}) {
+ const fallbackColor = this.getSeriesColor(options.index)
+ if (!options.focused || !fence) {
+ return fallbackColor
+ }
+ const status = this.resolveFenceDevicePreviewStatus(item, fence)
+ if (status === 'outside') {
+ return '#ef4444'
+ }
+ if (status === 'inside') {
+ return '#22c55e'
+ }
+ return fallbackColor
+ },
+ resolveFenceDevicePreviewStatus(item, fence) {
+ const statusKey = this.buildFenceDeviceStatusKey(fence && fence.id, this.resolveDeviceOptionId(item))
+ const mappedStatus = String(this.editorFenceDeviceStatusMap[statusKey] || '').trim().toLowerCase()
+ if (mappedStatus === 'inside') {
+ return 'inside'
+ }
+ if (mappedStatus === 'outside' || mappedStatus === 'boundary') {
+ return 'outside'
+ }
+ const lat = this.resolveOptionLat(item)
+ const lng = this.resolveOptionLng(item)
+ if (!this.hasCoordinatePair(lat, lng) || !fence) {
+ return ''
+ }
+ return this.isPointInsideFence(Number(lat), Number(lng), fence) ? 'inside' : 'outside'
+ },
getFenceSeriesStyle(index, overrides = {}) {
const color = this.getSeriesColor(index)
const fillColor = overrides.fillColor || overrides.color || color
@@ -2485,6 +2653,8 @@ export default {
if (!row || !row.id) {
return
}
+ this.editorLocateRequestSeq += 1
+ this.editorPreferredCenter = null
await this.switchTab('fence')
const response = await getFence(row.id)
const detailData = this.normalizeObject(response)
@@ -2501,6 +2671,7 @@ export default {
geomWkt: (detailData && detailData.geomWkt) || (row && row.geomWkt) || '',
deviceIds: focusedDeviceIds
}
+ this.editorFenceDeviceStatusMap = {}
this.editorDeviceOptions = []
this.editorNotice = this.$t('fenceDevice.editor.previewHint', { name: this.editorFocusedFence.fenceName || '-' })
await this.$nextTick()
@@ -2509,6 +2680,7 @@ export default {
if (focusedDeviceIds.length) {
try {
await this.loadEditorMapDeviceOptions(focusedDeviceIds)
+ await this.loadEditorFenceDeviceStatuses(this.editorFocusedFence, focusedDeviceIds)
this.renderEditorMap()
} catch (error) {
this.$message.warning((error && error.message) || this.$t('fenceDevice.message.devicePointLoadFailed'))
@@ -2805,6 +2977,102 @@ export default {
return null
}
},
+ isPointInsideFence(lat, lng, fence) {
+ const circle = this.circlePayload(fence)
+ if (circle) {
+ return this.isPointInsideCircle(lat, lng, circle)
+ }
+ const normalizedShapeType = this.normalizeFenceShapeType(fence && fence.shapeType)
+ const bounds = this.rectPayload(fence)
+ if (bounds && normalizedShapeType === 'rect') {
+ return this.isPointInsideRect(lat, lng, bounds)
+ }
+ const points = this.polygonPayload(fence)
+ if (points.length) {
+ return this.isPointInsidePolygon(lat, lng, points)
+ }
+ if (bounds) {
+ return this.isPointInsideRect(lat, lng, bounds)
+ }
+ return false
+ },
+ isPointInsideCircle(lat, lng, circle) {
+ if (!circle || !Array.isArray(circle.center) || circle.center.length < 2 || !Number.isFinite(circle.radius)) {
+ return false
+ }
+ const centerLat = Number(circle.center[0])
+ const centerLng = Number(circle.center[1])
+ const radiusMeter = Number(circle.radius)
+ if (!Number.isFinite(centerLat) || !Number.isFinite(centerLng) || !Number.isFinite(radiusMeter)) {
+ return false
+ }
+ return this.calculateDistanceMeters(lat, lng, centerLat, centerLng) <= radiusMeter
+ },
+ isPointInsideRect(lat, lng, bounds) {
+ if (!Array.isArray(bounds) || bounds.length < 2) {
+ return false
+ }
+ const southWest = bounds[0] || []
+ const northEast = bounds[1] || []
+ const minLat = Math.min(Number(southWest[0]), Number(northEast[0]))
+ const maxLat = Math.max(Number(southWest[0]), Number(northEast[0]))
+ const minLng = Math.min(Number(southWest[1]), Number(northEast[1]))
+ const maxLng = Math.max(Number(southWest[1]), Number(northEast[1]))
+ if (![minLat, maxLat, minLng, maxLng].every(Number.isFinite)) {
+ return false
+ }
+ return lat >= minLat && lat <= maxLat && lng >= minLng && lng <= maxLng
+ },
+ isPointInsidePolygon(lat, lng, points) {
+ if (!Array.isArray(points) || points.length < 3) {
+ return false
+ }
+ let inside = false
+ for (let i = 0, j = points.length - 1; i < points.length; j = i++) {
+ const current = points[i] || []
+ const previous = points[j] || []
+ const currentLat = Number(current[0])
+ const currentLng = Number(current[1])
+ const previousLat = Number(previous[0])
+ const previousLng = Number(previous[1])
+ if (![currentLat, currentLng, previousLat, previousLng].every(Number.isFinite)) {
+ continue
+ }
+ if (this.isPointOnLineSegment(lat, lng, previousLat, previousLng, currentLat, currentLng)) {
+ return true
+ }
+ const intersects = ((currentLat > lat) !== (previousLat > lat)) &&
+ (lng < ((previousLng - currentLng) * (lat - currentLat)) / ((previousLat - currentLat) || Number.EPSILON) + currentLng)
+ if (intersects) {
+ inside = !inside
+ }
+ }
+ return inside
+ },
+ isPointOnLineSegment(pointLat, pointLng, startLat, startLng, endLat, endLng) {
+ const cross = (pointLng - startLng) * (endLat - startLat) - (pointLat - startLat) * (endLng - startLng)
+ if (Math.abs(cross) > 1e-9) {
+ return false
+ }
+ const dot = (pointLat - startLat) * (endLat - startLat) + (pointLng - startLng) * (endLng - startLng)
+ if (dot < 0) {
+ return false
+ }
+ const lengthSquared = Math.pow(endLat - startLat, 2) + Math.pow(endLng - startLng, 2)
+ return dot <= lengthSquared
+ },
+ calculateDistanceMeters(lat1, lng1, lat2, lng2) {
+ const toRadians = value => Number(value) * Math.PI / 180
+ const earthRadius = 6371000
+ const dLat = toRadians(lat2 - lat1)
+ const dLng = toRadians(lng2 - lng1)
+ const startLat = toRadians(lat1)
+ const endLat = toRadians(lat2)
+ const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+ Math.cos(startLat) * Math.cos(endLat) * Math.sin(dLng / 2) * Math.sin(dLng / 2)
+ const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
+ return earthRadius * c
+ },
extendBounds(bounds, layer) {
if (!layer || !layer.getBounds) return
const layerBounds = layer.getBounds()
@@ -2866,6 +3134,38 @@ export default {
getAlarmLevelColor(type) {
return type === 'critical' ? '#dc2626' : type === 'warning' ? '#d97706' : '#059669'
},
+ resolveMonitorMapPointColor(item) {
+ const statusType = this.resolveMonitorMapStatusType(item)
+ if (statusType === 'alert') {
+ return '#ef4444'
+ }
+ if (statusType === 'normal') {
+ return '#22c55e'
+ }
+ return '#22c55e'
+ },
+ resolveMonitorMapStatusType(item) {
+ const groupStatus = String((item && item._groupFenceStatus) || '').trim().toLowerCase()
+ if (groupStatus === 'outside' || groupStatus === 'boundary') {
+ return 'alert'
+ }
+ if (groupStatus === 'inside') {
+ return 'normal'
+ }
+ const selectedFenceId = this.normalizeFenceId(this.selectedMonitorFenceId)
+ const statuses = this.parseFenceStatuses(item && item.fenceStatuses)
+ if (selectedFenceId && statuses.length) {
+ const matchedStatus = statuses.find(status => this.isSameFenceId(status && status.id, selectedFenceId))
+ const matchedType = String((matchedStatus && matchedStatus.status) || '').trim().toLowerCase()
+ if (matchedType === 'outside' || matchedType === 'boundary') {
+ return 'alert'
+ }
+ if (matchedType === 'inside') {
+ return 'normal'
+ }
+ }
+ return this.resolveMonitorDeviceStatusType(item)
+ },
resolveMonitorDeviceStatusType(item) {
const groupStatus = String((item && item._groupFenceStatus) || '').trim().toLowerCase()
if (groupStatus === 'outside') return 'alert'
@@ -3222,6 +3522,7 @@ export default {
.fence-content-split { display: grid; grid-template-columns: minmax(480px, 0.92fr) minmax(640px, 1.08fr); min-height: 0; height: 100%; }
.form-grid, .alert-filter-grid { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 8px; align-items: end; }
.form-grid label, .alert-filter-grid label { display: block; margin-bottom: 4px; font-size: 12px; color: #6b7280; }
+.form-label--required::before { content: '*'; color: #ef4444; margin-right: 4px; }
.alert-filter-grid--alarm { grid-template-columns: repeat(4, minmax(240px, 1fr)); gap: 14px 16px; padding: 14px 16px 10px; border: 1px solid #e5e7eb; border-radius: 10px; background: #f8fafc; }
.alert-filter-grid--alarm label { margin-bottom: 6px; color: #475569; font-weight: 600; }
.span-2 { grid-column: span 2; }
diff --git a/src/views/login.vue b/src/views/login.vue
index df6214a..c658bf7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,186 +1,129 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -51,6 +44,17 @@
/>
+
+
+
+
+
+
+
+
@@ -131,7 +136,7 @@ function createDefaultProfileForm() {
businessName: "",
gaodeKey: "",
gaodeSecurityKey: "",
- googleKey: "",
+ maptilerKey: "",
canEditBusinessConfig: false,
};
}
@@ -218,7 +223,7 @@ export default {
if (this.canEditMapConfig) {
payload.gaodeKey = this.profileForm.gaodeKey;
payload.gaodeSecurityKey = this.profileForm.gaodeSecurityKey;
- payload.googleKey = this.profileForm.googleKey;
+ payload.maptilerKey = this.profileForm.maptilerKey;
}
this.profileSaving = true;
updateUserProfile(payload)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
-
-
-
-
-
- {{ $t("login.login") }}
- {{ $t("login.loggingIn") }}
+
+ {{ $t('login.login') }}
+ {{ $t('login.loggingIn') }}
-
-
diff --git a/src/views/system/user/components/ProfileSettingsCard.vue b/src/views/system/user/components/ProfileSettingsCard.vue
index 133900c..0b380f1 100644
--- a/src/views/system/user/components/ProfileSettingsCard.vue
+++ b/src/views/system/user/components/ProfileSettingsCard.vue
@@ -32,14 +32,7 @@
+
+ ![login-left]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
{{ $t("login.title") }}
+{{ loginTitle }}
@@ -203,51 +146,53 @@