From 80e0b09695493b7f811f746dfb7158244088afe3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 22 九月 2024 11:02:56 +0800
Subject: [PATCH] 修改了多个bug

---
 ruoyi-ui/src/views/device/index.vue |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index bc6dbda..731c75b 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -560,7 +560,7 @@
 import {showShareUser} from "@/api/bignote/index";
 
 export default {
-  name: "Role",
+  name: "ZfDevice",
   dicts: ['sys_normal_disable'],
   data() {
     return {
@@ -662,7 +662,8 @@
         buyer:undefined,
         location:undefined,
         createDate:undefined,
-        happenTime:undefined
+        happenTime:undefined,
+		name:undefined,
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -880,13 +881,13 @@
 		       this.listRoot.forEach(element => {
 		         kon[element['nickName']] = element['userId']
 		       })
-		       for(let i in kon){
-		         this.userOptions.push({label: i,value: kon[i]})
-		       }
-		       for(let i in this.userOptions){
-		         this.userList.push(this.userOptions[i].value)
-		       }
-		       console.log(this.userList,'userListuserListuserList99999999999999')
+		       // for(let i in kon){
+		       //   this.userOptions.push({label: i,value: kon[i]})
+		       // }
+		       // for(let i in this.userOptions){
+		       //   this.userList.push(this.userOptions[i].value)
+		       // }
+		       // console.log(this.userList,'userListuserListuserList99999999999999')
 		       this.loading1 = false;
 		     }
 		   );
@@ -949,7 +950,8 @@
       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.queryParams)
+	  //alert(this.queryParams.name)
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
       let _this = this
       listEquipment(this.queryParams).then(response => {

--
Gitblit v1.9.1