From 4469428bfec368ea9c735303ff9ad4ed25f5b762 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 16 五月 2024 11:44:35 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/components/advancedSearch/advancedSearch.vue | 9 ++
src/pages/character/detail.vue | 124 +++++++++++++++++-------------
src/pages/character/index.vue | 10 ++
src/api/index.js | 8 ++
src/utils/request/req1.js | 2
package.json | 4
src/pages/inherit/list.vue | 30 ++++---
.env | 4 +
.env.prod | 4 +
README.md | 2
10 files changed, 122 insertions(+), 75 deletions(-)
diff --git a/.env b/.env
new file mode 100644
index 0000000..631b46b
--- /dev/null
+++ b/.env
@@ -0,0 +1,4 @@
+NODE_ENV = 'development'
+VUE_APP_ENV = 'dev'
+VUE_APP_MOCK = 'false'
+VUE_APP_API_URL = 'http://icmm.test.xyinde.com/api'
diff --git a/.env.prod b/.env.prod
new file mode 100644
index 0000000..048895c
--- /dev/null
+++ b/.env.prod
@@ -0,0 +1,4 @@
+NODE_ENV = 'production'
+VUE_APP_ENV = 'prod'
+VUE_APP_MOCK = 'false'
+VUE_APP_API_URL = '/api'
diff --git a/README.md b/README.md
index 19ecda7..88c36fb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# my-project
+# icmm
## Project setup
```
diff --git a/package.json b/package.json
index 36aefac..c013346 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,12 @@
{
- "name": "my-project",
+ "name": "icmm",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "npm run dev:h5",
"build": "npm run build:h5",
+ "build:test": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+ "build:prod": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service --mode prod uni-build",
"build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
"build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
"build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
diff --git a/src/api/index.js b/src/api/index.js
index cfdaad6..74e0d05 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -140,6 +140,14 @@
params: Obj
});
};
+export const getWebBasic = (Obj) => {
+ return req1({
+ url: "/person/webBasic",
+ method: "post",
+ params: Obj
+ });
+};
+
// 鍖诲浜虹墿鐭ヨ瘑搴� 鍩虹妫�绱�
export const getFuzzySearch = (requestData) => {
return req1({
diff --git a/src/components/advancedSearch/advancedSearch.vue b/src/components/advancedSearch/advancedSearch.vue
index 666ae59..9941fee 100644
--- a/src/components/advancedSearch/advancedSearch.vue
+++ b/src/components/advancedSearch/advancedSearch.vue
@@ -46,6 +46,9 @@
return true;
}
},
+ advancedSearchBack: {
+ type: Function
+ },
isSearchTrue: {
type: Boolean,
default() {
@@ -141,7 +144,11 @@
},
methods: {
isAvancedClick() {
- this.isAdvancedSearch = !this.isAdvancedSearch;
+ if (this.advancedSearchBack) {
+ this.advancedSearchBack();
+ } else {
+ this.isAdvancedSearch = !this.isAdvancedSearch;
+ }
// this.$nextTick(() => {
// var box1Height = document.querySelector('.fbox').offsetHeight;
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 66a93f5..c2a8b37 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -309,6 +309,8 @@
import {
getFuzzySearch,
getPersonInfo,
+ getWebBasic,
+ getIntroduction,
getSource,
getPersonImages,
getPersonBiog,
@@ -461,63 +463,75 @@
}
}
console.log(obj);
- this.tableArr = [
- {
- list: [
- {
- name: "鍒悕",
- value: obj.WEAK_NAME || "-",
- },
- {
- name: "瀛�",
- value: obj.ALIAS || "-",
- },
- {
- name: "鍙�",
- value: obj.ALIAS || "-",
- },
- {
- name: "鎵�澶勬椂鏈�",
- value: obj.PERIOD || "-",
- },
- {
- name: "姘戞棌",
- value: obj.ETHNIC || "-",
- },
- ],
- },
- {
- list: [
- {
- name: "绫嶈疮",
- value: obj.NATIVE_PLACE || "-",
- },
- {
- name: "鎬у埆",
- value: obj.GENDER
- ? obj.GENDER == "UNKNOWN"
- ? "鏈煡"
- : "-"
- : "-",
- },
- {
- name: "鑱屽畼",
- value: obj.MEDICAL_BRANCH || "-",
- },
- {
- name: "娴佹淳",
- value: obj.MEDICAL_BRANCH || "-",
- },
- {
- name: "瀛︽湳鐗圭偣",
- value: obj.MEDICAL_EXPERTISE || "-",
- },
- ],
- },
- ];
this.detailInfo = obj;
// 鍏崇郴鍥捐氨
this.getMappingData(this.detailInfo.NAME);
+ });
+
+ getWebBasic({
+ personId: this.detailId
+ }).then((res) => {
+ console.log(res, "resres");
+ const obj = res.object;
+ getIntroduction(Number(obj.school)).then((sres) => {
+ console.log(sres, "sres");
+ this.tableArr = [
+ {
+ list: [
+ {
+ name: "鍒悕",
+ value: obj.alias || "-"
+ },
+ {
+ name: "瀛�",
+ value: obj.zi || "-"
+ },
+ {
+ name: "鍙�",
+ value: obj.hao || "-"
+ },
+ {
+ name: "鎵�澶勬椂鏈�",
+ value: obj.dynastyDesc || "-"
+ },
+ {
+ name: "姘戞棌",
+ value: obj.ethnic || "-"
+ }
+ ]
+ },
+ {
+ list: [
+ {
+ name: "绫嶈疮",
+ value: obj.native || "-"
+ },
+ {
+ name: "鎬у埆",
+ value: obj.gender || "-"
+ },
+ {
+ name: "鑱屽畼",
+ value: obj.official || "-"
+ },
+ {
+ name: "娴佹淳",
+ value:
+ sres &&
+ sres.object &&
+ sres.object.school_NAME &&
+ sres.object.school_NAME.length
+ ? sres.object.school_NAME[0].content
+ : "-"
+ },
+ {
+ name: "瀛︽湳鐗圭偣",
+ value: obj.features || "-"
+ }
+ ]
+ }
+ ];
+ });
});
// 娲诲姩骞磋氨
getPersonInfo({
@@ -629,7 +643,7 @@
const data = res.list.map((item) => {
return {
name: item.activityName,
- value: [item.xcoord, item.ycoord],
+ value: [item.xcoord, item.ycoord]
};
});
// 鏃剁┖鍦板浘
diff --git a/src/pages/character/index.vue b/src/pages/character/index.vue
index 3d38805..b2ce438 100644
--- a/src/pages/character/index.vue
+++ b/src/pages/character/index.vue
@@ -9,6 +9,7 @@
:from="From"
placehold="璇疯緭鍏ュ叧閿瓧"
:keyword="searchKey"
+ :advancedSearchBack="advancedSearchBack"
/>
</view>
<!-- 鐑棬鎼滅储 -->
@@ -388,7 +389,7 @@
}
};
});
-
+
var option;
option = {
title: {
@@ -473,7 +474,12 @@
page: 1,
pageSize: 100
}).then((res) => {
- console.log(res,"res");
+ console.log(res, "res");
+ });
+ },
+ advancedSearchBack() {
+ uni.navigateTo({
+ url: "/pages/knowledgeBase/knowledgeBase"
});
},
// 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
diff --git a/src/pages/inherit/list.vue b/src/pages/inherit/list.vue
index 3d759f3..f8e7faa 100644
--- a/src/pages/inherit/list.vue
+++ b/src/pages/inherit/list.vue
@@ -56,30 +56,26 @@
<!-- echarts鍥� -->
<div v-if="showType == 1" class="barChart" id="barChart"></div>
<view v-if="showType == 2" class="cultureBox">
- <view class="cultureItem">
+ <view class="cultureItem" v-if="culture1">
<view class="imgBox">
<img src="@/static/image/inherit/icon1.png" alt="" />
</view>
- <p>
- 钑欏睍涓佷笐鍚岄噷鏃ュ博棰濆簭鍏堣�冩湀姹犵縼钁椼�婂洓褰吀鏄庛�嬪叓鍗凤紝鐨嗙簿鎸囧ゥ瀹わ紝鑼傜妧鏈兘鐤�狅紝鐝嶅洜鎾补鎯宠彍锛屽兊鎾版鍞愶紝浠ヤ究鏅虹潧锛屾湇鎸囧崡銆備笘涔嬮浄鐥呴洦瀹讹紝鍜镐互鏈嶇剦棣栧姟锛屼笉鐭ユ淳涔冨洓鑳戒箣鏈紝璋撲箣宸ц�呴洦銆備笂澹鑸嶅叾鍏紝闈炲洓涓嶅彲銆�
- </p>
- <h4>鈥斺�斻�婂鍏湇鑰冦�婸 3</h4>
+ <p>{{culture1.content}}</p>
+ <h4 v-if="culture1.source">鈥斺�斻�妠{culture1.source}}銆婸 {{culture1.pageNo}}</h4>
</view>
- <view class="cultureItem">
+ <view class="cultureItem" v-if="culture2">
<view class="imgBox">
<img src="@/static/image/inherit/icon2.png" alt="" />
</view>
- <p>鐎曟箹涓栧剴锛屽吋浠ラ啱槌达紝涓�闁�鐖跺瓙鍏勫紵瀵屾湁钁楄堪锛屾鐗硅涓�鏂戣�炽��</p>
- <h4>鈥斺�斻�婂鍏湇鑰冦�婸 3</h4>
+ <p>{{culture2.content}}</p>
+ <h4 v-if="culture2.source">鈥斺�斻�妠{culture2.source}}銆婸 {{culture2.pageNo}}</h4>
</view>
- <view class="cultureItem">
+ <view class="cultureItem" v-if="culture3">
<view class="imgBox">
<img src="@/static/image/inherit/icon3.png" alt="" />
</view>
- <p>
- 鐥呭潑鍒荤�曟箹銆婃湰鑽夈�嬩箣鍥犱粛瑷涜锛岀埌閲嶇埐閸ユ澘銆傜稉濮嬫柤鐧告湭鍏湀锛岃縿涔欓厜浜旀湀锛岄柋浜屾锛岀硿宸ユ暩钀紝涔冨厠钁充簨銆傚叾鏍＄悊瑷涜锛岀洠鐫ｅ墳鍔傦紝鍛藉厭瀛愬腑鐝嶃�佸＋鐟溿�佸＋鐝╁垎浠讳箣锛涘晢姒锋柟鍔戯紝鍗�鍒ュ搧褰欙紝閱＋鐜嬪悰閺″爞涔嬪姏鐖插锛涘弮浠ラ嵕鍚涘彈鐧斤紱鑰岀稉绱�鍏朵簨锛屽绲備笉鎳堣�咃紝鍓囪寖鍚涢潨瀛樹篃銆傛澶栧鐢板悰鎾扮暟銆佹浌鍚涙櫞宄�佺唺鍚涗徊灞便�佺縼鍚涢惖姊呫�侀花鍚涘辜闆层�佸嫉鍚涜搏涔嬨�佺▼鍚涢仈涓夈�侀櫝鍚涙尟閬犮�佽ū鍚涘姛鐢�佹湵鍚涜椈鑷ｃ�佹垨鍙冩牎璁愶紝鎴栧徃缍滄牳锛屾垨鑱峰湒绻紝璎瑰倷鏇镐箣
- </p>
- <h4>鈥斺�斻�婂鍏湇鑰冦�婸 3</h4>
+ <p>{{culture3.content}}</p>
+ <h4 v-if="culture3.source">鈥斺�斻�妠{culture3.source}}銆婸 {{culture3.pageNo}}</h4>
</view>
</view>
</view>
@@ -101,7 +97,10 @@
dataList: [],
links: [],
socialMapping: true,
- showType: "1"
+ showType: "1",
+ culture1: null,
+ culture2: null,
+ culture3: null,
};
},
onLoad(options) {
@@ -194,6 +193,9 @@
identifier: this.idIndex
}).then((res) => {
console.log(res, "res");
+ this.culture1 = res.list.find(item=>item.typeName == "瀹堕")
+ this.culture2 = res.list.find(item=>item.typeName == "鍖诲痉")
+ this.culture3 = res.list.find(item=>item.typeName == "瀹惰")
});
},
showSocialMapping() {
diff --git a/src/utils/request/req1.js b/src/utils/request/req1.js
index ba1b63d..6bd9b0a 100644
--- a/src/utils/request/req1.js
+++ b/src/utils/request/req1.js
@@ -1,7 +1,7 @@
// 灏佽缃戠粶璇锋眰
import axios from "axios";
import { Message } from "element-ui";
-export const baseUrl = "http://icmm.test.xyinde.com/api";
+export const baseUrl = process.env.VUE_APP_API_URL;
// 鍒涘缓璇锋眰瀹炰緥
const req = axios.create({
// baseURL: '/api'
--
Gitblit v1.9.1