Browse Source

refactor: 电量损耗,百分比名茶修改;电压步长修改;chart legend scroll

feature-with-login
wally 4 years ago
parent
commit
c5af184055
  1. 9303
      package-lock.json
  2. 6
      src/components/config/function-config-pending.vue
  3. 6
      src/components/history/device.vue
  4. 2
      src/components/history/local.vue
  5. 1
      src/utils/statistical.js
  6. 6
      src/views/data-realtime.vue

9303
package-lock.json

File diff suppressed because it is too large

6
src/components/config/function-config-pending.vue

@ -27,18 +27,18 @@
<el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24"> <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
<el-form-item label="电池电压低阈值(V)" prop="batteryLow"> <el-form-item label="电池电压低阈值(V)" prop="batteryLow">
<el-input-number v-model="data.batteryLow" :min="0" /> <el-input-number v-model="data.batteryLow" :min="0" :step="0.1" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24"> <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
<el-form-item label="电池电压高阈值(V)" prop="batteryHigh"> <el-form-item label="电池电压高阈值(V)" prop="batteryHigh">
<el-input-number v-model="data.batteryHigh" :min="0" /> <el-input-number v-model="data.batteryHigh" :min="0" :step="0.1" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24"> <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
<el-form-item label="太阳能板电压高阈值(V)" prop="sunHigh"> <el-form-item label="太阳能板电压高阈值(V)" prop="sunHigh">
<el-input-number v-model="data.sunHigh" :min="0" /> <el-input-number v-model="data.sunHigh" :min="0" :step="0.1" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24"> <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">

6
src/components/history/device.vue

@ -26,10 +26,10 @@
<el-table-column align="center" label="机箱温度(℃)" min-width="110" prop="deviceTemperature" /> <el-table-column align="center" label="机箱温度(℃)" min-width="110" prop="deviceTemperature" />
<el-table-column align="center" label="机箱湿度(RH%)" min-width="130" prop="deviceHumidity" /> <el-table-column align="center" label="机箱湿度(RH%)" min-width="130" prop="deviceHumidity" />
<el-table-column align="center" label="太阳能板电压(V)" min-width="140" prop="solarVoltage" /> <el-table-column align="center" label="太阳能板电压(V)" min-width="140" prop="solarVoltage" />
<el-table-column align="center" label="电池电压(V)" min-width="120" prop="batteryVoltage" /> <el-table-column align="center" label="电池电压(V)" min-width="120" prop="batteryVoltage" />
<el-table-column align="center" label="电百分比" min-width="94" prop="batteryVoltagePercentage" /> <el-table-column align="center" label="电百分比" min-width="94" prop="batteryVoltagePercentage" />
<el-table-column align="center" label="剩余电量(mAH)" min-width="140" prop="batteryVoltageRemain" /> <el-table-column align="center" label="剩余电量(mAH)" min-width="140" prop="batteryVoltageRemain" />
<el-table-column align="center" label="耗电量(mAH)" min-width="140" prop="batteryLoss" /> <el-table-column align="center" label="耗电量(mAH)" min-width="140" prop="batteryLoss" />
<el-table-column align="center" label="ICCID" min-width="190" prop="iccid" /> <el-table-column align="center" label="ICCID" min-width="190" prop="iccid" />
<el-table-column align="center" label="IMEI" min-width="150" prop="imei" /> <el-table-column align="center" label="IMEI" min-width="150" prop="imei" />
<el-table-column align="center" label="信号强度" min-width="80" prop="signal" /> <el-table-column align="center" label="信号强度" min-width="80" prop="signal" />

2
src/components/history/local.vue

@ -24,7 +24,7 @@
<el-table-column align="center" label="盐分温度(℃)" min-width="110" prop="saltT" /> <el-table-column align="center" label="盐分温度(℃)" min-width="110" prop="saltT" />
<el-table-column align="center" label="盐分阻抗(Ω)" min-width="110" prop="saltR" /> <el-table-column align="center" label="盐分阻抗(Ω)" min-width="110" prop="saltR" />
<el-table-column align="center" label="太阳能板电压(V)" min-width="140" prop="solarVoltage" /> <el-table-column align="center" label="太阳能板电压(V)" min-width="140" prop="solarVoltage" />
<el-table-column align="center" label="电池电压(V)" min-width="120" prop="batteryVoltage" /> <el-table-column align="center" label="电池电压(V)" min-width="120" prop="batteryVoltage" />
<el-table-column align="center" label="机箱温度(℃)" min-width="110" prop="deviceTemperature" /> <el-table-column align="center" label="机箱温度(℃)" min-width="110" prop="deviceTemperature" />
<el-table-column align="center" label="机箱湿度(RH%)" min-width="130" prop="deviceHumidity" /> <el-table-column align="center" label="机箱湿度(RH%)" min-width="130" prop="deviceHumidity" />
</el-table> </el-table>

1
src/utils/statistical.js

@ -158,6 +158,7 @@ export function generateChartOption(rawData, selected = defaultSelectedLegend) {
}, },
grid, grid,
legend: { legend: {
type: 'scroll',
selected, selected,
data: legendData, data: legendData,
}, },

6
src/views/data-realtime.vue

@ -27,10 +27,10 @@
<el-table-column align="center" label="机箱温度(℃)" min-width="110" prop="deviceTemperature" /> <el-table-column align="center" label="机箱温度(℃)" min-width="110" prop="deviceTemperature" />
<el-table-column align="center" label="机箱湿度(RH%)" min-width="130" prop="deviceHumidity" /> <el-table-column align="center" label="机箱湿度(RH%)" min-width="130" prop="deviceHumidity" />
<el-table-column align="center" label="太阳能板电压(V)" min-width="140" prop="solarVoltage" /> <el-table-column align="center" label="太阳能板电压(V)" min-width="140" prop="solarVoltage" />
<el-table-column align="center" label="电池电压(V)" min-width="120" prop="batteryVoltage" /> <el-table-column align="center" label="电池电压(V)" min-width="120" prop="batteryVoltage" />
<el-table-column align="center" label="电百分比" min-width="94" prop="batteryVoltagePercentage" /> <el-table-column align="center" label="电百分比" min-width="94" prop="batteryVoltagePercentage" />
<el-table-column align="center" label="剩余电量(mAH)" min-width="140" prop="batteryVoltageRemain" /> <el-table-column align="center" label="剩余电量(mAH)" min-width="140" prop="batteryVoltageRemain" />
<el-table-column align="center" label="耗电量(mAH)" min-width="140" prop="batteryLoss" /> <el-table-column align="center" label="耗电量(mAH)" min-width="140" prop="batteryLoss" />
<el-table-column align="center" label="ICCID" min-width="190" prop="iccid" /> <el-table-column align="center" label="ICCID" min-width="190" prop="iccid" />
<el-table-column align="center" label="IMEI" min-width="150" prop="imei" /> <el-table-column align="center" label="IMEI" min-width="150" prop="imei" />
<el-table-column align="center" label="信号强度" min-width="80" prop="signal" /> <el-table-column align="center" label="信号强度" min-width="80" prop="signal" />

Loading…
Cancel
Save