1
0

2 Commits 9d2b49c3b3 ... 09e051aab6

Autor SHA1 Nachricht Datum
  zxh 09e051aab6 Merge branch 'master' of http://192.168.2.241:3000/zxh/myyz vor 1 Jahr
  zxh 9a74fc4771 1 vor 1 Jahr

BIN
src/assets/images/dsd.png


BIN
src/assets/images/mt.png


BIN
src/assets/images/sd.png


BIN
src/assets/images/sdd.png


+ 18 - 6
src/views/currentSystem/dashboard/compts/electricRealData/index.vue

@@ -2,25 +2,37 @@
   <div class="data-box">
     <el-row>
       <el-col :span="8">
-        <div></div>
+        <div>
+          <div>356</div>
+          <div>(KWH)</div>
+          <div>今日实时用电量</div>
+        </div>
       </el-col>
       <el-col :span="8">
-        <div></div>
+        <div>
+          <div>356</div>
+          <div>(KWH)</div>
+          <div>昨日实时用电量</div>
+        </div>
       </el-col>
       <el-col :span="8">
-        <div></div>
+        <div>
+          <div>35%</div>
+          <div>↑</div>
+          <div>环比上升</div>
+        </div>
       </el-col>
     </el-row>
     <el-row>
       <el-col :span="4">
-        <img src="">
+        <img src="../../../../../assets/images/mt.png">
       </el-col>
       <el-col :span="16">
         <div>标煤当量</div>
-        <div>本月</div>
+        <div>本月电能耗相当于燃烧标准(吨)</div>
       </el-col>
       <el-col :span="4">
-        <div></div>
+        <div>356</div>
       </el-col>
     </el-row>
   </div>

+ 50 - 0
src/views/currentSystem/dashboard/compts/waterRealData/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <div class="data-box">
+    <el-row>
+      <el-col :span="8">
+        <div>
+          <div>356</div>
+          <div>(KWH)</div>
+          <div>今日实时用水量</div>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div>
+          <div>356</div>
+          <div>(KWH)</div>
+          <div>昨日实时用水量</div>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div>
+          <div>35%</div>
+          <div>↓</div>
+          <div>环比下降</div>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="4">
+        <img src="../../../../../assets/images/dsd.png">
+      </el-col>
+      <el-col :span="16">
+        <div>漏损率</div>
+        <div>本月水漏损率</div>
+      </el-col>
+      <el-col :span="4">
+        <div>1.5%</div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped>
+.data-box{
+    width: 100%;
+    height: 100%;
+}
+</style>

+ 7 - 2
src/views/currentSystem/dashboard/index.vue

@@ -26,7 +26,11 @@
       </el-col>
       <el-col :span="6">
         <div class="box-item right1">
-          <card :icon="'el-icon-office-building'" :cardTitle="'实时用水量'"></card>
+          <card :icon="'el-icon-office-building'" :cardTitle="'实时用水量'">
+            <template slot="body">
+              <waterRealData></waterRealData>
+            </template>
+          </card>
         </div>
         <div class="box-item right2">
           <card :icon="'el-icon-office-building'" :cardTitle="'用水排行(吨)'">
@@ -67,11 +71,12 @@ import olMap from "@/views/components/olMap/index.vue";
 import card from "@/views/currentSystem/dashboard/compts/card/index.vue"
 import rankList from "@/views/currentSystem/dashboard/compts/rankingList/index.vue"
 import electricRealData from "@/views/currentSystem/dashboard/compts/electricRealData/index.vue"
+import waterRealData from "@/views/currentSystem/dashboard/compts/waterRealData/index.vue"
 
 import lineChart from "@/views/currentSystem/dashboard/charts/lineCharts"
 import pieChart from "@/views/currentSystem/dashboard/charts/pieChart"
 export default {
-  components: { olMap, card, rankList, electricRealData },
+  components: { olMap, card, rankList, electricRealData, waterRealData },
 
   computed: {
   },