Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

杨磊

2024-05-16 4469428bfec368ea9c735303ff9ad4ed25f5b762

Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

 .env

New file
@@ -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'

 .env.prod

New file
@@ -0,0 +1,4 @@
NODE_ENV = 'production'
VUE_APP_ENV = 'prod'
VUE_APP_MOCK = 'false'
VUE_APP_API_URL = '/api'

 README.md

@@ -1,4 +1,4 @@
# my-project
# icmm

## Project setup
```

 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",

 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({

 src/components/advancedSearch/advancedSearch.vue

@@ -46,6 +46,9 @@
        return true;
      }
    },
    advancedSearchBack: {
      type: Function
    },
    isSearchTrue: {
      type: Boolean,
      default() {
@@ -141,7 +144,11 @@
  },
  methods: {
    isAvancedClick() {
      if (this.advancedSearchBack) {
        this.advancedSearchBack();
      } else {
      this.isAdvancedSearch = !this.isAdvancedSearch;
      }
      //     this.$nextTick(() => {

      //         var box1Height = document.querySelector('.fbox').offsetHeight;

 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.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.WEAK_NAME || "-",
                  value: obj.alias || "-"
              },
              {
                name: "字",
                value: obj.ALIAS || "-",
                  value: obj.zi || "-"
              },
              {
                name: "号",
                value: obj.ALIAS || "-",
                  value: obj.hao || "-"
              },
              {
                name: "所处时期",
                value: obj.PERIOD || "-",
                  value: obj.dynastyDesc || "-"
              },
              {
                name: "民族",
                value: obj.ETHNIC || "-",
              },
            ],
                  value: obj.ethnic || "-"
                }
              ]
          },
          {
            list: [
              {
                name: "籍贯",
                value: obj.NATIVE_PLACE || "-",
                  value: obj.native || "-"
              },
              {
                name: "性别",
                value: obj.GENDER
                  ? obj.GENDER == "UNKNOWN"
                    ? "未知"
                    : "-"
                  : "-",
                  value: obj.gender || "-"
              },
              {
                name: "职官",
                value: obj.MEDICAL_BRANCH || "-",
                  value: obj.official || "-"
              },
              {
                name: "流派",
                value: obj.MEDICAL_BRANCH || "-",
                  value:
                    sres &&
                    sres.object &&
                    sres.object.school_NAME &&
                    sres.object.school_NAME.length
                      ? sres.object.school_NAME[0].content
                      : "-"
              },
              {
                name: "学术特点",
                value: obj.MEDICAL_EXPERTISE || "-",
              },
            ],
          },
                  value: obj.features || "-"
                }
              ]
            }
        ];
        this.detailInfo = obj;
        // 关系图谱
        this.getMappingData(this.detailInfo.NAME);
        });
      });
      // 活动年谱
      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]
          };
        });
        // 时空地图

 src/pages/character/index.vue

@@ -9,6 +9,7 @@
        :from="From"
        placehold="请输入关键字"
        :keyword="searchKey"
        :advancedSearchBack="advancedSearchBack"
      />
    </view>
    <!-- 热门搜索 -->
@@ -476,6 +477,11 @@
        console.log(res,"res");
      });
    },
    advancedSearchBack() {
      uni.navigateTo({
        url: "/pages/knowledgeBase/knowledgeBase"
      });
    },
    // 点击下面的朝代按钮
    dynastyBottomClick(item) {
      this.dynastyColor = item.id;

 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>——《奇八服考》P 3</h4>
        <p>{{culture1.content}}</p>
        <h4 v-if="culture1.source">——《{{culture1.source}}》P {{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>——《奇八服考》P 3</h4>
        <p>{{culture2.content}}</p>
        <h4 v-if="culture2.source">——《{{culture2.source}}》P {{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>——《奇八服考》P 3</h4>
        <p>{{culture3.content}}</p>
        <h4 v-if="culture3.source">——《{{culture3.source}}》P {{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() {

 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'