From 75ca0722b86e7751202e7aec2e8d8ef96d68ce98 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 22 Dec 2021 16:22:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/router/page/index.js               |   16 +-
 src/api/pc/service/index.js            |   18 ++
 src/components/campusNav/index.vue     |    7 
 src/components/orgNavBar/index.vue     |    5 
 src/pcLayout/index.vue                 |    4 
 src/pcviews/campusnavi/index.vue       |   33 ++++
 src/pcviews/mapnav/index.vue           |   14 +
 src/components/arcNavBar/index.vue     |    5 
 public/img/icon/service-qcj.png        |    0 
 src/pcviews/service/transfer.vue       |    8 
 src/components/map/index.vue           |   38 ++--
 src/components/serviceNavBar/index.vue |   32 ++++
 src/styles/divforms/popup.scss         |    4 
 public/img/icon/xndh.png               |    0 
 src/components/leftNav/index.vue       |  130 ++++++++++--------
 src/styles/pcpage/element-ui.scss      |   41 +++++
 src/api/pc/leftNav/index.js            |   48 ++++++
 17 files changed, 285 insertions(+), 118 deletions(-)

diff --git a/public/img/icon/service-qcj.png b/public/img/icon/service-qcj.png
new file mode 100644
index 0000000..3925d55
--- /dev/null
+++ b/public/img/icon/service-qcj.png
Binary files differ
diff --git a/public/img/icon/xndh.png b/public/img/icon/xndh.png
new file mode 100644
index 0000000..db9e1ab
--- /dev/null
+++ b/public/img/icon/xndh.png
Binary files differ
diff --git a/src/api/pc/leftNav/index.js b/src/api/pc/leftNav/index.js
new file mode 100644
index 0000000..21cd826
--- /dev/null
+++ b/src/api/pc/leftNav/index.js
@@ -0,0 +1,48 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-05-09 15:17:44
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-12-22 16:01:37
+ */
+// 右侧nav栏相关
+import request from '@/router/axios'
+
+export const getComeList = (params) => {
+    return request({
+        url: '/blade-door/door/selectDoor',
+        method: 'get',
+        params: params
+    })
+}
+
+export const getParkList = (params) => {
+    return request({
+        url: '/blade-parking/parking/selectPark',
+        method: 'get',
+        params: params
+    })
+}
+
+export const getAEDkList = (params) => {
+    return request({
+        url: '/blade-aed/aed/selectAed',
+        method: 'get',
+        params: params
+    })
+}
+
+export const getSceneList = (params) => {
+    return request({
+        url: '/blade-architecture/architecture/selectArch',
+        method: 'get',
+        params: params
+    })
+}
+
+export const getTagList = (params) => {
+    return request({
+        url: '/blade-architecture/architecture/selectArchALL',
+        method: 'get',
+        params: params
+    })
+}
diff --git a/src/api/pc/service/index.js b/src/api/pc/service/index.js
index af9133e..d87180b 100644
--- a/src/api/pc/service/index.js
+++ b/src/api/pc/service/index.js
@@ -2,7 +2,7 @@
  * @Author: Morpheus
  * @Date: 2021-05-09 15:17:44
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 09:59:43
+ * @Last Modified time: 2021-12-22 13:44:26
  */
 // 校区
 import request from '@/router/axios'
@@ -55,6 +55,14 @@
     })
 }
 
+export const getTransferList = (params) => {
+    return request({
+        url: '/blade-transference/transference/list',
+        method: 'get',
+        params: params
+    })
+}
+
 export const getCopyList = (params) => {
     return request({
         url: '/blade-duplicate/duplicate/list',
@@ -94,3 +102,11 @@
         params: params
     })
 }
+
+export const getAlleywayList = (params) => {
+    return request({
+        url: '/blade-door/door/list',
+        method: 'get',
+        params: params
+    })
+}
diff --git a/src/components/arcNavBar/index.vue b/src/components/arcNavBar/index.vue
index b168144..470a231 100644
--- a/src/components/arcNavBar/index.vue
+++ b/src/components/arcNavBar/index.vue
@@ -224,8 +224,8 @@
     width: 322px;
     height: auto;
     border-radius: 8px;
-    top: 24%;
-    left: 20%;
+    top: 16%;
+    left: 5%;
     background-color: transparent;
     z-index: 999;
     font-size: 14px;
@@ -271,6 +271,7 @@
                 margin: auto;
                 width: 14px;
                 height: 14px;
+                cursor: pointer;
             }
         }
         .move {
diff --git a/src/components/campusNav/index.vue b/src/components/campusNav/index.vue
index f9ab156..4c0342e 100644
--- a/src/components/campusNav/index.vue
+++ b/src/components/campusNav/index.vue
@@ -6,7 +6,7 @@
              :class="{'move': moveFlag}">
             <div class="title">
                 <img class="icon deblurring"
-                     src="/img/icon/jg.png"
+                     src="/img/icon/xndh.png"
                      alt="">
                 <span>
                     校内导航
@@ -51,7 +51,7 @@
                 </div>
                 <div>
                     <el-button @click="startNavigation"
-                               type="danger">导航</el-button>
+                               type="primary">导航</el-button>
                 </div>
             </div>
         </div>
@@ -258,7 +258,7 @@
         width: 100%;
         height: 36px;
         line-height: 36px;
-        background-color: #020c17;
+        background-color: #2196f3;
 
         .title {
             padding-left: 10px;
@@ -286,6 +286,7 @@
             margin: auto;
             width: 14px;
             height: 14px;
+            cursor: pointer;
         }
     }
 
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index 47fbe8c..01bffa1 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -14,6 +14,8 @@
 
 <script>
 
+import { getAEDkList, getParkList, getComeList, getSceneList, getTagList } from '@/api/pc/leftNav/index'
+
 export default {
     name: 'leftNav',
     computed: {},
@@ -98,8 +100,8 @@
         generatePosition (num) {
             const list = []
             for (let i = 0; i < num; i++) {
-                const lng = 115.87186406 + Math.random() * 0.5
-                const lat = 28.74449337 + Math.random() * 0.5
+                const lng = 115.86271917 + Math.random() * 0.01
+                const lat = 28.73615593 + Math.random() * 0.02
                 list.push(new this.DC.Position(lng, lat, 0))
             }
             return list
@@ -115,6 +117,7 @@
             }
         },
         initialize (viewer) {
+            var that = this
             viewer.scene.globe.depthTestAgainstTerrain = false
             this.viewer = viewer
             this.tagLayer = new this.DC.HtmlLayer('tagLayer')
@@ -132,25 +135,27 @@
             this.comeLayer = new this.DC.VectorLayer('comeLayer')
             viewer.addLayer(this.comeLayer)
 
-            const positions1 = this.generatePosition(50)
-            positions1.forEach((item, index) => {
-                const divIcon = new this.DC.DivIcon(
-                    item,
-                    `
+            getTagList().then(res => {
+                res.data.data.forEach(item => {
+                    const divIcon = new this.DC.DivIcon(
+                        new that.DC.Position(Number(item.jd), Number(item.wd), 0),
+                        `
                         <div class="tag-entitys-box">
                             <div class="tag-content">
-                                南门口
+                                ${item.mechanismname}
                             </div>
                             <div class="tag-angle-content">
                                 <img src="https://map.hit.edu.cn/images/tarrow_xq.png">
                             </div>
                         </div>
                     `
-                )
-                this.tagLayer.addOverlay(divIcon)
+                    )
+                    this.tagLayer.addOverlay(divIcon)
+                })
+                this.tagLayer.show = false
             })
 
-            const positions2 = this.generatePosition(50)
+            const positions2 = this.generatePosition(5)
             positions2.forEach((item, index) => {
                 const divIcon = new this.DC.DivIcon(
                     item,
@@ -168,40 +173,47 @@
                 this.wayLayer.addOverlay(divIcon)
             })
 
-            const positions3 = this.generatePosition(50)
-            positions3.forEach(item => {
-                const billboard = new this.DC.Billboard(item, '/img/leftnav/map-panorama.png')
-                billboard.size = [16, 16]
-                this.sceneLayer.addOverlay(billboard)
-            })
-
-            const positions4 = this.generatePosition(10)
-            positions4.forEach((item, index) => {
-                const label = new this.DC.Label(item, '建筑AED')
-                label.setStyle({
-                    fillColor: this.DC.Color.ORANGERED,
-                    font: '10px sans-serif',
-                    pixelOffset: { x: 0, y: -16 }
+            getSceneList().then(res => {
+                res.data.data.forEach(item => {
+                    const billboard = new this.DC.Billboard(new that.DC.Position(Number(item.jd), Number(item.wd), 0), '/img/leftnav/map-panorama.png')
+                    billboard.size = [20, 20]
+                    this.sceneLayer.addOverlay(billboard)
                 })
-                this.aedLayer.addOverlay(label)
-
-                const billboard = new this.DC.Billboard(item, '/img/leftnav/map-aed.png')
-                billboard.size = [16, 16]
-
-                this.aedLayer.addOverlay(billboard)
+                this.sceneLayer.show = false
             })
 
-            const positions5 = this.generatePosition(120)
-            positions5.forEach((item, index) => {
-                const divIcon = new this.DC.DivIcon(
-                    item,
-                    `
+            getAEDkList().then(res => {
+                res.data.data.forEach(item => {
+                    const label = new this.DC.Label(new that.DC.Position(Number(item.jd), Number(item.wd), 0), item.mechanismname)
+                    label.setStyle({
+                        fillColor: this.DC.Color.CRIMSON,
+                        style: that.DC.Namespace.Cesium.LabelStyle.FILL_AND_OUTLINE,
+                        outlineColor: that.DC.Color.WHITE, // 边框颜色
+                        outlineWidth: 8, // 边框大小,
+                        font: '14px sans-serif',
+                        pixelOffset: { x: 0, y: -24 }
+                    })
+                    this.aedLayer.addOverlay(label)
+
+                    const billboard = new this.DC.Billboard(new that.DC.Position(Number(item.jd), Number(item.wd), 0), '/img/leftnav/map-aed.png')
+                    billboard.size = [20, 20]
+
+                    this.aedLayer.addOverlay(billboard)
+                })
+                this.aedLayer.show = false
+            })
+
+            getParkList().then(res => {
+                res.data.data.forEach(item => {
+                    const divIcon = new this.DC.DivIcon(
+                        new that.DC.Position(Number(item.jd), Number(item.wd), 0),
+                        `
                         <div class="park-entitys-box">
-                            <div class="park-title" alt="校外街路侧停车场">
+                            <div class="park-title" alt="${item.mechanismname}">
                             </div>
                             <div class="park-sign-box">
                                 <div>
-                                    <img src="https://map.hit.edu.cn/images/p-biao.png" width="14" height="14" alt="校外街路侧停车场" title="校外街路侧停车场">
+                                    <img src="https://map.hit.edu.cn/images/p-biao.png" width="14" height="14" alt="${item.mechanismname}" title="${item.mechanismname}">
                                 </div>
                                 <div>
                                     <img src="https://map.hit.edu.cn/images/roadsign.png" width="5" height="21">
@@ -209,34 +221,36 @@
                             </div>
                         </div>
                     `
-                )
-                this.parkLayer.addOverlay(divIcon)
+                    )
+                    this.parkLayer.addOverlay(divIcon)
+                })
+                this.parkLayer.show = false
             })
 
-            const positions6 = this.generatePosition(10)
-            positions6.forEach((item, index) => {
-                const label = new this.DC.Label(item, '数字视觉')
-                label.setStyle({
-                    fillColor: this.DC.Color.PURPLE,
-                    outlineColor: this.DC.Color.WHITE, // 边框颜色
-                    outlineWidth: 2, // 边框大小,
-                    font: '10px sans-serif',
-                    pixelOffset: { x: 0, y: -16 }
+            getComeList().then(res => {
+                res.data.data.forEach(item => {
+                    const label = new that.DC.Label(new that.DC.Position(Number(item.jd), Number(item.wd), 0), item.mechanismname)
+                    label.setStyle({
+                        fillColor: that.DC.Color.FUCHSIA,
+                        style: that.DC.Namespace.Cesium.LabelStyle.FILL_AND_OUTLINE,
+                        outlineColor: that.DC.Color.WHITE, // 边框颜色
+                        outlineWidth: 8, // 边框大小,
+                        font: '14px sans-serif',
+                        pixelOffset: { x: 0, y: -24 }
+                    })
+                    that.comeLayer.addOverlay(label)
+
+                    const billboard = new that.DC.Billboard(new that.DC.Position(Number(item.jd), Number(item.wd), 0), '/img/leftnav/map-activity.png')
+                    billboard.size = [20, 20]
+
+                    that.comeLayer.addOverlay(billboard)
                 })
-                this.comeLayer.addOverlay(label)
-
-                const billboard = new this.DC.Billboard(item, '/img/leftnav/map-activity.png')
-                billboard.size = [16, 16]
-
-                this.comeLayer.addOverlay(billboard)
+                this.comeLayer.show = false
             })
 
             this.tagLayer.show = false
             this.wayLayer.show = false
             this.sceneLayer.show = false
-            this.aedLayer.show = false
-            this.parkLayer.show = false
-            this.comeLayer.show = false
         }
     }
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 6f5c55e..f313c22 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -150,25 +150,25 @@
                 name: '电子'
             })
 
-            // eslint-disable-next-line camelcase
-            const baselayer_street = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
-                url:
-                    'http://services.arcgisonline.com/arcgis/rest/services/World_Physical_Map/MapServer'
-            })
-            viewer.addBaseLayer(baselayer_street, {
-                iconUrl: 'examples/images/icon/ter.png',
-                name: '地形'
-            })
+            // // eslint-disable-next-line camelcase
+            // const baselayer_street = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
+            //     url:
+            //         'http://services.arcgisonline.com/arcgis/rest/services/World_Physical_Map/MapServer'
+            // })
+            // viewer.addBaseLayer(baselayer_street, {
+            //     iconUrl: 'examples/images/icon/ter.png',
+            //     name: '地形'
+            // })
 
-            // eslint-disable-next-line camelcase
-            const baselayer_ter = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
-                url:
-                    'http://services.arcgisonline.com/arcgis/rest/services/World_Terrain_Base/MapServer'
-            })
-            viewer.addBaseLayer(baselayer_ter, {
-                iconUrl: 'examples/images/icon/ter.png',
-                name: '地形'
-            })
+            // // eslint-disable-next-line camelcase
+            // const baselayer_ter = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
+            //     url:
+            //         'http://services.arcgisonline.com/arcgis/rest/services/World_Terrain_Base/MapServer'
+            // })
+            // viewer.addBaseLayer(baselayer_ter, {
+            //     iconUrl: 'examples/images/icon/ter.png',
+            //     name: '地形'
+            // })
 
             // const tilesetLayer = new that.DC.TilesetLayer('tilesetLayer')
             // viewer.addLayer(tilesetLayer)
@@ -246,7 +246,7 @@
             )
             wall.setStyle({
                 material: new that.DC.WallTrailMaterialProperty({
-                    color: that.DC.Color.GREEN,
+                    color: that.DC.Color.DEEPSKYBLUE,
                     speed: 4
                 })
             })
diff --git a/src/components/orgNavBar/index.vue b/src/components/orgNavBar/index.vue
index affd761..ddc8bc8 100644
--- a/src/components/orgNavBar/index.vue
+++ b/src/components/orgNavBar/index.vue
@@ -169,8 +169,8 @@
     width: 322px;
     height: auto;
     border-radius: 8px;
-    top: 24%;
-    left: 20%;
+    top: 16%;
+    left: 5%;
     background-color: transparent;
     z-index: 999;
     font-size: 14px;
@@ -220,6 +220,7 @@
                 margin: auto;
                 width: 14px;
                 height: 14px;
+                cursor: pointer;
             }
         }
 
diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index e5cdee1..99f650f 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -46,8 +46,11 @@
 <script>
 import { mapGetters } from 'vuex'
 import {
-    getList, getCanteenList, getSupermarketList, getMedicalList,
-    getExpressList, getShowersList, getCopyList, getBankList, getAedList, getServiceList, getParkList
+    getList, getCanteenList, getSupermarketList,
+    getMedicalList, getExpressList, getShowersList,
+    getTransferList, getCopyList, getBankList,
+    getAedList, getServiceList, getParkList,
+    getAlleywayList
 } from '@/api/pc/service/index'
 
 export default {
@@ -214,6 +217,16 @@
                         })
                     })
                 })
+            } else if (this.arcCode == 6) {
+                getTransferList({ campus: campus }).then(res => {
+                    res.data.data.records.forEach(item => {
+                        this.itemNavList.push({
+                            navTitle: item.mechanismname,
+                            icon: '/img/navicon/tag.png',
+                            details: item
+                        })
+                    })
+                })
             } else if (this.arcCode == 7) {
                 getCopyList({ campus: campus }).then(res => {
                     res.data.data.records.forEach(item => {
@@ -256,6 +269,16 @@
                 })
             } else if (this.arcCode == 11) {
                 getParkList({ campus: campus }).then(res => {
+                    res.data.data.records.forEach(item => {
+                        this.itemNavList.push({
+                            navTitle: item.mechanismname,
+                            icon: '/img/navicon/tag.png',
+                            details: item
+                        })
+                    })
+                })
+            } else if (this.arcCode == 12) {
+                getAlleywayList({ campus: campus }).then(res => {
                     res.data.data.records.forEach(item => {
                         this.itemNavList.push({
                             navTitle: item.mechanismname,
@@ -313,8 +336,8 @@
     width: 322px;
     height: auto;
     border-radius: 8px;
-    top: 24%;
-    left: 20%;
+    top: 16%;
+    left: 5%;
     background-color: transparent;
     z-index: 999;
     font-size: 14px;
@@ -360,6 +383,7 @@
                 margin: auto;
                 width: 14px;
                 height: 14px;
+                cursor: pointer;
             }
         }
         .move {
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index 8168c3f..6496ffd 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -43,7 +43,7 @@
                         <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/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>
@@ -63,7 +63,7 @@
                     <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/sign">地图标记</el-menu-item> -->
                         <el-menu-item index="/pcLayout/default/tool/ranging">地图测距</el-menu-item>
                     </el-submenu>
 
diff --git a/src/pcviews/campusnavi/index.vue b/src/pcviews/campusnavi/index.vue
index b52331c..21a01c1 100644
--- a/src/pcviews/campusnavi/index.vue
+++ b/src/pcviews/campusnavi/index.vue
@@ -1,15 +1,38 @@
 <template>
-  <div>
-      校园导航
-  </div>
+    <div>
+        <campusNav ref="campusNavRoute"
+                   :comeName="comeName"
+                   :getToName="getToName"
+                   v-show="campusNavFlag" />
+    </div>
 </template>
 
 <script>
 export default {
-
+    data () {
+        return {
+            campusNavFlag: true,
+            comeName: '',
+            getToName: ''
+        }
+    },
+    methods: {
+        closeCampusNav () {
+            this.campusNavFlag = false
+            this.$refs.campusNavRoute.clearLayer()
+            this.$store.commit('SET_STARTINGPOINT', null)
+            this.$store.commit('SET_TERMINUS', null)
+            this.comeName = ''
+            this.getToName = ''
+            this.$store.dispatch('delVisitedViews', this.$route)
+            this.$router.push('/pcLayout/default')
+        }
+    },
+    destroyed () {
+        this.campusNavFlag = false
+    }
 }
 </script>
 
 <style>
-
 </style>
diff --git a/src/pcviews/mapnav/index.vue b/src/pcviews/mapnav/index.vue
index 313ea66..b5cc01d 100644
--- a/src/pcviews/mapnav/index.vue
+++ b/src/pcviews/mapnav/index.vue
@@ -1,7 +1,14 @@
+/*
+ * @Author: Morpheus
+ * @Name:   地图导览
+ * @Date: 2021-12-21 17:30:17
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-12-21 17:33:47
+ */
 <template>
-  <div>
-      地图导览
-  </div>
+    <div>
+
+    </div>
 </template>
 
 <script>
@@ -11,5 +18,4 @@
 </script>
 
 <style>
-
 </style>
diff --git a/src/pcviews/service/transfer.vue b/src/pcviews/service/transfer.vue
index 77ce962..f460510 100644
--- a/src/pcviews/service/transfer.vue
+++ b/src/pcviews/service/transfer.vue
@@ -3,12 +3,13 @@
  * @Name: 圈存机
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:42:21
+ * @Last Modified time: 2021-12-22 11:21:20
  */
 <template>
     <div>
         <service-nav-bar :title="title"
-                         :arcCode="code"></service-nav-bar>
+                         :arcCode="code"
+                         :headerLog="headerLog"></service-nav-bar>
     </div>
 </template>
 
@@ -17,7 +18,8 @@
     data () {
         return {
             title: '圈存机',
-            code: 6
+            code: 6,
+            headerLog: '/img/icon/service-qcj.png'
         }
     },
     created () {
diff --git a/src/router/page/index.js b/src/router/page/index.js
index 06e930f..fc122b1 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -2,7 +2,7 @@
  * @Author: Morpheus
  * @Date: 2021-04-30 14:12:09
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:42:32
+ * @Last Modified time: 2021-12-22 10:17:37
  */
 
 import Vue from 'vue'
@@ -166,13 +166,13 @@
                                 title: '学生浴室'
                             }
                         },
-                        // {
-                        //     path: 'transfer',
-                        //     component: resolve => require(['../../pcviews/service/transfer.vue'], resolve),
-                        //     meta: {
-                        //         title: '圈存机'
-                        //     }
-                        // },
+                        {
+                            path: 'transfer',
+                            component: resolve => require(['../../pcviews/service/transfer.vue'], resolve),
+                            meta: {
+                                title: '圈存机'
+                            }
+                        },
                         {
                             path: 'copy',
                             component: resolve => require(['../../pcviews/service/copy.vue'], resolve),
diff --git a/src/styles/divforms/popup.scss b/src/styles/divforms/popup.scss
index 75da573..850cf27 100644
--- a/src/styles/divforms/popup.scss
+++ b/src/styles/divforms/popup.scss
@@ -15,7 +15,7 @@
             list-style: none;
             font-size: .875rem;
             text-align: center;
-            border: 1px solid #ffc107;
+            border: 1px solid rgb(0, 208, 255);
             border-radius: 15px;
             cursor: pointer;
 
@@ -161,6 +161,7 @@
             margin: auto;
             width: 20px;
             height: 20px;
+            cursor: pointer;
         }
 
         .close-box {
@@ -172,6 +173,7 @@
             margin: auto;
             width: 16px;
             height: 16px;
+            cursor: pointer;
         }
     }
 }
diff --git a/src/styles/pcpage/element-ui.scss b/src/styles/pcpage/element-ui.scss
index 2bad802..bbe189e 100644
--- a/src/styles/pcpage/element-ui.scss
+++ b/src/styles/pcpage/element-ui.scss
@@ -7,24 +7,53 @@
         padding: 0px !important;
         background: #fff !important;
         border-radius: 2px;
+
         .el-menu-item {
-            color: #333 !important;
+            color: #fff !important;
             border-bottom: 1px solid #e5e5e5 !important;
+            background: #2196f3 !important;
         }
+
         .el-menu-item:last-child {
             border-bottom: none !important;
         }
+
         .el-menu-item:hover {
-            background: rgb(235, 235, 235) !important;
+            background: #1A78C2 !important;
         }
     }
 }
 
-.el-header {
-    .el-menu {
-        .el-menu-item {
-            font-size: 14px !important;
+.layout-container {
+
+    .el-container {
+
+        .el-header {
+            position: fixed;
+            top: 0;
+            left: 0;
+            height: 60px;
+            width: 100%;
+            z-index: 99999;
+
+            .el-menu {
+
+                .el-menu-item {
+                    font-size: 14px !important;
+                }
+            }
         }
+
+        .el-main {
+            position: fixed;
+            top: 60px;
+            left: 0;
+            height: calc(100% - 60px);
+            width: 100%;
+            z-index: 10;
+
+        }
+
     }
 }
 

--
Gitblit v1.9.3