From 3910b79b0549b583387ff96ef5a21a2ad5313631 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 15 十一月 2024 10:43:02 +0800
Subject: [PATCH] 修改了相关bug
---
ruoyi-ui/src/views/device/index.vue | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 72e8601..c0cc85f 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -723,7 +723,7 @@
};
},
created() {
- alert(1233)
+ // alert(1233)
this.getList();
// this.getCateInfor()
this.getInfo()
@@ -863,7 +863,7 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
-
+
this.userOptions = []
showShareUser(userId, 2017).then(response=>{
console.log("===========ddddddddddddd")
@@ -957,9 +957,20 @@
getList() {
this.loading = true;
- this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
- this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
- console.log(this.queryParams)
+ console.log(this.dateRange)
+ if(this.dateRange!=null)
+ {
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+ console.log(this.queryParams)
+ }
+ else
+ {
+ this.queryParams.happenStartTime = null
+ this.queryParams.happenEndTime = null
+ }
+
+ console.log(this.queryParams)
//alert(this.queryParams.name)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let _this = this
@@ -1043,7 +1054,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.open2 = false;
+ this.open2 = false;
// alert(988)
this.$router.push("/familymodel/Device/equipmentInfo/" + id);
},
--
Gitblit v1.9.1