zsysview 0.0.7 → 0.0.8

package/core/app.ts

@@ -8,17 +8,25 @@ import ElementPlus from 'element-plus' //导入 ElementPlus 组件库的所有
 import 'element-plus/dist/index.css' //导入 ElementPlus 组件库所需的全局 CSS 样式
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 
+
 //路由
-import router from './router.ts' //导入路由模块
+import {initRouter,addFrameRouter} from './router.ts' //导入路由模块
+
 
 const zsysapp=createApp(app)
 
 const pinia=createPinia()
 pinia.use(piniaPluginPersistedstate)
 
-zsysapp.use(router) //将 Vue Router 插件注册到 Vue 应用中
+addFrameRouter({path:'/desktop',component:()=>import('../../test_view/test_desktop.vue')})
+
+zsysapp.use(initRouter()) //将 Vue Router 插件注册到 Vue 应用中
 zsysapp.use(ElementPlus,{locale: zhCn}) //将 ElementPlus 插件注册到 Vue 应用中
 zsysapp.use(pinia)
+//从后台获取全局信息
+// import {GetPublish}from '../core/runtime.ts'
+// GetPublish(zsysapp)
 zsysapp.mount('#app')
 
+
 export default {zsysapp}

package/core/httpapi/http_api_v1.ts

@@ -57,6 +57,8 @@ export class HttpApiV1 {
   //导出
   static url_export_detail: string = 'api/export_detail'
   static url_export_file: string = 'api/export_file'
+  // 系统
+  static url_system_publish: string = 'api/system_publish'
 
   //应用级接口==========================
   //桌面

package/core/router.ts

@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from "vue-router"
+import { createRouter, createWebHistory, type Router,type RouteRecordRaw } from "vue-router"
 import { useTokenStore } from "./user_token"
 
 const routes = [
@@ -14,55 +14,60 @@ const routes = [
 		meta: { requiresAuth: true, title: '主界面' },
 		children: [
 			{
-			path: "/desktop",
-			meta: { title: '首页' },
-			component: () => import("../view/desktop/desktop.vue"),
-		}, 
-		{
-			path: "/self",//个人中心
-			meta: { title: '个人中心' },
-			component: () => import("../view/self/self.vue"),
-		},
-		{
-			path: "/password",//修改密码
-			meta: { title: '修改密码' },
-			component: () => import("../view/self/change_password.vue"),
-		},
-		{
-			path: "/sys",//系统管理
-			meta: { title: '系统管理' },
-			//component: () => import("../views/zsys_main/zsys_self/self.vue"),
-			children: [{
-				path: "/user",
-				meta: { title: '用户管理' },
-				component: () => import("../view/user/user.vue"),
+				path: "/desktop",
+				meta: { title: '首页' },
+				component: () => import("../view/desktop/desktop.vue"),
 			},
 			{
-				path: "/department",
-				meta: { title: '组织架构' },
-				component: () => import("../view/department/department.vue"),
+				path: "/self",//个人中心
+				meta: { title: '个人中心' },
+				component: () => import("../view/self/self.vue"),
 			},
 			{
-				path: "/position",
-				meta: { title: '职务' },
-				component: () => import("../view/position/position.vue"),
+				path: "/password",//修改密码
+				meta: { title: '修改密码' },
+				component: () => import("../view/self/change_password.vue"),
 			},
 			{
-				path: "/role",
-				meta: { title: '角色权限' },
-				component: () => import("../view/role/role.vue"),
-			},
-			{
-				path: "/log",
-				meta: { title: '日志' },
-				component: () => import("../view/log/log.vue"),
-			},
-			{
-				path: "/backup",
-				meta: { title: '备份' },
-				component: () => import("../view/backup/backup.vue"),
-			}]
-		}
+				path: "/sys",//系统管理
+				meta: { title: '系统管理' },
+				//component: () => import("../views/zsys_main/zsys_self/self.vue"),
+				children: [{
+					path: "/user",
+					meta: { title: '用户管理' },
+					component: () => import("../view/user/user.vue"),
+				},
+				{
+					path: "/department",
+					meta: { title: '组织架构' },
+					component: () => import("../view/department/department.vue"),
+				},
+				{
+					path: "/position",
+					meta: { title: '职务' },
+					component: () => import("../view/position/position.vue"),
+				},
+				{
+					path: "/role",
+					meta: { title: '角色权限' },
+					component: () => import("../view/role/role.vue"),
+				},
+				{
+					path: "/log",
+					meta: { title: '日志' },
+					component: () => import("../view/log/log.vue"),
+				},
+				{
+					path: "/backup",
+					meta: { title: '备份' },
+					component: () => import("../view/backup/backup.vue"),
+				},
+				{
+					path: "/sys",
+					meta: { title: '系统' },
+					component: () => import("../view/sys/sys.vue"),
+				}]
+			}
 		]
 	},
 	{
@@ -70,13 +75,61 @@ const routes = [
 		name: 'login',
 		component: () => import("../view/login.vue")
 	}
-]
+] as RouteRecordRaw[]
 
 const router = createRouter({
 	history: createWebHistory(),
 	routes
 })
 
+function addFrameRouter(r: RouteRecordRaw) {
+	try {
+    // 查找path为"/main"的路由
+    const mainRoute = routes.find(route => route.path === "/main");
+    
+    if (!mainRoute) {
+      console.error('未找到path为"/main"的路由');
+      return
+    }
+    
+    // 确保mainRoute有children数组
+    if (!mainRoute.children) {
+      mainRoute.children = [];
+    }
+    
+    // 检查是否已存在相同path的路由
+    const existingRouteIndex = mainRoute.children.findIndex(
+      child => child.path === r.path
+    );
+    
+    if (existingRouteIndex !== -1) {
+      // 如果已存在，替换该路由
+      mainRoute.children[existingRouteIndex] = r;
+      console.log(`已更新路由: ${r.path}`);
+    } else {
+      // 如果不存在，添加新路由
+      mainRoute.children.push(r);
+      console.log(`已添加新路由: ${r.path}`);
+    }
+    
+    // 重新创建router实例以确保路由更新生效
+    // 注意：在实际项目中可能需要更复杂的路由更新逻辑
+    // router.addRoute('main', r as RouteRecordRaw);
+    
+    return 1;
+  } catch (error) {
+    console.error('添加路由失败:', error);
+    return 0;
+  }
+}
+
+function initRouter(): Router {
+	return createRouter({
+		history: createWebHistory(),
+		routes
+	})
+}
+
 router.beforeEach((to, _, next) => {
 	console.log('to', to.fullPath);
 	if (to.matched.some(r => r.meta?.requiresAuth)) {
@@ -92,4 +145,5 @@ router.beforeEach((to, _, next) => {
 	}
 })
 
-export default router
+// export default router
+export { initRouter, addFrameRouter }

package/core/runtime.ts

@@ -0,0 +1,14 @@
+import type { App } from "vue";
+import { HttpApiV1 as http } from "./httpapi/http_api_v1";
+
+async function GetPublish(app:App){
+    let res=await http.Post(http.url_system_publish,{})
+    if(res.IsSuccess){
+        let data=res.data as {
+            app_name:string
+        }
+        app.config.globalProperties.$appName=data.app_name
+    }
+}
+
+export {GetPublish}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zsysview",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "zsystem view",
     "author": {
         "name": "liuhaomiao"
@@ -11,6 +11,9 @@
         "element-plus": "^2.11.2",
         "json-bigint": "^1.0.0",
         "ts-md5": "^2.0.1",
-        "vue": "^3.5.18"
+        "vue": "^3.5.18",
+        "vue-router": "^4.5.1",
+        "pinia": "^3.0.2",
+        "pinia-plugin-persistedstate": "^4.3.0"
     }
 }

package/view/log/log.vue

@@ -6,7 +6,7 @@
               <zsyslist :config="listconfig">
                 <template #content>
                   <el-table-column prop="log_id" label="日志ID" width="180" />
-                  <el-table-column prop="from_ip" label="IP" width="120" />
+                  <el-table-column prop="from_ip" label="IP" width="160" />
                   <el-table-column prop="c_time" label="时间" width="180">
                     <template #default="{row}">
                       {{ dataformat(row.c_time) }}

package/view/main/userHeader.vue

@@ -3,11 +3,11 @@
     <div style="padding-left: 20px; padding-right: 20px; ">
         <div
             style="height:60px; margin-right: 10px; float: left; display: flex; align-items: center; justify-content: center;">
-            <el-image style="height: 40px; "  />
+            <el-image style="height: 40px; " src="../../assets/default_logo_40.png" />
             <!-- :src="logoUrl" -->
         </div>
 
-        <div style="float: left; line-height: 60px;">岗位行为识别系统</div>
+        <div style="float: left; line-height: 60px;">{{app.zsysapp.config.globalProperties.$appName}}岗位行为识别系统</div>
         <!-- 右上角 -->
         <el-dropdown trigger="click" class="user_operate">
             <span class="el-dropdown-link">
@@ -37,6 +37,7 @@ import { ArrowDown } from '@element-plus/icons-vue'
 // import logoUrl from '../../assets/logo_40.png';
 import { HttpApiV1 as http } from '../../core/httpapi/http_api_v1';
 import { reactive } from 'vue';
+import app from '../../core/app';
 const r = useRouter()
 
 const user = reactive({

package/view/sys/sys.vue

@@ -0,0 +1,19 @@
+<template>
+  <breadcrumb />
+  <div style="padding: 0px 20px; margin-top: 20px">
+    <el-tabs v-model="tab">
+      <el-tab-pane label="基础" name="base">
+        
+        
+      </el-tab-pane>
+    </el-tabs>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+const tab = ref('base')
+</script>
+
+<style scoped></style>