From 38edd817f503603d2b86703e95ecd115d2c789bd Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期六, 07 十月 2023 23:18:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/search/index.vue | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/views/search/index.vue b/ruoyi-ui/src/views/search/index.vue
index a60c0c7..f7283a8 100644
--- a/ruoyi-ui/src/views/search/index.vue
+++ b/ruoyi-ui/src/views/search/index.vue
@@ -138,7 +138,8 @@
createTime:undefined,
by5:undefined,
remark:undefined,
-
+ location:undefined,
+ ctId:undefined
},
// 鏌ヨ鍙傛暟
queryParams: {
@@ -187,7 +188,6 @@
}
);
},
-
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -243,33 +243,43 @@
this.single = selection.length!=1
this.multiple = !selection.length
},
- // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
- // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
- // let newlist = this.formDat.filter(
- // (item) => item.content.indexOf(this.searchVal) > -1
- // );
- // this.contactList = newlist;
- // },
-
-
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
- const id = row.id;
- this.$router.push("/self/Honor/honorInfo/" + id);
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- const id = row.id;
- let jd = true
+ // const id = row.id;
+ console.log(row.by5 +'/' + row.ctId);
+ var path = row.by5
+ if (row.by5=="/family/zfEvent" ){ //瀹跺ぇ浜嬭
+ path = "/familymodel/bignote/familyeventInfo/"
- this.$router.push({
- path:"/self/Honor/honorInfo/" + id,
- query:{
- detail:jd
- }
- });
- },
+ }else if(row.by5=="/family/zfProperty"){//瀹跺涵璧勪骇绠＄悊
+ path ="/familymodel/property/propertyInfo/"
+ }else if(row.by5=="/family/zfEquipment"){//瀹跺涵璁惧
+ path ="/familymodel/Device/equipmentInfo/"
+
+ }else if(row.by5=="/family/zfCollection"){//鏀惰棌鍜岃崳瑾�
+ path = "/familymodel/collection/collectionInfo/"
+
+ }else if(row.by5=="/family/zfDoctor"){//瀹跺涵灏忓尰鐢�
+ path ="/familymodel/Doctor/doctorInfo/"
+
+ }else if(row.by5=="/family/zfClea"){ // 淇濇磥鏀剁撼 -----------鏈夐棶棰�
+ path = "/familymodel/clean/cleanInfo/"
+
+ }else if(row.by5=="/family/zfContact"){ //閫氳褰�
+ path ="/familymodel/Contact/contactsInfo/"
+
+ }else if(row.by5=="/familymodel/zfPet"){ // 榄呭疇
+ path = "/familymodel/pet/petInfo/"
+
+ }else if(row.by5=="/family/zfEconomy"){ // 瀹跺涵鏀舵敮鍙拌处
+ path = "/familymodel/economy/economyInfo/"
+ }
+
+ this.$router.push(path + row.ctId);
+
+
+ },
},
--
Gitblit v1.9.1