页面调整

src/pages/kb/indoor/history.vue

@@ -27,8 +27,8 @@
         .echartsWarp(width="100%", flex)
             div(v-for='item in chartList' :key='item.id')
                 chart(:id="item.id", :data="data", :title="item.title", :color="item.color")
-            div
-                pie
+            //- div
+            //-     pie
     span.dialog-footer(slot='footer')
       el-button(@click='visible = false' size='mini') 取消
       el-button(type='primary', @click='dataFormSubmit' size='mini') 确定
@@ -66,7 +66,9 @@ export default {
       chartList: [
         { id: '11', title: '温度', color: '#21ACFC' },
         { id: '22', title: '湿度', color: '#36CBCB' },
-        { id: '33', title: 'CO2', color: '#4ECB74' }
+        { id: '33', title: 'CO2', color: '#4ECB74' },
+        { id: '77', title: '故障报警', color: '#975FE4' }
+
       ],
       data: [
         ['2019-8-14 8:00:00', 70],
@@ -142,10 +144,10 @@ export default {
   justify-content: space-between;
   flex-wrap: wrap;
   height: calc(100vh - 530px);
-  margin-bottom: 90px;
+  // margin-bottom: 90px;
   // border: 1px solid;
   > div {
-    width: 22%;
+    width: 48%;
     height: calc(85% / 2);
     padding: 10px 10px 0 10px;
     box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);

src/pages/kb/indoor/index.vue

@@ -163,7 +163,7 @@ export default {
       }).then((data) => {
         if (data && data.code === 0) {
           console.log('数据', data)
-          this.dataList = data.page.rows
+          // this.dataList = data.page.rows
 
           // this.tableColums = crecords
           this.totalSize = data.page.total

src/pages/kb/outdoor/history.vue

@@ -3,7 +3,7 @@ el-dialog(
   :title="type == 1 ? '历史数据' : '统计图表'",
   :close-on-click-modal="false",
   :visible.sync="visible",
-  width="80%",
+  width="85%",
   :append-to-body="true"
 )
   el-form(
@@ -122,8 +122,8 @@ el-dialog(
           :title="item.title",
           :color="item.color"
         )
-      div
-        pie
+      //- div
+      //-   pie
   //- span.dialog-footer(slot="footer")
   //-   el-button(@click="visible = false", size="mini") 取消
   //-   el-button(type="primary", @click="dataFormSubmit", size="mini") 确定
@@ -132,13 +132,13 @@ el-dialog(
 <script>
 import tablePagination from '@/pages/components/tablePagination'
 import chart from '@/pages/components/chart.vue'
-import pie from './pie'
+// import pie from './pie'
 
 export default {
   components: {
     tablePagination,
-    chart,
-    pie
+    chart
+    // pie
   },
   data() {
     return {
@@ -166,7 +166,8 @@ export default {
         { id: '44', title: '光照', color: '#FAD337', data: [] },
         { id: '55', title: 'CO2', color: '#4ECB74', data: [] },
         { id: '66', title: 'PM2.5', color: '#999999', data: [] },
-        { id: '77', title: '辐射', color: '#975FE4', data: [] }
+        { id: '77', title: '辐射', color: '#975FE4', data: [] },
+        { id: '88', title: '故障报警数', color: '#F2637B', data: [] }
       ],
       dataRule: {}
     }
@@ -232,6 +233,7 @@ export default {
           this.chartList[4].data = data.carbonDioxideList
           this.chartList[5].data = data.fineParticlesList
           this.chartList[6].data = data.radiationList
+          this.chartList[7].data = data.radiationList
         }
       })
     },
@@ -250,8 +252,8 @@ export default {
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
-  height: calc(100vh - 530px);
-  margin-bottom: 90px;
+  height: calc(100vh - 430px);
+  // margin-bottom: 90px;
   // border: 1px solid;
   > div {
     width: 22%;

src/pages/kb/outdoor/index.vue

@@ -140,8 +140,8 @@ card-warp(title="室外气象数据", height="45px", showBackground)
           :title="item.title",
           :color="item.color"
         )
-      div
-        pie
+      //- div
+      //-   pie
     history(
       v-if="historyVisible",
       ref="history",
@@ -151,7 +151,7 @@ card-warp(title="室外气象数据", height="45px", showBackground)
 
 <script>
 import tablePagination from '@/pages/components/tablePagination'
-import pie from './pie'
+// import pie from './pie'
 import history from './history'
 import chart from '@/pages/components/chart.vue'
 
@@ -159,7 +159,7 @@ export default {
   components: {
     tablePagination,
     chart,
-    pie,
+    // pie,
     history
   },
   data() {
@@ -194,7 +194,8 @@ export default {
         { id: '44', title: '光照', color: '#FAD337', data: [] },
         { id: '55', title: 'CO2', color: '#4ECB74', data: [] },
         { id: '66', title: 'PM2.5', color: '#999999', data: [] },
-        { id: '77', title: '辐射', color: '#975FE4', data: [] }
+        { id: '77', title: '辐射', color: '#975FE4', data: [] },
+        { id: '88', title: '故障报警数', color: '#F2637B', data: [] }
       ],
       type: 1,
       data: [
@@ -229,6 +230,7 @@ export default {
           this.chartList[4].data = data.carbonDioxideList
           this.chartList[5].data = data.fineParticlesList
           this.chartList[6].data = data.radiationList
+          this.chartList[7].data = data.radiationList
         }
       })
     },