Merge branch 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf

ruoyi-ui/src/views/components/table/homeTable.vue

@@ -160,7 +160,7 @@
                 :label="'SO2浓度'"
               >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.value > normalPer" style="color:red">{{ scope.row.value }}% ↑ {{ ((scope.row.value - normalPer) / normalPer * 100).toFixed(0) }}%</div>
+                  <div v-if="scope.row.value > normalPer" style="color:red">{{ scope.row.value }}% ↑</div>
                   <div v-if=" scope.row.value <= normalPer">{{ scope.row.value }}%</div>
                 </template>
               </el-table-column>
@@ -168,7 +168,7 @@
                 :label="'NO2浓度'"
               >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.value > normalPer" style="color:red">{{ scope.row.value }}% ↑ {{ ((scope.row.value - normalPer) / normalPer * 100).toFixed(0) }}%</div>
+                  <div v-if="scope.row.value > normalPer" style="color:red">{{ scope.row.value }}% ↑</div>
                   <div v-if=" scope.row.value <= normalPer">{{ scope.row.value }}%</div>
                 </template>
               </el-table-column>
@@ -176,20 +176,20 @@
                 :label="'CO2浓度'"
               >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.value > normalPer" style="color:red">{{ scope.row.value }}% ↑ {{ ((scope.row.value - normalPer) / normalPer * 100).toFixed(0) }}%</div>
+                  <div v-if="scope.row.value > normalPer" style="color:red">{{ scope.row.value }}% ↑</div>
                   <div v-if=" scope.row.value <= normalPer">{{ scope.row.value }}%</div>
                 </template>
               </el-table-column>
               <el-table-column
                 :label="'硫碳比'">
                 <template slot-scope="scope">
-                  <div v-if="scope.row.count > normalCount" style="color:red">{{ scope.row.count }}度 ↑ {{ ((scope.row.count - normalCount) / normalCount * 100).toFixed(0) }}%</div>
+                  <div v-if="scope.row.count > normalCount" style="color:red">{{ scope.row.count }}度 ↑</div>
                   <div v-if=" scope.row.count <= normalCount">{{ scope.row.count }}度</div>
                 </template>
               </el-table-column>
               <el-table-column
                 property="date"
-                label="监测时间">
+                label="监测时间" width="90">
               </el-table-column>
             </el-table>
 
@@ -344,42 +344,42 @@ export default {
         radio: 1
       },
       tableData: [{
-        date: '2016-05-02 10:00',
+        date: '2016-05-02',
         name: '王小虎',
         address: '上海市普陀区金沙江路 1518 弄',
         value: 0.19,
         count: 1.9,
       }, {
-        date: '2016-05-04 10:00',
+        date: '2016-05-04',
         name: '王小虎',
         value: 0.1,
         count: 1.3,
         address: '上海市普陀区金沙江路 1517 弄'
       }, {
-        date: '2016-05-01 10:00',
+        date: '2016-05-01',
         name: '王小虎',
         value: 0.2,
         count: 2,
         address: '上海市普陀区金沙江路 1519 弄'
       }, {
-        date: '2016-05-03 10:00',
+        date: '2016-05-03',
         name: '王小虎',
         value: 0.08,
         count: 0.6,
         address: '上海市普陀区金沙江路 1516 弄'
-      }, {
-        date: '2016-05-03 10:00',
+      }/*, {
+        date: '2016-05-03',
         name: '王小虎',
         value: 0.03,
         count: 0.2,
         address: '上海市普陀区金沙江路 1516 弄'
       }, {
-        date: '2016-05-03 10:00',
+        date: '2016-05-03',
         name: '王小虎',
         value: 0.09,
         count: 0.3,
         address: '上海市普陀区金沙江路 1516 弄'
-      }]
+      }*/]
     }
   }, mounted() {
     this.getStaticDevice();
@@ -724,7 +724,7 @@ export default {
   position: absolute;
   top: 250rem;
   left: 140rem;
-  width: 200rem;
+  width: 220rem;
   height: 130rem;
   background-color: white;
 }