From e33eb0eb98aa0a88d2b3a7163abf92e4e028fb31 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 17 五月 2024 21:09:39 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/detail.vue | 163 +++++++++++----
src/pages/territory/territory.vue | 48 ----
package-lock.json | 11 +
src/pages/userAgreement/userAgreement.vue | 4
src/pages/knowledgeBase/knowledgeBase.vue | 9
src/pages/characterMap/characterMap.vue | 15
yarn.lock | 13
package.json | 1
src/components/headNav/headNav.vue | 2
src/@/uni_modules/uni-scss/index.scss | 3
src/components/footer/footer.vue | 131 +++++++-----
src/pages/inherit/index.vue | 42 ++-
src/components/form/form.vue | 153 +++++++++-----
src/pages/academicGenres/detail.vue | 3
14 files changed, 359 insertions(+), 239 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 376a5ac..e01de36 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
"js-export-excel": "^1.1.4",
"leaflet": "^1.9.4",
"leaflet-tilelayer-wmts": "^1.0.0",
+ "leaflet.chinatmsproviders": "^3.0.6",
"querystring": "^0.2.1",
"sass": "^1.74.1",
"uview-ui": "^2.0.37",
@@ -14956,6 +14957,11 @@
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/leaflet-tilelayer-wmts/-/leaflet-tilelayer-wmts-1.0.0.tgz",
"integrity": "sha512-8VzMOXEJtC89aUKKBSNgsM9vYBp9G229tozqhevZS/hg9fyd0l1J6zcmwTOzQxnEXKtWesUHf1ylp0QHAd356Q=="
+ },
+ "node_modules/leaflet.chinatmsproviders": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmmirror.com/leaflet.chinatmsproviders/-/leaflet.chinatmsproviders-3.0.6.tgz",
+ "integrity": "sha512-B4UPSn2MT//RkFoyrVjwqQyfKuf4tSmMjJDKQ6nqwCCGgirYKRWHafSH9JmA88WoG5pkuMXBcKQhY32FobxU/g=="
},
"node_modules/leven": {
"version": "3.1.0",
@@ -34380,6 +34386,11 @@
"resolved": "https://registry.npmmirror.com/leaflet-tilelayer-wmts/-/leaflet-tilelayer-wmts-1.0.0.tgz",
"integrity": "sha512-8VzMOXEJtC89aUKKBSNgsM9vYBp9G229tozqhevZS/hg9fyd0l1J6zcmwTOzQxnEXKtWesUHf1ylp0QHAd356Q=="
},
+ "leaflet.chinatmsproviders": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmmirror.com/leaflet.chinatmsproviders/-/leaflet.chinatmsproviders-3.0.6.tgz",
+ "integrity": "sha512-B4UPSn2MT//RkFoyrVjwqQyfKuf4tSmMjJDKQ6nqwCCGgirYKRWHafSH9JmA88WoG5pkuMXBcKQhY32FobxU/g=="
+ },
"leven": {
"version": "3.1.0",
"resolved": "https://registry.npmmirror.com/leven/-/leven-3.1.0.tgz",
diff --git a/package.json b/package.json
index c013346..9175cda 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
"js-export-excel": "^1.1.4",
"leaflet": "^1.9.4",
"leaflet-tilelayer-wmts": "^1.0.0",
+ "leaflet.chinatmsproviders": "^3.0.6",
"querystring": "^0.2.1",
"sass": "^1.74.1",
"uview-ui": "^2.0.37",
diff --git a/src/@/uni_modules/uni-scss/index.scss b/src/@/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..132a0d6
--- /dev/null
+++ b/src/@/uni_modules/uni-scss/index.scss
@@ -0,0 +1,3 @@
+* {
+ font-family: "瀹嬩綋", "Microsoft YaHei", "寰蒋闆呴粦", "Arial", sans-serif !important;
+}
\ No newline at end of file
diff --git a/src/components/footer/footer.vue b/src/components/footer/footer.vue
index 6814f3c..07cbb53 100644
--- a/src/components/footer/footer.vue
+++ b/src/components/footer/footer.vue
@@ -1,65 +1,84 @@
<template>
- <view class="BottomColumn flex flex-center" :style="{'position':isLocation==true?'fixed':'','marginTop':isMarginTop+'rem'}">
- <view class="Bbar flex">
- <img style="display: block;margin-right: .22rem;width: .4rem;height: .4rem;" src="@/static/image/logo.png"
- alt="" srcset="" />
- <view class="font-family" style="color: #2C2C2C; font-size: .12rem;line-height: 1.5;">
- <view class="">
- 漏2017 涓浗涓尰绉戝闄腑鍖昏嵂淇℃伅鐮旂┒鎵�鐗堟潈鎵�鏈� 浜琁CP澶�********鍙�
- </view>
- <view class="">鍦板潃锛氬寳浜競涓滃煄鍖轰笢鐩撮棬鍐呭崡灏忚16鍙� 閭紪锛�100700 鐢佃瘽锛�8610-64089611 Email: tcmbase@126.com</view>
- </view>
- </view>
- </view>
+ <view
+ class="BottomColumn flex flex-center"
+ :style="{
+ position: isLocation == true ? 'fixed' : '',
+ marginTop: isMarginTop + 'rem',
+ }"
+ >
+ <view class="Bbar flex">
+ <img
+ style="
+ display: block;
+ margin-right: 0.22rem;
+ width: 0.4rem;
+ height: 0.4rem;
+ "
+ src="@/static/image/logo.png"
+ alt=""
+ srcset=""
+ />
+ <view
+ class="font-family"
+ style="color: #2c2c2c; font-size: 0.12rem; line-height: 1.5"
+ >
+ <view class="">
+ 漏2017 涓浗涓尰绉戝闄腑鍖昏嵂淇℃伅鐮旂┒鎵�鐗堟潈鎵�鏈� 浜琁CP澶�********鍙�
+ </view>
+ <view class=""
+ >鍦板潃锛氬寳浜競涓滃煄鍖轰笢鐩撮棬鍐呭崡灏忚16鍙� 閭紪锛�100700 鐢佃瘽锛�8610-64089611
+ Email: tcmtczy@mail.cintcm.ac.cn</view
+ >
+ </view>
+ </view>
+ </view>
</template>
<script>
- export default {
- name: "footer",
- props: {
- isLocation: {
- type: Boolean,
- default () {
- return true
- }
- },
- isMarginTop: {
- type: Number,
- default () {
- return 0
- }
- },
- },
- data() {
- return {
-
- };
- }
- }
+export default {
+ name: "footer",
+ props: {
+ isLocation: {
+ type: Boolean,
+ default() {
+ return true;
+ },
+ },
+ isMarginTop: {
+ type: Number,
+ default() {
+ return 0;
+ },
+ },
+ },
+ data() {
+ return {};
+ },
+};
</script>
<style scoped>
- .BottomColumn {
- /* position: sticky;
+.BottomColumn {
+ /* position: sticky;
top: 0; */
- /* position: fixed; */
- /* left: 0px; */
- bottom: 0px;
- left: 0;
- z-index: 999999999999999999999999999999999999999999;
- padding: .19rem 0;
- width: 100%;
- background-color: #e6eff8;
- font-size: 10px;
- color: #000;
+ /* position: fixed; */
+ /* left: 0px; */
+ bottom: 0px;
+ left: 0;
+ z-index: 999999999999999999999999999999999999999999;
+ padding: 0.19rem 0;
+ width: 100%;
+ background-color: #e6eff8;
+ font-size: 10px;
+ color: #000;
- /* margin-top: 1rem; */
- .Bbar {
- img {
- width: 60rpx;
- height: 60rpx;
- border-radius: 50%;
- }
- }
- }
-</style>
\ No newline at end of file
+ /* margin-top: 1rem; */
+ .Bbar {
+ img {
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 50%;
+ }
+ }
+}
+</style>
diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index 19805f9..12fdc49 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -1,67 +1,102 @@
<template class="">
- <div>
- <el-form size="mini" :inline="true" style="padding: 30rpx 30rpx 10rpx 30rpx" :model="from"
- class="row demo-form-inline col-xs-12">
- <el-row :gutter="10">
- <el-form-item style="width: 30%;" v-for="(item, i) in from.from" :key="i" :label="item.label">
- <el-input v-if="item.type === 'input'" v-model="item.value" :placeholder="item.label"></el-input>
- <el-input v-if="item.type === 'number'" min="1" type="number" v-model.number="item.value"
- :placeholder="item.label"></el-input>
- <el-select v-else-if="item.type === 'select'" v-model="item.value" :placeholder="item.label">
- <el-option v-for="(option, optionIndex) in item.options" :key="optionIndex"
- :label="option.label" :value="option.value"></el-option>
- </el-select>
- </el-form-item>
- <!-- 鍏朵粬琛ㄥ崟椤圭渷鐣� -->
- <!-- <el-form-item style="display:block; "> -->
- <view class="flex flex-center Formbtn">
-
- <el-button style="background-color: #244A7B;color: #fff;" size="mini"
- @click="handleSubmit">鎻愪氦</el-button>
- <el-button type="info" plain size="mini" @click="handleReset">閲嶇疆</el-button>
- </view>
- <!-- </el-form-item> -->
- </el-row>
- </el-form>
- </div>
+ <div>
+ <el-form
+ size="mini"
+ :inline="true"
+ style="padding: 30rpx 30rpx 10rpx 30rpx"
+ :model="from"
+ class="row demo-form-inline col-xs-12"
+ >
+ <el-row :gutter="10">
+ <el-form-item
+ style="width: 30%"
+ v-for="(item, i) in from.from"
+ :key="i"
+ :label="item.label"
+ >
+ <el-input
+ v-if="item.type === 'input'"
+ v-model="item.value"
+ :placeholder="item.label"
+ ></el-input>
+ <el-input
+ v-if="item.type === 'number'"
+ min="1"
+ type="number"
+ v-model.number="item.value"
+ :placeholder="item.label"
+ ></el-input>
+ <el-select
+ v-else-if="item.type === 'select'"
+ v-model="item.value"
+ :placeholder="item.label"
+ >
+ <el-option
+ v-for="(option, optionIndex) in item.options"
+ :key="optionIndex"
+ :label="option.label"
+ :value="option.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鍏朵粬琛ㄥ崟椤圭渷鐣� -->
+ <!-- <el-form-item style="display:block; "> -->
+ <view class="flex flex-center Formbtn">
+ <el-button
+ style="background-color: #244a7b; color: #fff"
+ size="mini"
+ @click="handleSubmit"
+ >鎻愪氦</el-button
+ >
+ <el-button type="info" plain size="mini" @click="handleReset"
+ >閲嶇疆</el-button
+ >
+ </view>
+ <!-- </el-form-item> -->
+ </el-row>
+ </el-form>
+ </div>
</template>
<script>
- export default {
- props: ['from'],
- methods: {
- handleSubmit() {
- this.$message({
- message: '鏌ヨ鎴愬姛',
- type: 'success'
- })
- const result = this.from.from.reduce((obj, item) => {
- obj[item.name] = item.value
- return obj
- }, {})
- // 鎻愪氦閫昏緫
- this.$emit('submit', result) // 鍙戦�� submit 浜嬩欢锛屽苟灏嗚〃鍗曟暟鎹綔涓哄弬鏁颁紶閫掔粰鐖剁粍浠�
- },
- handleReset() {
- this.from.from.forEach(item => {
- item.value = ''
- })
- // 閲嶇疆閫昏緫
- // this.$emit('reset') // 鍙戦�� reset 浜嬩欢缁欑埗缁勪欢
- }
- }
- }
+export default {
+ props: ["from"],
+ mounted(){
+ console.log(this.from,"from");
+ },
+ methods: {
+ handleSubmit() {
+ this.$message({
+ message: "鏌ヨ鎴愬姛",
+ type: "success",
+ });
+ const result = this.from.from.reduce((obj, item) => {
+ obj[item.name] = item.value;
+ return obj;
+ }, {});
+ // 鎻愪氦閫昏緫
+ this.$emit("submit", result); // 鍙戦�� submit 浜嬩欢锛屽苟灏嗚〃鍗曟暟鎹綔涓哄弬鏁颁紶閫掔粰鐖剁粍浠�
+ },
+ handleReset() {
+ this.from.from.forEach((item) => {
+ item.value = "";
+ });
+ // 閲嶇疆閫昏緫
+ this.$emit('reset') // 鍙戦�� reset 浜嬩欢缁欑埗缁勪欢
+ },
+ },
+};
</script>
<style scoped>
- .el-form--inline .el-form-item {
- margin-right: 0;
- }
+.el-form--inline .el-form-item {
+ margin-right: 0;
+}
- ::v-deep .el-form-item__content {
- width: 80%;
- }
+::v-deep .el-form-item__content {
+ width: 80%;
+}
- ::v-deep .el-form-item__content div {
- width: 100%;
- }
-</style>
\ No newline at end of file
+::v-deep .el-form-item__content div {
+ width: 100%;
+}
+</style>
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 3a3f61b..958c87d 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -9,6 +9,7 @@
margin-right: 3rem;
cursor: pointer;
"
+ title="瀵艰埅鑿滃崟"
@click="menuNav = !menuNav"
><img
style="width: 100%; height: 100%"
@@ -22,7 +23,6 @@
style="
margin-left: 0.19rem;
font-size: 0.24rem;
- font-family: cursive;
font-weight: 900;
"
>
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 16e896e..1be251f 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -169,6 +169,7 @@
methods: {
getData() {
getIntroduction(Number(this.idIndex)).then((res) => {
+ console.log(res,"rrrr");
this.detailData = {
name: res.object.school_NAME[0].content,
icon:
@@ -247,7 +248,7 @@
})
: []
};
- console.log(this.detailData);
+ console.log(this.detailData,"detailDatadetailData");
});
},
goBack() {
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index aa2dc67..4226957 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -11,7 +11,6 @@
}}</view>
<ul class="flex" style="line-height: 1.2; margin: 0.15rem 0">
<li
- v-for="item in 4"
style="
background-color: #fff;
padding: 0 0.08rem;
@@ -22,7 +21,46 @@
margin-right: 0.15rem;
"
>
- VSDS
+ RDF
+ </li>
+ <li
+ style="
+ background-color: #fff;
+ padding: 0 0.08rem;
+ border: 0.01rem solid #000;
+ border-radius: 0.1rem;
+ font-size: 0.12rem;
+ text-align: center;
+ margin-right: 0.15rem;
+ "
+ >
+ NT
+ </li>
+ <li
+ style="
+ background-color: #fff;
+ padding: 0 0.08rem;
+ border: 0.01rem solid #000;
+ border-radius: 0.1rem;
+ font-size: 0.12rem;
+ text-align: center;
+ margin-right: 0.15rem;
+ "
+ >
+ XML
+ </li>
+ <li
+ style="
+ background-color: #fff;
+ padding: 0 0.08rem;
+ border: 0.01rem solid #000;
+ border-radius: 0.1rem;
+ font-size: 0.12rem;
+ text-align: center;
+ margin-right: 0.15rem;
+ "
+ >
+ JSON
</li>
</ul>
<view
@@ -58,9 +96,9 @@
</view>
<view style="width: 5%"></view>
</view>
- <el-row style="padding: 0 1.2rem 0; padding-top: 0.24rem">
+ <div style="padding: 0 1.2rem 0; padding-top: 0.24rem;display: flex;">
<!-- 宸︿晶 -->
- <el-col
+ <div
:span="5"
class="BoxLeft"
style="padding-right: 0.2rem; width: 2.8rem"
@@ -148,9 +186,9 @@
</ul>
</el-card>
</div>
- </el-col>
+ </div>
<!-- 鍙充晶 -->
- <el-col :span="18" class="BoxRight">
+ <div :span="18" class="BoxRight">
<div class="grid-content bg-purple-dark" style="width: 100%">
<el-card class="box-card" style="padding: 0">
<div
@@ -222,7 +260,7 @@
<el-image
v-for="item in imageList"
:key="item"
- style="width: 2.05rem; height: 1.4rem"
+ style="width: 2.05rem; height: 2.4rem"
:src="item"
fit="fill"
></el-image>
@@ -237,30 +275,21 @@
padding-bottom: 0.1rem;
"
>
- <span>鐩稿叧闄勮〃/鍥惧儚</span>
+ <span>鐜颁唬鐮旂┒</span>
</div>
<ul class="font-family" style="font-size: 0.13rem; line-height: 2">
- <li>
- [1|鍒樼倻,璋㈣搲,寮犵,绛�.鍚戜汉鏂囩爺绌剁殑鍥藉鏁版嵁鍩虹璁炬柦寤鸿[J|.涓浗鍥句功棣嗗鎶�,2016,42(5):29-39.
- </li>
- <li>
- [2|鍛ㄦ櫒.鍥介檯鏁板瓧浜烘枃鐮旂┒鐗瑰緛涓庣煡璇嗙粨鏋剕J鍥句功棣嗚鍧�2017.37(4):1-8.
- </li>
- <li>
- [3]鍌呭痉鍗�,浜庣繝鑹�,鏉庢槬鍗�,鍏充簬鍒涘缓鈥�20
- 涓栫邯涓浗浜虹墿浼犺璧勬枡鍏ㄦ枃鏁版嵁搴撴不鐨勬瀯鎯砙宸�,涓浗鑰呭紩,2009,714):24-26.
- </li>
- <li>
- [4|浜庣繝鑹�,鍌呭痉鍗�,鏉庢槬鍗�,鍏充簬鈥�20涓栫邯涓浗浜虹墿浼犺璧勬枡鍏ㄦ枃鏁版嵁搴撴不鐨勮繘灞曚笌鍥版儜[J1.涓浗甯稿紩,2012.10111:20-22
- </li>
- <li>
- [5]璐炬銆傘�婃箹鍗楄繎浠ｄ汉鐗╂暟鎹巼銆嬭祫婧愭敹褰曡寖鍥寸爺绌秥J娌冲崡鍥句功棣嗗鍒�,2015,35(7):126.127.140.
+ <li
+ v-for="(item, index) in personResearchList"
+ :key="index"
+ @click="toLink(item)"
+ >
+ {{ "[" + Number(index + 1) + "]" + item.achievementName }}
</li>
</ul>
</el-card>
</div>
- </el-col>
- </el-row>
+ </div>
+ </div>
<!-- 杩斿洖椤堕儴 -->
<el-col style="position: absolute; bottom: 1rem; left: 1.2rem">
@@ -274,9 +303,13 @@
<!-- 涓汉灏忎紶 -->
<el-dialog :visible.sync="isProfile" :modal-append-to-body="false">
<view class="ProfileNav flex flex-center"> 涓汉灏忎紶 </view>
- <view style="padding: 0.44rem 0.3rem; min-height: 7.32rem">
+ <view
+ style="padding: 0.44rem 0.3rem; min-height: 7.32rem"
+ v-if="biogData.length > 0"
+ >
<view
- v-for="item in biogData"
+ v-for="(item, index) in biogData"
+ :key="index"
style="
margin-bottom: 0.2rem;
background-color: #f0f0f0;
@@ -297,6 +330,9 @@
</view>
</view>
</view>
+ <div v-else>
+ <el-empty description="鏆傛棤鏁版嵁"></el-empty>
+ </div>
</el-dialog>
</view>
</template>
@@ -344,6 +380,10 @@
{
prop: "a",
label: "姝ｄ功鍚�",
+ },
+ {
+ prop: "e",
+ label: "浣滆��",
},
{
prop: "b",
@@ -401,6 +441,7 @@
tableData5: [],
nodes: [],
relationships: [],
+ personResearchList: [],
};
},
onLoad(options) {
@@ -442,6 +483,9 @@
type: "success",
});
},
+ toLink(item) {
+ window.open(item.url);
+ },
getData() {
// 鍩烘湰淇℃伅
getPersonInfo({
@@ -466,9 +510,31 @@
// 鍏崇郴鍥捐氨
this.getMappingData(this.detailInfo.NAME);
});
-
+ //鐜颁唬鐮旂┒
+ getPersonInfo({
+ id: this.detailId,
+ type: "PERSON_RESEARCH",
+ }).then((res) => {
+ console.log(res, "123123123");
+ this.personResearchList = res.object.personResearchList;
+ });
+ getPersonInfo({
+ id: this.detailId,
+ type: "PERSON_RELATIONS",
+ }).then((res) => {
+ console.log(res, "PERSON_RELATIONS");
+ this.personRelationList = res.object.personRelationList;
+ if (this.personRelationList.length) {
+ this.tableData4 = this.personRelationList.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
+ });
getWebBasic({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
console.log(res, "resres");
const obj = res.object;
@@ -479,39 +545,39 @@
list: [
{
name: "鍒悕",
- value: obj.alias || "-"
+ value: obj.alias || "-",
},
{
name: "瀛�",
- value: obj.zi || "-"
+ value: obj.zi || "-",
},
{
name: "鍙�",
- value: obj.hao || "-"
+ value: obj.hao || "-",
},
{
name: "鎵�澶勬椂鏈�",
- value: obj.dynastyDesc || "-"
+ value: obj.dynastyDesc || "-",
},
{
name: "姘戞棌",
- value: obj.ethnic || "-"
- }
- ]
+ value: obj.ethnic || "-",
+ },
+ ],
},
{
list: [
{
name: "绫嶈疮",
- value: obj.native || "-"
+ value: obj.native || "-",
},
{
name: "鎬у埆",
- value: obj.gender || "-"
+ value: obj.gender || "-",
},
{
name: "鑱屽畼",
- value: obj.official || "-"
+ value: obj.official || "-",
},
{
name: "娴佹淳",
@@ -521,14 +587,14 @@
sres.object.school_NAME &&
sres.object.school_NAME.length
? sres.object.school_NAME[0].content
- : "-"
+ : "-",
},
{
name: "瀛︽湳鐗圭偣",
- value: obj.features || "-"
- }
- ]
- }
+ value: obj.features || "-",
+ },
+ ],
+ },
];
});
});
@@ -583,6 +649,7 @@
b: item.dynasty,
c: item.writeWay,
d: item.classify,
+ e: this.detailInfo.NAME,
};
});
});
@@ -642,7 +709,7 @@
const data = res.list.map((item) => {
return {
name: item.activityName,
- value: [item.xcoord, item.ycoord]
+ value: [item.xcoord, item.ycoord],
};
});
// 鏃剁┖鍦板浘
@@ -1086,6 +1153,12 @@
.BoxLeft ::v-deep.el-card__body {
padding: 0.1rem 0.11rem !important;
}
+.BoxLeft{
+ width: 30%;
+}
+.BoxRight{
+ width: 70%;
+}
::v-deep .el-tabs__content {
line-height: 1;
diff --git a/src/pages/characterMap/characterMap.vue b/src/pages/characterMap/characterMap.vue
index e9a18d3..8d04186 100644
--- a/src/pages/characterMap/characterMap.vue
+++ b/src/pages/characterMap/characterMap.vue
@@ -123,15 +123,14 @@
// "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
// ).addTo(map);
- L.tileLayer(
- "https://t{s}.tianditu.gov.cn/vec_c/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=c&TileMatrix={z}&TileRow={y}&TileCol={x}&style=default&format=tiles&tk=76bc34ead7e30e663a4eded8aeaf5860",
- {
+
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Map", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- attribution: "Map data © 2012-2019, TianDiTu",
- id: "tdtAnnoLayer",
- accessToken: "your.mapbox.public.access.token",
- }
- ).addTo(map);
+ minZoom: 5,
+ })
+ .addTo(map);
let DefaultIcon1 = L.icon({
iconUrl: this.icoName,
iconSize: [24, 41], // 鍥炬爣鐨勫ぇ灏� 銆愬��1锛屽��2銆� 涓哄叿浣撲綘鑷畾涔夊浘鏍囩殑灏哄锛屾瘮濡傛垜鍥炬爣灏哄鏄�32脳52锛岃〃绀鸿鍥炬爣锛氬搴�32鍍忕礌锛岄珮搴︼細52鍍忕礌锛岄偅涔堝��1:灏辨槸32锛屽��2锛氬氨鏄�52
diff --git a/src/pages/inherit/index.vue b/src/pages/inherit/index.vue
index 88a8415..2da7bd0 100644
--- a/src/pages/inherit/index.vue
+++ b/src/pages/inherit/index.vue
@@ -71,7 +71,10 @@
</div>
<div class="contentBox">
<!-- echarts鍥� -->
- <div class="barChart" ref="barChart"></div>
+ <div v-if="nodeData.length > 0" class="barChart" ref="barChart"></div>
+ <div v-else>
+ <el-empty description="鏆傛棤鏁版嵁"></el-empty>
+ </div>
<div
class="toolBox"
v-if="showTool"
@@ -88,7 +91,7 @@
import * as echarts from "echarts";
import {
inheritMedicalSataStatistics,
- inheritMedicalList
+ inheritMedicalList,
} from "@/api/index.js";
export default {
data() {
@@ -96,7 +99,7 @@
// 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
keyword: "",
idIndex: 0,
- activeId: "",
+ activeId: 28,
conditionId: "",
searchType: "KEYWORD",
dynasty: [],
@@ -104,33 +107,36 @@
showTool: false,
toolTop: 0,
toolLeft: 0,
- toolInfo: {}
+ toolInfo: {},
};
},
onLoad(options) {
this.idIndex = options.id;
console.log("optionsoptionsoptions", options.id);
- getDynasty()
+ // getDynasty();
},
mounted() {
this.getStatistics();
- this.getData();
- this.getDynasty()
-
+ // this.getDynasty();
},
methods: {
getStatistics() {
inheritMedicalSataStatistics().then((res) => {
this.dynasty = res.object;
+ const defaultDynasty = this.dynasty.find((f) => f.dynasty == "瀹�");
+ this.activeId = defaultDynasty.dynastyId;
+ this.searchType = "DYNASTY";
+ this.getData();
});
},
getData() {
this.nodeData = [];
+
inheritMedicalList({
keywords: this.keyword,
dynastyId: this.activeId,
searchType: this.searchType,
- path: this.conditionId
+ path: this.conditionId,
}).then((res) => {
console.log(res);
for (let i = 0; i < res.object.nodeList.length; i++) {
@@ -143,12 +149,12 @@
itemStyle: {
color: "#F8E2D7",
borderColor: "#F3AA78",
- borderWidth: "3"
- }
+ borderWidth: "3",
+ },
});
}
}
- console.log(this.nodeData);
+ console.log(this.nodeData, "nodeData");
// 鍒濆鍖� echarts
this.initBarChart();
});
@@ -254,7 +260,7 @@
this.toolLeft = params.event.offsetX + "px";
this.toolInfo = {
id: params.data.identifier,
- name: encodeURIComponent(params.data.name)
+ name: encodeURIComponent(params.data.name),
};
} else {
this.showTool = false;
@@ -265,7 +271,7 @@
switch (type) {
case 1:
uni.navigateTo({
- url: "/pages/character/detail?id=" + this.toolInfo.id
+ url: "/pages/character/detail?id=" + this.toolInfo.id,
});
break;
case 2:
@@ -276,7 +282,7 @@
"&id=" +
this.toolInfo.id +
"&name=" +
- this.toolInfo.name
+ this.toolInfo.name,
});
break;
case 3:
@@ -287,7 +293,7 @@
"&id=" +
this.toolInfo.id +
"&name=" +
- this.toolInfo.name
+ this.toolInfo.name,
});
break;
}
@@ -327,8 +333,8 @@
this.keyword = "";
}
this.getData();
- }
- }
+ },
+ },
};
</script>
<style scoped>
diff --git a/src/pages/knowledgeBase/knowledgeBase.vue b/src/pages/knowledgeBase/knowledgeBase.vue
index 970b559..4562450 100644
--- a/src/pages/knowledgeBase/knowledgeBase.vue
+++ b/src/pages/knowledgeBase/knowledgeBase.vue
@@ -47,7 +47,7 @@
class="advancedSeaTrue1"
>
<h3>楂樼骇鎼滅储</h3>
- <MyForm @submit="onSubmit" :from="from" />
+ <MyForm @submit="onSubmit" @reset="resetForm" :from="from" />
</view>
</view>
<uni-row
@@ -398,6 +398,10 @@
this.getStatistics();
},
methods: {
+ //閲嶇疆鎼滅储缁撴灉
+ resetForm() {
+ this.tableData = [];
+ },
// ExportJsonExcel瀹炰緥
Ture() {
// 鍒涘缓ExportJsonExcel瀹炰緥瀵硅薄
@@ -410,7 +414,7 @@
const dataList = this.tableData;
console.log(this.keywords, "keywords");
let Obj = {
- keywords: '妤�', //鎼滅储妗嗘绱�
+ keywords: "妤�", //鎼滅储妗嗘绱�
// keywords: this.keywords, //鎼滅储妗嗘绱�
name: this.submitData.name, //濮撳悕
alias: this.submitData.alias, //鍒悕
@@ -588,7 +592,6 @@
var box1Height = document.querySelector(".fbox").offsetHeight;
// let box2Height= document.querySelector('.fbox1').style.height = box1Height + 'px';
let box2Height = document.querySelector(".fbox1").offsetHeight;
- console.log(box1Height, box2Height);
if (box1Height <= box2Height) {
document.querySelector(".fbox1").style.height = box1Height + "px";
}
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 8e94f77..5337057 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -177,6 +177,7 @@
import L from "leaflet";
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
+import "leaflet.chinatmsproviders";
export default {
data() {
return {
@@ -360,55 +361,18 @@
methods: {
//鍒濆鍖栧湴鍥�
initMap() {
- // var map = L.map("map", {
-
- // center: [34.26, 108.96],
-
- // zoom: 4,
-
- // maxZoom: 18, //鏈�澶х缉鏀惧眰绾�
-
- // minZoom: 1, //鏈�灏忕缉鏀惧眰绾�
-
- // tileSize: 256, //鍒囩墖澶у皬
-
- // attributionControl: false, // 绉婚櫎鍙充笅瑙抣eaflet鏍囪瘑
-
- // zoomControl: false, //绂佺敤 + - 鎸夐挳
-
- // maxBounds: bounds, //璁剧疆杈圭晫
-
- // preferCanvas: true, //榛樿浣跨敤svg娓叉煋锛岃缃甤anvas娓叉煋
-
- // doubleClickZoom: false, //鍏抽棴鍙屽嚮缂╂斁
-
- // // dragging: false, //榧犳爣绉诲姩浜嬩欢
- // });
var map = L.map("map", {
attributionControl: false,
preferCanvas: true,
withPopup: L.latLng(34.261, 108.96),
}).setView([39.91667, 116.41667], 4);
- // L.tileLayer(
- // "http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}"
- // ).addTo(map);
- L.tileLayer(
- "http://t0.tianditu.gov.cn/vec_c/wmts?tk=36ef7d20eba483627b043f0909c493ee"
- ).addTo(map);
-
L.tileLayer
- .wmts(
- "http://t{s}.tianditu.gov.cn/vec_c/wmts?tk=36ef7d20eba483627b043f0909c493ee",
- {
- layer: "vec", // 鐭㈤噺鍥惧眰
- style: "default",
- tilematrixset: "c", // 缂╂斁绾у埆
- format: "tiles",
- attribution: "Map Data © 2023 Tencent",
- subdomains: ["0", "1", "2", "3", "4", "5", "6", "7"],
- }
- )
+ .chinaProvider("TianDiTu.Normal.Map", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
+ // maxZoom: 18,
+ // minZoom: 5,
+ })
.addTo(map);
let DefaultIcon1 = L.icon({
diff --git a/src/pages/userAgreement/userAgreement.vue b/src/pages/userAgreement/userAgreement.vue
index acd6c7e..5e8ed0f 100644
--- a/src/pages/userAgreement/userAgreement.vue
+++ b/src/pages/userAgreement/userAgreement.vue
@@ -63,7 +63,7 @@
2.濡傚弻鏂瑰氨鍗忚鍐呭鎴栧叾鎵ц鍙戠敓浠讳綍浜夎锛屽弻鏂瑰簲灏介噺鍙嬪ソ鍗忓晢瑙ｅ喅锛屽崗鍟嗕笉鎴愭椂锛岀敤鎴峰拰鏈煡璇嗗簱涓�鑷村悓鎰忔彁浜ゆ湰鐭ヨ瘑搴撹繍钀ュ晢鎵�鍦ㄥ湴鏈夌杈栨潈鐨勬硶闄㈢杈栥��
涔濄�佽仈绯绘柟寮�
鑱旂郴鐢佃瘽锛�010-64089611
- 鐢靛瓙閭锛歵cmbase@126.com
+ 鐢靛瓙閭锛歵cmtczy@mail.cintcm.ac.cn
@@ -140,7 +140,7 @@
鍏�佸浣曡仈绯绘垜浠�
濡傛偍瀵规湰鏀跨瓥鏈変换浣曠枒闂�佸缓璁垨鎰忚鐨勶紝鎴栨偍鍙戠幇鎮ㄧ殑涓汉淇℃伅鍙兘琚硠闇茬殑锛屾偍鍙�氳繃鑱旂郴鐢佃瘽鎴栫數瀛愰偖绠辫仈绯绘垜浠��
鑱旂郴鐢佃瘽锛�010-64089611
- 鐢靛瓙閭锛歵cmbase@126.com
+ 鐢靛瓙閭锛歵cmtczy@mail.cintcm.ac.cn
鏈斂绛栫殑鐢熸晥銆佸饱琛屻�佽В閲婂強浜夎鐨勮В鍐筹紝鎮ㄥ洜浣跨敤鎴戜滑鐨勬湇鍔¤�屼骇鐢熸垨涓庢湰鏀跨瓥鐩稿叧鐨勪竴鍒囦簤璁�佹潈鍒╀富寮犳垨鍏朵粬浜嬮」锛屽潎閫傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰嬶紙娓境鍙�
鍦板尯闄ゅ锛夈�傛偍涓庢垜浠彂鐢熺殑涓�鍒囦簤璁紝搴斿弸濂藉崗鍟嗭紝濡傚崗鍟嗕笉鎴愮殑锛屽簲鎻愪氦鎵�鍦ㄥ湴浜烘皯娉曢櫌绠¤緰銆�
璇锋偍鍐嶆纭鎮ㄥ凡鍏ㄩ儴闃呰骞跺厖鍒嗙悊瑙ｄ笂杩版潯娆俱��
diff --git a/yarn.lock b/yarn.lock
index ea57f5a..c5a3701 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7800,10 +7800,15 @@
resolved "https://registry.npmmirror.com/leaflet-tilelayer-wmts/-/leaflet-tilelayer-wmts-1.0.0.tgz"
integrity sha512-8VzMOXEJtC89aUKKBSNgsM9vYBp9G229tozqhevZS/hg9fyd0l1J6zcmwTOzQxnEXKtWesUHf1ylp0QHAd356Q==
-leaflet@^1.9.4:
- version "1.9.4"
- resolved "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.4.tgz"
- integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+"leaflet.chinatmsproviders@^3.0.6":
+ "integrity" "sha512-B4UPSn2MT//RkFoyrVjwqQyfKuf4tSmMjJDKQ6nqwCCGgirYKRWHafSH9JmA88WoG5pkuMXBcKQhY32FobxU/g=="
+ "resolved" "https://registry.npmmirror.com/leaflet.chinatmsproviders/-/leaflet.chinatmsproviders-3.0.6.tgz"
+ "version" "3.0.6"
+
+"leaflet@^1.9.4":
+ "integrity" "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA=="
+ "resolved" "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.4.tgz"
+ "version" "1.9.4"
leven@^3.1.0:
version "3.1.0"
--
Gitblit v1.9.1