From 1e7469a4967ba84c898c8c67ee69c8fdc143468e Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Wed, 11 Jun 2025 10:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/pages/index/main.ts          |  3 +++
 .../application/SfcEditor/NavbarEditor/Navbar.vue   | 13 +++++++++----
 .../SfcEditor/NavbarEditor/editNavbar.vue           |  8 ++++++--
 .../application/permissionset/user/index.vue        |  6 ++++--
 4 files changed, 22 insertions(+), 8 deletions(-)

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: `
     <div class="Navbar-menu-time">
       <div class="Navbar-menu-time-text">{{ currentTime }}</div>
@@ -146,7 +145,8 @@ function permissionClick() {
     </div>
     <div v-if="!props.isExecuteEvent" class="system-box-content"
       :style="{ height: props.isFixed ? 'calc(100vh - 65px)' : 'calc(100vh - 125px)' }">
-      <Assocmodule v-if="showmodule" :applicationId="props.applicationId" :moduleinfo="{ module_id: currentMoudleId }" />
+      <Assocmodule v-if="showmodule" :applicationId="props.applicationId"
+        :moduleinfo="{ module_id: currentMoudleId }" />
       <PermissionSet v-if="showermission" />
     </div>
   </div>
@@ -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 @@
             <el-button type="primary" @click="saveClick">保存</el-button>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="预览" name="预览" style="height: calc(100vh - 190px);">
+        <el-tab-pane label="预览" name="预览" style="height: calc(100vh - 175px);">
           <div ref="previewContainer" class="preview"></div>
         </el-tab-pane>
       </el-tabs>
@@ -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){