diff --git a/src/assets/images/di.png b/src/assets/images/di.png new file mode 100644 index 0000000..0e3ddfc Binary files /dev/null and b/src/assets/images/di.png differ diff --git a/src/assets/images/diAc.png b/src/assets/images/diAc.png new file mode 100644 index 0000000..38afce8 Binary files /dev/null and b/src/assets/images/diAc.png differ diff --git a/src/assets/images/high.png b/src/assets/images/high.png new file mode 100644 index 0000000..430d7d1 Binary files /dev/null and b/src/assets/images/high.png differ diff --git a/src/assets/images/highAc.png b/src/assets/images/highAc.png new file mode 100644 index 0000000..3984ce0 Binary files /dev/null and b/src/assets/images/highAc.png differ diff --git a/src/assets/images/rb.png b/src/assets/images/rb.png new file mode 100644 index 0000000..83df6e8 Binary files /dev/null and b/src/assets/images/rb.png differ diff --git a/src/assets/images/rbAc.png b/src/assets/images/rbAc.png new file mode 100644 index 0000000..edc341a Binary files /dev/null and b/src/assets/images/rbAc.png differ diff --git a/src/assets/images/sg.png b/src/assets/images/sg.png new file mode 100644 index 0000000..69e047f Binary files /dev/null and b/src/assets/images/sg.png differ diff --git a/src/assets/images/sgAc.png b/src/assets/images/sgAc.png new file mode 100644 index 0000000..085c239 Binary files /dev/null and b/src/assets/images/sgAc.png differ diff --git a/src/assets/images/zhong.png b/src/assets/images/zhong.png new file mode 100644 index 0000000..70fca5f Binary files /dev/null and b/src/assets/images/zhong.png differ diff --git a/src/assets/images/zhongAc.png b/src/assets/images/zhongAc.png new file mode 100644 index 0000000..4fdf1ba Binary files /dev/null and b/src/assets/images/zhongAc.png differ diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index a11159b..5d12355 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -79,6 +79,7 @@ const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[]) }; const resolvePath = (routePath: string, routeQuery?: string): any => { + if (isExternal(routePath)) { return routePath; } diff --git a/src/views/controlCenter/670/index.vue b/src/views/controlCenter/670/index.vue index aafd5b8..f741000 100644 --- a/src/views/controlCenter/670/index.vue +++ b/src/views/controlCenter/670/index.vue @@ -19,8 +19,8 @@
设备静止报警中!
-
- 设备强制报警中,{{ Status.timeOut }}S! +
+ 设备强制报警中,{{ Status.timeOut }}S!
@@ -102,7 +102,7 @@
- 姓名 + 姓名:
@@ -206,11 +206,24 @@ const router = useRouter(); // 导入图片资源(确保路径正确) import strongLightDefault from '@/assets/images/strong-light.png'; import strongLightActive from '@/assets/images/strong-light_HL.png'; -import weakLightDefault from '@/assets/images/weak-light.png'; -import weakLightActive from '@/assets/images/weak-light_HL.png'; +import floodLightDefault from '@/assets/images/flood-light.png'; +import floodLightActive from '@/assets/images/flood-light_HL.png'; + +import di from '@/assets/images/di.png'; +import diAc from '@/assets/images/diAc.png'; +import high from '@/assets/images/high.png'; +import highAc from '@/assets/images/highAc.png'; +import rb from '@/assets/images/rb.png'; +import rbAc from '@/assets/images/rbAc.png'; +import sg from '@/assets/images/sg.png'; +import sgAc from '@/assets/images/sgAc.png'; +import zhong from '@/assets/images/zhong.png'; +import zhongAc from '@/assets/images/zhongAc.png'; import closeDefault from '@/assets/images/close.png'; import closeActive from '@/assets/images/close_HL.png'; +import { hi } from 'element-plus/es/locale/index.mjs'; + const fullscreenLoading = ref(false); var timer = null; const sendTextLoading = ref(false); @@ -248,8 +261,8 @@ const lightModes = ref([ { id: '2', name: '弱光', - icon: weakLightDefault, - activeIcon: weakLightActive, + icon: floodLightDefault, + activeIcon: floodLightActive, active: false }, { @@ -265,24 +278,24 @@ const sosModes = ref([ { id: '1', name: '声光报警', - icon: strongLightDefault, // 直接使用导入的变量 - activeIcon: strongLightActive, + icon: sg, // 直接使用导入的变量 + activeIcon: sgAc, active: false }, { id: '2', name: '红蓝模式', - icon: strongLightDefault, // 直接使用导入的变量 - activeIcon: strongLightActive, + icon: rb, // 直接使用导入的变量 + activeIcon: rbAc, active: false }, { id: '0', name: '关闭', - icon: strongLightDefault, // 直接使用导入的变量 - activeIcon: strongLightActive, + icon: closeDefault, // 直接使用导入的变量 + activeIcon: closeActive, active: false } @@ -292,32 +305,32 @@ const staticModes = ref([ { id: '3', name: '高档', - icon: strongLightDefault, // 直接使用导入的变量 - activeIcon: strongLightActive, + icon: high, // 直接使用导入的变量 + activeIcon: highAc, active: false }, { id: '2', name: '中档', - icon: strongLightDefault, // 直接使用导入的变量 - activeIcon: strongLightActive, + icon: zhong, // 直接使用导入的变量 + activeIcon:zhongAc, active: false }, { id: '1', name: '低档', - icon: strongLightDefault, // 直接使用导入的变量 - activeIcon: strongLightActive, + icon: di, // 直接使用导入的变量 + activeIcon: diAc, active: false }, { id: '0', name: '关闭', - icon: strongLightDefault, // 直接使用导入的变量 - activeIcon: strongLightActive, + icon: closeDefault, // 直接使用导入的变量 + activeIcon: closeActive, active: false } diff --git a/src/views/system/user/profile/appVer.vue b/src/views/system/user/profile/appVer.vue new file mode 100644 index 0000000..000a39d --- /dev/null +++ b/src/views/system/user/profile/appVer.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue index 97d70ae..4618fa4 100644 --- a/src/views/system/user/profile/index.vue +++ b/src/views/system/user/profile/index.vue @@ -61,6 +61,9 @@ + + + @@ -78,7 +81,7 @@ import { getAuthList } from '@/api/system/social/auth'; import { getUserProfile } from '@/api/system/user'; import { getOnline } from '@/api/monitor/online'; import { UserVO } from '@/api/system/user/types'; - +import appVer from './appVer.vue'; const activeTab = ref('userinfo'); interface State { user: Partial; @@ -86,13 +89,15 @@ interface State { postGroup: string; auths: any; devices: any; + vers: any; } const state = ref({ user: {}, roleGroup: '', postGroup: '', auths: [], - devices: [] + devices: [], + vers: '' }); const userForm = ref({});