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-sd/index.vue | 188 ++++++++++++++++++++++++++---------------------
1 files changed, 104 insertions(+), 84 deletions(-)
diff --git a/src/pcLayout-sd/index.vue b/src/pcLayout-sd/index.vue
index 26b483c..2757158 100644
--- a/src/pcLayout-sd/index.vue
+++ b/src/pcLayout-sd/index.vue
@@ -1,92 +1,97 @@
<template>
<div class="layout-container">
- <el-container>
- <el-header id="pcElHeader">
- <img src="/zhxy/img/logo.png" alt />
- <div class="header-title">智慧校园大数据三维可视化平台</div>
- <el-menu
- menu-trigger="click"
- :unique-opened="true"
- :default-active="$router.currentRoute.path"
- class="el-menu-demo"
- mode="horizontal"
- @select="handleSelect"
- background-color="#2196f3"
- text-color="#fff"
- active-text-color="#fff"
- :router="true"
- >
- <!-- <el-menu-item index="/pcLayout/default/mapnav"> <i class='custom-icon menu-dtdl'></i> 地图导览</el-menu-item> -->
+ <el-container style="display: flex;">
+ <el-header height="auto" id="pcElHeader">
+ <div class="logo">
+ <img src="/zhjg/img/logo.png" alt />
+ <div class="header-title">智慧校园大数据三维可视化平台</div>
+ </div>
+ <div class="nav">
+ <el-menu
+ menu-trigger="click"
+ :unique-opened="true"
+ :default-active="$router.currentRoute.path"
+ class="el-menu-demo"
+ mode="horizontal"
+ @select="handleSelect"
+ background-color="#2196f3"
+ text-color="#fff"
+ active-text-color="#fff"
+ :router="true"
+ >
+ <!-- <el-menu-item index="/pcLayout/default/mapnav"> <i class='custom-icon menu-dtdl'></i> 地图导览</el-menu-item> -->
- <el-submenu index="orgnav">
- <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/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>
- <el-menu-item index="/pcLayout/default/orgnav/rest">其他机构</el-menu-item>
- </el-submenu>
+ <el-submenu index="orgnav">
+ <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/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>
+ <el-menu-item index="/pcLayout/default/orgnav/rest">其他机构</el-menu-item>
+ </el-submenu>
- <el-submenu index="arc">
- <template slot="title">
- <i class="custom-icon menu-xyjz"></i> 校内建筑
- </template>
- <el-menu-item index="/pcLayout/default/arc/edifact">行政办公</el-menu-item>
- <el-menu-item index="/pcLayout/default/arc/teaching">教学科研</el-menu-item>
- <el-menu-item index="/pcLayout/default/arc/venue">校园场馆</el-menu-item>
- <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-submenu>
- <!-- popper-class="only-life-box" -->
- <el-submenu index="service">
- <template slot="title">
- <i class="custom-icon menu-shfw"></i> 生活设施
- </template>
- <el-menu-item index="/pcLayout/default/service/canteen">食堂餐厅</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/supermarket">购物超市</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/medical">校园医疗</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/express">邮寄快递</el-menu-item>
- <!-- <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/aed">AED</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>
+ <el-submenu index="arc">
+ <template slot="title">
+ <i class="custom-icon menu-xyjz"></i> 校内建筑
+ </template>
+ <el-menu-item index="/pcLayout/default/arc/edifact">行政办公</el-menu-item>
+ <el-menu-item index="/pcLayout/default/arc/teaching">教学科研</el-menu-item>
+ <el-menu-item index="/pcLayout/default/arc/venue">校园场馆</el-menu-item>
+ <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-submenu>
+ <!-- popper-class="only-life-box" -->
+ <el-submenu index="service">
+ <template slot="title">
+ <i class="custom-icon menu-shfw"></i> 生活设施
+ </template>
+ <el-menu-item index="/pcLayout/default/service/canteen">食堂餐厅</el-menu-item>
+ <el-menu-item index="/pcLayout/default/service/supermarket">购物超市</el-menu-item>
+ <el-menu-item index="/pcLayout/default/service/medical">校园医疗</el-menu-item>
+ <el-menu-item index="/pcLayout/default/service/express">邮寄快递</el-menu-item>
+ <!-- <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/aed">AED</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>
- <!-- <el-menu-item index="/pcLayout/default/campusnav"> <i class='custom-icon menu-xydl'></i> 校园导览</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/campusnav"> <i class='custom-icon menu-xydl'></i> 校园导览</el-menu-item> -->
- <el-menu-item index="/pcLayout/default/campusnavi">
- <i class="custom-icon menu-xydh"></i> 校园导航
- </el-menu-item>
+ <el-menu-item index="/pcLayout/default/campusnavi">
+ <i class="custom-icon menu-xydh"></i> 校园导航
+ </el-menu-item>
- <el-submenu index="specialmap">
- <template slot="title">
- <i class="custom-icon menu-ztdt"></i> 专题地图
- </template>
- <el-menu-item index="/pcLayout/default/specialmap/welcome?name=校庆">校庆</el-menu-item>
- <el-menu-item index="/pcLayout/default/specialmap/welcome?name=校园迎新">校园迎新</el-menu-item>
- </el-submenu>
+ <el-submenu index="specialmap">
+ <template slot="title">
+ <i class="custom-icon menu-ztdt"></i> 专题地图
+ </template>
+ <el-menu-item index="/pcLayout/default/specialmap/welcome?name=校庆">校庆</el-menu-item>
+ <el-menu-item
+ index="/pcLayout/default/specialmap/welcome?name=校园迎新"
+ >校园迎新</el-menu-item>
+ </el-submenu>
- <el-submenu index="tool">
- <template slot="title">
- <i class="custom-icon menu-tool"></i> 工具
- </template>
- <el-menu-item index="/pcLayout/default/tool/download">地图下载</el-menu-item>
- <el-menu-item index="/pcLayout/default/tool/sign">地图标记</el-menu-item>
- <el-menu-item index="/pcLayout/default/tool/ranging">地图测距</el-menu-item>
- <el-menu-item index="/pcLayout/default/tool/area">地图测面</el-menu-item>
- <!-- <el-menu-item index="/pcLayout/default/tool/layer-manage">图层管理</el-menu-item> -->
- </el-submenu>
+ <el-submenu index="tool">
+ <template slot="title">
+ <i class="custom-icon menu-tool"></i> 工具
+ </template>
+ <el-menu-item index="/pcLayout/default/tool/download">地图下载</el-menu-item>
+ <el-menu-item index="/pcLayout/default/tool/sign">地图标记</el-menu-item>
+ <el-menu-item index="/pcLayout/default/tool/ranging">地图测距</el-menu-item>
+ <el-menu-item index="/pcLayout/default/tool/area">地图测面</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/tool/layer-manage">图层管理</el-menu-item> -->
+ </el-submenu>
- <el-submenu index="technique">
+ <!-- <el-submenu index="technique">
<template slot="title">
<i class="custom-icon menu-rest"></i> 其他
</template>
@@ -97,13 +102,15 @@
<el-menu-item index="/pcLayout/default/technique/space">三维空间分析</el-menu-item>
<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-menu>
+ </el-submenu>-->
+ </el-menu>
+ </div>
+
<!-- <div class="out-home">
<el-button size="mini" @click="outHome">返回首页</el-button>
</div>-->
</el-header>
- <el-main>
+ <el-main style="flex: 1;">
<router-view />
</el-main>
</el-container>
@@ -125,4 +132,17 @@
}
</script>
-<style></style>
+<style lang="scss" scoped>
+#pcElHeader {
+ display: flex;
+ width: 100%;
+ flex-wrap: wrap;
+ .logo {
+ display: flex;
+ width: 410px;
+ }
+ .nav {
+ width: 850px;
+ }
+}
+</style>
--
Gitblit v1.9.3