From a85494cc5769c3dab7f210c012fba1c45103e779 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 06 六月 2023 16:16:55 +0800
Subject: [PATCH] 修改了不会重复页面的一些bug
---
ruoyi-ui/src/views/economy/economyInfo.vue | 10 +-
ruoyi-ui/src/views/device/equipmentInfo.vue | 10 +-
ruoyi-ui/src/views/note/propertyInfo.vue | 8 +-
ruoyi-ui/src/views/collection/collectionInfo.vue | 8 +-
ruoyi-ui/src/views/pet/petInfo.vue | 4
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 8 +-
ruoyi-ui/src/views/doctor/doctorInfo.vue | 8 +-
ruoyi-ui/src/views/clean/cleanInfo.vue | 6 +-
ruoyi-ui/src/views/contacts/contactsInfo.vue | 4
ruoyi-ui/src/router/index.js | 85 +++------------------------
ruoyi-ui/src/store/modules/tagsView.js | 2
11 files changed, 45 insertions(+), 108 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 08bc27b..930ac12 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -124,7 +124,7 @@
path: 'propertyInfo/:id(\\d+)',
component: () => import('@/views/note/propertyInfo'),
name: 'propertyInfo',
- meta: { title: '瀹跺涵璧勪骇鏌ヨ璇︽儏', activeMenu: '/familymodel/zfProperty' }
+ meta: { title: '瀹跺涵璧勪骇璇︾粏淇℃伅', activeMenu: '/familymodel/zfProperty' }
}
]
},
@@ -141,7 +141,7 @@
path: 'familyeventInfo/:id(\\d+)',
component: () => import('@/views/bignote/familyeventInfo'),
name: 'familyeventInfo',
- meta: { title: '瀹跺ぇ浜嬭鏌ヨ璇︽儏',activeMenu: '/familymodel/zfEvent'}
+ meta: { title: '瀹跺ぇ浜嬭璇︾粏淇℃伅',activeMenu: '/familymodel/zfEvent'}
}
]
},
@@ -158,7 +158,7 @@
path: 'contactsInfo/:id(\\d+)',
component: () => import('@/views/contacts/contactsInfo'),
name: 'contactsInfo',
- meta: { title: '閫氳褰曟煡璇㈣鎯�',activeMenu: '/familymodel/zfContact'}
+ meta: { title: '閫氳褰曡缁嗕俊鎭�',activeMenu: '/familymodel/zfContact'}
}
]
},
@@ -175,24 +175,7 @@
path: 'equipmentInfo/:id(\\d+)',
component: () => import('@/views/device/equipmentInfo'),
name: 'equipmentInfo',
- meta: { title: '瀹跺涵璁惧鏌ヨ璇︽儏',activeMenu: '/familymodel/zfDevice'}
- }
- ]
- },
- //钘忓績瀵嗚
- {
- path: '/self/secret',
- component: Layout,
- // permissions: [],
- hidden: true,
- permissions: ['self:secret:info'],
-
- children: [
- {
- path: 'secretInfo/:id(\\d+)',
- component: () => import('@/views/secret/secretInfo'),
- name: 'secretInfo',
- meta: { title: '闅愮璇︽儏',activeMenu: '/self/zsecret'}
+ meta: { title: '瀹跺涵璁惧璇︾粏淇℃伅',activeMenu: '/familymodel/zfDevice'}
}
]
},
@@ -209,7 +192,7 @@
path: 'economyInfo/:id(\\d+)',
component: () => import('@/views/economy/economyInfo'),
name: 'economyInfo',
- meta: { title: '瀹跺涵鏀舵敮鍙拌处鏌ヨ璇︽儏',activeMenu: '/familymodel/zfEconomy'}
+ meta: { title: '瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅',activeMenu: '/familymodel/zfEconomy'}
}
]
},
@@ -226,7 +209,7 @@
path: 'cleanInfo/:id(\\d+)',
component: () => import('@/views/clean/cleanInfo'),
name: 'cleanInfo',
- meta: { title: '淇濇磥鏀剁撼鏌ヨ璇︽儏',activeMenu: '/familymodel/zfClean'}
+ meta: { title: '淇濇磥鏀剁撼璇︾粏淇℃伅',activeMenu: '/familymodel/zfClean'}
}
]
},
@@ -243,7 +226,7 @@
path: 'collectionInfo/:id(\\d+)',
component: () => import('@/views/collection/collectionInfo'),
name: 'collectionInfo',
- meta: { title: '鏀惰棌涓庤崳瑾夋煡璇㈣鎯�',activeMenu: '/familymodel/zfCollection'}
+ meta: { title: '鏀惰棌涓庤崳瑾夎缁嗕俊鎭�',activeMenu: '/familymodel/zfCollection'}
}
]
},
@@ -261,7 +244,7 @@
path: 'petInfo/:pid(\\d+)',
component: () => import('@/views/pet/petInfo'),
name: 'petInfo',
- meta: { title: '澶囧繕褰�',activeMenu: '/familymodel/zfPetNote'}
+ meta: { title: '榄呭疇璇︾粏淇℃伅',activeMenu: '/familymodel/zfPetNote'}
}
]
},
@@ -277,7 +260,7 @@
path: 'doctorInfo/:id(\\d+)',
component: () => import('@/views/doctor/doctorInfo'),
name: 'doctorInfo',
- meta: { title: '灏卞尰璁板綍鏌ヨ璇︽儏',activeMenu: '/familymodel/zfDoctor'}
+ meta: { title: '灏卞尰璁板綍璇︾粏淇℃伅',activeMenu: '/familymodel/zfDoctor'}
}
]
},
@@ -293,7 +276,7 @@
path: 'personInfo/:id(\\d+)',
component: () => import('@/views/homeRoot/personInfo'),
name: 'personInfo',
- meta: { title: '涓汉淇℃伅鏌ヨ璇︽儏',activeMenu: '/familymodel/jiagenwang'}
+ meta: { title: '涓汉璇︾粏淇℃伅',activeMenu: '/familymodel/jiagenwang'}
}
]
},
@@ -309,7 +292,7 @@
path: 'getPInfo/:id(\\d+)',
component: () => import('@/views/genealogy/perInfo'),
name: 'perInfo',
- meta: { title: '涓汉淇℃伅鏌ヨ璇︽儏',activeMenu: '/familymodel/jiagenwang'}
+ meta: { title: '瀹惰氨涓汉璇︾粏淇℃伅',activeMenu: '/familymodel/jiagenwang'}
}
]
},
@@ -330,53 +313,7 @@
}
]
},
-//璇佷功銆佽祫璐�
- {
- path: '/self/honor',
- component: Layout,
- hidden: true,
- permissions: ['self:honor:info'],
- children: [
- {
- path: 'honorInfo/:id(\\d+)',
- component: () => import('@/views/honor/honorInfo'),
- name: 'honorInfo',
- meta: { title: '鑽ｈ獕璇佷功璇︽儏',activeMenu: '/self/zHonor'}
- }
- ]
- },
- //淇敼鏃呮父
- {
- path: '/self/travel',
- component: Layout,
- permissions: ['person:travel:edit'],
-
- hidden: true,
- children: [
- {
- path: 'edit/:id(\\d+)',
- component: () => import('@/views/travel/edit'),
- name: 'edit',
- meta: { title: '缂栬緫',activeMenu: '/geren/Ztravel'}
- }
- ]
- },
- //鏌ョ湅鏃呮父璇︽儏
- {
- path: '/self/travel',
- component: Layout,
- hidden: true,
- permissions: ['person:travel:info'],
- children: [
- {
- path: 'Info/:id',
- component: () => import('@/views/travel/Info'),
- name: 'show',
- meta: { title: '鏌ョ湅璇︽儏',activeMenu: '/geren/Ztravel'}
- }
- ]
- },
{
path: '/system/role-auth',
component: Layout,
diff --git a/ruoyi-ui/src/store/modules/tagsView.js b/ruoyi-ui/src/store/modules/tagsView.js
index 5fc011c..0419764 100644
--- a/ruoyi-ui/src/store/modules/tagsView.js
+++ b/ruoyi-ui/src/store/modules/tagsView.js
@@ -14,7 +14,7 @@
)
},
ADD_VISITED_VIEW: (state, view) => {
- if (state.visitedViews.some(v => v.path === view.path)) return
+ if (state.visitedViews.some(v => v.path === view.path || v.title === view.meta.title)) return
state.visitedViews.push(
Object.assign({}, view, {
title: view.meta.title || 'no-name'
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index b53783b..d97a9ec 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -133,7 +133,7 @@
</el-form>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -221,9 +221,9 @@
this.$route.meta.title = "淇敼澶т簨璁拌缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅澶т簨璁拌缁嗕俊鎭�";
- this.$route.meta.title = "鏌ョ湅澶т簨璁拌缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
- this.isShow=false
+ document.title = "瀹跺ぇ浜嬭璇︾粏淇℃伅";
+ this.$route.meta.title = "瀹跺ぇ浜嬭璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.isShow=true
}
let _this = this
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 56fa346..17f5f40 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -113,7 +113,7 @@
</el-form>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -214,8 +214,8 @@
this.$route.meta.title = "淇敼淇濇磥鏀剁撼璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅淇濇磥鏀剁撼璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅淇濇磥鏀剁撼璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "淇濇磥鏀剁撼璇︾粏淇℃伅";
+ this.$route.meta.title = "淇濇磥鏀剁撼璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
let _this = this
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index ad3add3..19af4ad 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -195,7 +195,7 @@
</div>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
</el-dialog>
@@ -328,9 +328,9 @@
this.$route.meta.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
- this.$route.meta.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
- this.isShow=false
+ document.title = "鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
+ this.$route.meta.title = "鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+ this.isShow=true
}
let _this = this
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 587b2e3..9a0bfa5 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -282,8 +282,8 @@
this.$route.meta.title = "淇敼閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅閫氳褰曡缁嗕俊鎭�";
- this.$route.meta.title = "鏌ョ湅閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+ document.title = "閫氳褰曡缁嗕俊鎭�";
+ this.$route.meta.title = "閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
this.isShow=false
}
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 060756e..26131e8 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="form-header mt">
- <h4 class="dt h4">瀹跺涵璁惧璇︽儏 </h4>
+ <h4 class="dt h4">瀹跺涵璁惧璇︾粏淇℃伅 </h4>
</div>
<!-- 鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佸唴瀹广�佸湴鐐广�佸娉� -->
@@ -145,7 +145,7 @@
</el-form>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -247,9 +247,9 @@
this.$route.meta.title = "淇敼瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅瀹跺涵璁惧璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- this.isShow=false
+ document.title = "瀹跺涵璁惧璇︾粏淇℃伅";
+ this.$route.meta.title = "瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.isShow=true
}
let _this = this
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 1146589..e469830 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -181,7 +181,7 @@
</el-form>
</div>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -299,9 +299,9 @@
this.$route.meta.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- this.isShow=false
+ document.title = "灏卞尰璁板綍璇︾粏淇℃伅";
+ this.$route.meta.title = "灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.isShow=true
}
let _this = this
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 9531e06..d656304 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="form-header mt">
- <h4 class="dt h4">瀹跺涵鏀舵敮鍙拌处淇℃伅 </h4>
+ <h4 class="dt h4">瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅 </h4>
</div>
@@ -242,12 +242,12 @@
this.btn= jd
this.dsb = !jd
this.isShow=true
- document.title = "淇敼璧勪骇璇︾粏淇℃伅";
- this.$route.meta.title = "淇敼璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";
+ this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅璧勪骇璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";
+ this.$route.meta.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
this.isShow=false
}
diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
index f10d352..63d0c4f 100644
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ b/ruoyi-ui/src/views/note/propertyInfo.vue
@@ -134,7 +134,7 @@
</el-form>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -223,9 +223,9 @@
this.$route.meta.title = "淇敼璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅璧勪骇璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- this.isShow=false
+ document.title = "瀹跺涵璧勪骇璇︾粏淇℃伅";
+ this.$route.meta.title = "瀹跺涵璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.isShow=true
}
let _this = this
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index 7a4f7f2..c91dc8a 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -387,8 +387,8 @@
this.$route.meta.title = "淇敼榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";
- this.$route.meta.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "榄呭疇璇︾粏淇℃伅";
+ this.$route.meta.title = "榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
let _this = this
--
Gitblit v1.9.1