xiangshan
/
ggfwjsc
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiangshan:43157fccbcc4385b6b2a5da1973d1495d21c2860
Branches Tags
xiangshan:main
..
compare: xiangshan:2a2ff8b3883316db38ef04f6f42b13700e6e543a
Branches Tags
xiangshan:main

No commits in common. "43157fccbcc4385b6b2a5da1973d1495d21c2860" and "2a2ff8b3883316db38ef04f6f42b13700e6e543a" have entirely different histories.
43157fccbc ... 2a2ff8b388

2 changed files with 10 additions and 11 deletions
Show Stats Expand all files Collapse all files

8
src/view/home.vue
View File

@ -8,14 +8,14 @@
<!-- <keep-alive include="首页地图"> <!-- <keep-alive include="首页地图">
<router-view /> <router-view />
</keep-alive> --> </keep-alive> -->
<router-view v-slot="{ Component }"> <!-- <router-view v-slot="{ Component }">
<keep-alive> <keep-alive>
<component :is="Component" /> <component :is="Component" />
</keep-alive> </keep-alive>
</router-view> </router-view> -->
<!-- <keep-alive :max="1" :include="['首页地图']"> <keep-alive :max="1" :include="['首页地图']">
<router-view /> <router-view />
</keep-alive> --> </keep-alive>
</div> </div>
</div> </div>
</template> </template>

13
src/view/person/index.vue
View File

@ -1,5 +1,7 @@
<template> <template>
<div class="person-container"> <div class="person-container">
<a @click="back()" class="page_back"><i class="el-icon-arrow-left" title="返回"></i>返回</a>
<div class="person-content"> <div class="person-content">
<div class="person-side"> <div class="person-side">
<div class="my-label"> <div class="my-label">
@ -390,7 +392,10 @@ const tableType = reactive({
const onClickTag = (item) => { const onClickTag = (item) => {
dialogShow.value = true; dialogShow.value = true;
}; };
const back = () =>{
// sessionStorage.setItem('return',true);
window.location.href = 'javascript:history.back(-1)';
}
const paginationDialog = reactive({ const paginationDialog = reactive({
current: 1, current: 1,
@ -461,10 +466,6 @@ const getData = (nm, identNo) => {
const back=()=>{ const back=()=>{
router.back() router.back()
} }
// const back = () => {
// // sessionStorage.setItem('return',true);
// window.location.href = "javascript:history.back(-1)";
// };
onMounted(() => { onMounted(() => {
// console.log(routers.query); // console.log(routers.query);
if (routers.query.type == "map") { if (routers.query.type == "map") {
@ -609,8 +610,6 @@ onMounted(() => {
display: inline-block; display: inline-block;
// font-family: PangMenZhengDao, PangMenZhengDao; // font-family: PangMenZhengDao, PangMenZhengDao;
font-family: titletheRightWay, titletheRightWay; font-family: titletheRightWay, titletheRightWay;
font-weight: 500;
font-size: 18px;
font-weight: normal; font-weight: normal;
font-size: 34px; font-size: 34px;
color: #b8fcfc; color: #b8fcfc;