From d1a606963672990eee0b4db6834fa0c3e74fa946 Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Thu, 06 Jul 2023 09:35:24 +0800
Subject: [PATCH] 上传组件
---
src/views/Listdata/index.vue | 112 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 17 deletions(-)
diff --git a/src/views/Listdata/index.vue b/src/views/Listdata/index.vue
index ae35e81..d065d2c 100644
--- a/src/views/Listdata/index.vue
+++ b/src/views/Listdata/index.vue
@@ -12,7 +12,7 @@
style="width: 21rem"
/>
<!-- <div> -->
- <el-select
+ <!-- <el-select
v-model="value"
placeholder="������������"
style="margin-left: 20px"
@@ -23,18 +23,37 @@
:label="item.label"
:value="item.value"
/>
- </el-select>
- <el-date-picker
- v-model="timevalue"
- type="datetimerange"
- range-separator="���"
- value-format="yyyy-MM-dd HH"
- start-placeholder="������������"
- :picker-options="pickerOptions"
- end-placeholder="������������"
- style="margin-left: 1rem"
- >
- </el-date-picker>
+ </el-select> -->
+ <div style="margin-left: 1.5rem">
+ <el-cascader
+ v-model="value"
+ :options="newSensor"
+ :props="props"
+ collapse-tags
+ clearable
+ ></el-cascader>
+ </div>
+ <div>
+ <el-select
+ v-model="select1"
+ placeholder="���������"
+ style="margin-left: 1.5rem; width: 15rem"
+ >
+ <el-option
+ v-for="item in options1"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ <component
+ :is="dataType"
+ style="padding-left: 0; margin-left: 20px; width: 160px"
+ @sendPickerChild="showPickerChild"
+ class="select11"
+ />
<el-button type="primary" @click="toExcel()" style="margin-left: 20px"
>������</el-button
@@ -66,7 +85,23 @@
import FileSaver from 'file-saver'
import XLSX2 from 'xlsx-style'
import XLSX from 'xlsx'
+import DatePicker from '@/components/Form/DatePicker'
+import MouthPicker from '@/components/Form/MouthPicker'
+import HourPicker from '@/components/Form/HourPicker'
+import HourPicker1 from '@/components/Form/HourPicker1'
+import CustomPicker from '@/components/Form/CustomPicker'
+import CustomPicker1 from '@/components/Form/CustomPicker1'
+import TimePicker1 from '@/components/Form/TimePicker1'
export default {
+ components: {
+ DatePicker,
+ MouthPicker,
+ HourPicker,
+ CustomPicker,
+ CustomPicker1,
+ TimePicker1,
+ HourPicker1,
+ },
data() {
// ������������������
return {
@@ -79,6 +114,23 @@
columnList: [], //���������������
dateList: [],
timevalue: [],
+ select1: '������',
+ dataType: 'HourPicker',
+ unit: 'day',
+ options1: [
+ {
+ label: '���������',
+ value: '���������',
+ },
+ {
+ label: '������',
+ value: '������',
+ },
+ {
+ label: '������',
+ value: '������',
+ },
+ ],
pickerOptions: {
disabledDate: (time) => {
return time.getTime() > new Date()
@@ -90,6 +142,24 @@
computed: {},
// ������data������������������
watch: {
+ select1(nv, ov) {
+ if (nv === '������') {
+ this.dataType = 'HourPicker'
+ this.unit = 'day'
+ } else if (nv === '������') {
+ this.dataType = 'DatePicker'
+ this.unit = 'month'
+ } else if (nv === '������') {
+ this.dataType = 'MouthPicker'
+ this.unit = 'month'
+ } else if (nv === '���������') {
+ this.dataType = 'HourPicker1'
+ this.unit = 'hours'
+ } else {
+ this.dataType = 'CustomPicker'
+ this.unit = 'hours'
+ }
+ },
// ���������������������������
newMac(newVal, oldval) {
this.newMac1 = []
@@ -105,6 +175,9 @@
// ������������ - ��������������������������������� this ���������
created() {
this.getData()
+ // for (let key in this.timess[0]) {
+ // this.columnList.push(key)
+ // }
},
// ������������ - ��������������������������� DOM ���������
// mounted() {
@@ -119,6 +192,9 @@
activated() {},
// ������������
methods: {
+ showPickerChild(data) {
+ this.newData = data
+ },
getData() {
this.$request({
url: '/monitorPoint/queryMonitorPoints',
@@ -154,6 +230,7 @@
},
// ���������������������������������
getSensor() {
+ this.newSensor = []
this.$request({
url: '/deviceInfo/getMacSensors',
method: 'post',
@@ -183,7 +260,6 @@
this.$message.warning('���������������')
return
}
-
this.dateList = []
this.columnList = []
this.$request({
@@ -192,13 +268,15 @@
data: {
macs: this.newMac1,
sensors: this.value.toString(),
- startTime: this.timevalue[0],
- endTime: this.timevalue[1],
+ // startTime: this.timevalue[0],
+ // endTime: this.timevalue[1],
+ type: this.unit,
+ times: this.newData instanceof Array ? this.newData : [this.newData],
},
}).then((res) => {
console.log(res, 11)
this.tableData = res.data
- console.log(this.tableData, 'this.tableData')
+ // console.log(this.tableData, 'this.tableData')
for (let key in this.tableData[0]) {
this.columnList.push(key)
}
--
Gitblit v1.8.0