From bf5ba56e8a82f0ef699f2eae413d0dc2c4e4f67d Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Tue, 25 Oct 2022 16:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web into master

---
 src/pcLayout/index.vue |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index 48d3a7e..19df158 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="layout-container">
-        <el-container style="display: flex;">
+        <el-container>
             <el-header height="auto" id="pcElHeader">
                 <div class="logo">
-                    <img src="/zhxy/img/logo.png" alt />
-                    <div class="header-title">智慧校园大数据三维可视化平台</div>
+                    <img src="/zhjg/img/logo.png" alt />
+                    <div class="header-title">江西经济管理干部学院三维可视化平台</div>
                 </div>
                 <div class="nav">
                     <el-menu
@@ -25,8 +25,7 @@
                             <template slot="title">
                                 <i class="custom-icon menu-jg"></i> 机构导览
                             </template>
-                            <!--  师大 -->
-                            <el-menu-item index="/pcLayout/default/orgnav/masses">党群机构</el-menu-item>
+                            <el-menu-item index="/pcLayout/default/orgnav/masses">党政机构</el-menu-item>
                             <el-menu-item index="/pcLayout/default/orgnav/ofc">职能部处</el-menu-item>
                             <el-menu-item index="/pcLayout/default/orgnav/directly">直属及附属单位</el-menu-item>
                             <el-menu-item index="/pcLayout/default/orgnav/teaching">教学与科研机构</el-menu-item>
@@ -43,7 +42,7 @@
                             <el-menu-item index="/pcLayout/default/arc/dorm">校园宿舍</el-menu-item>
                             <el-menu-item index="/pcLayout/default/arc/culture">文化风景</el-menu-item>
                             <!-- <el-menu-item index="/pcLayout/default/arc/family">家属住宅</el-menu-item> -->
-                            <el-menu-item index="/pcLayout/default/arc/rest">主要楼宇</el-menu-item>
+                            <!-- <el-menu-item index="/pcLayout/default/arc/rest">主要楼宇</el-menu-item> -->
                         </el-submenu>
                         <!-- popper-class="only-life-box" -->
                         <el-submenu index="service">
@@ -57,9 +56,9 @@
                             <!-- <el-menu-item index="/pcLayout/default/service/showers">校园浴室</el-menu-item> -->
                             <!-- <el-menu-item index="/pcLayout/default/service/transfer">圈存机</el-menu-item> -->
                             <el-menu-item index="/pcLayout/default/service/copy">打字复印</el-menu-item>
-                            <!-- <el-menu-item index="/pcLayout/default/service/bank">银行网点</el-menu-item> -->
+                            <el-menu-item index="/pcLayout/default/service/bank">银行网点</el-menu-item>
                             <!-- <el-menu-item index="/pcLayout/default/service/aed">AED</el-menu-item> -->
-                            <!-- <el-menu-item index="/pcLayout/default/service/service">通信营业厅</el-menu-item> -->
+                            <el-menu-item index="/pcLayout/default/service/service">通信营业厅</el-menu-item>
                             <el-menu-item index="/pcLayout/default/service/park">停车场</el-menu-item>
                             <el-menu-item index="/pcLayout/default/service/alleyway">出入口</el-menu-item>
                         </el-submenu>
@@ -103,6 +102,19 @@
                         <el-menu-item index="/pcLayout/default/technique/graph">学生迁徙图</el-menu-item>
                         <el-menu-item index="/pcLayout/default/technique/path">漫游</el-menu-item>
                         </el-submenu>-->
+
+                        <el-submenu index="technique">
+                            <template slot="title">
+                                <i class="custom-icon menu-rest"></i> 应用系统
+                            </template>
+                            <el-menu-item>校园安防可视化系统</el-menu-item>
+                            <el-menu-item>校园地下管网可视化系统</el-menu-item>
+                            <el-menu-item>校园资产可视化系统</el-menu-item>
+                            <el-menu-item>校园节能管理可视化系统</el-menu-item>
+                            <el-menu-item>校园消防可视化系统</el-menu-item>
+                            <el-menu-item>校园行为轨迹可视化系统</el-menu-item>
+                            <el-menu-item>校园图书馆可视化系统</el-menu-item>
+                        </el-submenu>
                     </el-menu>
                 </div>
 
@@ -110,7 +122,7 @@
                     <el-button size="mini" @click="outHome">返回首页</el-button>
                 </div>-->
             </el-header>
-            <el-main style="flex: 1;">
+            <el-main>
                 <router-view />
             </el-main>
         </el-container>
@@ -139,10 +151,9 @@
     flex-wrap: wrap;
     .logo {
         display: flex;
-        width: 410px;
-    }
-    .nav {
-        width: 850px;
+        align-items: center;
+        flex: 1;
+        min-width: 840px;
     }
 }
 </style>

--
Gitblit v1.9.3