数据列表图表修改

src/common/dataDetail/dataDetail_chart.vue

@@ -294,7 +294,7 @@ export default {
 
           }
           // console.log(arr);
-          // this.tableData=arr;
+          this.tableData=arr;
         }
         // console.log('this.tableData');
         // console.log(this.tableData);

src/common/dataDetail/dataDetail_graph.vue

@@ -10,7 +10,7 @@
 
     </div>
 		
-		<el-card class="box-card" v-for="(item,index) in mpArray">
+		<el-card class="box-card" v-for="(item,index) in mpArray" v-if="showReject">
 			<mpGraph2  :beforeData='item.before' :afterData='item.after'
 			:xTime='item.time' :title='item.name'></mpGraph2>
 		</el-card>
@@ -65,7 +65,7 @@
       mpGraph2,
    
     },
-    mounted() {
+    created() {
 
       this.currentEquipId = this.$route.query.equipmentId
       // this.currentEquipId = window.sessionStorage.getItem("dataList_currentEquipId");
@@ -239,6 +239,7 @@
 
       },
       startGetData() {
+        this.handleHbaseSearch();
         this.timer = setInterval(() => {
 
           this.handleHbaseSearch()

src/components/mpGraph/mpGraph.vue

@@ -1,5 +1,6 @@
 <template>
-	<div class="com-chart2" ref="mpGraph"></div>
+	<div class="com-chart2" ref="mpGraph" style="height: 145px;
+		width: 1500px;"></div>
 </template>
 <script>
 	export default {
@@ -19,6 +20,7 @@
 		watch: {
 			beforeData: {
 				handler(val) {
+					console.log(val);
 					this.updateChart();
 
 				},
@@ -27,6 +29,7 @@
 			},
 			afterData: {
 				handler(val) {
+					console.log(val);
 					this.updateChart();
 
 				},
@@ -35,6 +38,7 @@
 			},
 			xTime: {
 				handler(val) {
+					console.log(val);
 					this.updateChart();
 
 				},
@@ -51,6 +55,8 @@
 			//   }, 2000)
 		},
 		destroyed() {
+		        // clearInterval(this.timer)
+				console.log("子组件里的destroyed");
 
 		    },
 		methods: {
@@ -223,8 +229,5 @@
 	}
 </script>
 <style scoped>
-	.com-chart {
-		height: 145px;
-		width: 500px;
-	}
+	
 </style>

src/views/power_supply/systemData/dataDetail.vue

@@ -2,7 +2,7 @@
   <!-- 查看数据质量信息 -->
   <div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="采煤工作面" name="main">
+      <el-tab-pane label="供电系统" name="main">
         <router-view></router-view>
       </el-tab-pane>
       <el-tab-pane label="表格信息" name="chart">
@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       moreVisible: false,
-      activeName: "graph",
+      activeName: "chart",
       pointnumVisible: false,
       systemId: undefined,
     };

src/views/transportation/systemData.vue

@@ -19,7 +19,7 @@
 
 </template> 
 <script>
-import checkData from "@/views/monitor/systemData/checkData.vue";
+import checkData from "@/views/transportation/systemData/checkData.vue";
 import coal_quantity from "@/components/transportation/systemData/coal_quantity.vue";
 import energy_consume from "@/components/transportation/systemData/energy_consume.vue";
 import coaloutput from "@/components/transportation/systemData/output.vue";

src/views/transportation/systemData/checkData.vue

@@ -1,18 +1,6 @@
 <template>
   <!-- 查看系统的对话框 -->
   <div>
-    <el-breadcrumb separator-class="el-icon-arrow-right" v-if="this.$router.currentRoute.path!='/home'">
-      <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>数据管理</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataManage-dataList/dataList' }">系统数据列表</el-breadcrumb-item>
-      <el-breadcrumb-item>设备数据列表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <!-- <over-view-of-sub-system  :table-data="tableData" :total="total" v-if="overViewFlag"></over-view-of-sub-system> -->
-    <span style="font-size: 10px;">搜索：</span>
-    <el-select v-model="currentSubSystemId" placeholder="请选择子系统" @change="selectSubsystem()" style="width: 400px">
-      <el-option v-for="item in options" :key="item.id" :label="item.subSystem" :value="item.id">
-      </el-option>
-    </el-select>
 
     <el-table
         :data="tableData"

src/views/transportation/systemData/dataDetail.vue

@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       moreVisible: false,
-      activeName: "graph",
+      activeName: "chart",
       pointnumVisible: false,
       systemId: undefined,
     };

src/views/tunnelling/systemData/dataDetail.vue

@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       moreVisible: false,
-      activeName: "graph",
+      activeName: "chart",
       pointnumVisible: false,
       systemId: undefined,
     };

src/views/ventilate/systemData.vue

@@ -18,7 +18,7 @@
 
 
 <script>
-import checkData from "@/views/monitor/systemData/checkData.vue";
+import checkData from "@/views/ventilate/systemData/checkData.vue";
 import power from "@/components/ventilate/systemData/power.vue";
 import wind_pressure from "@/components/ventilate/systemData/wind_pressure.vue";
 import wind_speed from "@/components/ventilate/systemData/wind_speed.vue";

src/views/ventilate/systemData/checkData.vue

@@ -1,19 +1,6 @@
 <template>
   <!-- 查看系统的对话框 -->
   <div>
-    <el-breadcrumb separator-class="el-icon-arrow-right" v-if="this.$router.currentRoute.path!='/home'">
-      <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>数据管理</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataManage-dataList/dataList' }">系统数据列表</el-breadcrumb-item>
-      <el-breadcrumb-item>设备数据列表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <!-- <over-view-of-sub-system  :table-data="tableData" :total="total" v-if="overViewFlag"></over-view-of-sub-system> -->
-    <span style="font-size: 10px;">搜索：</span>
-    <el-select v-model="currentSubSystemId" placeholder="请选择子系统" @change="selectSubsystem()" style="width: 400px">
-      <el-option v-for="item in options" :key="item.id" :label="item.subSystem" :value="item.id">
-      </el-option>
-    </el-select>
-
     <el-table
         :data="tableData"
         style="min-width: 100%"