diff --git a/core/core-frontend/src/pages/index/main.ts b/core/core-frontend/src/pages/index/main.ts index 0110953..9081003 100644 --- a/core/core-frontend/src/pages/index/main.ts +++ b/core/core-frontend/src/pages/index/main.ts @@ -31,6 +31,9 @@ const setupAll = async () => { app.use(WebSocketPlugin).use(FcDesigner).use(ElementPlus, { locale: zhCn, }) + app.use(ElementPlus, { + locale: zhCn, + }) app.mount('#app') } diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue index 80219c1..bd378c5 100644 --- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue @@ -52,10 +52,9 @@ function childmenuclick(item: any) { } else { showmodule.value = false } - // console.log('传递给 Assocmodule 的 props:',Assocmodule) } // 时间相关逻辑移动到独立组件中 -const TimeDisplay = { +const TimeDispl ay = { template: `
- +
@@ -157,20 +157,23 @@ function permissionClick() { width: 100%; height: 100%; background-color: rgb(0, 52, 102); + .Navbar-box { width: 100%; height: 65px; display: flex; align-items: center; color: #fff; + .Navbar-box-titie { width: 400px; height: 65px; line-height: 65px; background: url(/images/navleft.png) no-repeat; - background-size:100% 100%; + background-size: 100% 100%; padding-left: 20px; padding-right: 15px; + .Navbar-box-titie-text { font-size: 25px; font-weight: 700; @@ -180,6 +183,7 @@ function permissionClick() { color: transparent; } } + .Navbar-menu-box { width: calc(100% - 400px); height: 63px; @@ -190,6 +194,7 @@ function permissionClick() { justify-content: space-between; background: url(/images/navright.png) no-repeat; background-size: 100% 100%; + .Navbar-menu-content { width: 100%; display: flex; diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue index 858ba65..9c4660e 100644 --- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue @@ -19,7 +19,7 @@ 保存 - +
@@ -34,6 +34,7 @@ import { useRoute, useRouter } from 'vue-router' import { loadModule } from 'vue3-sfc-loader' import * as Vue from 'vue/dist/vue.esm-bundler.js' import ElementPlus from 'element-plus' +import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import * as VueRouter from 'vue-router' import less from 'less' import defaultTemplate from '@/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue?raw' @@ -175,6 +176,9 @@ const runCode = async () => { prevApp.use(route) prevApp.use(i18n) prevApp.use(ElementPlus) + prevApp.use(ElementPlus, { + locale: zhCn, + }) prevApp.mount(previewContainer.value) } catch (error) { @@ -300,7 +304,7 @@ function importNav() { } .sfc-content { - height: calc(100vh -60px); + height: calc(100vh - 60px); padding: 10px 20px; color: #fff; } diff --git a/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue b/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue index d82d0f5..085e83f 100644 --- a/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue +++ b/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue @@ -138,7 +138,7 @@ function getuserinfo(){ } queryUsers(params).then(res => { tableData.value = res.data.data.records - total.value = res.data.data.total + total.value = Number(res.data.data.total) tableloading.value = false }) } @@ -153,7 +153,7 @@ function queryuserinfo(){ } queryUsers(params).then(res => { tableData.value = res.data.data.records - total.value = res.data.data.total + total.value = Number(res.data.data.total) tableloading.value = false }) } @@ -163,6 +163,8 @@ function nodeclick(data:any,node:any){ return } currentNodeId.value = node.key + currentPage.value = 1 + pageSize.value = 10 getuserinfo() } function edittable(data:any){