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

src/components/mining/monitor/safety_statistics.vue

@@ -52,7 +52,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .main {
   height: 200px;
   background: url(../../../assets/img/tunneling/dataBg.png) no-repeat;
@@ -70,7 +70,7 @@ export default {
   font-size: 16px;
   color: #4adefe;
 }
-.el-progress__text {
+.main ::v-deep .el-progress__text {
   color: #f3db5c;
 }
 </style>

src/views/mining/Monitor/Index.vue

@@ -27,14 +27,13 @@
 </template>
 
 <script>
-import Emulsion from "./Emulsion.vue";
+import Emulsion from "./Emulsion.vue"; 
 import errorRecording from "../../../components/mining/monitor/error_recording";
 import processStatistics from "../../../components/mining/monitor/process_statistics";
 import safetyStatistics from "../../../components/mining/monitor/safety_statistics";
 import CoalMining from "./CoalMining.vue";
 import bar from "./echarts/Bars.vue";
 import headline from "@/common/headline"
-// import lines from "./echarts/Lines.vue";
 export default {
   components: {
     Emulsion,

src/views/mining/mining.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
-    123
-    <!-- <el-tabs
+    <el-tabs
       v-model="activeName"
       type="card"
       @tab-click="handleClick"
@@ -23,13 +22,15 @@
         <systemData v-if="activeName == 'first'"></systemData>
       </el-tab-pane>
       <el-tab-pane label="数据标准" name="second">
-        <dataStandard v-if="activeName == 'second'" :dataQualitySystemId=16></dataStandard>
+        <dataStandard
+          v-if="activeName == 'second'"
+          :dataQualitySystemId="16"
+        ></dataStandard>
       </el-tab-pane>
-    </el-tabs> -->
+    </el-tabs>
   </div>
 </template>
 
-
 <script>
 import supporting from "./supporting/supporting";
 import dataStandard from "./dataStandard/dataStandard";
@@ -45,7 +46,6 @@ export default {
       checkVisible: "false",
     };
   },
-  mounted() {},
   methods: {
     handleClick(tab, event) {},
   },
@@ -56,11 +56,9 @@ export default {
     supporting,
     envTest,
     Monitor,
-    machines
+    machines,
   },
 };
 </script>
 
-
-<style scoped>
-</style>
+<style scoped></style>