From 55e8be9dc4b2c297ae1990fe45ac5c008fc64e4a Mon Sep 17 00:00:00 2001
From: lucky star <984949691@qq.com>
Date: Mon, 22 Apr 2024 14:31:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=B5=8B=E9=87=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                  |  3 +++
 src/modules/pages/datas/index.vue | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index bdf0615..70bafdd 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -4,6 +4,9 @@ export const userListExport = '/apis/v1/web/user/list/export'
 export const deviceList = '/apis/v1/web/device/list'
 export const deviceListExport = '/apis/v1/web/device/list/export'
 
+export const datasList = '/apis/v1/web/weight/list'
+export const datasListExport = '/apis/v1/web/weight/list/export'
+
 export const settingsList = '/apis/v1/web/comment/list'
 export const settingsAdd = '/apis/v1/web/comment/add'
 export const settingsDelete = '/apis/v1/web/comment/del'
diff --git a/src/modules/pages/datas/index.vue b/src/modules/pages/datas/index.vue
index bca4d63..359c523 100644
--- a/src/modules/pages/datas/index.vue
+++ b/src/modules/pages/datas/index.vue
@@ -68,7 +68,7 @@ import TableMixin from '@TableMixin'
 import FormMixin from '@FormMixin'
 import PagerMixin from '@PagerMixin'
 import { getTimeStamp } from '@/utils/format'
-import { userList, userListExport } from '@/api'
+import { datasList, datasListExport } from '@/api'
 export default {
   name: 'Datas',
   mixins: [ControllerMixin, ModalMixin, TableMixin, FormMixin, PagerMixin],
@@ -102,18 +102,18 @@ export default {
         },
         {
           prop: 'weight',
-          label: '体重'
+          label: '体重（kg）'
         },
         {
           prop: 'bmi',
           label: 'BMI'
         },
         {
-          prop: 'result',
+          prop: 'content',
           label: '结果'
         },
         {
-          prop: 'result1',
+          prop: 'time',
           label: '测量时间',
           dataType: 'time',
           fixw: '160'
@@ -148,8 +148,9 @@ export default {
     },
     onSearch (date1, phone, gender, date2, isExport) {
       let params = {
-        cdate: date1 ? getTimeStamp(date1[0]) : 0,
-        cdateEnd: date1 ? getTimeStamp(date1[1]) + 24 * 60 * 60 * 1000 - 1 : 0,
+        userId: Number(this.$route.query.userId) || 0,
+        start: date1 ? getTimeStamp(date1[0]) : 0,
+        end: date1 ? getTimeStamp(date1[1]) + 24 * 60 * 60 * 1000 - 1 : 0,
         phone: this.delSpace(phone) || '',
         sex: Number(gender) || 0,
         bdate: date2 ? getTimeStamp(date2[0]) : 0,
@@ -157,13 +158,13 @@ export default {
       }
       if (isExport) {
         this.$message('正在下载，请稍等。。。')
-        this.download(userListExport, params, '测量数据')
+        this.download(datasListExport, params, '测量数据')
       } else {
         this.pageIndex = 1
         this.currentPage = 1
         params.pageSize = this.pageSize
         params.pageIndex = this.pageIndex
-        this.postLoadDatasP(userList, params)
+        this.postLoadDatasP(datasList, params)
       }
     },
     resetData () {