From 674a49b6b6c98d0d71215bc8784a95ac7342b9ed Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Wed, 10 Nov 2021 16:11:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/device-select-and-status.vue | 20 ++------------------
 src/components/function-config-pending.vue  | 12 ++++++------
 src/config/config.js                        | 16 ++++++++++++++++
 src/store/index.js                          |  2 +-
 src/views/data-report.vue                   |  2 +-
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/components/device-select-and-status.vue b/src/components/device-select-and-status.vue
index 166441b..54d8949 100644
--- a/src/components/device-select-and-status.vue
+++ b/src/components/device-select-and-status.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { computed, ref, watch, defineProps } from 'vue';
 import { useStore } from 'vuex';
+import { PEND_TYPE } from '@/config/config';
 
 const props = defineProps({ status: String });
 
@@ -9,24 +10,7 @@ const devices = computed(() => store.state.device.devices); // 设备/站点列
 const deviceId = ref(''); // 选中的设备id
 const currentDeviceId = computed(() => store.state.device.currentDeviceId); // 正在操作的设备的id
 
-const statusType = computed(() => {
-  let type = 'success';
-  switch (props.status) {
-    case 'PENDING':
-      type = 'primary';
-      break;
-    case 'FAIL':
-      type = 'danger';
-      break;
-    case 'SUCCESS':
-      type = 'success';
-      break;
-    default:
-      type = 'primary';
-      break;
-  }
-  return type;
-});
+const statusType = computed(() => PEND_TYPE[props.status].type);
 
 // 监听currentDeviceId
 watch(
diff --git a/src/components/function-config-pending.vue b/src/components/function-config-pending.vue
index d601fda..3c8956d 100644
--- a/src/components/function-config-pending.vue
+++ b/src/components/function-config-pending.vue
@@ -36,34 +36,34 @@
       </el-col>
 
       <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
-        <el-form-item label="设置电池电压低阈值" prop="batteryLow">
+        <el-form-item label="设置电池电压低阈值(V)" prop="batteryLow">
           <el-input-number v-model="data.batteryLow" :min="0" />
         </el-form-item>
       </el-col>
       <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
-        <el-form-item label="设置电池电压高阈值" prop="batteryHigh">
+        <el-form-item label="设置电池电压高阈值(V)" prop="batteryHigh">
           <el-input-number v-model="data.batteryHigh" :min="0" />
         </el-form-item>
       </el-col>
 
       <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
-        <el-form-item label="设置太阳能电压高阈值" prop="sunHigh">
+        <el-form-item label="设置太阳能电压高阈值(V)" prop="sunHigh">
           <el-input-number v-model="data.sunHigh" :min="0" />
         </el-form-item>
       </el-col>
       <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
-        <el-form-item label="设置湿度高阈值" prop="humidityHigh">
+        <el-form-item label="设置湿度高阈值(V)" prop="humidityHigh">
           <el-input-number v-model="data.humidityHigh" :min="0" />
         </el-form-item>
       </el-col>
 
       <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
-        <el-form-item label="设置温度低阈值" prop="temperatureLow">
+        <el-form-item label="设置温度低阈值(℃)" prop="temperatureLow">
           <el-input-number v-model="data.temperatureLow" :min="0" />
         </el-form-item>
       </el-col>
       <el-col :lg="8" :md="12" :span="12" :xl="6" :xs="24">
-        <el-form-item label="设置温度高阈值" prop="temperatureHigh">
+        <el-form-item label="设置温度高阈值(℃)" prop="temperatureHigh">
           <el-input-number v-model="data.temperatureHigh" :min="0" />
         </el-form-item>
       </el-col>
diff --git a/src/config/config.js b/src/config/config.js
index 481aa00..ac6781e 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -73,3 +73,19 @@ export const deviceData = {
   joint: '', // 主站后台联调情况
   remark: '', // 备注
 };
+
+// 下发类型
+export const PEND_TYPE = {
+  PENDING: {
+    type: 'primary',
+    text: '未下发',
+  },
+  FAIL: {
+    type: 'danger',
+    text: '下发失败',
+  },
+  SUCCESS: {
+    type: 'success',
+    text: '下发成功',
+  },
+};
diff --git a/src/store/index.js b/src/store/index.js
index d06b59f..bd58b2a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,7 +5,7 @@ import user from './user';
 
 export default createStore({
   modules: { user, device, statistics },
-  state: { menu: { show: true, collapse: false } },
+  state: { menu: { show: true, collapse: true } },
   getters: {},
   mutations: {
     toggleCollapse(state) {
diff --git a/src/views/data-report.vue b/src/views/data-report.vue
index 039bfcb..2f23b22 100644
--- a/src/views/data-report.vue
+++ b/src/views/data-report.vue
@@ -35,7 +35,7 @@ const getData = async () => {
       const params = {
         deviceId: currentDeviceId.value,
         date,
-        page: page.value.age,
+        page: page.value.page,
         size: page.value.size,
         type: 1,
       };