From c4b8209d92daa8c6e8ec20bdd56fecf4a95d0990 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 05 六月 2024 16:41:33 +0800
Subject: [PATCH] 1
---
src/pages/character/detail.vue | 30 ++
src/static/tool.js | 4
src/pages/character/index.vue | 22 +-
src/pages/territory/territory.vue | 149 +++++++++-----
src/pages/changePassword/changePassword.vue | 17 -
src/uni_modules/luanqing-search/components/luanqing-search/luanqing-search.vue | 1
src/pages/Register/Register.vue | 32 ++
src/pages/characterMap/characterMap.vue | 42 ++--
src/api/index.js | 12 +
src/pages/repository/repository.vue | 5
src/static/initialize.css | 7
src/components/headNav/headNav.vue | 25 +-
src/pages/inherit/index.vue | 34 ++
src/components/form/form.vue | 2
src/App.vue | 2
src/pages/academicGenres/detail.vue | 68 ++++--
src/pages/forgetPass/forgetPass.vue | 94 ++++-----
src/pages/TcmSystem/TcmSystem.vue | 7
18 files changed, 321 insertions(+), 232 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 81fd47d..44f601f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,4 +20,6 @@
/*姣忎釜椤甸潰鍏叡css */
/*璁剧疆鏁翠釜椤圭洰鐨勮儗鏅壊*/
@import '@/static/initialize.css';
+
+
</style>
diff --git a/src/api/index.js b/src/api/index.js
index 31f915a..9c15377 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -177,8 +177,16 @@
// 涓浗鍦板煙鍦拌氨妫�绱汉鐗�
export const getRetrieval = (requestData) => {
return req1({
- url: "/person/retrieval?keyword=" + requestData?.keyword + "&dynasty=" + requestData?.dynasty,
- method: "post",
+ url:
+ "/person/retrieval?page=" +
+ requestData?.page +
+ "&pageSize=" +
+ requestData?.pageSize +
+ "&keyword=" +
+ requestData?.keyword +
+ "&dynasty=" +
+ requestData?.dynasty,
+ method: "post"
});
};
// 鍖诲浜虹墿鐭ヨ瘑搴�
diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index 3090bea..affedfc 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -46,7 +46,7 @@
style="background-color: #244a7b; color: #fff"
size="mini"
@click="handleSubmit"
- >妫�绱�</el-button
+ >鎼滅储</el-button
>
<el-button type="info" plain size="mini" @click="handleReset"
>閲嶇疆</el-button
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 27a7c40..4e516a2 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -97,7 +97,7 @@
>
<!-- 鑳屾櫙 -->
<img class="leftListBgImage" src="@/static/image/leftListBg.png" alt="" />
- <view style="position: relative; z-index: 999">
+ <view style="position: relative; z-index: 999">
<view class="flex flex-center LeftLogo">
<!-- <img src="@/static/image/logo.png" ></img> -->
<view class="img"></view>
@@ -114,7 +114,7 @@
<el-menu-item index="1">
<span slot="title">涓尰浜虹墿鏁版嵁搴�</span>
</el-menu-item>
- <el-menu-item index="2">
+ <el-menu-item index="2" class="oActive">
<span slot="title">涓栧尰鍖诲鏁版嵁搴�</span>
</el-menu-item>
<el-menu-item index="3">
@@ -315,23 +315,22 @@
}
}
-@media screen and (min-width: 2560px) and (max-width: 3840px) {
- ::v-deep .el-menu .is-active {
- background-color: #244a7b !important;
- border-radius: 0.5rem;
- }
+::v-deep .el-menu .is-active {
+ background-color: #244a7b !important;
+ border-radius: 0.5rem;
+}
+::v-deep .el-menu .is-active.oActive {
+ background-color: #e27917 !important;
+}
+
+@media screen and (min-width: 2560px) and (max-width: 3840px) {
.LeftLogo .img {
background-image: url(@/static/image/logo4.png);
}
}
@media screen and (min-width: 1366px) and (max-width: 1920px) {
- ::v-deep .el-menu .is-active {
- background-color: #244a7b !important;
- border-radius: 0.5rem;
- }
-
.LeftLogo .img {
background-image: url(@/static/image/logo.png);
}
@@ -345,7 +344,7 @@
/* 绮樻�у畾浣� */
position: sticky;
top: 0;
- z-index: 9;
+ z-index: 99999999;
}
.NavTop {
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 532fc67..49b8e76 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -5,8 +5,8 @@
class="Ttop flex flex-center flex-wrap"
style="flex-direction: column"
>
- <view ></view>
- <view ref="Rtop">
+ <view></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -35,7 +35,6 @@
<!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
<view class="LoginBg"></view>
<view
-
@click="BacktoLogin"
style="
cursor: pointer;
@@ -74,10 +73,10 @@
placeholder="蹇呴』涓庡瘑鐮佷竴鑷�"
></el-input>
</el-form-item>
- <el-form-item label="鎵嬫満鍙�" prop="cellphoneORmailbox">
+ <el-form-item label="鎵嬫満鍙�/閭" prop="cellphoneORmailbox">
<el-input
v-model="registerData.cellphoneORmailbox"
- placeholder="璇峰～鍐欐纭殑鎵嬫満"
+ placeholder="璇峰～鍐欐墜鏈哄彿/閭"
></el-input>
</el-form-item>
<el-form-item label="楠岃瘉鐮�" prop="verifyCode">
@@ -132,11 +131,18 @@
margin-bottom: 0.19rem;
"
>
+ <el-checkbox v-model="checked" style="margin-right: 0.06rem;"></el-checkbox>
鐢ㄦ埛娉ㄥ唽鍗充唬琛ㄥ悓鎰�
- <span class="cursor" @click="termOfServiceClick(1)"
+ <span
+ class="cursor"
+ style="color: #244a7b"
+ @click="termOfServiceClick(1)"
>銆婃湇鍔℃潯娆俱��</span
>
- 鍜�<span class="cursor" @click="termOfServiceClick(2)"
+ 鍜�<span
+ class="cursor"
+ style="color: #244a7b"
+ @click="termOfServiceClick(2)"
>銆婄敤鎴烽殣绉佷繚鎶ゅ拰涓汉淇℃伅鏉℃銆�</span
>
</view>
@@ -236,7 +242,7 @@
cellphoneORmailbox: [
{
required: true,
- message: "璇疯緭鍏ユ墜鏈�",
+ message: "璇疯緭鍏ユ墜鏈哄彿/閭",
trigger: "blur"
},
{
@@ -306,7 +312,8 @@
name: "涓尰鍖讳簨鍒跺害",
id: 5
}
- ]
+ ],
+ checked: false
};
},
onLoad() {
@@ -379,6 +386,13 @@
},
// 鐢ㄦ埛娉ㄥ唽
async Login(formName) {
+ if(!this.checked) {
+ this.$message({
+ message: '璇峰嬀閫夊悓鎰忔湇鍔℃潯娆俱�佺敤鎴烽殣绉佷繚鎶ゅ拰涓汉淇℃伅鏉℃',
+ type: 'warning'
+ });
+ return false;
+ }
let Obj = {
username: this.registerData.loginID,
password: encryptAES(this.registerData.pass),
diff --git a/src/pages/TcmSystem/TcmSystem.vue b/src/pages/TcmSystem/TcmSystem.vue
index 288342f..1f63040 100644
--- a/src/pages/TcmSystem/TcmSystem.vue
+++ b/src/pages/TcmSystem/TcmSystem.vue
@@ -954,14 +954,13 @@
position: fixed;
right: 0;
top: 0;
- z-index: 9999999999999999999999999999999999999999999 !important;
-
+ z-index: 99999 !important;
> div {
height: 100%;
margin: 0 !important;
position: fixed;
right: 0;
- top: 0;
+ top: 86px;
> :nth-child(1) {
display: none;
@@ -1064,7 +1063,7 @@
.search1 ::v-deep .uni-select__selector-item {
position: relative;
- z-index: 999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 !important;
+ z-index: 99999 !important;
display: flex;
justify-content: center;
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 64a5931..12ebb2d 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -9,7 +9,6 @@
>
<view class="flex flex-center flex-column">
<view
-
style="
font-weight: 900;
margin-bottom: 0.2rem;
@@ -19,13 +18,18 @@
>{{ detailData.name }}
</view>
<ul class="flex Lists">
- <li style="background-color: #597aa5; color: #fff;cursor: pointer;">瀛︽淳浠嬬粛</li>
- <li @click="ListClick" style="background-color: #fff; color: #597aa5;cursor: pointer;">
+ <li style="background-color: #597aa5; color: #fff; cursor: pointer">
+ 瀛︽淳浠嬬粛
+ </li>
+ <li
+ @click="ListClick"
+ style="background-color: #fff; color: #597aa5; cursor: pointer"
+ >
瀛︽淳鍥捐氨
</li>
</ul>
</view>
- <view ></view>
+ <view></view>
</view>
<view class="Bottom">
<view class="Bottom_top flex">
@@ -198,12 +202,14 @@
? res.object.school_INTRODUCTION.map((item) => {
return {
content: item.content,
- source:
- "鍑哄锛氥��" +
- res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ source: res.object.bookList
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -211,12 +217,14 @@
? res.object.school_DEVELOPMENT.map((item) => {
return {
content: item.content,
- source:
- "鍑哄锛氥��" +
- res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ source: res.object.bookList
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -224,12 +232,14 @@
? res.object.achievement_INFLUENCE.map((item) => {
return {
content: item.content,
- source:
- "鍑哄锛氥��" +
- res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ source: res.object.bookList
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -237,12 +247,14 @@
? res.object.related_LITERATURE.map((item) => {
return {
content: item.content,
- source:
- "鍑哄锛氥��" +
- res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ source: res.object.bookList
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: []
diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue
index 61a81bc..4bf979c 100644
--- a/src/pages/changePassword/changePassword.vue
+++ b/src/pages/changePassword/changePassword.vue
@@ -264,12 +264,8 @@
this.getElementWidth();
},
methods: {
- // 杩斿洖鐧诲綍
BacktoLogin() {
- // uni.redirectTo({
- // url: '/pages/Login/Login'
- // })
- uni.navigateBack();
+ this.$router.go(-1);
},
getElementWidth() {
this.$nextTick(() => {
@@ -278,26 +274,25 @@
});
},
// 蹇樿瀵嗙爜
- async Login2(formName) {
+ Login2(formName) {
let Obj = {
username: this.amendDataPass.loginID,
password: encryptAES(this.amendDataPass.rawPass),
newPassword: encryptAES(this.amendDataPass.newPass)
};
- this.$refs[formName].validate(async (valid) => {
+ this.$refs[formName].validate((valid) => {
if (valid) {
// alert('submit!鎴愬姛');
getchangePassword(Obj).then((res) => {
if (res.success == true) {
this.$message.success('淇敼鎴愬姛');
- uni.navigateBack();
+ uni.navigateTo({
+ url: "/pages/Login/Login"
+ });
} else {
this.$message.error(res.errorText);
}
});
- // uni.redirectTo({ encryptAES
- // url: '/pages/Login/Login'
- // })
} else {
console.log("error submit!!澶辫触");
return false;
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 70367fd..10fcf40 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -320,6 +320,7 @@
</div>
<ul class="font-family" style="font-size: 0.13rem; line-height: 2">
<li
+ style="cursor: pointer"
v-for="(item, index) in personResearchList"
:key="index"
@click="toLink(item)"
@@ -339,7 +340,15 @@
</div>
<!-- 杩斿洖椤堕儴 -->
- <el-col style="position: absolute; bottom: 1rem; left: 1.2rem">
+ <el-col
+ style="
+ position: absolute;
+ bottom: 1rem;
+ left: 1.2rem;
+ width: 0.6rem;
+ height: 0.6rem;
+ "
+ >
<el-button
style="font-size: 0.3rem"
icon="el-icon-top"
@@ -401,7 +410,7 @@
getPersonRelationAtSchool,
getSpaceTime
} from "@/api/index.js";
-import { getImg } from "@/static/tool.js";
+import { getImg, getFile } from "@/static/tool.js";
import L from "leaflet";
import "leaflet.chinatmsproviders";
@@ -539,7 +548,13 @@
});
},
toLink(item) {
- window.open(item.url);
+ console.log(item);
+ if (item.url) {
+ window.open(item.url);
+ }
+ if (item.filePath) {
+ window.open(getFile(item.filePath));
+ }
},
getData() {
// 鍩烘湰淇℃伅
@@ -560,6 +575,7 @@
: fieldItem.content1;
}
}
+ console.log(obj);
this.detailInfo = obj;
// 鍏崇郴鍥捐氨
this.getMappingData(this.detailInfo.NAME);
@@ -773,13 +789,13 @@
(node) => node.id === item.identifier2 && node.name === item.name2
);
// 璇佹槑涓嶅瓨鍦�
- if (exists1 !== true) {
+ if (item.name1 && exists1 !== true) {
this.nodes.push({
name: item.name1,
id: item.identifier1
});
}
- if (exists2 !== true) {
+ if (item.name2 && exists2 !== true) {
this.nodes.push({
name: item.name2,
id: item.identifier2
@@ -1295,10 +1311,6 @@
::v-deep .el-dialog__body {
padding: 0;
-}
-
-::v-deep .el-dialog__wrapper {
- z-index: 999999999999999 !important;
}
.ProfileNav {
diff --git a/src/pages/character/index.vue b/src/pages/character/index.vue
index fded48b..fe8ecf5 100644
--- a/src/pages/character/index.vue
+++ b/src/pages/character/index.vue
@@ -28,12 +28,13 @@
</li>
</ul>
</view>
- <view style="margin-left: 0.2rem">涔︿腑鏈�甯告彁鍒扮殑100浣嶄汉鐗�</view>
+ <view style="margin-left: 0.2rem">涔︿腑鏈�甯告彁鍒扮殑100浣嶄汉鐗�</view>
<!-- 鍏崇郴琛ㄥ湴鍥� -->
<view
id="relation"
style="margin-top: 0.2rem; flex: 1; width: 100%; position: relative"
- ><div
+ >
+ <div
v-if="!loading && relationships.length == 0"
style="
position: absolute;
@@ -46,8 +47,8 @@
"
>
鏆傛棤鐩稿叧鏁版嵁
- </div></view
- >
+ </div>
+ </view>
<!-- 鏈濅唬 -->
<!-- <view
@@ -282,10 +283,10 @@
},
mounted() {
this.getData();
- this.echartsArr();
+ // this.echartsArr();
this.hotSearch();
// 鐩戝惉绐楀彛澶у皬鍙樺寲
- // window.addEventListener("resize", this.relation);
+ window.addEventListener("resize", this.relation);
this.innt();
},
onLoad(options) {
@@ -293,6 +294,7 @@
},
methods: {
getData(key) {
+ this.loading = true;
getFuzzySearch({
keyword: key ? key : this.searchKey ? this.searchKey : ""
}).then((res) => {
@@ -307,13 +309,13 @@
(node) => node.id === item.identifier2 && node.name === item.name2
);
// 璇佹槑涓嶅瓨鍦�
- if (exists1 !== true) {
+ if (item.name1 && exists1 !== true) {
this.nodes.push({
name: item.name1,
id: item.identifier1
});
}
- if (exists2 !== true) {
+ if (item.name2 && exists2 !== true) {
this.nodes.push({
name: item.name2,
id: item.identifier2
@@ -461,8 +463,8 @@
}
},
force: {
- initLayout: null,
- // gravity: 0
+ // layoutAnimation: false,
+ // friction: 1,
repulsion: 800,
edgeLength: 400
}
diff --git a/src/pages/characterMap/characterMap.vue b/src/pages/characterMap/characterMap.vue
index df06f02..5abd983 100644
--- a/src/pages/characterMap/characterMap.vue
+++ b/src/pages/characterMap/characterMap.vue
@@ -12,7 +12,7 @@
<view
class="font-family"
style="font-size: 0.26rem; padding-top: 0.16rem; font-weight: bold"
- >{{ activityInfo.participants }}</view
+ >{{ basicInfo.name }}</view
>
<ul
style="
@@ -23,15 +23,11 @@
line-height: 0.28rem;
"
>
- <li>鍑虹敓浜巤{ basicInfo.nativePlace }}</li>
+ <li>鍑虹敓浜巤{ basicInfo.nativePlace || "-" }}</li>
<li>
- {{
- basicInfo.birthYear +
- basicInfo.nativePlace +
- "(浠�" +
- basicInfo.nowPlace +
- ")"
- }}
+ <span v-if="basicInfo.birthYear">{{basicInfo.birthYear}}</span>
+ <span v-if="basicInfo.nativePlace">{{basicInfo.nativePlace}}</span>
+ <span v-if="basicInfo.nowPlace">锛堜粖{{basicInfo.nowPlace}}锛�</span>
</li>
</ul>
<ul
@@ -42,18 +38,18 @@
line-height: 0.28rem;
"
>
- <li>娲诲姩鍚嶇О锛歿{ activityInfo.activityName }}</li>
- <li>娲诲姩鍦扮偣锛歿{ activityInfo.activityAddr }}</li>
- <li>娲诲姩鍖洪棿锛歿{ activityInfo.time }}</li>
- <li>娲诲姩鎻忚堪锛歿{ activityInfo.desc }}</li>
- <li>鍙備笌浜哄憳锛歿{ activityInfo.participants }}</li>
+ <li>娲诲姩鍚嶇О锛歿{ activityInfo.activityName || "-" }}</li>
+ <li>娲诲姩鍦扮偣锛歿{ activityInfo.activityAddr || "-" }}</li>
+ <li>娲诲姩鍖洪棿锛歿{ activityInfo.time || "-" }}</li>
+ <li>娲诲姩鎻忚堪锛歿{ activityInfo.desc || "-" }}</li>
+ <li>鍙備笌浜哄憳锛歿{ activityInfo.participants || "-" }}</li>
</ul>
<!-- <img
style="width: 100%; height: 2rem"
src="https://img0.baidu.com/it/u=1845740325,2917001370&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1711731600&t=0b208ab46e1d33aa81ac31dd6bf627be"
alt=""
/> -->
- <div class="box" style="width: 80%">
+ <!-- <div class="box" style="width: 80%">
<span class="span" :style="{ marginLeft: spanML + 'rem' }"
>{{ span }}骞�</span
>
@@ -67,7 +63,7 @@
</div>
<div class="MX"></div>
<div class="cursor" :style="{ marginLeft: cursorML + 'rem' }"></div>
- </div>
+ </div> -->
</el-dialog>
</view>
</view>
@@ -95,7 +91,13 @@
spanML: 0,
cursorML: -0.05,
activityInfo: {},
- basicInfo: {}
+ basicInfo: {
+ name: "",
+ birthYear: "",
+ deathYear: "",
+ nativePlace: "",
+ nowPlace: "",
+ }
};
},
@@ -204,7 +206,7 @@
this.basicInfo.nowPlace = res.object.personFieldList.find(
(f) => f.fieldName == "NATIVE_PLACE"
).content2;
- // this.initMap(res.object.personSpaceTimeList);
+ console.log(this.basicInfo);
});
},
@@ -555,9 +557,9 @@
margin: 0 !important;
position: absolute;
right: 0;
- top: 0;
+ top: 86px;
+ bottom: 0;
width: 4rem;
- height: 100%;
}
.particulars ::v-deep .el-dialog__header {
diff --git a/src/pages/forgetPass/forgetPass.vue b/src/pages/forgetPass/forgetPass.vue
index bcaf9db..8c93a9f 100644
--- a/src/pages/forgetPass/forgetPass.vue
+++ b/src/pages/forgetPass/forgetPass.vue
@@ -5,8 +5,8 @@
class="Ttop flex flex-center flex-wrap"
style="flex-direction: column"
>
- <view ></view>
- <view ref="Rtop">
+ <view></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -35,7 +35,6 @@
<!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
<view class="LoginBg"></view>
<view
-
@click="BacktoLogin"
style="
cursor: pointer;
@@ -51,6 +50,7 @@
:hide-required-asterisk="true"
ref="formLogin2"
label-position="right"
+ :label-width="80"
:rules="rules"
:model="resetDataPass"
>
@@ -128,7 +128,7 @@
import { Message } from "element-ui";
export default {
components: {
- Footer1,
+ Footer1
},
data() {
// 瀵嗙爜
@@ -171,58 +171,58 @@
{
required: true,
message: "璇疯緭鍏ョ櫥褰曡处鍙�",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
newPass: [
{
required: true,
message: "璇疯緭鍏ュ瘑鐮�",
- trigger: "blur",
+ trigger: "blur"
},
{
min: 6,
max: 10,
message: "瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�",
- trigger: "blur",
+ trigger: "blur"
},
{
validator: validatePass,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
checkPass: [
{
validator: validatePass2,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
cellphoneORmailbox: [
{
required: true,
message: "璇疯緭鍏ユ墜鏈哄彿",
- trigger: "blur",
+ trigger: "blur"
},
{
validator: this.validateContact,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
verifyCode: [
{
required: true,
message: "璇疯緭鍏ラ獙璇佺爜",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// 閲嶇疆瀵嗙爜
resetDataPass: {
cellphoneORmailbox: "",
verifyCode: "",
newPass: "",
- checkPass: "",
- },
+ checkPass: ""
+ }
};
},
onLoad() {
@@ -230,7 +230,7 @@
success: function (info) {
// console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
// console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
- },
+ }
});
},
mounted() {
@@ -240,7 +240,7 @@
// 宸叉湁璐﹀彿锛熻繑鍥炵櫥褰�
BacktoLogin() {
uni.redirectTo({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
},
// 鑾峰彇楠岃瘉鐮�
@@ -248,7 +248,7 @@
if (!this.resetDataPass.cellphoneORmailbox) {
this.$message({
message: "璇疯緭鍏ユ墜鏈猴紒",
- type: "warning",
+ type: "warning"
});
return false;
@@ -257,7 +257,7 @@
return;
}
let Obj = {
- communicateParam: this.resetDataPass.cellphoneORmailbox,
+ communicateParam: this.resetDataPass.cellphoneORmailbox
};
this.countdown = 60;
const intervalId = setInterval(() => {
@@ -277,7 +277,7 @@
// uni.setStorageSync('globalData', { id: 123, name: 'example' });
if (item.id == 1) {
uni.navigateTo({
- url: "/pages/character/detail?id=" + item.id,
+ url: "/pages/character/detail?id=" + item.id
});
} else if (item.id == 2) {
// uni.navigateTo({
@@ -285,15 +285,15 @@
// })
} else if (item.id == 3) {
uni.navigateTo({
- url: "/pages/academicGenres/index?id=" + item.id,
+ url: "/pages/academicGenres/index?id=" + item.id
});
} else if (item.id == 4) {
uni.navigateTo({
- url: "/pages/territory/territory?id=" + item.id,
+ url: "/pages/territory/territory?id=" + item.id
});
} else if (item.id == 5) {
uni.navigateTo({
- url: "/pages/TcmSystem/TcmSystem?id=" + item.id,
+ url: "/pages/TcmSystem/TcmSystem?id=" + item.id
});
}
},
@@ -319,34 +319,30 @@
let Obj = {
communicateParam: this.resetDataPass.cellphoneORmailbox, //鎵嬫満鎴栭偖绠�
verifyCode: this.resetDataPass.verifyCode, //楠岃瘉鐮�
- newPassword: encryptAES(this.resetDataPass.newPass), //鏂板瘑鐮�
+ newPassword: encryptAES(this.resetDataPass.newPass) //鏂板瘑鐮�
};
- this.$refs[formName].validate(async (valid) => {
+ this.$refs[formName].validate((valid) => {
if (valid) {
- await getRestPassword(Obj).then((res) => {
+ getRestPassword(Obj).then((res) => {
if (res.success) {
+ this.$message({
+ message: "瀵嗙爜閲嶇疆鎴愬姛",
+ type: "success"
+ });
uni.navigateTo({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
} else {
Message.error(res.errorText || "");
}
- });
- // alert('submit!鎴愬姛');
- // uni.redirectTo({
- // url: '/pages/Login/Login'
- // })
- this.$message({
- message: "瀵嗙爜閲嶇疆鎴愬姛",
- type: "success",
});
} else {
console.log("error submit!!澶辫触");
return false;
}
});
- },
- },
+ }
+ }
};
</script>
<style scoped>
@@ -406,14 +402,6 @@
::v-deep .el-input__inner {
height: 0.35rem !important;
font-size: 0.14rem;
- }
-
- ::v-deep .el-form-item__label {
- display: flex;
- align-items: center;
- justify-content: flex-end;
- margin-right: 0.2rem !important;
- width: 0.7rem;
}
.hua {
@@ -581,7 +569,7 @@
width: 1.2rem;
height: 0.37rem;
background: url(@/static/image/閲嶇疆瀵嗙爜.png) no-repeat 0 0;
- background-size: 100% ;
+ background-size: 100%;
}
::v-deep .el-card {
@@ -627,12 +615,12 @@
}
::v-deep .el-form-item__label {
- min-width: 0.6rem;
+ width: 0.8rem;
padding: 0;
color: #244a7b;
font-size: 0.14rem;
font-weight: 500;
- margin-right: 0.29rem;
+ margin-right: 0.1rem;
}
::v-deep .el-form-item {
diff --git a/src/pages/inherit/index.vue b/src/pages/inherit/index.vue
index 91659ac..203d015 100644
--- a/src/pages/inherit/index.vue
+++ b/src/pages/inherit/index.vue
@@ -1,5 +1,5 @@
<template>
- <view >
+ <view>
<headNav
idIndex="2"
:searchBg="false"
@@ -71,7 +71,21 @@
</div>
<div class="contentBox">
<!-- echarts鍥� -->
- <div class="barChart" ref="barChart"></div>
+ <div id="barChart" ref="barChart"></div>
+ <div
+ v-if="!loading && nodeData.length == 0"
+ style="
+ position: absolute;
+ top: 30%;
+ left: 0;
+ right: 0;
+ text-align: center;
+ font-size: 0.2rem;
+ color: #666;
+ "
+ >
+ 鏆傛棤鎼滅储鏁版嵁
+ </div>
<div
class="toolBox"
v-if="showTool"
@@ -94,6 +108,7 @@
export default {
data() {
return {
+ loading: true,
// 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
keyword: "",
idIndex: 0,
@@ -106,7 +121,7 @@
toolTop: 0,
toolLeft: 0,
toolInfo: {},
- totalCount: 0,
+ totalCount: 0
};
},
onLoad(options) {
@@ -119,11 +134,12 @@
getStatistics() {
inheritMedicalSataStatistics().then((res) => {
this.dynasty = res.object;
- this.activeId = this.dynasty[0].dynastyId
+ this.activeId = this.dynasty[0].dynastyId;
this.getData();
});
},
getData() {
+ this.loading = true;
this.nodeData = [];
// const defaultDynasty = this.dynasty.find(f.dynasty == "瀹�");
this.showTool = false;
@@ -151,16 +167,18 @@
searchType: this.searchType,
path: this.conditionId
}).then((res) => {
- this.totalCount = res.object.totalCount
+ this.totalCount = res.object.totalCount;
});
+ console.log(this.nodeData, "this.nodeData");
+ this.loading = false;
// 鍒濆鍖� echarts
this.initBarChart();
});
},
initBarChart() {
- // WMBg
//閫氳繃 $ref 杩涜鎸傝浇
- let myChart = echarts.init(this.$refs.barChart);
+ var chartDom = document.getElementById("barChart");
+ let myChart = echarts.init(chartDom);
let FontSize = 18; // 瀛椾綋澶у皬
let BorderWidth = 2; // 杈规澶у皬
@@ -356,7 +374,7 @@
height: 80vh;
position: relative;
}
-.barChart {
+#barChart {
width: 100%;
height: 100%;
}
diff --git a/src/pages/repository/repository.vue b/src/pages/repository/repository.vue
index 7d3d912..cbf0926 100644
--- a/src/pages/repository/repository.vue
+++ b/src/pages/repository/repository.vue
@@ -703,7 +703,6 @@
}
/* --------------- */
- @media screen and (min-width:2560px)and (max-width:3840px) {}
.BoxLeft ::v-deep.el-card__body {
padding: .1rem .11rem !important;
@@ -721,10 +720,6 @@
::v-deep .el-dialog__body {
padding: 0;
- }
-
- ::v-deep .el-dialog__wrapper {
- z-index: 999999999999999 !important;
}
.ProfileNav {
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 2d7274d..beb6588 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -56,7 +56,7 @@
height: 3.2rem;
width: 3rem;
position: fixed;
- z-index: 999999999999;
+ z-index: 99;
left: 1rem;
top: 2.2rem;
"
@@ -76,6 +76,20 @@
>
</div>
<view style="overflow: auto; height: 2.5rem">
+ <div
+ v-if="!loading && SearchArr.length == 0"
+ style="
+ position: absolute;
+ top: 30%;
+ left: 0;
+ right: 0;
+ text-align: center;
+ font-size: 0.2rem;
+ color: #666;
+ "
+ >
+ 鏆傛棤鎼滅储鏁版嵁
+ </div>
<ul
class="information"
v-for="(item, index) in SearchArr"
@@ -209,6 +223,7 @@
export default {
data() {
return {
+ loading: true,
// echarts鍏冪礌鐐瑰嚮鏃跺嚭鏉ョ殑寮圭獥鍜屽潗鏍�
keyword: "",
isEchTrue: false,
@@ -401,45 +416,60 @@
this.map.setView(latlng, 10);
},
getDataList() {
- getRetrieval({ keyword: this.keyword, dynasty: this.dynasty1Color }).then(
- (res) => {
- if (res.object) {
- let markerList = [];
- const listData = res.object.personList;
- for (let i = 0; i < listData.length; i++) {
- const item = listData[i];
- if (item.NATIVE_PLACE?.length > 0) {
- item.NATIVE_PLACE.forEach((citem) => {
- if (citem.xCoord && citem.yCoord) {
- const currentDynasty = this.dynasty1.find(
- (f) => f.id == item.PERIOD[0].content1
- );
- if (currentDynasty) {
- item.dynastyInfo = currentDynasty;
- }
- markerList.push({ ...citem, ...item });
+ this.SearchArr = [];
+ this.loading = true;
+ // 杩欓噷鏀规垚浜嗗垎椤电殑鎺ュ彛锛岄渶瑕佽皟鐢ㄥ娆″彇鍑烘墍鏈夋暟鎹�
+
+ // 闂锛�
+ // 鎼滅储缁撴灉涓嶅
+ // 鐐瑰嚮鍦板浘鏍囩偣鍑虹幇寮规锛屾嫋鍔ㄥ湴鍥炬椂搴斿叧闂脊妗�
+
+ getRetrieval({
+ keyword: this.keyword,
+ dynasty: this.dynasty1Color,
+ page: 1,
+ pageSize: 1000
+ }).then((res) => {
+ this.loading = false;
+ if (res.object) {
+ let markerList = [];
+ const listData = res.object.personList;
+ for (let i = 0; i < listData.length; i++) {
+ const item = listData[i];
+ if (item.NATIVE_PLACE?.length > 0) {
+ item.NATIVE_PLACE.forEach((citem) => {
+ if (citem.xCoord && citem.yCoord) {
+ const currentDynasty = this.dynasty1.find(
+ (f) => f.id == item.PERIOD[0].content1
+ );
+ if (currentDynasty) {
+ item.dynastyInfo = currentDynasty;
}
- });
- }
+ markerList.push({ ...citem, ...item });
+ }
+ });
}
- this.initMap(markerList);
- this.SearchArr = markerList.map((item) => ({
- birthAndDeath: item?.BIRTH_YEAR[0]?.content1
- ? item?.BIRTH_YEAR[0]?.content1 +
- "-" +
- item?.DEATH_YEAR[0]?.content1
- : "-",
- name: item?.NAME[0]?.content1,
- source: "-",
- id: item.id
- }));
- this.markerList = markerList;
}
+ this.initMap(markerList);
+ this.SearchArr = markerList.map((item) => ({
+ birthAndDeath: item?.BIRTH_YEAR[0]?.content1
+ ? item?.BIRTH_YEAR[0]?.content1 +
+ "-" +
+ item?.DEATH_YEAR[0]?.content1
+ : "-",
+ name: item?.NAME[0]?.content1,
+ source: "-",
+ id: item.id
+ }));
+ this.markerList = markerList;
+ } else {
+ this.initMap([]);
}
- );
+ });
},
//鍒濆鍖栧湴鍥�
initMap(markerList) {
+ console.log(markerList,'markerList');
this.isEchTrue = false;
if (this.map) {
this.map.remove();
@@ -473,32 +503,35 @@
for (let i = 0; i < markerList.length; i++) {
const item = markerList[i];
let currentClassName = "map-circle-name";
- switch (item.dynastyInfo.dynastyChs) {
- case "澶�":
- currentClassName = "map-circle-xia";
- break;
- case "鍟�":
- currentClassName = "map-circle-shang";
- break;
- case "瑗垮懆":
- currentClassName = "map-circle-zhou";
- break;
- case "绉�":
- currentClassName = "map-circle-qin";
- break;
- case "姹�":
- currentClassName = "map-circle-han";
- break;
- case "闅�":
- currentClassName = "map-circle-sui";
- break;
- case "鍞�":
- currentClassName = "map-circle-tang";
- break;
- case "鏄�":
- currentClassName = "map-circle-ming";
- break;
+ if (item.dynastyInfo) {
+ switch (item.dynastyInfo.dynastyChs) {
+ case "澶�":
+ currentClassName = "map-circle-xia";
+ break;
+ case "鍟�":
+ currentClassName = "map-circle-shang";
+ break;
+ case "瑗垮懆":
+ currentClassName = "map-circle-zhou";
+ break;
+ case "绉�":
+ currentClassName = "map-circle-qin";
+ break;
+ case "姹�":
+ currentClassName = "map-circle-han";
+ break;
+ case "闅�":
+ currentClassName = "map-circle-sui";
+ break;
+ case "鍞�":
+ currentClassName = "map-circle-tang";
+ break;
+ case "鏄�":
+ currentClassName = "map-circle-ming";
+ break;
+ }
}
+
let icon = L.divIcon({
html: `<div class='${currentClassName} ripple'></div>`,
iconSize: [80, 80],
diff --git a/src/static/initialize.css b/src/static/initialize.css
index 04fae22..f380711 100644
--- a/src/static/initialize.css
+++ b/src/static/initialize.css
@@ -58,7 +58,6 @@
.relative {
position: relative;
- /* z-index: 99999 !important; */
z-index: 1;
}
@@ -122,3 +121,9 @@
width: 100%;
height: 100%;
}
+
+.el-dialog__wrapper,
+.el-dialog {
+ position: relative;
+ z-index: 9999 !important;
+}
diff --git a/src/static/tool.js b/src/static/tool.js
index 5b82698..29d6ab0 100644
--- a/src/static/tool.js
+++ b/src/static/tool.js
@@ -3,4 +3,8 @@
} from "../utils/request/req1"
export const getImg = (path) => {
return baseUrl + "/picture/getImageByFilePath?filePath=" + path
+}
+
+export const getFile = (path) => {
+ return baseUrl + "/file/getFileByFilePath?filePath=" + path
}
\ No newline at end of file
diff --git a/src/uni_modules/luanqing-search/components/luanqing-search/luanqing-search.vue b/src/uni_modules/luanqing-search/components/luanqing-search/luanqing-search.vue
index e12b198..43a43f4 100644
--- a/src/uni_modules/luanqing-search/components/luanqing-search/luanqing-search.vue
+++ b/src/uni_modules/luanqing-search/components/luanqing-search/luanqing-search.vue
@@ -119,6 +119,7 @@
background-color: #244a7b;
border-radius: 30px;
margin: 2rpx;
+ cursor: pointer;
}
.searchBg {
width: 0.46rem;
--
Gitblit v1.9.1