From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/pcLayout/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index dfdb3a6..3ae199a 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="layout-container">
<el-container>
- <el-header>
+ <el-header id="pcElHeader">
<img src="/img/logo.png"
alt="">
<div class="header-title">智慧社区大数据三维可视化平台</div>
@@ -20,7 +20,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/ofc">职能部处</el-menu-item> -->
- <!-- <el-menu-item index="/pcLayout/default/orgnav/directly">直属及附属单位</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>
@@ -40,7 +40,7 @@
<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/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> -->
--
Gitblit v1.9.3