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

src/views/compressed/compressed.vue

@@ -1,15 +1,17 @@
 <template>
   <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-    <el-tab-pane label="系统数据" name="first">系统数据</el-tab-pane>
-    <el-tab-pane label="数据标准" name="second">
-      <dataStandard></dataStandard>
+     <el-tab-pane label="系统图" name="third">
+      <config-img></config-img>
     </el-tab-pane>
     <el-tab-pane label="数据看板" name="fourth">
         <data-board></data-board>
       </el-tab-pane>
-    <el-tab-pane label="系统图" name="third">
-      <config-img></config-img>
+    <el-tab-pane label="系统数据" name="first">系统数据</el-tab-pane>
+    <el-tab-pane label="数据标准" name="second">
+      <dataStandard></dataStandard>
     </el-tab-pane>
+   
+    
   </el-tabs>
 </template>
 
@@ -21,7 +23,7 @@ import configImg from "@/views/compressed/configImg/configImg"
       name: "compressed",
       data() {
         return {
-          activeName: 'first'
+          activeName: 'third'
         };
       },
       methods: {

src/views/gas/gas.vue

@@ -2,6 +2,9 @@
   <div>
     <!--标签-->
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="组态图" name="third">
+        <router-view></router-view>
+      </el-tab-pane>
       <el-tab-pane label="系统数据" name="first">
         <!-- 系统数据页面 -->
         <el-breadcrumb separator-class="el-icon-arrow-right">
@@ -83,9 +86,7 @@
       <el-tab-pane label="数据标准" name="second">
         <dataStandard></dataStandard>
       </el-tab-pane>
-      <el-tab-pane label="组态图" name="third">
-        <router-view></router-view>
-      </el-tab-pane>
+      
     </el-tabs>
   </div>
 </template>
@@ -140,7 +141,7 @@ export default {
       currentSubSystemId: 0,
       currentsubSystem: "",
       // 被激活页签的名称
-      activeName: "first",
+      activeName: "third",
       systemName: "瓦斯抽放系统",
     };
   },

src/views/mining/mining.vue

@@ -2,15 +2,16 @@
   <div>
     <!--标签-->
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="系统图" name="third">
+        <router-view></router-view>
+      </el-tab-pane>
       <el-tab-pane label="系统数据" name="first">
         <systemData></systemData>
       </el-tab-pane>
       <el-tab-pane label="数据标准" name="second">
         <dataStandard></dataStandard>
       </el-tab-pane>
-      <el-tab-pane label="系统图" name="third">
-        <router-view></router-view>
-      </el-tab-pane>
+      
     </el-tabs>
   </div>
 
@@ -24,7 +25,7 @@
     name: "mining",
     data() {
       return {
-        activeName: 'first',
+        activeName: 'third',
         checkVisible: 'false'
       };
     },

src/views/monitor/monitor.vue

@@ -2,15 +2,16 @@
   <div>
     <!--标签-->
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="系统图" name="zutai">
+        <configImg></configImg>
+      </el-tab-pane>
       <el-tab-pane label="系统数据" name="first">
         <systemData></systemData>
       </el-tab-pane>
       <el-tab-pane label="数据标准" name="second">
         <dataStandard></dataStandard>
       </el-tab-pane>
-      <el-tab-pane label="组态图" name="zutai">
-        <configImg></configImg>
-      </el-tab-pane>
+      
     </el-tabs>
   </div>
 </template>
@@ -24,7 +25,7 @@ export default {
   name: "monitor",
   data() {
     return {
-      activeName: "first",
+      activeName: "zutai",
       checkVisible: "false",
     };
   },

src/views/power_supply/power.vue

@@ -7,12 +7,12 @@
         <el-breadcrumb-item>数据标准</el-breadcrumb-item>
       </el-breadcrumb>
     </el-tab-pane>
+    <el-tab-pane label="系统图" name="third">
+      <TablePage></TablePage>
+    </el-tab-pane>
     <el-tab-pane label="数据标准" name="second">
       <dataStandard></dataStandard>
     </el-tab-pane>
-    <el-tab-pane label="组态图" name="third">
-      <TablePage></TablePage>
-    </el-tab-pane>
     <el-tab-pane label="数据看板" name="fourth">
       <data-board></data-board>
     </el-tab-pane>
@@ -28,7 +28,7 @@ export default {
   name: "compressed",
   data() {
     return {
-      activeName: "first",
+      activeName: "third",
     };
   },
   methods: {

src/views/transportation/transportation.vue

@@ -2,15 +2,15 @@
     <div>
       <!--标签-->
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="组态图" name="third">
+          <router-view></router-view>
+        </el-tab-pane>
         <el-tab-pane label="系统数据" name="first">
           <systemData></systemData>
         </el-tab-pane>
         <el-tab-pane label="数据标准" name="second">
           <dataStandard></dataStandard>
         </el-tab-pane>
-        <el-tab-pane label="组态图" name="third">
-          <router-view></router-view>
-        </el-tab-pane>
       </el-tabs>
     </div>
   
@@ -25,7 +25,7 @@
         name: "auxiliarytrans",
         data() {
             return {
-                activeName: 'first',
+                activeName: 'third',
                 checkVisible: 'false'
             };
         },

src/views/tunnelling/tunnelling.vue

@@ -2,15 +2,15 @@
   <div>
     <!--标签-->
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="系统图" name="zutai">
+        <zutai></zutai>
+      </el-tab-pane>
       <el-tab-pane label="系统数据" name="first">
         <systemData></systemData>
       </el-tab-pane>
       <el-tab-pane label="数据标准" name="second">
         <dataStandard></dataStandard>
       </el-tab-pane>
-      <el-tab-pane label="组态图" name="zutai">
-        <zutai></zutai>
-      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -24,7 +24,7 @@
         name: "tunnelling",
         data() {
             return {
-                activeName: 'first',
+                activeName: 'zutai',
                 checkVisible: 'false'
             };
         },

src/views/ventilate/ventilate.vue

@@ -6,6 +6,18 @@
       type="card"
       @tab-click="handleClick"
     >
+      <el-tab-pane
+        label="系统图"
+        name="third"
+      >
+        <config-img></config-img>
+      </el-tab-pane>
+      <el-tab-pane
+        label="数据看板"
+        name="fourth"
+      >
+        <data-board></data-board>
+      </el-tab-pane>
       <el-tab-pane
         label="系统数据"
         name="first"
@@ -18,15 +30,7 @@
       >
         <dataStandard></dataStandard>
       </el-tab-pane>
-      <el-tab-pane
-        label="系统图"
-        name="third"
-      >
-       <config-img></config-img>
-      </el-tab-pane>
-      <el-tab-pane label="数据看板" name="fourth">
-        <data-board></data-board>
-      </el-tab-pane>
+
     </el-tabs>
   </div>
 </template>
@@ -35,25 +39,24 @@
 <script>
 import dataStandard from "./dataStandard";
 import systemData from "./systemData";
-import configImg from '@/views/ventilate/configImg/configImg'
-import dataBoard from '@/views/ventilate/dataBoard/dataBoard'
+import configImg from "@/views/ventilate/configImg/configImg";
+import dataBoard from "@/views/ventilate/dataBoard/dataBoard";
 export default {
   name: "ventilate",
   data() {
     return {
-      activeName: "first",
+      activeName: "third",
       checkVisible: "false",
     };
   },
   methods: {
-    handleClick(tab, event) {
-    },
+    handleClick(tab, event) {},
   },
   components: {
     dataStandard,
     systemData,
     configImg,
-    dataBoard
+    dataBoard,
   },
 };
 </script>