Merge branch 'master' of dd.tall.wiki:ccsens_fe/corrosion

src/components/device-select-and-status.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, defineProps, defineEmits, ref, watch } from 'vue';
+import { computed, ref, watch, defineProps, defineEmits } from 'vue';
 import { useStore } from 'vuex';
 
 const props = defineProps({ status: Object });

src/views/data-history.vue

@@ -88,24 +88,24 @@ const onPrev = e => {
 
   <template v-if="data">
     <el-table :data="data" style="width: 100%" border stripe :style="{ 'max-height': contentHeight + 'px' }">
-      <el-table-column label="设备编号" fixed prop="deviceNo" width="140" />
+      <el-table-column label="设备编号" fixed prop="deviceNo" min-width="140" align="center" />
-      <el-table-column label="ICCID" fixed prop="ICCID" width="100" />
+      <el-table-column label="ICCID" fixed prop="ICCID" min-width="100" align="center" />
-      <el-table-column label="IMEI" fixed prop="IMEI" width="80" />
+      <el-table-column label="IMEI" fixed prop="IMEI" min-width="80" align="center" />
-      <el-table-column label="信号强度" prop="signal" width="80" />
+      <el-table-column label="信号强度" prop="signal" min-width="80" align="center" />
-      <el-table-column label="基站编号" prop="stationNo" width="80" />
+      <el-table-column label="基站编号" prop="stationNo" min-width="80" align="center" />
-      <el-table-column label="版本号" prop="version" width="80" />
+      <el-table-column label="版本号" prop="version" min-width="80" align="center" />
-      <el-table-column label="太阳能电压" prop="solarVoltage" width="94" />
+      <el-table-column label="太阳能电压" prop="solarVoltage" min-width="94" align="center" />
-      <el-table-column label="蓄电池电压" prop="batteryVoltage" width="94" />
+      <el-table-column label="蓄电池电压" prop="batteryVoltage" min-width="94" align="center" />
-      <el-table-column label="机箱温度" prop="deviceTemperature" width="80" />
+      <el-table-column label="机箱温度" prop="deviceTemperature" min-width="80" align="center" />
-      <el-table-column label="机箱湿度" prop="deviceHumidity" width="80" />
+      <el-table-column label="机箱湿度" prop="deviceHumidity" min-width="80" align="center" />
-      <el-table-column label="环境温度" prop="environmentTemperature" width="80" />
+      <el-table-column label="环境温度" prop="environmentTemperature" min-width="80" align="center" />
-      <el-table-column label="环境湿度" prop="environmentHumidity" width="80" />
+      <el-table-column label="环境湿度" prop="environmentHumidity" min-width="80" align="center" />
-      <el-table-column label="SO2" prop="so2" width="50" />
+      <el-table-column label="SO2" prop="so2" min-width="50" align="center" />
-      <el-table-column label="盐分" prop="salt" width="50" />
+      <el-table-column label="盐分" prop="salt" min-width="50" align="center" />
-      <el-table-column label="腐流1" prop="corrosion1" width="60" />
+      <el-table-column label="腐流1" prop="corrosion1" min-width="60" align="center" />
-      <el-table-column label="腐流2" prop="corrosion2" width="60" />
+      <el-table-column label="腐流2" prop="corrosion2" min-width="60" align="center" />
-      <el-table-column label="腐流3" prop="corrosion3" width="60" />
+      <el-table-column label="腐流3" prop="corrosion3" min-width="60" align="center" />
-      <el-table-column label="腐流4" prop="corrosion4" width="60" />
+      <el-table-column label="腐流4" prop="corrosion4" min-width="60" align="center" />
     </el-table>
 
     <el-pagination