Merge branch 'master' of https://gitee.com/qinnamin/large_screen

src/router.js

@@ -53,14 +53,25 @@ export default new Router({
                 hidden: false,
 
             }, {
-                path: '/transportation',
-                name: ' 主运输系统',
-                id: 103,
+            path: '/checkSubSys',
+            name: '查看子系统',
+            hidden: true,
+            component: () =>
+                import('./views/monitor/checkSubSys.vue')
+            }, {
+                path: '/checkCheckPoint',
+                name: '查看测点数据',
+                hidden: true,
                 component: () =>
-                    import ('./views/transportation/transportation.vue'),
-                hidden: false,
-            },
-            {
+                    import('./views/monitor/checkCheckPoint.vue')
+            }, {
+                    path: '/transportation',
+                    name: ' 主运输系统',
+                    id: 103,
+                    component: () =>
+                        import ('./views/transportation/transportation.vue'),
+                    hidden: false,
+            }, {
                 path: '/coalCentral',
                 name: ' 煤中央皮带',
                 id: 1030,
@@ -258,4 +269,4 @@ export default new Router({
             hidden: false,
         }]
     }]
-})
+})

src/views/monitor/monitor.vue

@@ -1,13 +1,37 @@
 <template>
-
+  <div>
+    <!--标签-->
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="系统数据" name="first">
+        <systemData></systemData>
+      </el-tab-pane>
+      <el-tab-pane label="数据标准" name="second">
+        <dataStandard></dataStandard>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 
 
 <script>
+    import systemData from "./systemData";
+    import dataStandard from "./dataStandard";
     export default {
         name: "monitor",
-        data() {
-            return {}
+      data() {
+        return {
+          activeName: 'first',
+          checkVisible: 'false'
+        }
+      },
+        methods: {
+          handleClick(tab, event) {
+            console.log(tab, event);
+          }
+        },
+        components: {
+          systemData,
+          dataStandard
         }
     }
 </script>