From b759f16558bb01a1f925f87510fd27a3d5c6dbb0 Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Tue, 17 Jun 2025 14:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/permission/user.ts |   3 +-
 .../SfcEditor/LoginEditor/editlogin.vue       |   6 +-
 .../SfcEditor/LoginEditor/login.vue           | 101 +++++++++++++-----
 .../SfcEditor/LoginEditor/previewLogin.vue    |   6 +-
 .../SfcEditor/NavbarEditor/Navbar.vue         |  10 +-
 .../SfcEditor/NavbarEditor/assocPage.vue      |   1 -
 .../SfcEditor/NavbarEditor/editNavbar.vue     |   2 +
 .../SfcEditor/NavbarEditor/previewNavSfc.vue  |   2 +
 .../src/viewsnew/application/SystemLogin.vue  |   7 +-
 .../permissionset/user/userinfo.vue           |  25 +++--
 10 files changed, 121 insertions(+), 42 deletions(-)

diff --git a/core/core-frontend/src/api/permission/user.ts b/core/core-frontend/src/api/permission/user.ts
index eda4bc6..6457a8c 100644
--- a/core/core-frontend/src/api/permission/user.ts
+++ b/core/core-frontend/src/api/permission/user.ts
@@ -6,4 +6,5 @@ export const updateUser = data => request.post({ url: '/user/updateUser', data }
 export const setStatus = params => request.post({ url: '/user/setStatus', params }) //设置有效状态
 export const deleteUserById = id => request.post({ url: '/user/deleteUserById?id=' + id }) //删除
 export const deleteUserByIds = id => request.post({ url: '/user/deleteUserByIds?ids=' + id }) //删除
-export const resetPassword = id => request.post({ url: '/user/resetPassword?id=' + id }) //重置密码
\ No newline at end of file
+export const resetPassword = id => request.post({ url: '/user/resetPassword?id=' + id }) //重置密码
+export const userLogin = params => request.post({ url: '/user/login', params }) //登录
\ No newline at end of file
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue
index 324749c..4a4cd48 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue
@@ -40,6 +40,8 @@
   import 'element-plus/dist/index.css'
   import { i18n } from '@/plugins/vue-i18n'
   import { moduleUpdate,moduleById } from '@/api/application/module'
+  import { userLogin } from '@/api/permission/user'
+  import { useCache } from '@/hooks/web/useCache'
   const route = useRoute()
   const router = useRouter()
   const activeName: any = ref('代码')
@@ -80,7 +82,9 @@
         vue: Vue,
         'element-plus': ElementPlus,
         'vue/dist/vue.esm-bundler.js': Vue,
-        'vue-router': VueRouter
+        'vue-router': VueRouter,
+        '@/api/permission/user': { userLogin },
+        '@/hooks/web/useCache': { useCache }
       },
       getFile: async (fileName) => {
         if (fileName.startsWith('@/')) {
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/login.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/login.vue
index 8525c0b..f63bbed 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/login.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/login.vue
@@ -1,13 +1,17 @@
 <script lang="ts" setup>
 import { ref, watch, onMounted, onBeforeUnmount, shallowRef } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
-import {useRoute, useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import { userLogin } from '@/api/permission/user'
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 const router = useRouter()
 const route = useRoute()
 const props = defineProps({
     id: String,
     name: String,
-    isExecuteEvent:  Boolean,
+    isExecuteEvent: Boolean,
 })
 const form = ref({
     username: '',
@@ -24,15 +28,35 @@ const loginRules = ref({
 const ruleFormRef = ref<FormInstance>()
 const loginTitle: any = ref('')
 const submitForm = async (formEl: FormInstance | undefined) => {
-   if(props.isExecuteEvent){
-    return
-   }
+    if (props.isExecuteEvent) {
+        return
+    }
     if (!formEl) return
     await formEl.validate((valid, fields) => {
         if (valid) {
-            router.push({
-                path: '/PreviewSystem',
-                query: { id: props.id, name: props.name }
+            const params = {
+                username: form.value.username,
+                password: form.value.password
+            }
+            userLogin(params).then(res => {
+              if(res.data.code == '0'){
+                let userInfo = {
+                    nickname: res.data.data.nickname,
+                    username: res.data.data.username,
+                    id: res.data.data.id,
+                    phone: res.data.data.phone,
+                    email: res.data.data.email,
+                }
+                wsCache.set('Permission-userinfo', userInfo)
+                ElMessage.success('登录成功')
+                router.push({
+                    path: '/PreviewSystem',
+                    query: { id: props.id, name: props.name }
+                })
+              }else{
+                ElMessage.error(res.data.msg)
+                return
+              }
             })
         } else {
 
@@ -64,17 +88,19 @@ onBeforeUnmount(() => {
                                     <img src="@/assets/img/username.png" alt="">
                                 </template>
                             </el-input>
-                            <img class="login-splitline" src="@/assets/img/splitline2.png" style="width:100%;height: 1px;" alt="">
+                            <img class="login-splitline" src="@/assets/img/splitline2.png"
+                                style="width:100%;height: 1px;" alt="">
                         </div>
                     </el-form-item>
                     <el-form-item label="" prop="password">
                         <div class="logininput">
-                            <el-input v-model="form.password" placeholder="请输入密码" type="password">
+                            <el-input v-model="form.password" show-password placeholder="请输入密码" type="password">
                                 <template #prepend>
                                     <img src="@/assets/img/password.png" alt="">
                                 </template>
                             </el-input>
-                            <img class="login-splitline" src="@/assets/img/splitline1.png" style="width:100%;height: 1px;" alt="">
+                            <img class="login-splitline" src="@/assets/img/splitline1.png"
+                                style="width:100%;height: 1px;" alt="">
                         </div>
                     </el-form-item>
                     <div class="login-button" @click="submitForm(ruleFormRef)">登录</div>
@@ -93,6 +119,7 @@ onBeforeUnmount(() => {
     display: flex;
     justify-content: center;
     padding-top: 8%;
+
     .login-container {
 
         .login-title {
@@ -146,48 +173,68 @@ onBeforeUnmount(() => {
             .logininput {
                 position: relative;
                 height: 40px;
-                width:100%;
-                .login-splitline{
+                width: 100%;
+
+                .login-splitline {
                     position: absolute;
                     bottom: 0px;
                     left: 0px;
                 }
             }
-         
+
         }
-        .login-button{
+
+        .login-button {
             height: 40px;
             line-height: 40px;
             font-size: 16px;
             color: #fff;
             background: url(/images/loginbtn.png) no-repeat;
-            background-size: 100% 100%;  
-            margin-top: 40px;  
+            background-size: 100% 100%;
+            margin-top: 40px;
             cursor: pointer;
         }
     }
 }
-
 </style>
 <style>
-.logininput .el-input__wrapper{
-   background-color: transparent;
-   border: none;
-   box-shadow: none;
+.logininput .el-input__wrapper {
+    background-color: transparent;
+    border: none;
+    box-shadow: none;
 }
-.logininput .el-input-group__prepend{
+
+.logininput .el-input-group__prepend {
     box-shadow: none;
     background-color: transparent;
 }
-.logininput .el-input__inner{
+
+.logininput .el-input__inner {
     color: #fff;
 }
-.logininput .el-form-item.is-error .el-input-tag__wrapper, .el-form-item.is-error .el-input-tag__wrapper.is-focus, .el-form-item.is-error .el-input-tag__wrapper:focus, .el-form-item.is-error .el-input-tag__wrapper:hover, .el-form-item.is-error .el-input__wrapper, .el-form-item.is-error .el-input__wrapper.is-focus, .el-form-item.is-error .el-input__wrapper:focus, .el-form-item.is-error .el-input__wrapper:hover, .el-form-item.is-error .el-select__wrapper, .el-form-item.is-error .el-select__wrapper.is-focus, .el-form-item.is-error .el-select__wrapper:focus, .el-form-item.is-error .el-select__wrapper:hover, .el-form-item.is-error .el-textarea__inner, .el-form-item.is-error .el-textarea__inner.is-focus, .el-form-item.is-error .el-textarea__inner:focus, .el-form-item.is-error .el-textarea__inner:hover{
+
+.logininput .el-form-item.is-error .el-input-tag__wrapper,
+.el-form-item.is-error .el-input-tag__wrapper.is-focus,
+.el-form-item.is-error .el-input-tag__wrapper:focus,
+.el-form-item.is-error .el-input-tag__wrapper:hover,
+.el-form-item.is-error .el-input__wrapper,
+.el-form-item.is-error .el-input__wrapper.is-focus,
+.el-form-item.is-error .el-input__wrapper:focus,
+.el-form-item.is-error .el-input__wrapper:hover,
+.el-form-item.is-error .el-select__wrapper,
+.el-form-item.is-error .el-select__wrapper.is-focus,
+.el-form-item.is-error .el-select__wrapper:focus,
+.el-form-item.is-error .el-select__wrapper:hover,
+.el-form-item.is-error .el-textarea__inner,
+.el-form-item.is-error .el-textarea__inner.is-focus,
+.el-form-item.is-error .el-textarea__inner:focus,
+.el-form-item.is-error .el-textarea__inner:hover {
     box-shadow: none;
     border: none;
     box-shadow: none;
 }
-.login-form .el-form-item__error{
-    padding-top: 4px ;
+
+.login-form .el-form-item__error {
+    padding-top: 4px;
 }
 </style>
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue
index 5a691d9..bc1099a 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue
@@ -14,6 +14,8 @@ import { i18n } from '@/plugins/vue-i18n'
 import * as VueRouter from 'vue-router'
 import { useRoute, useRouter } from 'vue-router'
 import { moduleUpdate,moduleById } from '@/api/application/module'
+import { userLogin } from '@/api/permission/user'
+import { useCache } from '@/hooks/web/useCache'
 const route = useRoute()
 const router = useRouter()
 const props = defineProps({
@@ -54,7 +56,9 @@ const runCode = async () => {
         vue: Vue,
         'element-plus': ElementPlus,
         'vue/dist/vue.esm-bundler.js': Vue,
-        'vue-router': VueRouter
+        'vue-router': VueRouter,
+        '@/api/permission/user': { userLogin },
+        '@/hooks/web/useCache': { useCache }
       },
       getFile: async (fileName) => {
         if (fileName.startsWith('@/')) {
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 1385b8c..1931fd8 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
@@ -5,6 +5,8 @@ import Assocmodule from '@/viewsnew/application/SfcEditor/NavbarEditor/assocPage
 import PermissionSet from '@/viewsnew/application/permissionset/index.vue'
 import UserInfoSet from '@/viewsnew/application/permissionset/user/userinfo.vue'
 import {useRoute, useRouter } from 'vue-router'
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 const router = useRouter()
 const route = useRoute()
 const props = defineProps({
@@ -27,6 +29,7 @@ const currentMoudleId = ref('')
 const showermission = ref(false)
 const showUserInfo = ref(false)
 const currentrow = ref({})
+const userList:any = ref({})
 watch(
   () => props.menuList,
   (newVal) => {
@@ -109,6 +112,7 @@ const TimeDisplay = {
 onMounted(() => {
   navmenulist.value = props.menuList
   navtitle.value = props.projectName
+  userList.value = wsCache.get('Permission-userinfo')
 })
 onBeforeUnmount(() => {
 
@@ -132,13 +136,13 @@ function logout(){
     }
   )
     .then(() => {
+      wsCache.delete('Permission-userinfo')
       router.push({
         path: '/SystemLogin',
         query: { id: props.applicationId, name: props.projectName }
       })
     })
     .catch(() => {})
-    
 }
 function userdetails(){
   showmodule.value = false
@@ -176,7 +180,7 @@ function userdetails(){
           <div style="margin-right: 10px;cursor: pointer;" @click="permissionClick"><img
               src="@/assets/img/navpermission.png" alt=""></div>
           <div style="margin-right: 10px;cursor: pointer;"><img src="@/assets/img/nav1.png" alt=""></div>
-          <div style="margin-right: 15px;min-width: 45px;cursor: pointer;" @click="userdetails">admin</div>
+          <div style="margin-right: 15px;min-width: 45px;cursor: pointer;" @click="userdetails">{{ props.isExecuteEvent == false?userList.nickname:'admin' }}</div>
           <div style="margin-right: 15px;cursor: pointer;" @click="userdetails"><img src="@/assets/img/nav3.png" alt=""></div>
           <div @click="logout" style="cursor: pointer;"><img src="@/assets/img/nav4.png" alt=""></div>
         </div>
@@ -187,7 +191,7 @@ function userdetails(){
       <Assocmodule v-if="showmodule" :applicationId="props.applicationId"
         :moduleinfo="currentrow" />
       <PermissionSet v-if="showermission" />
-      <UserInfoSet v-if="showUserInfo" :applicationId="props.applicationId" />
+      <UserInfoSet v-if="showUserInfo" :userList="userList" :applicationId="props.applicationId" />
     </div>
   </div>
 </template>
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue
index fa33025..419a054 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue
@@ -96,7 +96,6 @@ function handleNodeClick(e) {
     isNavbar.value = true
     loading.value = false
   }
-
 }
 </script>
 <template>
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 28a4059..85237eb 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue
@@ -41,6 +41,7 @@ import defaultTemplate from '@/viewsnew/application/SfcEditor/NavbarEditor/Navba
 import { getMenuTree } from '@/api/permission/menu'
 import { moduleUpdate, moduleById } from '@/api/application/module'
 import { i18n } from '@/plugins/vue-i18n'
+import { useCache } from '@/hooks/web/useCache'
 import 'element-plus/dist/index.css'
 const route = useRoute()
 const router = useRouter()
@@ -92,6 +93,7 @@ const runCode = async () => {
         '@/viewsnew/application/permissionset/user/userinfo.vue': Vue.defineAsyncComponent(() =>
           import('@/viewsnew/application/permissionset/user/userinfo.vue')
         ),
+        '@/hooks/web/useCache':{useCache}
       },
       getFile: async (fileName) => {
         if (fileName.startsWith('@/')) {
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue
index 2cadc88..fe04026 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue
@@ -15,6 +15,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { i18n } from '@/plugins/vue-i18n'
 import defaultTemplate from '@/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue?raw'
 import { moduleUpdate, moduleById } from '@/api/application/module'
+import { useCache } from '@/hooks/web/useCache'
 const route = useRoute()
 const router = useRouter()
 const props = defineProps({
@@ -76,6 +77,7 @@ const runCode = async () => {
                 '@/viewsnew/application/permissionset/user/userinfo.vue': Vue.defineAsyncComponent(() =>
                     import('@/viewsnew/application/permissionset/user/userinfo.vue')
                 ),
+        '@/hooks/web/useCache': { useCache }
             },
             getFile: async (fileName) => {
                 if (fileName === 'dynamic.vue') {
diff --git a/core/core-frontend/src/viewsnew/application/SystemLogin.vue b/core/core-frontend/src/viewsnew/application/SystemLogin.vue
index d7aebfe..b7352b4 100644
--- a/core/core-frontend/src/viewsnew/application/SystemLogin.vue
+++ b/core/core-frontend/src/viewsnew/application/SystemLogin.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { ref, watch, onMounted, onBeforeUnmount } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import * as VueRouter from 'vue-router'
 import { loadModule } from 'vue3-sfc-loader'
@@ -10,6 +9,8 @@ import * as ElementPlus from 'element-plus'
 import less from 'less'
 import defaultTemplate from '@/viewsnew/application/SfcEditor/LoginEditor/login.vue?raw'
 import { moduleList, moduleById } from '@/api/application/module'
+import { userLogin } from '@/api/permission/user'
+import { useCache } from '@/hooks/web/useCache'
 const route = useRoute()
 const router = useRouter()
 const sfcCode = ref(defaultTemplate)
@@ -44,7 +45,9 @@ const runCode = async () => {
         vue: Vue,
         'element-plus': ElementPlus,
         'vue/dist/vue.esm-bundler.js': Vue,
-        'vue-router': VueRouter
+        'vue-router': VueRouter,
+        '@/api/permission/user': { userLogin },
+        '@/hooks/web/useCache': { useCache }
       },
       getFile: async (fileName) => {
         if (fileName.startsWith('@/')) {
diff --git a/core/core-frontend/src/viewsnew/application/permissionset/user/userinfo.vue b/core/core-frontend/src/viewsnew/application/permissionset/user/userinfo.vue
index 0de6af1..fb8bbb8 100644
--- a/core/core-frontend/src/viewsnew/application/permissionset/user/userinfo.vue
+++ b/core/core-frontend/src/viewsnew/application/permissionset/user/userinfo.vue
@@ -1,22 +1,35 @@
 <script lang="ts" setup>
 import { ref, onMounted } from 'vue'
+import { updateUser } from '@/api/permission/user'
+import { ElMessage } from 'element-plus'
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 const props = defineProps({
     applicationId: String,
+    userList:Object,
 })
 const userlist: any = ref({
     username: 'admin',
     nickname: '管理员',
-    password: '',
-    newpassword: '',
-    submitpassword: '',
     email: '',
     phone: '',
+    id:''
 })
 onMounted(() => {
-
+    userlist.value = props.userList
 })
 function saveinfo() {
     //保存
+    updateUser(userlist.value).then(res => {
+      if(res.data.code == '0'){
+        ElMessage({
+          type: 'success',
+          message: '修改成功',
+       })
+       wsCache.set('Permission-userinfo', userlist.value)
+      }    
+        
+})
 }
 </script>
 <template>
@@ -46,7 +59,7 @@ function saveinfo() {
                     </div>
                 </div>
             </div>
-            <div class="userinfo-content-top" style="margin-top: 50px;">
+            <!-- <div class="userinfo-content-top" style="margin-top: 50px;">
                 <div class="userinfo-title">
                     <div class="userinfo-title-icon"></div>
                     <div class="userinfo-title-text">修改密码</div>
@@ -65,7 +78,7 @@ function saveinfo() {
                         <el-input v-model="userlist.submitpassword" placeholder="请输入确认新密码"></el-input>
                     </div>
                 </div>
-            </div>
+            </div> -->
             <div class="userinfo-content-btn">
                 <el-button type="primary" style="min-width: 50px;" @click="saveinfo">保存</el-button>
             </div>