Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/register.vue

src/router/index.js

@@ -65,11 +65,11 @@ export const constantRoutes = [
   {
     path: "",
     component: Layout,
-    redirect: "index",
+    redirect: "register",
     children: [
       {
-        path: "index",
-        component: () => import("@/views/video/index"),
+        path: "/register",
+        component: () => import("@/views/register"),
         name: "Index",
         meta: { title: "首页", icon: "dashboard", affix: true },
       },

src/views/register.vue

@@ -12,7 +12,7 @@
         <span  style="font-size: x-large">首页</span>
       </li >
 
-      <li class = "contant-li" @click="userPath">
+      <li class = "contant-li" @click="userPath" >
         <div class="li-img">
           <img src="@/assets/images/userMessage.png" >
         </div>
@@ -24,45 +24,45 @@
         </div>
         <span style="font-size: x-large">历史记录</span>
       </li>
-      <li class = "contant-li">
+      <li class = "contant-li"  @click="logPath">
 
-        <div class="li-img" @click="logPath">
+        <div class="li-img">
           <img src="@/assets/images/dayLog.png" >
         </div>
         <span style="font-size: x-large">日志查看</span>
 
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
         <div class="li-img">
           <img src="@/assets/images/ClassificationManagement.png" >
         </div>
         <span style="font-size: x-large">设备分类管理</span>
     </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
         <div class="li-img">
           <img src="@/assets/images/DeviceManagement.png" >
         </div>
         <span style="font-size: x-large">设备管理</span>
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
         <div class="li-img">
           <img src="@/assets/images/StateManagement.png" >
         </div>
         <span style="font-size: x-large">设备状态管理</span>
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
         <div class="li-img">
           <img src="@/assets/images/AlarmMonitoring.png" >
         </div>
         <span  style="font-size: x-large">设备警报监控</span>
       </li>
-      <li class = "contant-li"  @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
         <div class="li-img">
           <img src="@/assets/images/Warranty.png" >
         </div>
         <span  style="font-size: x-large">设备保修管理</span>
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
         <div class="li-img">
           <img src="@/assets/images/MonitoringManagement.png" >
         </div>
@@ -74,7 +74,7 @@
         </div>
         <span  style="font-size: x-large">监控视频管理</span>
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
 
           <div class="li-img">
             <img src="@/assets/images/MonitorAlerts.png" >
@@ -82,7 +82,7 @@
           <span  style="font-size: x-large">监控警报</span>
 
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
 
         <div class="li-img">
           <img src="@/assets/images/Duser.png" >
@@ -90,7 +90,7 @@
         <span  style="font-size: x-large">监控实时画面</span>
 
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
 
         <div class="li-img">
           <img src="@/assets/images/alert.png" >
@@ -98,7 +98,7 @@
         <span  style="font-size: x-large">警报提示</span>
 
       </li>
-      <li class = "contant-li" @click="indexPath">
+      <li class = "contant-li" @click="indexPath" >
 
         <div class="li-img">
           <img src="@/assets/images/GimbalControl1.png" >
@@ -165,7 +165,7 @@ export default {
       this.$message.warning("暂无权限，请稍后再试")
     },
     homePath() {
-      this.$router.push({ path: "/" }).catch(()=>{});
+      this.$router.push({ path: "/monitoring/video" }).catch(()=>{});
     },
     logPath() {
       this.$router.push({ path: "/job/job" }).catch(()=>{});