From 7ca9a667d71d4830cd4a9229762460a5ff8621f5 Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Mon, 26 May 2025 18:30:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../img/{资源 9.png => menuhoverbg.png}       | Bin
 .../visualization/UserViewEnlarge.vue         |   4 +-
 core/core-frontend/src/router/index.ts        |   7 +
 .../viewsnew/application/PreviewSystem.vue    |  42 +++
 .../src/viewsnew/application/index.vue        |   9 +-
 .../application/menuconfig/assocmenu.vue      |   6 +
 .../application/menuconfig/assocmodule.vue    |   8 +-
 .../application/module/Navbar/index.vue       | 251 +++++++++++++-----
 8 files changed, 256 insertions(+), 71 deletions(-)
 rename core/core-frontend/src/assets/img/{资源 9.png => menuhoverbg.png} (100%)
 create mode 100644 core/core-frontend/src/viewsnew/application/PreviewSystem.vue

diff --git a/core/core-frontend/src/assets/img/资源 9.png b/core/core-frontend/src/assets/img/menuhoverbg.png
similarity index 100%
rename from core/core-frontend/src/assets/img/资源 9.png
rename to core/core-frontend/src/assets/img/menuhoverbg.png
diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index 5fc122b..dc62abd 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -51,7 +51,7 @@
             "
             @click="downloadViewDetails('view')"
           >
-            <el-icon color="#1F2329" size="16" style="margin-right: 3px"
+            <el-icon color="#ffffff" size="16" style="margin-right: 3px"
               ><icon_download_outlined
             /></el-icon>
             {{ t('chart.export_excel') }}
@@ -68,7 +68,7 @@
               state.dataFrom === 'template'
             "
           >
-            <el-icon color="#1F2329" size="16" style="margin-right: 3px"
+            <el-icon color="#ffffff" size="16" style="margin-right: 3px"
               ><icon_download_outlined
             /></el-icon>
             {{ t('chart.export_raw_details') }}
diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts
index ab66a0e..6280169 100644
--- a/core/core-frontend/src/router/index.ts
+++ b/core/core-frontend/src/router/index.ts
@@ -219,6 +219,13 @@ export const routes: AppRouteRecordRaw[] = [
     hidden: true,
     meta: {},
     component: () => import('@/viewsnew/application/menuconfig/index.vue')
+  },
+  {
+    path: '/PreviewSystem',
+    name: 'PreviewSystem',
+    hidden: true,
+    meta: {},
+    component: () => import('@/viewsnew/application/PreviewSystem.vue')
   }
 ]
 
diff --git a/core/core-frontend/src/viewsnew/application/PreviewSystem.vue b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue
new file mode 100644
index 0000000..d011b26
--- /dev/null
+++ b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue
@@ -0,0 +1,42 @@
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+import Navbar from '@/viewsnew/application/module/Navbar/index.vue'
+import { useRoute, useRouter } from 'vue-router'
+import { getMenuTree } from '@/api/permission/menu'
+const route = useRoute()
+const applicationId:any = ref('')
+const menuList = ref([])
+const isNavbar = ref(false)
+const projectName:any = ref('')
+onMounted(()=>{
+    if (route.query.id) {
+        applicationId.value = route.query.id
+        projectName.value = route.query.name
+        getmenuinfo()
+    }
+})
+function getmenuinfo() {
+   const params = { 
+    appId: applicationId.value,
+    name:'',
+    isdisplay:''
+   }
+   getMenuTree(params).then(res => {
+    menuList.value = res.data
+    isNavbar.value = true
+   })
+}
+</script>
+<template>
+    <div class="system-box">
+        <Navbar v-if="isNavbar" :menuList="menuList" :projectName="projectName" 
+        :isFixed="true" :applicationId="applicationId"></Navbar>
+    </div>
+</template>
+
+<style lang="less" scoped>
+.system-box {
+    width: 100%;
+    height: 100vh;
+}
+</style>
diff --git a/core/core-frontend/src/viewsnew/application/index.vue b/core/core-frontend/src/viewsnew/application/index.vue
index 94c09b8..82674c0 100644
--- a/core/core-frontend/src/viewsnew/application/index.vue
+++ b/core/core-frontend/src/viewsnew/application/index.vue
@@ -68,6 +68,13 @@ function delClick(row){
     })
  
 }
+function preview(row){
+  const route = router.resolve({
+    path: '/PreviewSystem',
+    query: { id: row.id,name:row.name }
+  });
+  window.open(route.href, '_blank');
+}
 </script>
 <template>
   <div class="common-layout">
@@ -112,7 +119,7 @@ function delClick(row){
             <img src="@/assets/newimg/icon/del.png" alt="" title="删除" @click="delClick(item)">
           </div>
           <div style="display: flex;justify-content: center;">
-            <div class="yulan">预览</div>
+            <div class="yulan" @click="preview(item)">预览</div>
             <div class="mokuaipeizhi" @click="routerClick(item,'/module')">模块配置</div>
           </div>
         </div>
diff --git a/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue b/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue
index 9c61ce8..c2c8982 100644
--- a/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue
+++ b/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue
@@ -9,6 +9,7 @@ import { ElTree,FormInstance } from 'element-plus'
 import { publicTree } from '@/utils/validate';
 import { setModuleId } from '@/api/permission/menu'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import Navbar from '@/viewsnew/application/module/Navbar/index.vue'
 const props = defineProps({
   applicationId:String,
   assoccurrentid:String,
@@ -43,6 +44,7 @@ const assocmenuname = ref('')
 const moduletreeData = ref([])
 const moduletreeRef = ref<InstanceType<typeof ElTree>>()
 const assoccurrentid = ref('')
+const isNavbar = ref(false)
 const loadCanvasData = (dvId, weight?, ext?) => {
   const initMethod = initCanvasData
   dataInitState.value = false
@@ -81,6 +83,7 @@ const handleNodeClick = (e: any) => {
    // 树节点点击
   isFormCreate.value = false
   dataInitState.value = false
+  isNavbar.value = false
   if(e.type == '0301'){
     busiFlag.value = 'dashboard'
     loadCanvasData(e.id,9,0)
@@ -90,6 +93,8 @@ const handleNodeClick = (e: any) => {
   }else if(e.type == '09'){
     moduleInfo.value = e
     isFormCreate.value = true
+  } else if(e.type == '02'){
+    isNavbar.value = true
   }
   rightloading.value = false
 }
@@ -198,6 +203,7 @@ function handleDatasetName() {
             :download-status="downloadStatus"
           ></dv-preview> 
           <form-create v-if="isFormCreate" :moduleInfo="moduleInfo"></form-create>
+          <Navbar v-if="isNavbar"></Navbar>
             </div>
            
           </div>
diff --git a/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue b/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue
index 2c043d8..7c66ab6 100644
--- a/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue
+++ b/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue
@@ -5,6 +5,7 @@ import FormCreate from '@/viewsnew/common/FormCreate.vue'
 import { initCanvasData } from '@/utils/canvasUtils'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { moduleList } from '@/api/application/module'
+import Navbar from '@/viewsnew/application/module/Navbar/index.vue'
 const props = defineProps({
     moduleinfo:Object,
     applicationId:String
@@ -25,6 +26,7 @@ const busiFlag = ref('dataV')
 const dataInitState = ref(true)
 const downloadStatus = ref(false)
 const loading = ref(false)
+const isNavbar = ref(false)
 const loadCanvasData = (dvId, weight?, ext?) => {
   const initMethod = initCanvasData
   dataInitState.value = false
@@ -84,6 +86,7 @@ console.log(props.applicationId,props.moduleinfo)
 function handleNodeClick(e){
   isFormCreate.value = false
   dataInitState.value = false
+  isNavbar.value = false
   if(e.type == '0301'){
     busiFlag.value = 'dashboard'
     loadCanvasData(e.id,9,0)
@@ -93,12 +96,14 @@ function handleNodeClick(e){
   }else if(e.type == '09'){
     moduleInfo.value = e
     isFormCreate.value = true
+  } else if(e.type == '02'){
+    isNavbar.value = true
   }
   loading.value = false
 }
 </script>
 <template>
-    <div v-loading="loading" style="width: 100%;height: 100%;">
+    <div v-loading="loading" style="width: 100%;height: 100%;overflow: hidden;">
         <dv-preview
             ref="dvPreviewRef"
             class="dvPreviewRef"
@@ -112,6 +117,7 @@ function handleNodeClick(e){
             :download-status="downloadStatus"
           ></dv-preview> 
           <form-create v-if="isFormCreate" :moduleInfo="moduleInfo"></form-create>  
+          <Navbar v-if="isNavbar"></Navbar>
     </div>
 </template>
 <style lang="less" scoped>
diff --git a/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue b/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue
index 28783a4..141fdc9 100644
--- a/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue
+++ b/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue
@@ -1,99 +1,216 @@
 <script lang="ts" setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted,onBeforeUnmount,shallowRef } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-
-const navtitle = ref('这里显示的是一个标题的名称')
-const navmenulist = ref([
-    { name: '菜单名称1', children: [{ name: '子菜单名称1' }] },
-    { name: '菜单名称2', children: [] },
-    { name: '菜单名称3', children: [{ name: '子菜单名称1' }, { name: '子菜单名称2' }] },
-    { name: '菜单名称4', children: [{ name: '子菜单名称1' }] },
+import Assocmodule from '@/viewsnew/application/menuconfig/assocmodule.vue'
+const props = defineProps({
+    menuList:Object,
+    isFixed:  Boolean,
+    projectName:String,
+    applicationId:String
+})
+const navtitle = ref('')
+const navmenulist:any = ref([
 ])
 const checkindex = ref(null)
+const showmodule = ref(false)
+const currentMoudleId = ref('')
+function menuclick(index:any) {
+    if(navmenulist.value[index].children.length == 0 || navmenulist.value[index].children == undefined){
+        checkindex.value = index
+        currentMoudleId.value = navmenulist.value[index].module_id
+    }
+}
+function childmenuclick(item:any){
+  if(item.module_id && item.module_id !== ''){
+    currentMoudleId.value = item.module_id
+    showmodule.value = true
+  }else{
+    showmodule.value = false
+  }
+}
+// 时间相关逻辑移动到独立组件中
+const TimeDisplay = {
+  template: `
+    <div class="Navbar-menu-time">
+      <div class="Navbar-menu-time-text">{{ currentTime }}</div>
+      <div class="Navbar-menu-time-text2">{{ currentDate }}</div>
+    </div>
+  `,
+  setup() {
+    const currentTime = shallowRef('')
+    const currentDate = shallowRef('')
+    let timer: number
+    
+    function updateTime() {
+      const now = new Date();
+      const hours = String(now.getHours()).padStart(2, '0');
+      const minutes = String(now.getMinutes()).padStart(2, '0');
+      const seconds = String(now.getSeconds()).padStart(2, '0');
+      const year = now.getFullYear();
+      const month = String(now.getMonth() + 1).padStart(2, '0');
+      const day = String(now.getDate()).padStart(2, '0');
+      const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+      const weekday = weekdays[now.getDay()];
+      currentTime.value = `${hours}:${minutes}:${seconds}`;
+      currentDate.value = `${year}-${month}-${day} ${weekday}`;
+    }
+    
+    onMounted(() => {
+      updateTime()
+      timer = setInterval(updateTime, 1000)
+    })
+    
+    onBeforeUnmount(() => {
+      clearInterval(timer)
+    })
+    
+    return { currentTime, currentDate }
+  }
+}
+onMounted(() => {
+    navmenulist.value = props.menuList
+    navtitle.value = props.projectName
+})
+onBeforeUnmount(() => {
+ 
+});
 </script>
 <template>
-    <div class="Navbar-box">
-        <div class="Navbar-box-titie">{{ navtitle }}</div>
-        <div class="Navbar-menu-box">
-            <div class="Navbar-menu-content">
-                <div class="Navbar-menu-time">
-                    <div class="Navbar-menu-time-text">12:45:35</div>
-                    <div class="Navbar-menu-time-text2">2022-08-16 星期二</div>
+    <div class="system-box">
+        <div class="Navbar-box">
+            <div class="Navbar-box-titie">{{ navtitle }}</div>
+            <div class="Navbar-menu-box">
+                <div class="Navbar-menu-content">
+                    <TimeDisplay />
+                    <div class="Navbar-menu-item"
+                        :class="{ 'Navbar-menu-items': checkindex == index && item.children.length == 0 }"
+                        v-for="(item, index) in navmenulist" :key="index" @click="menuclick(index)">
+                        <div v-if="item.children.length == 0">{{ item.name }}</div>
+                        <el-popover v-else class="tsmenu" placement="bottom" popper-class="tsmenu-popover">
+                            <div v-for="(items, indexs) in item.children" :key="indexs"
+                                class="Navbar-menu-item-child-item" @click.stop="childmenuclick(items)">
+                                {{ items.name }}
+                            </div>
+                            <template #reference>
+                                <div v-if="item.children.length > 0">{{ item.name }}</div>
+                            </template>
+                        </el-popover>
+                    </div>
                 </div>
-                <div class="Navbar-menu-item"  v-for="(item, index) in navmenulist" :key="index">
-                    <div>{{ item.name }}</div>
+                <div class="Navbar-box-right">
+                    <div style="margin-right: 10px;"><img src="@/assets/img/nav1.png" alt=""></div>
+                    <div style="margin-right: 15px;min-width: 45px;">admin</div>
+                    <div style="margin-right: 15px;"><img src="@/assets/img/nav3.png" alt=""></div>
+                    <div><img src="@/assets/img/nav4.png" alt=""></div>
                 </div>
             </div>
-            <div class="Navbar-box-right">
-                <div style="margin-right: 10px;"><img src="@/assets/img/nav1.png" alt=""></div>
-                <div style="margin-right: 15px;">admin</div>
-                <div style="margin-right: 15px;"><img src="@/assets/img/nav3.png" alt=""></div>
-                <div><img src="@/assets/img/nav4.png" alt=""></div>
-            </div>
+        </div>
+        <div class="system-box-content" :style="{height:props.isFixed?'calc(100vh - 65px)':'calc(100vh - 125px)'}">
+            <Assocmodule v-if="showmodule" :applicationId="applicationId" :moduleinfo="{module_id:currentMoudleId}" />
         </div>
     </div>
 </template>
 
 <style lang="less" scoped>
-.Navbar-box {
+.system-box {
     width: 100%;
-    height: 65px;
-    display: flex;
-    align-items: center;
-    color: #fff;
-    background: url(@/assets/img/navbg.png);
-    background-size: 100% 100%;
-    padding-left: 25px;
-
-    .Navbar-box-titie {
-        font-size: 25px;
-        font-weight: 700;
-        background: linear-gradient(to bottom, #ffffff, #0089ff);
-        -webkit-background-clip: text;
-        background-clip: text;
-        color: transparent;
-        width: 340px;
-    }
-
-    .Navbar-menu-box {
-        width: calc(100% - 340px);
+    height: 100%;
+    background-color: rgb(0,52,102);
+    .Navbar-box {
+        width: 100%;
+        height: 65px;
         display: flex;
         align-items: center;
-        padding-left: 43px;
-        padding-right: 20px;
-        justify-content: space-between;
+        color: #fff;
+        background: url(@/assets/img/navbg.png) no-repeat;
+        background-size: 100% 100%;
+        padding-left: 25px;
+        .Navbar-box-titie {
+            font-size: 25px;
+            font-weight: 700;
+            background: linear-gradient(to bottom, #ffffff, #0089ff);
+            -webkit-background-clip: text;
+            background-clip: text;
+            color: transparent;
+            width: 340px;
+        }
 
-        .Navbar-menu-content {
+        .Navbar-menu-box {
+            width: calc(100% - 340px);
             display: flex;
             align-items: center;
+            padding-left: 43px;
+            padding-right: 20px;
+            justify-content: space-between;
 
-            .Navbar-menu-time {
-                width: 150px;
-                .Navbar-menu-time-text {
-                    font-size: 16px;
-                    font-weight: 700;
+            .Navbar-menu-content {
+                width: 100%;
+                display: flex;
+                align-items: center;
+
+                .Navbar-menu-time {
+                    width: 150px;
+
+                    .Navbar-menu-time-text {
+                        font-size: 16px;
+                        font-weight: 700;
+                    }
+
+                    .Navbar-menu-time-text2 {
+                        font-size: 13px;
+                        font-weight: 700;
+                    }
                 }
 
-                .Navbar-menu-time-text2 {
-                    font-size: 13px;
-                    font-weight: 700;
+                .Navbar-menu-item {
+                    font-size: 14px;
+                    padding: 5px 15px;
+                    background: url(@/assets/img/navmenu.png) no-repeat;
+                    background-size: 100% 100%;
+                    margin-left: 15px;
+                    cursor: pointer;
+                    position: relative;
                 }
+
+                .Navbar-menu-items {
+                    background: url(@/assets/img/navmenucheck.png)  no-repeat;
+                    background-size: 100% 100%;
+                }
+
             }
-            .Navbar-menu-item{
+
+            .Navbar-box-right {
+                width: 165px;
+                display: flex;
+                align-items: center;
                 font-size: 14px;
-                padding: 5px 15px;
-                background: url(@/assets/img/navmenu.png);
-                background-size: 100% 100%;
-                margin-left: 15px;
             }
         }
 
-        .Navbar-box-right {
-            width: 165px;
-            display: flex;
-            align-items: center;
-            font-size: 14px;
-        }
+    }
+
+    .system-box-content {
+        width: 100%;
     }
 }
+</style>
+<style>
+.tsmenu-popover.ed-popover.ed-popper {
+    background: linear-gradient(to bottom, rgba(0, 52, 102, 1), rgba(0, 55, 110, 0.5));
+    color: #fff;
+    border: none;
+    border-radius: 0px;
+    padding: 5px 0px;
+}
+
+.tsmenu-popover .Navbar-menu-item-child-item {
+    padding: 5px 15px;
+    cursor: pointer;
+    text-align: center;
+}
+.tsmenu-popover .Navbar-menu-item-child-item:hover {
+    color: rgb(0, 255, 254);
+    background: rgb(2, 88, 161);
+    font-weight:700;
+}
 </style>
\ No newline at end of file

From 8b9e0bc03f3df58253c8841851c36203df3cf54c Mon Sep 17 00:00:00 2001
From: root <13910913995@163.com>
Date: Tue, 27 May 2025 14:42:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=AE=A4=E8=AF=81=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../substitute/permissions/login/SubstituleLoginServer.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/gisbi/substitute/permissions/login/SubstituleLoginServer.java b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/login/SubstituleLoginServer.java
index 93e8871..7d576a6 100644
--- a/core/core-backend/src/main/java/io/gisbi/substitute/permissions/login/SubstituleLoginServer.java
+++ b/core/core-backend/src/main/java/io/gisbi/substitute/permissions/login/SubstituleLoginServer.java
@@ -58,7 +58,8 @@ public class SubstituleLoginServer {
 
         // 生成新的 token
         String secret = SubstituleLoginConfig.getPwd(); // 获取密钥
-        return generate(userBO, secret);
+        String md5Pwd = Md5Utils.md5(secret);
+        return generate(userBO, md5Pwd);
     }
 
     @GetMapping("/logout")
@@ -73,6 +74,6 @@ public class SubstituleLoginServer {
         JWTCreator.Builder builder = JWT.create();
         builder.withClaim("uid", userId).withClaim("oid", defaultOid);
         String token = builder.sign(algorithm);
-        return new TokenVO(token, 0L);
+        return new TokenVO(token, 360000L);
     }
 }