From 355b21bf4c5023a677e1f0347636518972da32a7 Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Fri, 28 Jul 2023 16:01:43 +0800
Subject: [PATCH] fix
---
src/views/Equipment/index.vue | 108 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 9 deletions(-)
diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue
index 8a431d3..38375cb 100644
--- a/src/views/Equipment/index.vue
+++ b/src/views/Equipment/index.vue
@@ -2,32 +2,53 @@
<div style="padding: 20px">
<el-card>
<div style="display: flex">
- <div class="timee">
+ <div class="timee" style="margin-top: 0.5rem">
{{ time }}
</div>
- <div style="margin-left: 20px; margin-top: -12px">
+ <div style="margin-left: 1.5rem">
<span>���������������:</span>
<el-cascader
+ v-model="newMac"
:options="options"
:props="props"
collapse-tags
clearable
+ @change="changeYz"
+ placeholder="������������"
+ style="width: 25rem"
></el-cascader>
</div>
- <div style="margin-left: 20px; margin-top: -12px">
+ <div style="margin-left: 1.5rem">
<span>������������:</span>
<el-cascader
- :options="options"
+ v-model="value"
+ :options="newSensor"
:props="props"
collapse-tags
clearable
+ @change="res"
></el-cascader>
</div>
- <div style="margin-left: 20px; margin-top: -12px">
- <el-button type="primary">������</el-button>
+ <div style="margin-left: 1.5rem">
+ <el-button type="primary" @click="Equisel">������</el-button>
</div>
</div>
</el-card>
+ <el-table
+ :data="dateList"
+ style="margin-top: 20px"
+ border
+ max-height="800"
+ >
+ <el-table-column
+ v-for="item in columnList"
+ :prop="item"
+ :label="item"
+ width="180px"
+ :key="item"
+ >
+ </el-table-column>
+ </el-table>
</div>
</template>
@@ -46,14 +67,41 @@
props: { multiple: true },
defaultData: [],
options: [],
+ newSensor:[],
+ newMac:'',
+ newMac1:[],
+ value:'',
+ value1:'',
+ columnList: [], //���������������
+ dateList: [],
}
},
// ������������ ���������data������
computed: {},
// ������data������������������
- watch: {},
+ watch: {
+ newMac(newVal, oldval) {
+ this.newMac1 = []
+ for (let i = 0; i < newVal.length; i++) {
+ // console.log(newVal[i], 111)
+ this.newMac1.push(newVal[i][1][1])
+ }
+ // ������������������������������������������
+ this.getSensor()
+ console.log(this.newMac1)
+ },
+ value(n, o) {
+ this.value1 = []
+ for (let i = 0; i < n.length; i++) {
+ this.value1.push(n[i][0])
+ }
+ },
+ },
//������������
methods: {
+ res(res){
+ console.log(res.toString());
+ },
getData() {
this.$request({
url: '/monitorPoint/queryMonitorPoints',
@@ -85,11 +133,53 @@
console.log(error)
})
},
+ changeYz(){
+ this.getSensor();
+ },
+ getSensor() {
+ this.$request({
+ url: '/deviceInfo/getMacSensors',
+ method: 'post',
+ data: {
+ macs: this.newMac1,
+ },
+ })
+ .then((result) => {
+ console.log(result);
+ var sensor = result.data
+ for (var i in sensor) {
+ this.newSensor.push({ value: i, label: sensor[i] })
+ }
+ })
+ .catch((err) => {
+ console.log(err)
+ })
+ },
+ Equisel(){
+ this.$request({
+ url:'',
+ method:'post',
+ data:{
+ time:this.time,
+ zhan:this.newMac1,
+ sensorCode:this.value1
+ }
+ }).then((res)=>{
+ console.log(res);
+ this.tableData = res.data
+ console.log(this.tableData, 'this.tableData')
+ for (let key in this.tableData[0]) {
+ this.columnList.push(key)
+ }
+ for (let item of this.tableData) {
+ this.dateList.push(item)
+ }
+ })
+ }
},
//������������ - ��������������������������������� this ���������
created() {
- var timer = this.dateTypeFormat('YYYY-mm-dd HH:MM:SS', new Date())
- this.time = timer
+ this.time = this.dateTypeFormat('YYYY-mm-dd HH:MM:SS', new Date())
this.getData();
},
//������������ - ��������������������������� DOM ���������
--
Gitblit v1.8.0