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

YM

2024-07-24 b228a8d21e0bbbdf31f8f91c60215f9f459ae876

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

 src/api/index.js

@@ -310,6 +310,14 @@
  });
};

export const getPlaceInfo = (data) => {
  return req1({
    url: "/person/search/place",
    method: "post",
    params: data,
  });
};

export const searchSchoolPerson = (data) => {
  return req1({
    url: "/person/searchSchoolPerson",
@@ -410,4 +418,3 @@
    method: "post",
  });
};


 src/pages/academicSchools/index.vue

@@ -237,8 +237,80 @@
      :visible.sync="drawer"
      direction="rtl"
      :before-close="handleClose"
      class="customDrawer"
    >
      <span>我来啦!</span>
      <div class="drawerContent">
        <div class="drawerTips">選中的地址：</div>
        <div class="drawerTable">
          <div class="tableTabs">
            <div class="inputItem">
              <el-input
                placeholder="請輸入地名搜索"
                v-model="tableKey"
                class="input-with-select"
                @keyup.enter="searchAddress"
              >
                <el-button
                  @click="searchAddress"
                  type="primary"
                  slot="append"
                  icon="el-icon-search"
                ></el-button>
              </el-input>
            </div>
            <div class="selectItem">
              <el-select v-model="dynastyId" placeholder="請選擇時期">
                <el-option
                  v-for="item in dynastyData"
                  :key="item.dynastyId + '0'"
                  :label="item.name"
                  :value="item.dynastyId"
                ></el-option>
              </el-select>
            </div>
          </div>
          <el-table
            ref="multipleTable"
            :data="gridData"
            tooltip-effect="dark"
            style="width: 100%"
            height="530"
            @selection-change="handleSelectionChange"
          >
            <el-table-column type="selection" width="55"> </el-table-column>
            <el-table-column prop="currentName" label="地名"> </el-table-column>
            <el-table-column width="250" label="年代區間" show-overflow-tooltip>
              <template slot-scope="scope">{{
                scope.row.start + "-" + scope.row.end
              }}</template>
            </el-table-column>
            <el-table-column
              prop="dynastyName"
              label="時期"
              width="250"
              show-overflow-tooltip
            >
            </el-table-column>
          </el-table>
        </div>
        <div class="drawerPage">
          <el-pagination
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
            :current-page="currentPage"
            :page-sizes="[10, 20, 60, 100]"
            :page-size="pageSize"
            layout="total, sizes, prev, pager, next, jumper"
            :total="total"
          >
          </el-pagination>
        </div>
        <div class="drawerBtn">
          <el-button @click="setCurrent">全選當前頁</el-button>
          <el-button @click="setCurrent('cancle')">取消全選</el-button>
          <el-button @click="onOkAddress" type="primary">確定</el-button>
        </div>
      </div>
    </el-drawer>
  </view>
</template>
@@ -251,7 +323,8 @@
  academicSearch,
  getPersonTag,
  getSocialDistinction,
  getDynastyAll
  getDynastyAll,
  getPlaceInfo,
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -291,7 +364,7 @@
      // 当前人物信息
      ownInfo: null,
      detailData: {
        name: ""
        name: "",
      },
      isAdvancedSearch: false,
      formData: {
@@ -300,23 +373,33 @@
        works: "",
        personTags: "",
        socialIdentity: "",
        period: ""
        period: "",
      },
      showPerson: false,
      personList: [],
      personPageInfo: {
        totalCount: 0,
        page: 1,
        limit: 10
        limit: 10,
      },
      personTag: [],
      socialDistinction: [],
      dynastyData: [],
      // 抽屉
      gridData: [],
      page: 1,
      currentPage: 1,
      pageSize: 10,
      total: 0,
      multipleSelection: [],
      drawer: false,
      dynastyId: "",
      tableKey: "",
      // echarts
      infoOfPersons: [],
      infoOfSchools: [],
      nodeDatas: [],
      links: []
      links: [],
    };
  },
  mounted() {
@@ -324,6 +407,8 @@
    this.hotSearch();
    // 获取人物标签、社会身份
    this.getOptionInfo();
    // 獲取地址列表
    this.getAddressList();
    // 监听窗口大小变化
    window.addEventListener("resize", this.relation);
  },
@@ -331,6 +416,70 @@
    this.searchKey = options.keyword;
  },
  methods: {
    // 搜索地址
    searchAddress() {
      this.gridData = [];
      this.getAddressList();
    },
    //  分页
    handleSizeChange(val) {
      this.pageSize = val;
      this.getAddressList();
    },
    handleCurrentChange(val) {
      this.page = val;
      this.getAddressList();
    },
    // 表格选择
    handleSelectionChange(val) {
      this.multipleSelection = val;
    },
    // 全選
    setCurrent(str) {
      if (str == "cancle") {
        this.$refs.multipleTable.clearSelection();
        return false;
      }
      if (this.gridData.length) {
        this.gridData.forEach((row) => {
          this.$refs.multipleTable.toggleRowSelection(row);
        });
        this.multipleSelection = this.gridData;
      }
    },
    // 確認地址
    onOkAddress() {
      const data = this.multipleSelection.map((item) => {
        return {
          ...item,
          name: item.currentName,
          id: item.dynastyId,
        };
      });
      this.formData.actively = data;
      this.drawer = false;
    },
    // 獲取地址列表
    getAddressList() {
      const data = {
        page: this.page,
        pageSize: this.pageSize,
      };
      if (this.dynastyId != "") {
        data["dynastyId"] = this.dynastyId;
      }
      if (this.tableKey != "") {
        data["keyword"] = this.tableKey;
      }
      getPlaceInfo(data).then((res) => {
        if (res?.success && res?.list.length) {
          this.gridData = res?.list;
        } else {
          this.gridData = [];
        }
      });
    },

    getOptionInfo() {
      getDynastyAll().then((res) => {
        this.dynastyData = res.list;
@@ -342,6 +491,7 @@
        this.socialDistinction = res.list;
      });
    },

    resetForm(formName) {
      this.formData = {
        name: "",
@@ -349,18 +499,22 @@
        works: "",
        personTags: "",
        socialIdentity: "",
        period: ""
        period: "",
      };
    },

    searchFun() {
      console.log(this.formData);
    },

    selectActively() {
      this.drawer = true;
    },

    handleClose(done) {
      done();
    },

    // 获取人物关系
    getPersonInfo(arr, str, newArr, order, type, parent) {
      for (let i = 0; i < arr.length; i++) {
@@ -376,7 +530,7 @@
            parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
            name: personInfo?.NAME[0]?.content1,
            category: type,
            symbolSize: 15
            symbolSize: 15,
          };
          if (order > 80) {
            order = 80;
@@ -478,7 +632,7 @@
              const data = item[str]?.map((e) => {
                return {
                  ...e,
                  personId: item.personId
                  personId: item.personId,
                };
              });
              if (ele[str] && data?.length) {
@@ -647,6 +801,7 @@
        // }
      });
    },

    // 递归处理所有层级数据
    handleData(data, parent) {
      for (let i = 0; i < data.length; i++) {
@@ -662,8 +817,8 @@
            id: item.mainId,
            name: mainPerson.NAME[0].content1,
            itemStyle: {
              color: "#244a7b"
            }
              color: "#244a7b",
            },
          });
        } else {
          switch (parent.thisType) {
@@ -696,8 +851,8 @@
                  padding: [3, 8],
                  borderRadius: 30,
                  position: "middle", // 设置标签文本在线的中间位置上居中显示
                  distance: -10 // 将标签放置在连接线上
                }
                  distance: -10, // 将标签放置在连接线上
                },
              });
              break;
            case 2:
@@ -714,7 +869,7 @@
              }
              this.links.push({
                source: item.mainId,
                target: parent.mainId
                target: parent.mainId,
              });
              break;
            case 3:
@@ -731,7 +886,7 @@
              }
              this.links.push({
                source: item.mainId,
                target: parent.mainId
                target: parent.mainId,
              });
              break;
            case 4:
@@ -753,7 +908,7 @@
              }
              this.links.push({
                source: item.mainId,
                target: parent.mainId
                target: parent.mainId,
              });
              break;
            case 5:
@@ -785,8 +940,8 @@
                  padding: [3, 8],
                  borderRadius: 30,
                  position: "middle", // 设置标签文本在线的中间位置上居中显示
                  distance: -10 // 将标签放置在连接线上
                }
                  distance: -10, // 将标签放置在连接线上
                },
              });
              break;
            case 6:
@@ -818,8 +973,8 @@
                  padding: [3, 8],
                  borderRadius: 30,
                  position: "middle", // 设置标签文本在线的中间位置上居中显示
                  distance: -10 // 将标签放置在连接线上
                }
                  distance: -10, // 将标签放置在连接线上
                },
              });
              break;
          }
@@ -870,7 +1025,7 @@
        }
        return {
          ...item,
          symbolSize: size > 80 ? 80 : size
          symbolSize: size > 80 ? 80 : size,
        };
      });

@@ -904,8 +1059,8 @@
            orient: "vertical",
            data: this.categories.map(function (a) {
              return a.name;
            })
          }
            }),
          },
        ],
        series: [
          {
@@ -920,21 +1075,21 @@
            label: {
              show: true,
              position: "right",
              formatter: "{b}"
              formatter: "{b}",
            },
            scaleLimit: {
              min: 0.4,
              max: 2
              max: 2,
            },
            lineStyle: {
              color: "source",
              curveness: 0.2
              curveness: 0.2,
            },
            emphasis: {
              focus: "adjacency",
              lineStyle: {
                width: 5
              }
                width: 5,
              },
            },
            force: {
              repulsion: 600,
@@ -960,6 +1115,7 @@
      });
      myChart.setOption(option);
    },

    creatDom(params) {
      const id = params.data.id.split("_")[0];
      const type = params.data.id.split("_")[1];
@@ -1036,6 +1192,7 @@
        this.detailData = obj;
      }
    },

    closeDom() {
      const div = document.getElementById("customDialog");
      div.style.display = "none";
@@ -1061,7 +1218,7 @@
      academicSearch({
        keyword: key,
        page: this.personPageInfo.page,
        pageSize: this.personPageInfo.limit
        pageSize: this.personPageInfo.limit,
      }).then((res) => {
        this.personList = res.list.map((item) => {
          return {
@@ -1082,7 +1239,7 @@
            division:
              item.medicalBranchList && item.medicalBranchList.length
                ? item.medicalBranchList[0].content1
                : "-"
                : "-",
          };
        });
        this.showPerson = true;
@@ -1092,7 +1249,7 @@
    spaceTimeArr(id) {
      // 关系图的数据
      uni.navigateTo({
        url: "/pages/character/detail?id=" + id
        url: "/pages/character/detail?id=" + id,
      });
    },
    // 获取朝代echarts的数据
@@ -1116,7 +1273,7 @@
        this.hotKeyList = indexList.map((item) => {
          return {
            id: item,
            name: res.object[item]
            name: res.object[item],
          };
        });
      });
@@ -1131,12 +1288,56 @@
      //     document.querySelector(".fbox1").style.height = box1Height + "px";
      //   }
      // });
    }
  }
    },
  },
};
</script>

<style>
.customDrawer >>> .el-drawer__header {
  margin-bottom: 20px;
  border-bottom: 1px solid #eee;
  padding: 20px;
  box-sizing: border-box;
}

.drawerTips {
  margin-bottom: 20px;
  color: #666;
}

.drawerTable {
  width: 100%;
}

.tableTabs {
  width: 100%;
  display: flex;
}

.inputItem {
  width: 80%;
}

.drawerPage {
  display: flex;
  justify-content: flex-end;
  padding: 20px 0;
  box-sizing: border-box;
}

.drawerBtn {
  display: flex;
  justify-content: flex-end;
}

.drawerContent {
  width: 100%;
  height: 100%;
  padding: 0 20px;
  box-sizing: border-box;
}

#relation {
  width: 100%;
  height: 100%;