From 12d99c9a0dc366df61e10101b3e0821e1add6adb Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期二, 23 七月 2024 17:40:13 +0800
Subject: [PATCH] 1
---
src/pages/academicSchools/index.vue | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 91 insertions(+), 52 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 311a0a1..8ecc0ed 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -6,7 +6,7 @@
<!-- 楂樼骇鎼滅储 -->
<view
style="
- margin-left: 0.6rem;
+ padding-left: 0.6rem;
margin-top: 0.1rem;
display: flex;
position: relative;
@@ -43,9 +43,76 @@
</li>
</ul>
</view>
- <view v-if="isAdvancedSearch">
- <h3>楂樼骇鎼滅储</h3>
- <MyForm @submit="onSubmit" :from="searchFrom" />
+ <view v-if="isAdvancedSearch" class="searchDialog">
+ <h3 style="margin-bottom: 0.2rem">楂樼骇鎼滅储</h3>
+ <el-form label-width="100px" :model="formData" size="mini">
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="濮撳悕/鍒悕锛�">
+ <el-input v-model="formData.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="娲诲姩鍦帮細">
+ <el-select
+ style="width: 100%"
+ v-model="formData.actively"
+ placeholder="璇烽�夋嫨娲诲姩鍦�"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="浣滃搧锛�">
+ <el-input v-model="formData.works"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="浜虹墿鏍囩锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.personTags"
+ placeholder="璇烽�夋嫨浜虹墿鏍囩"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="绀句細韬唤锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.socialIdentity"
+ placeholder="璇烽�夋嫨绀句細韬唤"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏃舵湡锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.period"
+ placeholder="璇烽�夋嫨鏃舵湡"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div style="text-align: right">
+ <el-button type="primary" size="mini">鎼滅储</el-button>
+ <el-button size="mini">閲嶇疆</el-button>
+ </div>
</view>
<div v-if="showPerson" class="personDialog">
<i
@@ -137,7 +204,6 @@
academicSearch,
} from "@/api/index.js";
import * as echarts from "echarts";
-import MyForm from "@/components/form/form.vue";
export default {
data() {
return {
@@ -164,44 +230,14 @@
name: "",
},
isAdvancedSearch: false,
- searchFrom: [
- {
- type: "input",
- label: "濮撳悕/鍒悕",
- name: "name",
- value: "",
- },
- {
- type: "input",
- label: "娲诲姩鍦�",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "浣滃搧",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "浜虹墿鏍囩",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "绀句細韬唤",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "鏃舵湡",
- name: "address",
- value: "",
- },
- ],
+ formData: {
+ name: "",
+ actively: "",
+ works: "",
+ personTags: "",
+ socialIdentity: "",
+ period: ""
+ },
showPerson: false,
personList: [],
personPageInfo: {
@@ -378,6 +414,7 @@
getData() {
this.loading = true;
getPersonData(this.currentId).then((res) => {
+ console.log(res,'res')
this.nodes = [];
this.relationships = [];
let kinData = [];
@@ -437,7 +474,6 @@
this.ownInfo
);
literature = [...newArr];
- // console.log(literature, "literature");
}
if (obj.socialList?.length) {
let newArr = [];
@@ -457,7 +493,6 @@
this.categories.push({ name: "娲诲姩鍦�" });
let newArr = [];
const data = this.changeLiterature(obj.placeList, "placeList");
- console.log(data, "place");
this.getPersonInfo(data, "placeList", newArr, 1, 4, this.ownInfo);
place = [...newArr];
}
@@ -589,13 +624,6 @@
var nodeData = nodes;
var option;
option = {
- // backgroundColor: {
- // type: "image",
- // image: "/static/image/characterRelationBg.png",
- // size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
- // position: "center center", // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
- // },
- // tooltip: {},
legend: [
{
left: 20,
@@ -887,6 +915,17 @@
}
}
+.searchDialog {
+ position: absolute;
+ top: 0.68rem;
+ left: 0;
+ right: 0;
+ z-index: 999;
+ padding: 0.1rem 0.4rem;
+ background: #fff;
+ min-height: 2rem;
+}
+
.personDialog {
position: absolute;
top: 0.68rem;
--
Gitblit v1.9.1