From 5954aa0f9f982bba46843bf0dcc835f5efa2b667 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 10 十一月 2024 22:20:09 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 9 ++++
ruoyi-ui/src/views/device/index.vue | 8 ++++
ruoyi-ui/src/views/bignote/index.vue | 9 ++++
ruoyi-ui/src/views/contacts/index.vue | 6 +++
ruoyi-ui/src/views/clean/index.vue | 7 +++
ruoyi-ui/src/views/economy/index.vue | 7 +++
ruoyi-ui/src/views/pet/index.vue | 1
ruoyi-ui/src/views/note/index.vue | 7 +++
ruoyi-ui/src/views/collection/index.vue | 7 +++
ruoyi-ui/src/views/doctor/index.vue | 7 +++
10 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index e44df48..a0b98b1 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -860,7 +860,16 @@
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);
}).then(() => {
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 4a790fd..42bbb05 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -872,6 +872,8 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
+
+ this.userOptions = []
showShareUser(userId, 2020).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -907,6 +909,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);
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 9a7a261..4c6a2d8 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -939,7 +939,7 @@
getList1() {
let userId = this.$store.state.user.userId
-
+ this.userOptions = []
showShareUser(userId, 2018).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -976,6 +976,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);
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index b7e5153..ba8b7cf 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -953,6 +953,7 @@
let userId = this.$store.state.user.userId
+ this.userOptions = []
showShareUser(userId, 2021).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -989,6 +990,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);
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index d2f2101..147e1f9 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -440,6 +440,15 @@
if (this.formData.id != undefined) {
updateEquipment(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ console.log(this.$route)
+ this.$tab.closePage({ path: "/familymodel/zfDevice" })
+ // this.$store.dispatch("tagsView/delView",{ path: "/familymodel/zfDevice" }); //鍏抽棴褰撳墠椤�
+ //this.$store.dispatch('tagsView/addView', { title:"ZfDevice",path: "/familymodel/zfDevice" })
+ //this.$store.dispatch('tagsView/addIframeView', { title:"ZfDevice",ZfDevicepath: "/familymodel/zfDevice" })
+ // this.$tab.refreshPage({ path: "/familymodel/zfDevice" });
+ // this.$router.replace({ path: "/familymodel/zfDevice?cache=true" });
+ // this.$router.push("/familymodel/zfDevice");
+ window.location.url="https://localhost:80/familymodel/zfDevice"
// this.open = false;
if(this.formData.status==1)
this.formData.status = '鏄�'
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 1cf938d..72e8601 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);
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index de51fd4..264cb3f 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -884,6 +884,8 @@
},
getList1() {
let userId = this.$store.state.user.userId
+
+ this.userOptions = []
showShareUser(userId, 2019).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -919,6 +921,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);
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index e2ee900..c17ae39 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -841,6 +841,8 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
+
+ this.userOptions = []
showShareUser(userId, 2023).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -875,6 +877,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);
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index d821b33..acef4df 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -837,6 +837,8 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
+
+ this.userOptions = []
showShareUser(userId, 2002).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -872,6 +874,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);
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 099fd85..3908ab7 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -880,6 +880,7 @@
getList1() {
let userId = this.$store.state.user.userId
+ this.userOptions = []
showShareUser(userId, 2022).then(response=>{
console.log("===========ddddddddddddd")
--
Gitblit v1.9.1