设备运行统计小修改

src/views/module_tpm/equipmentRunStatis/history.vue

@@ -66,13 +66,12 @@
 </template>
 
 <script>
-import * as echarts from 'echarts'
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { httpAction, getAction } from '@/api/manage'
 import { pvdata } from '../../module_ems/photovoltaic/pvdata'
 export default {
-  name: '',
+  name: 'history',
   mixins: [JeecgListMixin, mixinDevice],
   data() {
     return {
@@ -213,7 +212,8 @@ export default {
       pvdata.mdcurveanalysisdata.forEach((item) => {
         item.data.forEach((i) => {
           i.id = rowid;
-          _this.dataSource.push(i)
+          _this.dataSource.push(i);
+          rowid++;
         })
       })
     },

src/views/module_tpm/equipmentRunStatis/realtime.vue

@@ -21,7 +21,7 @@
         </a-row>
       </a-form>
     </div>    
-    <div class="trend-charts" ref="trendCharts" :style="{ height: echartsHeight + 'px' }"></div>
+    <div class="trend-charts" ref="trendCharts" :style="{ height: echartsHeight + 'px', }"></div>
 
     <!-- table区域-begin -->
     <div>
@@ -29,6 +29,7 @@
         ref="table"
         size="middle"
         :scroll="{ x: true }"
+        style="padding-top:10px;"
         bordered
         rowKey="id"
         :columns="columns2"
@@ -197,7 +198,6 @@ export default {
       if (arg === 1) {
         this.ipagination.current = 1
       }
-      console.log("tagtype", this.queryParams.tagtype)
       var params = this.getQueryParams() //查询条件
       params.equipmentid = !this.queryParams.equipmentid ? '' : this.queryParams.equipmentid
       params.day = !this.queryParams.day ? '' : this.queryParams.day
@@ -281,8 +281,8 @@ export default {
     initEcharts() {
       var _this = this
       var chartDom = _this.$refs.trendCharts
+      _this.myChart && _this.myChart.dispose();
       _this.myChart = echarts.init(chartDom)
-      console.log(3)
 
       var option = {
         animationDuration: 3000, // 动态，刷新时长，3秒
@@ -511,7 +511,7 @@ export default {
 </style>
 <style lang="less">
 .trend-charts {
-  padding: 10px;
+  padding: 12px;
   margin-top: 10px;
   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
 }