update

src/router/cam.js

@@ -9,6 +9,12 @@ export default {
   component: Cam,
   meta: { needAuth: true },
   children: [
+    {
+      path: '',
+      name: '摄像头列表',
+      component: CamList,
+      meta: { needAuth: true }
+    },
     {
       path: '/cam/list',
       name: '摄像头列表',

src/router/disk.js

@@ -19,22 +19,10 @@ export default {
   children: [
     {
       path: '',
-      name: '概览',
-      component: DiskOverview,
-      meta: { needAuth: true }
-    },
-    {
-      path: '/disk/list',
       name: '文件',
       component: FileList,
       meta: { needAuth: true }
     },
-    {
-      path: '/disk/upload',
-      name: '上传',
-      component: UploadFile,
-      meta: { needAuth: true }
-    },
     {
       path: '/disk/image',
       name: '图片',
@@ -59,6 +47,12 @@ export default {
       component: FileText,
       meta: { needAuth: true }
     },
+    {
+      path: '/disk/upload',
+      name: '上传',
+      component: UploadFile,
+      meta: { needAuth: true }
+    },
     {
       path: '/disk/trash',
       name: 'Trash',

src/router/index.js

@@ -30,8 +30,6 @@ const ArticlePage = () => import('views/home/ArticlePage')
 const MessageStream = () => import('views/home/MessageStream2')
 const Search = () => import('views/home/Search')
 const DiscoverIndex = () => import('views/home/Discover')
-const BdMap = () => import('views/home/BdMap')
-const AMap = () => import('views/home/AMap')
 
 // ********************************************************************************************************************
 // 使用安装路由插件
@@ -104,24 +102,6 @@ const routes = [
         component: Search,
         meta: { needAuth: false }
       },
-      {
-        path: '/map',
-        name: 'AMap',
-        component: AMap,
-        meta: { needAuth: false }
-      },
-      {
-        path: '/bdmap',
-        name: 'BdMap',
-        component: BdMap,
-        meta: { needAuth: false }
-      },
-      {
-        path: '/amap',
-        name: 'AMap',
-        component: AMap,
-        meta: { needAuth: false }
-      },
       {
         path: '/shortvideo',
         name: 'ShortVideoIndex',

src/router/mall.js

@@ -10,6 +10,8 @@ const ConfirmOrder = () => import('views/mall/ConfirmOrder')
 const Visit = () => import('views/mall/Visit')
 const Pay = () => import('views/mall/Pay')
 const Product = () => import('views/mall/Product')
+const BdMap = () => import('views/home/BdMap')
+const AMap = () => import('views/home/AMap')
 
 export default {
   path: '/mall',
@@ -35,6 +37,24 @@ export default {
       component: Fav,
       meta: { needAuth: false }
     },
+    {
+      path: '/mall/map',
+      name: 'AMap',
+      component: AMap,
+      meta: { needAuth: false }
+    },
+    {
+      path: '/mall/bdmap',
+      name: 'BdMap',
+      component: BdMap,
+      meta: { needAuth: false }
+    },
+    {
+      path: '/mall/amap',
+      name: 'AMap',
+      component: AMap,
+      meta: { needAuth: false }
+    },
     {
       path: '/mall/order',
       name: '订单',

src/views/disk/Disk.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container style="height: 650px; border: 1px solid #eee">
+  <el-container style="border: 1px solid #eee">
     <el-header style="text-align: right; font-size: 12px">
       <el-col :md="2">
         <ul class="el-menu--horizontal el-menu">
@@ -11,42 +11,12 @@
           </li>
         </ul>
       </el-col>
-      <el-dropdown>
-        <img
-          :src="user.avatarUrl"
-          class="el-avatar--circle el-avatar--medium"
-          style="margin-right: 10px; margin-top: 15px"
-          alt=""
-        >
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            icon="el-icon-s-home"
-            class="size"
-            @click.native="goToHome"
-          >主页</el-dropdown-item>
-          <el-dropdown-item
-            icon="el-icon-error"
-            class="size"
-            @click.native="goToLogout"
-          >退出</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </el-header>
-    <el-container>
-      <el-aside width="200px" style="background-color: rgb(238, 241, 246)">
+      <el-col :md="20">
         <el-menu
           :default-active="this.$route.path"
           router
-          class="el-menu-vertical-demo"
+          mode="horizontal"
         >
-          <el-menu-item index="/disk/list">
-            <i class="el-icon-files" />
-            <span slot="title">文件</span>
-          </el-menu-item>
-          <el-menu-item index="/disk/upload">
-            <i class="el-icon-upload" />
-            <span slot="title">上传</span>
-          </el-menu-item>
           <el-menu-item index="/disk/image">
             <i class="el-icon-picture" />
             <span slot="title">图片</span>
@@ -63,12 +33,40 @@
             <i class="el-icon-headset" />
             <span slot="title">文本</span>
           </el-menu-item>
+          <el-menu-item index="/disk/upload">
+            <i class="el-icon-upload" />
+            <span slot="title">上传</span>
+          </el-menu-item>
           <el-menu-item index="/disk/trash">
             <i class="el-icon-delete" />
             <span slot="title">回收站</span>
           </el-menu-item>
         </el-menu>
-      </el-aside>
+      </el-col>
+      <el-col :md="2">
+        <el-dropdown>
+          <img
+            :src="user.avatarUrl"
+            class="el-avatar--circle el-avatar--medium"
+            style="margin-right: 10px; margin-top: 15px"
+            alt=""
+          >
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              icon="el-icon-s-home"
+              class="size"
+              @click.native="goToHome"
+            >主页</el-dropdown-item>
+            <el-dropdown-item
+              icon="el-icon-error"
+              class="size"
+              @click.native="goToLogout"
+            >退出</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-col>
+    </el-header>
+    <el-container>
       <el-main>
         <router-view />
       </el-main>
@@ -99,13 +97,4 @@ export default {
 </script>
 
 <style>
-.el-header {
-  background-color: #B3C0D1;
-  color: #333;
-  line-height: 60px;
-}
-
-.el-aside {
-  color: #333;
-}
 </style>

src/views/disk/FileText.vue

@@ -1,8 +1,5 @@
 <template>
   <el-row>
-    <el-row>
-      <el-button size="mini" type="danger" @click="loadAll">加载视频</el-button>
-    </el-row>
     <el-row>
       <el-col v-for="(item, index) in dataList" :key="index" :md="6" :sm="12" :xs="12">
         <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">

src/views/mall/Mall.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container style="height: 650px; border: 1px solid #eee">
+  <el-container style="border: 1px solid #eee">
     <el-header style="text-align: right; font-size: 12px">
       <el-row>
         <el-col :md="2">
@@ -36,6 +36,9 @@
             <el-menu-item index="/mall/fav">
               <template slot="title" class="el-icon-collection">收藏夹</template>
             </el-menu-item>
+            <el-menu-item index="/mall/map">
+              <template slot="title" class="el-icon-map-location">评论地图</template>
+            </el-menu-item>
           </el-menu>
         </el-col>
         <el-col :md="2">