diff --git a/package-lock.json b/package-lock.json index 405c7b1..74cf114 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,6 +42,7 @@ "vue": "^3.2.47", "vue-i18n": "^9.1.9", "vue-router": "^4.1.6", + "vue3-scale-box": "^0.1.9", "vue3-seamless-scroll": "^1.2.0", "vuedraggable": "^4.1.0" }, @@ -15679,6 +15680,11 @@ "typescript": "*" } }, + "node_modules/vue3-scale-box": { + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/vue3-scale-box/-/vue3-scale-box-0.1.9.tgz", + "integrity": "sha512-URKBWivTHglmwoqQTs9UBA+lWg7pMuyYusxI5ghU1ks3qZHcM+jCF5uoSiwlKpSd9XP47R3sO12oS+Sc5lW9ig==" + }, "node_modules/vue3-seamless-scroll": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vue3-seamless-scroll/-/vue3-seamless-scroll-1.2.0.tgz", @@ -27439,6 +27445,11 @@ "semver": "^7.3.8" } }, + "vue3-scale-box": { + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/vue3-scale-box/-/vue3-scale-box-0.1.9.tgz", + "integrity": "sha512-URKBWivTHglmwoqQTs9UBA+lWg7pMuyYusxI5ghU1ks3qZHcM+jCF5uoSiwlKpSd9XP47R3sO12oS+Sc5lW9ig==" + }, "vue3-seamless-scroll": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vue3-seamless-scroll/-/vue3-seamless-scroll-1.2.0.tgz", diff --git a/package.json b/package.json index 48e2141..211fd8f 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "vue": "^3.2.47", "vue-i18n": "^9.1.9", "vue-router": "^4.1.6", + "vue3-scale-box": "^0.1.9", "vue3-seamless-scroll": "^1.2.0", "vuedraggable": "^4.1.0" }, diff --git a/src/assets/images/subTabImg.gif b/src/assets/images/subTabImg.gif new file mode 100644 index 0000000..5b2c7f2 Binary files /dev/null and b/src/assets/images/subTabImg.gif differ diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 8b55ddd..e930df6 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -72,6 +72,16 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/bImModel", name: "BIM模型", component: () => import("@/views/sevenLargeScreen/bImModel/index.vue") + }, + { + path: "/safetyManagement/securityManagement", + name: "安全管理", + component: () => import("@/views/sevenLargeScreen/safetyManagement/securityManagement.vue") + }, + { + path: "/safetyManagement/foundationPitMonitoring", + name: "基坑监测", + component: () => import("@/views/sevenLargeScreen/safetyManagement/foundationPitMonitoring.vue") } ], meta: { diff --git a/src/stores/index.ts b/src/stores/index.ts index be63d38..c63da5c 100644 --- a/src/stores/index.ts +++ b/src/stores/index.ts @@ -23,7 +23,7 @@ export const GlobalStore = defineStore({ editPassword: false, openDropdown: false, Message: null, // 点击跳转的时候存的数据 - projectDateAuth: null, //是否拥有所属工程的必填 + projectDateAuth: null, //动态路由 isManager: "", // element组件大小 assemblySize: "default", @@ -77,7 +77,7 @@ export const GlobalStore = defineStore({ setAccount(account: string | null) { this.account = account; }, - // 判断所属工程有没有校验 + // 动态路由 setProjectDateAuth(projectDateAuth: number | null) { this.projectDateAuth = projectDateAuth; }, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index e181b40..19dc677 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -85,7 +85,7 @@ const login = (formEl: FormInstance | undefined) => { globalStore.setToken(result.token); globalStore.setAccount(result.account); globalStore.setAccountType(result.accountType); - globalStore.setProjectDateAuth(result.projectDateAuth); + globalStore.setProjectDateAuth(result.menuAuthority); globalStore.setIsManager(result.isManager); //我已知晓 // 2.添加动态路由 diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 3d84ce0..2c360fd 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -1,12 +1,13 @@ + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/safetyManagement/securityManagement.vue b/src/views/sevenLargeScreen/safetyManagement/securityManagement.vue new file mode 100644 index 0000000..5a144ab --- /dev/null +++ b/src/views/sevenLargeScreen/safetyManagement/securityManagement.vue @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file