From dd6cb011fc4fccd925f5ddaa524c5c320725534b Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 01 Mar 2024 16:12:03 +0800
Subject: [PATCH] fix:手持设备
---
src/components/formTypeComponets/dialog/index.vue | 4 ++
src/components/formTypeComponets/radioGroupCompones/index.vue | 4 +-
src/views/hand/index.vue | 54 +++++++++++++++++++++-----
3 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/src/components/formTypeComponets/dialog/index.vue b/src/components/formTypeComponets/dialog/index.vue
index b298c4b..e7a63fd 100644
--- a/src/components/formTypeComponets/dialog/index.vue
+++ b/src/components/formTypeComponets/dialog/index.vue
@@ -88,4 +88,8 @@
}
</script>
<style scoped lang="scss">
+/deep/.el-dialog__title{
+ font-size: 20px;
+ font-weight: bold;
+}
</style>
diff --git a/src/components/formTypeComponets/radioGroupCompones/index.vue b/src/components/formTypeComponets/radioGroupCompones/index.vue
index 3928cec..104d5b9 100644
--- a/src/components/formTypeComponets/radioGroupCompones/index.vue
+++ b/src/components/formTypeComponets/radioGroupCompones/index.vue
@@ -63,8 +63,8 @@
changeRadio (e) {
let data = _.find(this.radioData, ['label', e])
if (this.type === 'timeDate') {
- const endTime = dayjs().format('YYYY-MM-DD HH:mm')
- const startTime = data.num === '0' ? dayjs().startOf('day').format('YYYY-MM-DD HH:mm') : dayjs().subtract(data.num, data.type).format('YYYY-MM-DD HH:mm')
+ const endTime = dayjs()
+ const startTime = data.num === '0' ? dayjs().startOf('day') : dayjs().subtract(data.num, data.type)
data.startTime = startTime
data.endTime = endTime
}
diff --git a/src/views/hand/index.vue b/src/views/hand/index.vue
index 383e697..ca1d2d0 100644
--- a/src/views/hand/index.vue
+++ b/src/views/hand/index.vue
@@ -12,6 +12,7 @@
v-model="formInline.mac"
size="medium"
placeholder="������������"
+ clearable
>
<el-option
v-for="item in handList"
@@ -106,7 +107,13 @@
width="200px"
/>
<el-table-column
- width="60px"
+ prop="createName"
+ align="center"
+ label="���������"
+ width="200px"
+ />
+ <el-table-column
+ width="100px"
align="center"
label="������"
>
@@ -145,9 +152,23 @@
<template #body>
<div>
<div class="devaiceDetailTitle">
- <p>���������������{{ selectRow.name }}</p>
- <p>���������������{{ selectRow.address }}</p>
- <p>������������������{{ selectRow.longitude }},{{ selectRow.latitude }}</p>
+ <el-descriptions column="4">
+ <el-descriptions-item label="������������">
+ {{ selectRow.startTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="������������">
+ {{ selectRow.endTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="������������">
+ {{ selectRow.name }}
+ </el-descriptions-item>
+ <el-descriptions-item label="���������������">
+ {{ selectRow.longitude }},{{ selectRow.latitude }}
+ </el-descriptions-item>
+ <el-descriptions-item label="������������">
+ {{ selectRow.address }}
+ </el-descriptions-item>
+ </el-descriptions>
</div>
<div class="typeBox">
<div class="tapChart">
@@ -257,13 +278,13 @@
handList: [],
radio: '������',
tapName: 'hour',
- value: '',
+ value: [],
radioGrouplist: [
{ label: '������', value: 'today', type: 'day', num: '0' },
{ label: '������', value: 'yesterday', type: 'day', num: '1', },
{ label: '���3���', value: 'week', type: 'day', num: '3', },
- { label: '���1������', value: 'month', type: 'month', num: '1', },
- { label: '���3������', value: 'threeMonth', type: 'month', num: '3', },
+ { label: '���7���', value: 'month', type: 'day', num: '7', },
+ { label: '���1������', value: 'threeMonth', type: 'month', num: '1', },
],
tableData: [],
rowDetailDate: [],
@@ -287,6 +308,7 @@
}).then(res => {
if (res.code === 0) {
this.handList = res.data
+ this.onSubmit()
} else {
this.$message.error(res.message)
}
@@ -328,10 +350,20 @@
}
},
changeRadio (e) {
- this.formInline.startTime = e.startTime
- this.formInline.endTime = e.endTime
+ console.log('e', e)
this.radio = e.label
- this.value = ''
+ if (e.value === 'yesterday' || e.value === 'today') {
+ // const today = dayjs()
+ // const starTime = today.subtract(1, 'day').startOf('day')
+ // const endTime = today.subtract(1, 'day').endOf('day')
+ this.value = [ ]
+ this.formInline.endTime = ''
+ this.formInline.startTime = e.startTime.format('YYYY-MM-DD')
+ } else {
+ this.value = [e.startTime, e.endTime]
+ this.formInline.startTime = e.startTime.format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.endTime = e.endTime.format('YYYY-MM-DD HH:mm:ss')
+ }
},
sendPicker (e) {
this.radio = ''
@@ -415,7 +447,7 @@
.devaiceDetailTitle{
p{
display: inline-block;
- margin-right: 10px;
+ margin-right: 15px;
font-size: 18px;
}
}
--
Gitblit v1.8.0