From 7fc578dc2032fac935267e92208f7f11384e3800 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 28 十一月 2024 08:36:36 +0800
Subject: [PATCH] 修改了相关bug
---
ruoyi-ui/src/views/device/index.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 1cf938d..c0cc85f 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -723,6 +723,7 @@
};
},
created() {
+ // alert(1233)
this.getList();
// this.getCateInfor()
this.getInfo()
@@ -862,6 +863,8 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
+
+ this.userOptions = []
showShareUser(userId, 2017).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -897,6 +900,11 @@
const shareList = {}
shareList.shareContents = this.id1 || this.ids;
shareList.shareIds = this.ids1
+ if(shareList.shareIds.length==0)
+ {
+ this.$modal.msgSuccess("璇烽�夋嫨鍒嗕韩瀵硅薄");
+ return;
+ }
console.log(shareList,'sharelistsharelist')
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
@@ -949,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
@@ -1035,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