From a640a68b55034ad38b1936eedd33c23f63bec0f0 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 26 四月 2024 14:29:28 +0800
Subject: [PATCH] 调整医事制度、医学流派
---
src/pages.json | 13
src/pages/character/index.vue | 2
src/pages/fileDetail/index.vue | 38
src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue | 1
src/utils/request/req1.js | 1
src/pages/index/index.vue | 8
src/pages/academicGenres/index.vue | 275 ++++
/dev/null | 223 ---
src/uni_modules/next-search-more/components/next-search-more/next-search-more.vue | 602 +++++----
src/api/index.js | 34
src/static/initialize.css | 198 +-
src/components/headNav/headNav.vue | 2
src/pages/Login/Login.vue | 2
src/pages/forgetPass/forgetPass.vue | 2
src/pages/TcmSystem/TcmSystem.vue | 2056 ++++++++++++++++++----------------
15 files changed, 1,865 insertions(+), 1,592 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index eb5ef3c..5b46518 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -143,8 +143,8 @@
// 鍖诲浜虹墿鐭ヨ瘑搴� 鍩虹妫�绱�
export const getFuzzySearch = (requestData) => {
return req1({
- url: "/person/fuzzySearch?keyword="+requestData?.keyword,
- method: "post",
+ url: "/person/fuzzySearch?keyword=" + requestData?.keyword,
+ method: "post"
});
};
@@ -218,6 +218,30 @@
};
// -------------------------P
+// 鏈濅唬
+export const getDynastyAll = () => {
+ return req1({
+ url: "/dynasty/list",
+ method: "post"
+ });
+};
+
+export const getDynasty = () => {
+ return req1({
+ url: "/dynasty/listAll",
+ method: "post"
+ });
+};
+
+// 瀛︽湳娴佹淳
+export const getDynastyStatistics = () => {
+ return req1({
+ url: "/school/dynasty/statistics",
+ method: "get"
+ });
+};
+
+
// 鍖讳簨鍒跺害
// 鏁版嵁缁熻
export const getDataStatistics = () => {
@@ -235,11 +259,11 @@
});
};
// 璇︽儏
-export const getMedicalDetails = (Obj) => {
+export const getMedicalDetails = (data) => {
return req1({
url: "/medical/details",
method: "post",
- data: Obj
+ data: data
});
};
// 鍙栧�硷細RDF銆丯T銆乆ML銆丣SON
@@ -252,8 +276,6 @@
};
// -----------
-
-
// 涓浗鍖诲浜虹墿鐭ヨ瘑搴�
// 鏁版嵁缁熻
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 7dd5039..7a8a35d 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -292,7 +292,7 @@
});
} else if (index === "3") {
uni.navigateTo({
- url: "/pages/dataDisplay/dataDisplay?id=" + 3
+ url: "/pages/academicGenres/index?id=" + 3
});
} else if (index === "4") {
uni.navigateTo({
diff --git a/src/pages.json b/src/pages.json
index 7df4635..f919482 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -47,7 +47,7 @@
}
},
{
- "path": "pages/dataDisplay/dataDisplay",
+ "path": "pages/academicGenres/index",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
@@ -139,16 +139,7 @@
}
},
{
- "path" : "pages/RDF/RDF",
- "style" :
- {
- "navigationBarTitleText" : "",
- "enablePullDownRefresh" : false,
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/NT/NT",
+ "path" : "pages/fileDetail/index",
"style" :
{
"navigationBarTitleText" : "",
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index 721fba7..0171580 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -231,7 +231,7 @@
// })
} else if (item.id == 3) {
uni.navigateTo({
- url: '/pages/dataDisplay/dataDisplay?id=' + item.id
+ url: '/pages/academicGenres/index?id=' + item.id
})
} else if (item.id == 4) {
uni.navigateTo({
diff --git a/src/pages/NT/NT.vue b/src/pages/NT/NT.vue
deleted file mode 100644
index 0747b04..0000000
--- a/src/pages/NT/NT.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
- <view id="box">
- <!-- RDF瀵瑰簲鐨勫弬鏁� -->
- </view>
-</template>
-
-<script>
- import {getMedicalDataOutput} from '@/api/index.js'
- export default {
- data() {
- return {
- Obj:{}
- }
- },
- onLoad(options) {
- this.Obj=options
- console.log('optionsoptionsoptions', options);
- },
- mounted() {
- this.innt()
- },
- methods: {
- //
- async innt(){
- console.log(this.Obj,'this.Obj');
- var box = document.getElementById('box')
- await getMedicalDataOutput(this.Obj).then(res=>{
- console.log(res,'鎺ュ彛');
- box.innerHTML=res
- })
- }
- }
- }
-</script>
-
-<style>
-
-</style>
diff --git a/src/pages/RDF/RDF.vue b/src/pages/RDF/RDF.vue
deleted file mode 100644
index b8210ce..0000000
--- a/src/pages/RDF/RDF.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
- <view id="box">
- <!-- RDF瀵瑰簲鐨勫弬鏁� asdkfhkajsdfh-->
- </view>
-</template>
-
-<script>
- import {getMedicalDataOutput} from '@/api/index.js'
- export default {
- data() {
- return {
- Obj:{}
- }
- },
- onLoad(options) {
- this.Obj=options
- console.log('optionsoptionsoptions', options);
- },
- mounted() {
- this.innt()
- },
- methods: {
- //
- async innt(){
- console.log(this.Obj,'this.Obj');
- var box = document.getElementById('box')
- await getMedicalDataOutput(this.Obj).then(res=>{
- console.log(res,'鎺ュ彛');
- box.innerHTML=res
- })
- }
- }
- }
-</script>
-
-<style>
-
-</style>
diff --git a/src/pages/TcmSystem/TcmSystem.vue b/src/pages/TcmSystem/TcmSystem.vue
index e8cdc92..e2cce49 100644
--- a/src/pages/TcmSystem/TcmSystem.vue
+++ b/src/pages/TcmSystem/TcmSystem.vue
@@ -1,912 +1,1024 @@
<template>
- <view>
- <headNav :idIndex="idIndex" text="涓尰鍖讳簨鍒跺害" />
- <view class="flex flex-center sousuo" style="flex-direction: column;">
- <view class="search1">
- <next-search-more @search="onSearch" placeholder="鎼滅储鑱屽畼/鏈烘瀯" :selectValue="selectValue">
- </next-search-more>
- </view>
- <view class="flex remen">
- 鐑棬鎼滅储锛�
- <ul class="flex" style="margin-right: 10rpx;">
- <li v-for="item in hot" :key="item.id" @tap="HotClick(item.id)"
- style="margin: 0 .05rem;color: #244A7B;">
- {{item.name}}
- </li>
- </ul>
- </view>
- </view>
- <view class="centre flex">
- <!-- 宸� -->
- <view class="CLeft flex fbox">
- <!-- 鑱屼笟 -->
- <view class="demo-uni-col MargB box boox" :class="{ 'a': activeBox === 'a'?'a':'' }"
- style="background-color: #fff; border: 2rpx solid #e0e0e0;">
- <h3>{{institution.title}} ({{institution.list.length}}) </h3>
- <ul style="margin-top: 10rpx;">
- <!-- background-color: #d6e3f4;border-radius: 60rpx; -->
- <li class="flex"
- :style="{'background':institution.index === item.dynastyId ? '#DDE8F6' :'','borderRadius': institution.index === item.dynastyId ? '60rpx' :'',display:index+1>institutionIndex?'none':'flex'}"
- v-for="(item,index) in institution.list" :key="index"
- style="padding:0 20rpx;color: #2C2C2C;" @click="handInstitCLick(item,'a')">
- <view class="">{{item.dynastyName}}</view>
- <view class="">{{item.count}}</view>
- </li>
- </ul>
- <view v-if="institution.list.length-1 >3" class="flex flex-center ">
- <view class="toggleButton" style="color: #244A7B;" @click="shrinkClick('a','鏈烘瀯')">
- {{ activeBox !== 'a' ? '鏇村 锕�' : '鏀惰捣 锔�' }}
- </view>
- </view>
- </view>
- <!-- 鑱屽畼缁熻锛�10锛� -->
- <view class="demo-uni-col MargB dark box boox" :class="{ 'b': activeBox === 'b'?'b':'' }"
- style="background-color: #fff; border: 2rpx solid #e0e0e0;">
- <h3>{{officials.title}} ({{officials.list.length}}) </h3>
- <ul style="margin-top: 10rpx;">
- <!-- background-color: #d6e3f4;border-radius: 60rpx; -->
- <li class="flex"
- :style="{'background':officials.index === item.dynastyId ? '#DDE8F6' :'','borderRadius': officials.index == item.dynastyId ? '10rem' :'',display:index+1>officialsIndex?'none':'flex'}"
- v-for="(item,index) in officials.list" :key="index" style="padding:0 20rpx;"
- @click="handInstitCLick(item,'b')">
- <view class="">{{item.dynastyName}}</view>
- <view class="">{{item.count}}</view>
- </li>
- </ul>
- <view v-if="officials.list.length-1 >3" class="flex flex-center ">
- <view class="toggleButton" style="color: #244A7B;" @click="shrinkClick('b','鑱屽畼')">
- {{ activeBox !== 'b' ? '鏇村 锕�' : '鏀惰捣 锔�' }}
- </view>
- </view>
- </view>
- <!-- 鏉ユ簮锛�5锛� -->
- <view class="demo-uni-col dark box boox" style="background-color: #fff; border: 2rpx solid #e0e0e0;">
- <h3>{{source.title}} ({{source.list.length}}) </h3>
- <ul style="margin-top: 10rpx;">
- <!-- background-color: #d6e3f4;border-radius: 60rpx; -->
- <li class="flex" v-for="(item,index) in source.list" style="padding:0 20rpx;color: #244A7B;">
- <view @click="handInstitCLick(item,'c')" class="BeyondHiding1">{{index+1}}.{{item.source}}
- </view>
- <!-- <view class="">{{item.number}}</view> -->
- </li>
- </ul>
- </view>
- </view>
- <!-- 鍙� -->
- <view class="CRight fbox1 flex flex-column relative">
- <!-- <el-row style="height: 50rpx;width: 100%;"> -->
- <view class="flex" style="width: 100%;margin-bottom: .3rem;">
- <view class="" style="font-size: .14rem;color: #2C2C2C;font-weight: 400;">鍏眥{total}}鏉�</view>
- <view class="paixu">
- <!-- <el-select v-model="rankVal" placeholder="鎸夋彁鍚嶆帓搴�">
- <el-option v-for="(item,index) in rank" :key="index" :label="item.label"
- :value="item.value"></el-option>
- </el-select> -->
- <el-select v-model="rankVal" @change="selectChange" placeholder="璇锋彁鍚嶆帓搴�">
- <el-option v-for="(item,rankIndex) in rank" :key="rankIndex" :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </view>
- </view>
- <!-- </el-row> flex-grow: 1;-->
- <view style="" class="flex CommodityList">
- <view class="rightList" @click="ListClick(item)" v-for="item in CommodityList" :key="item">
- <el-card class="box-card" style="height: 100%;">
- <view class="flex flex-start RightListTop">
- <view class="Topzhiwei"
- style="background-color: #5879a4;text-align: right;;color: #fff;"
- :style="{background:item.post === '鑱屽畼' ? '#DA7A2B' : '#597AA5'}">
- <!-- :style="{background:item.color}"> -->
- {{item.post}}
- </view>
- <view class="TopName">{{item.name}}</view>
- <view class="TopDynasty"
- style="border: 1px solid #d4d4d4;font-weight:500;padding: 0 10rpx;border-radius: 10rpx;">
- {{item.dynasty}}
- </view>
- </view>
- <view class="desBox" style="padding: .14rem .2rem .23rem;">
- <view class="biecheng">
- <view class="flex" title="sdfsdf"> 鍒О锛�
- <view class="BeyondHiding1" style="width: .75rem;line-height: 1;">
- {{item.anotherNamer}}
- </view>
- </view>
- <view class="flex " style="">鏉ユ簮:
- <view class="BeyondHiding1" style="margin-left: .1rem;line-height: 1">
- {{item.source}}
- </view>
- </view>
- </view>
- <view class="describe font-family BeyondHiding2">
- {{item.content}}
- </view>
- </view>
- </el-card>
- </view>
- </view>
- <!-- 鍒嗛〉 -->
- <el-row class="fenye" style="position: absolute;bottom: .1rem;">
- <el-pagination class="paging" :current-page="CurrentPage" :total="total" :page-size="pageSize"
- @current-change="CurrentChange" @prev-click="PrevClick" @next-click="NextClick" prev-text="涓婁竴椤�"
- next-text="涓嬩竴椤�" background layout="prev, pager, next">
- </el-pagination>
- </el-row>
- </view>
- </view>
- <!-- 寮瑰嚭灞� -->
- <el-dialog title="" class="dialog" :visible.sync="dialogVisible" width="40%">
- <!-- 鍙栨秷閿� -->
- <view class=""
- style="padding: .16rem;position: absolute;z-index: 9999999999999999999999999999999999999999; left: 0;top: 0;">
- <img @click="dialogVisible=false" src="@/static/image/X.png" alt="" style="width: 100%;height: 100%;"
- sizes="" srcset="" />
- </view>
- <view class="flex" style="position: relative; height: 100%;flex-direction: column;">
- <view class="detailImage" style="position: relative;">
- <img src="@/static/image/personageBg.png" alt="" />
- <view class=" flex flex-column "
- style="height: 100%;justify-content: flex-start; position: relative;z-index: 999;">
- <view class="creatureXinxi1">{{ListDetails.name}}</view>
- <view class="creatureXinxi2">
- {{ListDetails.dynasty}}
- </view>
- <ul class="flex creatureXinxi3">
- <li @click="PDFClick(ListDetails,1)">RDF</li>
- <li @click="PDFClick(ListDetails,2)">NT</li>
- <li @click="PDFClick(ListDetails,3)">XML</li>
- <li @click="PDFClick(ListDetails,4)">JSON</li>
- </ul>
- </view>
- </view>
- <view class="" style="width: 80%; height: 100%;position: relative;">
- <view class="pinji flex ">
- <view class="">鍝佺骇: <span> {{ListDetails.grade}}</span> </view>
- <view class="">鍒悕: <span> {{ListDetails.alias}}</span> </view>
- <view class="">鏉ユ簮: <span> {{ListDetails.source}}</span> </view>
- </view>
- <view class="">
- <view class=""
- style="font-size: .14rem;color: #2C2C2C; background-color: #F0F0F0;font-weight: 700;padding-left: .18rem;height: .34rem;line-height: .34rem;">
- 鐩稿叧鎻忚堪
- </view>
- <view class="" style="font-size: .1rem;color: #2C2C2C;margin: .1rem 0 .19rem;line-height: 2.3;">
- {{ListDetails.desc}}
- </view>
- <view class="">
- <view class=""
- style="font-size: .14rem;color: #2C2C2C; background-color: #F0F0F0;font-weight: 700;padding-left: .18rem;height: .34rem;line-height: .34rem;">
- 澶囨敞
- </view>
- <span class="" v-for="item in ListDetails.notesList"
- style="font-size: .1rem;color: #2C2C2C;margin: .1rem 0 .19rem;line-height: 2.3;">
- {{item.content}}
- </span>
- </view>
- </view>
- </view>
- <view class="flex detailsBtn">
- <el-button class="flex btn-prev">
- <view class="flex">
- <view class="" style="margin-right: 40rpx;">涓婁竴鏉�</view>
- <view class="btn-prev-L">鏈烘瀯: 澶尰闄� </view>
- </view>
- </el-button>
- <view class="">
- 102/329
- </view>
- <el-button class="flex btn-next">
- <view class="flex">
- <view class="" style="margin-right: 40rpx;">鏈烘瀯: 澶尰闄� </view>
- <view class="btn-prev-R">涓嬩竴鏉�</view>
- </view>
- </el-button>
- </view>
- </view>
- </el-dialog>
+ <view>
+ <headNav :idIndex="idIndex" text="涓尰鍖讳簨鍒跺害" />
+ <view class="flex flex-center sousuo" style="flex-direction: column">
+ <view class="search1">
+ <next-search-more
+ :keyword="SearchValue"
+ @search="onSearch"
+ placeholder="鎼滅储鑱屽畼/鏈烘瀯"
+ :selectValue="selectValue"
+ >
+ </next-search-more>
+ </view>
+ <view class="flex remen">
+ 鐑棬鎼滅储锛�
+ <ul class="flex" style="margin-right: 10rpx">
+ <li
+ v-for="item in hot"
+ :key="item.id"
+ @tap="HotClick(item.name)"
+ style="margin: 0 0.05rem; color: #244a7b; cursor: pointer"
+ >
+ {{ item.name }}
+ </li>
+ </ul>
+ </view>
+ </view>
+ <view class="centre flex">
+ <!-- 宸� -->
+ <view class="CLeft flex fbox">
+ <!-- 鑱屼笟 -->
+ <view
+ class="demo-uni-col MargB box boox"
+ :class="{ a: activeBox === 'a' ? 'a' : '' }"
+ style="background-color: #fff; border: 2rpx solid #e0e0e0"
+ >
+ <h3>{{ institution.title }} ({{ institution.list.length - 1 }})</h3>
+ <ul style="margin-top: 10rpx">
+ <li
+ class="flex"
+ :style="{
+ background:
+ institution.index === item.dynastyId ? '#DDE8F6' : '',
+ borderRadius:
+ institution.index === item.dynastyId ? '60rpx' : '',
+ display: index + 1 > institutionIndex ? 'none' : 'flex'
+ }"
+ v-for="(item, index) in institution.list"
+ :key="index"
+ style="padding: 0 20rpx; color: #2c2c2c; cursor: pointer"
+ @click="handInstitCLick(item, 'a')"
+ >
+ <view class="">{{ item.dynastyName }}</view>
+ <view class="">{{ item.count }}</view>
+ </li>
+ </ul>
+ <view v-if="institution.list.length - 1 > 3" class="flex flex-center">
+ <view
+ class="toggleButton"
+ style="color: #244a7b; cursor: pointer"
+ @click="shrinkClick('a', '鏈烘瀯')"
+ >
+ {{ activeBox !== "a" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
+ </view>
+ </view>
+ </view>
+ <!-- 鑱屽畼缁熻锛�10锛� -->
+ <view
+ class="demo-uni-col MargB dark box boox"
+ :class="{ b: activeBox === 'b' ? 'b' : '' }"
+ style="background-color: #fff; border: 2rpx solid #e0e0e0"
+ >
+ <h3>{{ officials.title }} ({{ officials.list.length - 1 }})</h3>
+ <ul style="margin-top: 10rpx">
+ <!-- background-color: #d6e3f4;border-radius: 60rpx; -->
+ <li
+ class="flex"
+ :style="{
+ background: officials.index === item.dynastyId ? '#DDE8F6' : '',
+ borderRadius: officials.index == item.dynastyId ? '10rem' : '',
+ display: index + 1 > officialsIndex ? 'none' : 'flex'
+ }"
+ v-for="(item, index) in officials.list"
+ :key="index"
+ style="padding: 0 20rpx; cursor: pointer"
+ @click="handInstitCLick(item, 'b')"
+ >
+ <view class="">{{ item.dynastyName }}</view>
+ <view class="">{{ item.count }}</view>
+ </li>
+ </ul>
+ <view v-if="officials.list.length - 1 > 3" class="flex flex-center">
+ <view
+ class="toggleButton"
+ style="color: #244a7b; cursor: pointer"
+ @click="shrinkClick('b', '鑱屽畼')"
+ >
+ {{ activeBox !== "b" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
+ </view>
+ </view>
+ </view>
+ <!-- 鏉ユ簮锛�5锛� -->
+ <view
+ class="demo-uni-col dark box boox"
+ style="background-color: #fff; border: 2rpx solid #e0e0e0"
+ >
+ <h3>{{ source.title }} ({{ source.list.length }})</h3>
+ <ul style="margin-top: 10rpx">
+ <!-- background-color: #d6e3f4;border-radius: 60rpx; -->
+ <li
+ class="flex"
+ v-for="(item, index) in source.list"
+ style="padding: 0 20rpx; color: #244a7b"
+ >
+ <view @click="handInstitCLick(item, 'c')" class="BeyondHiding1"
+ >{{ index + 1 }}.{{ item.source }}
+ </view>
+ </li>
+ </ul>
+ </view>
+ </view>
+ <!-- 鍙� -->
+ <view
+ class="CRight fbox1 flex flex-column relative"
+ v-loading="pageLoading"
+ >
+ <view class="flex" style="width: 100%; margin-bottom: 0.3rem">
+ <view
+ class=""
+ style="font-size: 0.14rem; color: #2c2c2c; font-weight: 400"
+ >鍏眥{ total }}鏉�</view
+ >
+ <view class="paixu">
+ <el-select v-model="rankVal" @change="selectChange">
+ <el-option
+ v-for="(item, rankIndex) in rank"
+ :key="rankIndex"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </view>
+ </view>
+ <view class="flex CommodityList">
+ <view
+ class="rightList"
+ @click="ListClick(item)"
+ v-for="item in CommodityList"
+ :key="item"
+ >
+ <el-card class="box-card" style="height: 100%">
+ <view class="flex flex-start RightListTop">
+ <view
+ class="Topzhiwei"
+ style="
+ background-color: #5879a4;
+ text-align: right;
+ color: #fff;
+ "
+ :style="{
+ background: item.post === '鑱屽畼' ? '#DA7A2B' : '#597AA5'
+ }"
+ >
+ {{ item.post }}
+ </view>
+ <view
+ class="TopName flex"
+ :title="item.name"
+ style="justify-content: left"
+ >
+ <view class="title">{{ item.name }}</view>
+ <view class="TopDynasty">
+ {{ item.dynasty }}
+ </view>
+ </view>
+ </view>
+ <view class="desBox" style="padding: 0.14rem 0.2rem 0.23rem">
+ <view class="biecheng">
+ <view
+ class="flex"
+ style="flex: 1; justify-content: left; overflow: hidden"
+ >
+ <view>鍒О锛�</view>
+ <view
+ class="BeyondHiding1"
+ style="width: 0.75rem; line-height: 1; flex: 1"
+ :title="item.alias"
+ >
+ {{ item.alias || "-" }}
+ </view>
+ </view>
+ <view
+ class="flex"
+ style="flex: 1; justify-content: left; overflow: hidden"
+ >
+ <view>鏉ユ簮锛�</view>
+ <view
+ class="BeyondHiding1"
+ style="margin-left: 0.1rem; line-height: 1; flex: 1"
+ :title="item.source"
+ >
+ {{ item.source || "-" }}
+ </view>
+ </view>
+ </view>
+ <view
+ class="describe font-family BeyondHiding2"
+ :title="item.desc"
+ >
+ {{ item.desc || "-" }}
+ </view>
+ </view>
+ </el-card>
+ </view>
+ <view
+ class="nullBox"
+ v-if="CommodityList.length == 0 && !pageLoading"
+ >
+ <el-empty description="鏆傛棤鏁版嵁"></el-empty>
+ </view>
+ </view>
+ <!-- 鍒嗛〉 -->
+ <el-row
+ v-if="CommodityList.length"
+ class="fenye"
+ style="position: absolute; bottom: 0.1rem"
+ >
+ <el-pagination
+ class="paging"
+ :current-page="CurrentPage"
+ :total="total"
+ :page-size="pageSize"
+ @current-change="CurrentChange"
+ @prev-click="PrevClick"
+ @next-click="NextClick"
+ prev-text="涓婁竴椤�"
+ next-text="涓嬩竴椤�"
+ background
+ layout="prev, pager, next"
+ >
+ </el-pagination>
+ </el-row>
+ </view>
+ </view>
+ <!-- 寮瑰嚭灞� -->
+ <el-dialog class="dialog" :visible.sync="dialogVisible" width="40%">
+ <!-- 鍙栨秷閿� -->
+ <view
+ class=""
+ style="
+ padding: 0.16rem;
+ position: absolute;
+ z-index: 999999;
+ left: 0;
+ top: 0;
+ "
+ >
+ <img
+ @click="dialogVisible = false"
+ src="@/static/image/X.png"
+ alt=""
+ style="width: 100%; height: 100%; cursor: pointer"
+ sizes=""
+ srcset=""
+ />
+ </view>
+ <view
+ class="flex"
+ style="position: relative; height: 100%; flex-direction: column"
+ >
+ <view class="detailImage" style="position: relative">
+ <img src="@/static/image/personageBg.png" alt="" />
+ <view
+ class="flex flex-column"
+ style="
+ height: 100%;
+ justify-content: flex-start;
+ position: relative;
+ z-index: 999;
+ "
+ >
+ <view class="creatureXinxi1">{{ ListDetails.name }}</view>
+ <view class="creatureXinxi2">
+ {{ ListDetails.dynasty }}
+ </view>
+ <ul class="flex creatureXinxi3">
+ <li @click="PDFClick(ListDetails, 1)">RDF</li>
+ <li @click="PDFClick(ListDetails, 2)">NT</li>
+ <li @click="PDFClick(ListDetails, 3)">XML</li>
+ <li @click="PDFClick(ListDetails, 4)">JSON</li>
+ </ul>
+ </view>
+ </view>
+ <view class="" style="width: 80%; height: 100%; position: relative">
+ <view class="pinji flex">
+ <view class=""
+ >鍝佺骇锛�<span> {{ ListDetails.grade || "-" }}</span>
+ </view>
+ <view class=""
+ >鍒悕锛�<span> {{ ListDetails.alias || "-" }}</span>
+ </view>
+ <view class=""
+ >鏉ユ簮锛�<span> {{ ListDetails.source || "-" }}</span>
+ </view>
+ </view>
+ <view class="">
+ <view
+ class=""
+ style="
+ font-size: 0.14rem;
+ color: #2c2c2c;
+ background-color: #f0f0f0;
+ font-weight: 700;
+ padding-left: 0.18rem;
+ height: 0.34rem;
+ line-height: 0.34rem;
+ "
+ >
+ 鐩稿叧鎻忚堪
+ </view>
+ <view
+ class=""
+ style="
+ font-size: 0.14rem;
+ color: #2c2c2c;
+ margin: 0.1rem 0 0.19rem;
+ line-height: 2.3;
+ "
+ >
+ {{ ListDetails.desc || "-" }}
+ </view>
+ <view class="">
+ <view
+ class=""
+ style="
+ font-size: 0.14rem;
+ color: #2c2c2c;
+ background-color: #f0f0f0;
+ font-weight: 700;
+ padding-left: 0.18rem;
+ height: 0.34rem;
+ line-height: 0.34rem;
+ "
+ >
+ 澶囨敞
+ </view>
+ <span
+ class=""
+ v-for="item in ListDetails.notesList"
+ style="
+ font-size: 0.14rem;
+ color: #2c2c2c;
+ margin: 0.1rem 0 0.19rem;
+ line-height: 2.3;
+ "
+ >
+ {{ item.content }}
+ </span>
+ </view>
+ </view>
+ </view>
+ <!-- <view class="flex detailsBtn">
+ <el-button class="flex btn-prev">
+ <view class="flex">
+ <view class="" style="margin-right: 40rpx">涓婁竴鏉�</view>
+ <view class="btn-prev-L">鏈烘瀯: 澶尰闄� </view>
+ </view>
+ </el-button>
+ <view class=""> 102/329 </view>
+ <el-button class="flex btn-next">
+ <view class="flex">
+ <view class="" style="margin-right: 40rpx">鏈烘瀯: 澶尰闄� </view>
+ <view class="btn-prev-R">涓嬩竴鏉�</view>
+ </view>
+ </el-button>
+ </view> -->
+ </view>
+ </el-dialog>
- <Footer1 :isLocation="false" :isMarginTop="0.5" />
- </view>
+ <Footer1 :isLocation="false" :isMarginTop="0.5" />
+ </view>
</template>
<script>
- import {
- getDataStatistics,
- getMedicalList,
- getMedicalDetails,
- getHotSearch,
- getMedicalDataOutput
- } from '@/api/index.js'
- import Footer1 from '@/components/footer/footer.vue'
- export default {
- components: {
- Footer1
- },
- data() {
- return {
- // 鏈烘瀯缁熻
- institution: {
- title: '鏈烘瀯缁熻',
- index: 0,
- list: [ ]
- },
- // 鏄剧ず澶氬皯鏉¤亴瀹樻暟鎹�
- institutionIndex:4,
- // 鏈烘瀯鍜岃亴瀹樼殑绫诲瀷 鍙栧�硷細OFFICIAL->鑱屽畼 INSTITUTION->鏈烘瀯 ALL->鑱屽畼銆佹満鏋�
- classifyType: 'ALL',
- // 鏈烘瀯鍜岃亴瀹樼殑id
- classifyId: "",
- // 鑱屽畼缁熻
- officials: {
- title: '鑱屽畼缁熻',
- index: 0,
- list: [ ]
- },
- // 鏄剧ず澶氬皯鏉¤亴瀹樻暟鎹�
- officialsIndex:4,
- // 鏉ユ簮
- source: {
- title: '鏉ユ簮',
- index: 0,
- list: [ ]
- },
- // 灞曞紑鍜屾敹缂╃殑鎸夐挳闇�瑕�
- activeBox: null,
- // 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
- idIndex: 0,
- // 寮瑰嚭灞�
- dialogVisible: false,
- // 鎼滅储鐨勪笅鎷夊垪琛�
- selectValue: [{
- value: 0,
- text: '鍖讳簨鍒跺害'
- }, {
- value: 1,
- text: '11sd1'
- }, {
- value: 2,
- text: '11sdsd1'
- }],
+import {
+ getDataStatistics,
+ getMedicalList,
+ getMedicalDetails,
+ getHotSearch,
+ getMedicalDataOutput
+} from "@/api/index.js";
+import Footer1 from "@/components/footer/footer.vue";
+export default {
+ components: {
+ Footer1
+ },
+ data() {
+ return {
+ // 鏈烘瀯缁熻
+ institution: {
+ title: "鏈烘瀯缁熻",
+ index: 0,
+ list: []
+ },
+ // 鏄剧ず澶氬皯鏉¤亴瀹樻暟鎹�
+ institutionIndex: 4,
+ // 鏈烘瀯鍜岃亴瀹樼殑绫诲瀷 鍙栧�硷細OFFICIAL->鑱屽畼 INSTITUTION->鏈烘瀯 ALL->鑱屽畼銆佹満鏋�
+ classifyType: "ALL",
+ // 鏈烘瀯鍜岃亴瀹樼殑id
+ classifyId: "",
+ // 鑱屽畼缁熻
+ officials: {
+ title: "鑱屽畼缁熻",
+ index: 0,
+ list: []
+ },
+ // 鏄剧ず澶氬皯鏉¤亴瀹樻暟鎹�
+ officialsIndex: 4,
+ // 鏉ユ簮
+ source: {
+ title: "鏉ユ簮",
+ index: 0,
+ list: []
+ },
+ // 灞曞紑鍜屾敹缂╃殑鎸夐挳闇�瑕�
+ activeBox: null,
+ // 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
+ idIndex: 0,
+ // 寮瑰嚭灞�
+ dialogVisible: false,
+ // 鎼滅储鐨勪笅鎷夊垪琛�
+ selectValue: [
+ {
+ value: 0,
+ text: "鍖讳簨鍒跺害"
+ }
+ ],
- // 鐑棬鎼滅储
- hot: [],
- // 鐐瑰嚮鐨勬悳绱㈤」
- HotBg: false,
- // 鎺掑簭涓嬫媺鑿滃崟
- rank: [{
- value: 'CREATE',
- label: '鍒涘缓鏃堕棿'
- }, {
- value: 'NAME',
- label: '鍚嶇О'
- }],
- rankVal: 'NAME',
- // 鍒楄〃椤�
- CommodityList: [ ],
- // 鍒楄〃鐨勮鎯呮暟鎹�
- ListDetails: {},
- // 鍒嗛〉鐨勬�绘暟
- total: 0,
- // 褰撳墠椤�
- CurrentPage: 1,
- // 涓�椤垫樉绀哄灏戞潯鏁版嵁
- pageSize: 6,
- // 鎼滅储鐨剉alue
- SearchValue: ''
- }
- },
- mounted() {
- // 淇敼涓ゆ鐨勯珮搴︿繚鎸佷竴鑷�
- var box1Height = document.querySelector('.fbox').offsetHeight;
- console.log(box1Height, 'box1Height');
- document.querySelector('.fbox1').style.height = box1Height + 'px';
-
- // 鎺ュ彛宸︿晶鐨勬満鏋勭粺璁＄瓑
- this.getStatistics()
- this.getMList()
- },
- onLoad(options) {
- this.idIndex = options.id
- console.log('optionsoptionsoptions', options.id);
- },
- methods: {
- // 鎺ュ彛鐨勬暟鎹粺璁�
- async getStatistics() {
- await getHotSearch().then(res => {
- console.log(res, '鐑棬鎼滅储');
- this.hot = Object.keys(res.object).map(key => {
- return {
- id: parseInt(key),
- name: res.object[key]
- };
- })
- })
- await getDataStatistics().then(res => {
- let totalCount1 = res.object.institutionStatistic.details.reduce((total, item) => total +
- item.count, 0);
- let totalCount2 = res.object.officialStatistic.details.reduce((total, item) => total + item
- .count, 0);
- this.institution.list = [
- // {
- // count: totalCount1,
- // dynastyId: 0,
- // dynastyName: "鍏ㄩ儴"
- // },
- ...res.object.institutionStatistic.details
- ]
- this.institution.index = this.institution.list[0].dynastyId
- this.officials.list = [
- // {
- // count: totalCount2,
- // dynastyId: 0,
- // dynastyName: "鍏ㄩ儴"
- // },
- ...res.object.officialStatistic.details
- ]
- this.officials.index = this.officials.list[0].dynastyId
- // this.officials.list = res.object.officialStatistic.details
- this.source.list = res.object.sourceStatistic.details
- this.source.index = this.source.list[0].bookId
- // let a = [{count:4,dynastyName:'sdf'}]
- // [{name:'sdf',number}]
- console.log(res, '鎺ュ彛鎴愬姛sdsdfsdsfs');
- })
-
- },
- // 鍙充晶鐨刲ist鏁版嵁
- async getMList(obj) {
- let Obj = {
- medicalSearchType: "ALL",
- "type": this.classifyType, //鏌ヨ绫诲瀷 鍙栧�硷細OFFICIAL->鑱屽畼 INSTITUTION->鏈烘瀯 ALL->鑱屽畼銆佹満鏋�
- "name": this.SearchValue, //鎼滅储妗嗘绱�
- "dynastyId": this.classifyId, //鐐瑰嚮鏈濅唬鏌ヨ鏁版嵁鏃讹紝甯︿笂姝ゅ弬鏁�
- "sort": this.rankVal, //鎺掑簭鏂瑰紡 鍙栧�硷細CREATE鍒涘缓鏃堕棿锛孨AME鍚嶇О
- "page": this.CurrentPage, //绗嚑椤�
- "pageSize": this.pageSize //姣忛〉鏁伴噺
- }
- await getMedicalList(Obj).then(res => {
- this.CommodityList = res.list.map(item => {
- return {
- id: item.id,
- post: item.type === 'OFFICIAL' ? '鑱屽畼' : item.type === 'INSTITUTION' ?
- '鏈烘瀯' : '鑱屽畼銆佹満鏋�',
- name: item.name,
- anotherNamer: item.alias,
- source: item.source, // 鏉ユ簮
- dynasty: item.dynasty, // 鏈濅唬
- content: item.desc,
- ...item
- }
- })
- // 鎬绘暟閲�
- this.total = res.npage.totalCount
- console.log(res, '鏁版嵁');
- })
- },
- // list鏁扮粍 鑾峰彇list閲岄潰鐨勮鎯卻huju
- async ListClick(item) {
- console.log(item, 'listsdfdsfsdfs');
- let Obj = {
- id: item.id,
- type: item.type
- }
- await getMedicalDetails(Obj).then(res => {
- this.ListDetails = {
- ...item,
- ...res.object
- }
- console.log(res, this.ListDetails, '璇︽儏鏁版嵁');
- })
- this.dialogVisible = !this.dialogVisible
- },
- // 宸︿晶鐨勬満鏋勭粺璁＄瓑绛夋寜閽�
- handInstitCLick(item, name) {
- if (name == 'a') {
- this.CurrentPage = 1
- this.institution.index = item.dynastyId
- this.classifyId = item.dynastyId
- this.classifyType = 'INSTITUTION'
- this.getMList()
- } else if (name == 'b') {
- this.CurrentPage = 1
- this.officials.index = item.dynastyId
- this.classifyId = item.dynastyId
- this.classifyType = 'OFFICIAL'
- this.getMList()
- } else if (name == 'c') {
- this.CurrentPage = 1
- this.source.index = item.bookId
- this.getMList()
- console.log();
- }
- console.log(item, name);
- },
- // 灞曞紑鏀剁缉
- shrinkClick(box,name) {
- console.log(box);
- if(name=='鏈烘瀯'){
- this.institutionIndex = this.institutionIndex < this.institution.list.length ? this.institution.list.length : 4;
- this.officialsIndex=4
- this.activeBox = this.activeBox === 'a' ? null : 'a';
- }else if(name=='鑱屽畼'){
- this.officialsIndex = this.officialsIndex < this.officials.list.length ? this.officials.list.length : 4;
- this.institutionIndex=4
- this.activeBox = this.activeBox === 'b' ? null : 'b';
- }
- // if (this.activeBox === box) {
- // console.log('sdfs');
- // this.activeBox = null;
- // } else {
- // this.activeBox = box;
- // }
- },
- //鍙栧�硷細RDF銆丯T銆乆ML銆丣SON
- async PDFClick(item,index) {
- let Obj = {
- id:item.id,
- type:item.type,
- }
- if (index == 1) {
- Obj.outputType='RDF'
- console.log(Obj);
- let queryString = Object.keys(Obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(Obj[key])}`).join('&');
- console.log(queryString);
- // uni.navigateTo({
- // url:`/pages/RDF/RDF?${queryString}`
- // })
- window.open(`#/pages/RDF/RDF?${queryString}`)
- }else if(index ==2){
- Obj.outputType='NT'
- let queryString = Object.keys(Obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(Obj[key])}`).join('&');
- window.open(`#/pages/NT/NT?${queryString}`)
- }else if(index==3){
- Obj.outputType='XML'
- console.log('XML');
- await getMedicalDataOutput(Obj).then(res=>{
- console.log(res,'鎺ュ彛XML');
- })
- }else if(index ==4){
- Obj.outputType='JSON'
- console.log('JSON');
- await getMedicalDataOutput(Obj).then(res=>{
- console.log(res,'鎺ュ彛JSON');
- })
- }
- // console.log(Obj.id,);
- },
- // 鎼滅储鎸夐挳
- onSearch(val) {
- this.SearchValue = val
- this.getMList()
- console.log(val, '澹ぇ澶ぇ甯堝倕');
- },
- // 鐑棬鎼滅储
- HotClick(id) {
- this.hot.forEach(item => {
- if (item.id === id) {
- console.log(item.id === id);
- item.bgColor = true
- } else {
- console.log(item.id === id);
- item.bgColor = false
- }
- })
-
- },
- // 鎸夌収浠�涔堟帓搴�
- selectChange(e) {
- this.getMList()
- // console.log(e,this.rankVal);
- },
- // 鍒嗛〉褰撳墠椤佃Е鍙戜簨浠�
- CurrentChange(val) {
- if (this.CurrentPage != val) {
- this.CurrentPage = val
- console.log('褰撳墠椤�', val);
- console.log(this.CurrentPage);
- this.getMList()
- }
- },
- // 涓婁竴椤�
- PrevClick(val) {
- if (this.CurrentPage != val) {
- this.CurrentPage = val
- // console.log('涓婁竴椤�', val);
- // console.log(this.CurrentPage);
- this.getMList()
- }
- },
- // 涓嬩竴椤�
- NextClick(val) {
- if (this.CurrentPage != val) {
- // console.log('涓嬩竴椤�',val);
- this.CurrentPage = val
- // console.log(this.CurrentPage);
- this.getMList()
- }
- }
- }
- }
+ // 鐑棬鎼滅储
+ hot: [],
+ // 鐐瑰嚮鐨勬悳绱㈤」
+ HotBg: false,
+ // 鎺掑簭涓嬫媺鑿滃崟
+ rank: [
+ {
+ value: "CREATE",
+ label: "鎸夊垱寤烘椂闂存帓搴�"
+ },
+ {
+ value: "NAME",
+ label: "鎸夊悕绉版帓搴�"
+ }
+ ],
+ rankVal: "NAME",
+ // 鍒楄〃椤�
+ CommodityList: [],
+ // 鍒楄〃鐨勮鎯呮暟鎹�
+ ListDetails: {},
+ // 鍒嗛〉鐨勬�绘暟
+ total: 0,
+ // 褰撳墠椤�
+ CurrentPage: 1,
+ // 涓�椤垫樉绀哄灏戞潯鏁版嵁
+ pageSize: 6,
+ // 鎼滅储鐨剉alue
+ SearchValue: "",
+ pageLoading: true
+ };
+ },
+ onLoad(options) {
+ this.idIndex = options.id;
+ },
+ mounted() {
+ // 淇敼涓ゆ鐨勯珮搴︿繚鎸佷竴鑷�
+ var box1Height = document.querySelector(".fbox").offsetHeight;
+ // 鎺ュ彛宸︿晶鐨勬満鏋勭粺璁＄瓑
+ this.getStatistics();
+ this.getMList();
+ },
+ methods: {
+ // 鎺ュ彛鐨勬暟鎹粺璁�
+ getStatistics() {
+ getHotSearch().then((res) => {
+ this.hot = Object.keys(res.object).map((key) => {
+ return {
+ id: parseInt(key),
+ name: res.object[key]
+ };
+ });
+ });
+ getDataStatistics().then((res) => {
+ this.institution.list = [
+ {
+ count: res.object.institutionStatistic.totalCount,
+ dynastyId: "",
+ dynastyName: "鍏ㄩ儴"
+ },
+ ...res.object.institutionStatistic.details
+ ];
+ // this.institution.index = this.institution.list[0].dynastyId;
+ this.officials.list = [
+ {
+ count: res.object.officialStatistic.totalCount,
+ dynastyId: "",
+ dynastyName: "鍏ㄩ儴"
+ },
+ ...res.object.officialStatistic.details
+ ];
+ // this.officials.index = this.officials.list[0].dynastyId;
+ this.source.list = res.object.sourceStatistic.details;
+ this.source.index = this.source.list[0].bookId;
+ });
+ },
+ // 鍙充晶鐨刲ist鏁版嵁
+ getMList(obj) {
+ this.pageLoading = true;
+ let Obj = {
+ medicalSearchType: "ALL",
+ type: this.classifyType, //鏌ヨ绫诲瀷 鍙栧�硷細OFFICIAL->鑱屽畼 INSTITUTION->鏈烘瀯 ALL->鑱屽畼銆佹満鏋�
+ name: this.SearchValue, //鎼滅储妗嗘绱�
+ dynastyId: this.classifyId, //鐐瑰嚮鏈濅唬鏌ヨ鏁版嵁鏃讹紝甯︿笂姝ゅ弬鏁�
+ sort: this.rankVal, //鎺掑簭鏂瑰紡 鍙栧�硷細CREATE鍒涘缓鏃堕棿锛孨AME鍚嶇О
+ page: this.CurrentPage, //绗嚑椤�
+ pageSize: this.pageSize //姣忛〉鏁伴噺
+ };
+ getMedicalList(Obj).then((res) => {
+ this.CommodityList = res.list.map((item) => {
+ return {
+ id: item.id,
+ post:
+ item.type === "OFFICIAL"
+ ? "鑱屽畼"
+ : item.type === "INSTITUTION"
+ ? "鏈烘瀯"
+ : "鑱屽畼銆佹満鏋�",
+ ...item
+ };
+ });
+ // 鎬绘暟閲�
+ this.total = res.npage.totalCount;
+ this.pageLoading = false;
+ });
+ },
+ // list鏁扮粍 鑾峰彇list閲岄潰鐨勮鎯卻huju
+ ListClick(item) {
+ let Obj = {
+ id: item.dataId,
+ type: item.type
+ };
+ getMedicalDetails(Obj).then((res) => {
+ this.ListDetails = {
+ ...item,
+ ...res.object
+ };
+ });
+ this.dialogVisible = !this.dialogVisible;
+ },
+ // 宸︿晶鐨勬満鏋勭粺璁＄瓑绛夋寜閽�
+ handInstitCLick(item, name) {
+ if (name == "a") {
+ this.CurrentPage = 1;
+ this.institution.index = item.dynastyId;
+ this.officials.index = 0;
+ this.classifyId = item.dynastyId;
+ this.classifyType = "INSTITUTION";
+ this.getMList();
+ } else if (name == "b") {
+ this.CurrentPage = 1;
+ this.officials.index = item.dynastyId;
+ this.institution.index = 0;
+ this.classifyId = item.dynastyId;
+ this.classifyType = "OFFICIAL";
+ this.getMList();
+ } else if (name == "c") {
+ this.CurrentPage = 1;
+ this.source.index = item.bookId;
+ this.getMList();
+ }
+ },
+ // 灞曞紑鏀剁缉
+ shrinkClick(box, name) {
+ if (name == "鏈烘瀯") {
+ this.institutionIndex =
+ this.institutionIndex < this.institution.list.length
+ ? this.institution.list.length
+ : 4;
+ this.officialsIndex = 4;
+ this.activeBox = this.activeBox === "a" ? null : "a";
+ } else if (name == "鑱屽畼") {
+ this.officialsIndex =
+ this.officialsIndex < this.officials.list.length
+ ? this.officials.list.length
+ : 4;
+ this.institutionIndex = 4;
+ this.activeBox = this.activeBox === "b" ? null : "b";
+ }
+ // if (this.activeBox === box) {
+ // this.activeBox = null;
+ // } else {
+ // this.activeBox = box;
+ // }
+ },
+ //鍙栧�硷細RDF銆丯T銆乆ML銆丣SON
+ async PDFClick(item, index) {
+ let Obj = {
+ id: item.dataId,
+ type: item.type
+ };
+ if (index == 1) {
+ Obj.outputType = "RDF";
+ } else if (index == 2) {
+ Obj.outputType = "NT";
+ } else if (index == 3) {
+ Obj.outputType = "XML";
+ } else if (index == 4) {
+ Obj.outputType = "JSON";
+ }
+ let queryString = Object.keys(Obj)
+ .map(
+ (key) => `${encodeURIComponent(key)}=${encodeURIComponent(Obj[key])}`
+ )
+ .join("&");
+ window.open(`#/pages/fileDetail/index?${queryString}`);
+ },
+ // 鎼滅储鎸夐挳
+ onSearch(val) {
+ this.SearchValue = val;
+ this.getMList();
+ },
+ // 鐑棬鎼滅储
+ HotClick(val) {
+ this.SearchValue = val;
+ this.getMList();
+ },
+ // 鎸夌収浠�涔堟帓搴�
+ selectChange(e) {
+ this.getMList();
+ },
+ // 鍒嗛〉褰撳墠椤佃Е鍙戜簨浠�
+ CurrentChange(val) {
+ if (this.CurrentPage != val) {
+ this.CurrentPage = val;
+ this.getMList();
+ }
+ },
+ // 涓婁竴椤�
+ PrevClick(val) {
+ if (this.CurrentPage != val) {
+ this.CurrentPage = val;
+ this.getMList();
+ }
+ },
+ // 涓嬩竴椤�
+ NextClick(val) {
+ if (this.CurrentPage != val) {
+ this.CurrentPage = val;
+ this.getMList();
+ }
+ }
+ }
+};
</script>
<style scoped>
- @media screen and (min-width:2560px)and (max-width:3840px) {
+@media screen and (min-width: 2560px) and (max-width: 3840px) {
+ ::v-deep .search {
+ height: 0.36rem;
+ border-radius: 0.5rem !important;
+ align-items: center;
+ border-color: #597aa5 !important;
+ }
+}
- ::v-deep .search {
- height: .36rem;
- border-radius: .5rem !important;
- align-items: center;
- border-color: #597AA5 !important;
- }
- }
+@media screen and (min-width: 1366px) and (max-width: 1920px) {
+ ::v-deep .search {
+ height: 0.36rem;
+ border-radius: 0.5rem !important;
+ align-items: center;
+ border-color: #597aa5 !important;
+ }
+}
- @media screen and (min-width:1366px) and (max-width:1920px) {
- ::v-deep .search {
- height: .36rem;
- border-radius: .5rem !important;
- align-items: center;
- border-color: #597AA5 !important;
- }
- }
+/* 涓汉淇℃伅 */
+.creatureXinxi1 {
+ font-size: 0.24rem;
+ font-weight: 700;
+ line-height: 1;
+ margin-top: 0.29rem;
+}
- /* 涓汉淇℃伅 */
- .creatureXinxi1 {
- font-size: .24rem;
- font-weight: 700;
- line-height: 1;
- margin-top: .29rem;
- }
+.creatureXinxi2 {
+ /* width: .24rem; */
+ height: 0.17rem;
+ line-height: 1;
+ font-size: 0.12rem;
+ font-weight: 600;
+ background-color: #fff;
+ padding: 0.02rem 0.04rem;
+ margin: 0.15rem 0;
+ color: #2c2c2c;
+ border: 1px solid #2c2c2c;
+ border-radius: 2px;
+}
- .creatureXinxi2 {
- /* width: .24rem; */
- height: .17rem;
- line-height: 1;
- font-size: .12rem;
- font-weight: 600;
- background-color: #fff;
- padding: .02rem .04rem;
- margin: .15rem 0;
- color: #2C2C2C;
- border: 1px solid #2C2C2C;
- border-radius: 2px;
- }
+.creatureXinxi3 li {
+ height: 0.16rem;
+ line-height: 0.16rem;
+ background-color: #fff;
+ padding: 0 0.08rem;
+ margin: 0 0.07rem;
+ font-size: 0.12rem;
+ color: #2c2c2c;
+ border: 1px solid #2c2c2c;
+ border-radius: 0.3rem;
+ cursor: pointer;
+}
- .creatureXinxi3 li {
- height: .16rem;
- line-height: .16rem;
- background-color: #fff;
- padding: 0 .08rem;
- margin: 0 .07rem;
- font-size: .12rem;
- color: #2C2C2C;
- border: 1px solid #2C2C2C;
- border-radius: .3rem;
- }
-
- /* --------- */
- /* 鍝佺骇 */
- .pinji {
- box-shadow: 2px 0px 3px #888;
- background-color: #fff;
- width: 100%;
- /* height: .6rem;
+/* --------- */
+/* 鍝佺骇 */
+.pinji {
+ box-shadow: 2px 0px 3px #888;
+ background-color: #fff;
+ width: 100%;
+ /* height: .6rem;
line-height: .6rem; */
- font-size: .14rem;
- padding: .19rem .28rem .21rem;
- left: 0;
- position: relative;
- top: -.25rem;
- color: #2C2C2C;
- }
+ font-size: 0.14rem;
+ padding: 0.19rem 0.28rem 0.21rem;
+ left: 0;
+ position: relative;
+ top: -0.25rem;
+ color: #2c2c2c;
+}
- /* 涓汉淇℃伅鐨勬寜閽� */
- .detailsBtn {
- padding: .2rem;
- width: 100%;
- margin-bottom: 2rpx;
- position: absolute;
- bottom: 0;
- }
+/* 涓汉淇℃伅鐨勬寜閽� */
+.detailsBtn {
+ padding: 0.2rem;
+ width: 100%;
+ margin-bottom: 2rpx;
+ position: absolute;
+ bottom: 0;
+}
- .detailsBtn .btn-prev,
- .detailsBtn .btn-next {
- font-size: .14rem;
- /* padding: .14rem .1rem; */
- border: 1px solid #9E9E9E;
- border-radius: 5px;
- /* height: .32rem; */
- line-height: .32rem;
- }
+.detailsBtn .btn-prev,
+.detailsBtn .btn-next {
+ font-size: 0.14rem;
+ /* padding: .14rem .1rem; */
+ border: 1px solid #9e9e9e;
+ border-radius: 5px;
+ /* height: .32rem; */
+ line-height: 0.32rem;
+}
- .detailsBtn .btn-prev-L,
- .detailsBtn .btn-prev-R {
- border-left: 1px solid #9E9E9E;
- padding-left: .1rem;
- }
+.detailsBtn .btn-prev-L,
+.detailsBtn .btn-prev-R {
+ border-left: 1px solid #9e9e9e;
+ padding-left: 0.1rem;
+}
- .detailsBtn>:nth-child(2) {
- font-size: .14rem;
- color: #2C2C2C;
- }
+.detailsBtn > :nth-child(2) {
+ font-size: 0.14rem;
+ color: #2c2c2c;
+}
- /* ------ */
- img {
- width: 100%;
- height: 100%;
- }
+/* ------ */
+img {
+ width: 100%;
+ height: 100%;
+}
- .NavTop {
- background-color: #0c274c;
- padding: 25rpx;
- color: #fff !important;
+.NavTop {
+ background-color: #0c274c;
+ padding: 25rpx;
+ color: #fff !important;
- img {
- width: 30rpx;
- height: 30rpx;
- vertical-align: middle;
- }
+ img {
+ width: 30rpx;
+ height: 30rpx;
+ vertical-align: middle;
+ }
- .NavTopr {
- img {
- margin-right: 10rpx;
- }
- }
- }
+ .NavTopr {
+ img {
+ margin-right: 10rpx;
+ }
+ }
+}
- .mImage {
- width: 100%;
- height: 40rpx;
+.mImage {
+ width: 100%;
+ height: 40rpx;
- img {
- vertical-align: top;
- }
- }
+ img {
+ vertical-align: top;
+ }
+}
+.centre {
+ padding-left: 1.23rem;
+ padding-right: 1.17rem;
+ align-items: stretch;
+ .CLeft {
+ width: 2.4rem;
+ flex-direction: column;
+ margin-right: 0.2rem;
+ .institution {
+ width: 100%;
+ border: 1px solid #000;
+ padding: 20rpx;
+ }
+ .institution2 {
+ margin: 20rpx 0;
+ }
+ .institution3 {
+ flex-grow: 1;
+ }
+ }
- .centre {
- padding-left: 1.23rem;
- padding-right: 1.17rem;
- /* border: 1px solid #000; */
- /* height: 70vh; */
- /* overflow: hidden; */
- align-items: flex-start;
- position: relative;
- z-index: 1;
+ .CRight {
+ flex: 1;
+ border: 1px solid #c1d3ea;
+ box-sizing: border-box;
+ overflow: hidden;
+ padding: 0.1rem 0.2rem;
+ }
+}
- .CLeft {
- width: 2.6rem;
- height: 100%;
- vertical-align: top;
- flex-direction: column;
- justify-content: flex-start;
- margin-right: .2rem;
+.CommodityList {
+ flex-grow: 1;
+ width: 100%;
+ display: flex;
+ justify-content: flex-start;
+ align-items: flex-start;
+ flex-wrap: wrap;
+ align-content: flex-start;
+ /* padding: 20rpx 20rpx 0 20rpx; */
+ justify-content: space-between;
- .institution {
- width: 100%;
- border: 1px solid #000;
- padding: 20rpx;
+ > .rightList {
+ width: 49%;
+ margin-bottom: 20rpx;
- }
+ .box-card {
+ overflow: visible;
+ }
+ }
+}
- .institution2 {
- margin: 20rpx 0;
- }
-
- .institution3 {
- flex-grow: 1;
- }
- }
-
- .CRight {
- /* margin-left: 20rpx; */
- width: 100%;
- height: 100%;
- flex-grow: 1;
- border: 1px solid #c1d3ea;
- box-sizing: border-box;
- overflow: hidden;
- padding: 10rpx 30rpx;
- padding: .1rem .2rem;
- background-color: #fff;
- }
- }
-
- .CommodityList {
- flex-grow: 1;
- width: 100%;
- display: flex;
- justify-content: flex-start;
- align-items: flex-start;
- flex-wrap: wrap;
- align-content: flex-start;
- /* padding: 20rpx 20rpx 0 20rpx; */
- justify-content: space-between;
-
- >view {
- width: 49%;
- margin-bottom: 20rpx;
-
- .box-card {
- overflow: visible;
- }
- }
- }
-
- /* ::v-deep .el-card__body{
+/* ::v-deep .el-card__body{
padding: 30rpx;
} */
- /* 鍒嗛〉 */
- .paging {
- display: flex;
- align-items: center;
- }
+/* 鍒嗛〉 */
+.paging {
+ display: flex;
+ align-items: center;
+}
- .paging ::v-deep .btn-prev,
- .paging ::v-deep .btn-next {
- border: 0;
- }
+.paging ::v-deep .btn-prev,
+.paging ::v-deep .btn-next {
+ border: 0;
+}
- .paging ::v-deep .btn-prev span,
- .paging ::v-deep .btn-next span {
- font-size: .12rem;
- height: .3rem;
- line-height: .3rem;
- background-color: #fff;
- color: #9E9E9E;
- text-align: center;
- border: 1px solid #9E9E9E;
- padding: 0 .1rem;
- }
+.paging ::v-deep .btn-prev span,
+.paging ::v-deep .btn-next span {
+ font-size: 0.12rem;
+ height: 0.36rem;
+ line-height: 0.36rem;
+ background-color: #fff;
+ color: #9e9e9e;
+ text-align: center;
+ border: 1px solid #9e9e9e;
+ padding: 0 0.1rem;
+}
- .paging ::v-deep .el-pager li {
- font-size: .1rem;
- width: .28rem;
- height: .3rem;
- line-height: .3rem;
- background-color: #fff;
- color: #9E9E9E;
- text-align: center;
- border: 1px solid #9E9E9E;
- }
+.paging ::v-deep .el-pager li {
+ font-size: 0.1rem;
+ width: 0.36rem;
+ height: 0.36rem;
+ line-height: 0.36rem;
+ background-color: #fff;
+ color: #9e9e9e;
+ text-align: center;
+ border: 1px solid #9e9e9e;
+}
- /* ------------ */
- .dialog {
- position: fixed;
- right: 0;
- top: 0;
- z-index: 9999999999999999999999999999999999999999999 !important;
+/* ------------ */
+.dialog {
+ position: fixed;
+ right: 0;
+ top: 0;
+ z-index: 9999999999999999999999999999999999999999999 !important;
- >div {
- height: 100%;
- margin: 0 !important;
- position: fixed;
- right: 0;
- top: 0;
+ > div {
+ height: 100%;
+ margin: 0 !important;
+ position: fixed;
+ right: 0;
+ top: 0;
- > :nth-child(1) {
- display: none;
- }
+ > :nth-child(1) {
+ display: none;
+ }
+ > :nth-child(2) {
+ padding: 0;
+ }
+ }
+}
- >:nth-child(2) {
- padding: 0;
- }
- }
- }
+::v-deep .el-dialog .el-dialog__body {
+ height: 100%;
+}
- ::v-deep .el-dialog .el-dialog__body {
- height: 100%;
- }
+.detailImage {
+ width: 100%;
+ height: 1.94rem;
+ color: #000;
- .detailImage {
- width: 100%;
- height: 1.94rem;
- color: #000;
+ img {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ vertical-align: top;
+ }
+}
- img {
- position: absolute;
- width: 100%;
- height: 100%;
- vertical-align: top;
- }
- }
+/* 鎼滅储鎸夐挳 */
+.sousuo {
+ margin: 0.35rem 0 0.19rem;
+}
+.search1 {
+ width: 5rem;
+}
- /* 鎼滅储鎸夐挳 */
- .sousuo {
- margin: .35rem 0 .19rem;
- }
+::v-deep .search {
+ height: 0.36rem;
+ border-radius: 0.3rem;
+ align-items: center;
+ border-color: #597aa5 !important;
+}
- .search1 {
- width: 5rem;
+::v-deep .search .content {
+ height: 100% !important;
+ border: 0;
+}
- }
+::v-deep .search .uni-input-placeholder {
+ font-size: 0.14rem;
+}
- ::v-deep .search {
- height: .36rem;
- border-radius: .3rem;
- align-items: center;
- border-color: #597AA5 !important;
- }
+::v-deep .search .uni-icons {
+ font-size: 0.14rem !important;
+ color: #244a7b !important;
+}
- ::v-deep .search .content {
- height: 100% !important;
- border: 0;
- }
+::v-deep .search .uni-input-input,
+::v-deep .search .uni-select__input-box {
+ font-size: 0.14rem;
+ line-height: 1;
+}
- ::v-deep .search .uni-input-placeholder {
- font-size: .14rem;
- }
+::v-deep .xiala {
+ width: 20% !important;
+ text-align: center;
+}
- ::v-deep .search .uni-icons {
- font-size: .14rem !important;
- color: #244A7B !important;
- }
+::v-deep .uni-select__input-text {
+ color: #244a7b;
+}
- ::v-deep .search .uni-input-input,
- ::v-deep .search .uni-select__input-box {
- font-size: .14rem;
- line-height: 1;
- }
+::v-deep .next-search-more .search {
+ border: 2px solid #597aa5 !important;
+}
- ::v-deep .xiala {
- width: 20% !important;
- text-align: center;
- }
+::v-deep .next-search-more .search .content {
+ border-left: 1px solid #597aa5 !important;
+}
- ::v-deep .uni-select__input-text {
- color: #244A7B;
- }
+.search1 ::v-deep .btnn {
+ /* border: 10px solid red; */
+ width: 0.74rem !important;
+ height: 0.3rem;
+ line-height: 0.3rem;
+ text-align: center;
+ font-size: 0.14rem;
+ background-color: #244a7b;
+ border-radius: 0.5rem;
+ color: #fff;
+ margin-right: 0.03rem;
+ cursor: pointer;
+}
- ::v-deep .next-search-more .search {
- border: 2px solid #597AA5 !important;
- }
+.search1 ::v-deep .icon-del {
+ font-size: 0.24rem !important;
+ cursor: pointer;
+}
- ::v-deep .next-search-more .search .content {
- border-left: 1px solid #597AA5 !important;
- }
+.search1 ::v-deep .uni-select__selector-item {
+ position: relative;
+ z-index: 999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 !important;
- .search1 ::v-deep .btnn {
- /* border: 10px solid red; */
- width: .74rem !important;
- height: .3rem;
- line-height: .3rem;
- text-align: center;
- font-size: .14rem;
- background-color: #597AA5;
- border-radius: .5rem;
- color: #fff;
- margin-right: .03rem;
- }
+ display: flex;
+ justify-content: center;
+ font-size: 0.14rem;
+ height: 0.3rem;
+ line-height: 0.3rem;
+}
- .search1 ::v-deep .icon-del {
- font-size: .24rem !important;
- }
+/* ------------- */
+/* 鐑棬鎼滅储 */
+.remen {
+ font-size: 0.12rem;
+ margin-top: 0.1rem;
+ color: #2c2c2c;
+}
- .search1 ::v-deep .uni-select__selector-item {
- position: relative;
- z-index: 999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 !important;
+/* --------- */
- display: flex;
- justify-content: center;
- font-size: .14rem;
- height: .3rem;
- line-height: .3rem;
- }
-
- /* ------------- */
- /* 鐑棬鎼滅储 */
- .remen {
- font-size: .12rem;
- margin-top: .1rem;
- color: #2C2C2C;
- }
-
- /* --------- */
-
- /* .boox {
+/* .boox {
width: 100%;
padding: .1rem .09rem;
@@ -914,141 +1026,157 @@
font-size: .14rem;
}
} */
- .MargB {
- margin-bottom: .2rem;
- }
+.MargB {
+ margin-bottom: 0.2rem;
+}
- /* 宸﹁竟鐨� */
- .boox {
- width: 100%;
- padding: .1rem .09rem;
- min-height: 2rem !important;
- position: relative;
- border: 1px solid #c1d3ea !important;
+/* 宸﹁竟鐨� */
+.boox {
+ width: 100%;
+ padding: 0.1rem 0.09rem;
+ min-height: 2rem !important;
+ position: relative;
+ border: 1px solid #c1d3ea !important;
- ul {
- margin-top: .16rem !important;
- }
+ ul {
+ margin-top: 0.16rem !important;
+ }
- h3 {
- font-size: .14rem;
- margin-left: .1rem;
- }
+ h3 {
+ font-size: 0.14rem;
+ margin-left: 0.1rem;
+ }
- li {
- height: .3rem;
- line-height: .3rem;
- padding: 0 .2rem !important;
- margin: .05rem 0 !important;
- border-radius: .3rem !important;
- font-size: .14rem;
- }
+ li {
+ height: 0.3rem;
+ line-height: 0.3rem;
+ padding: 0 0.2rem !important;
+ margin: 0.05rem 0 !important;
+ border-radius: 0.3rem !important;
+ font-size: 0.14rem;
+ }
- .toggleButton1 {
- position: absolute;
- bottom: .1rem !important;
- left: 40% !important;
- }
+ .toggleButton1 {
+ position: absolute;
+ bottom: 0.1rem !important;
+ left: 40% !important;
+ }
- .toggleButton {
- font-size: .14rem !important;
- }
- }
+ .toggleButton {
+ font-size: 0.14rem !important;
+ }
+}
-
- .paixu {
- /* margin-right: .3rem;
+.paixu {
+ /* margin-right: .3rem;
height: .24rem; */
- }
+}
- .paixu ::v-deep .el-input__icon {
- font-size: .12rem;
- line-height: .24rem;
- margin-right: .05rem;
- }
+.paixu ::v-deep .el-input__icon {
+ font-size: 0.12rem;
+ line-height: 0.24rem;
+ margin-right: 0.05rem;
+}
+.paixu ::v-deep .el-input__inner {
+ width: 1.09rem;
+ font-size: 0.12rem;
+ padding-left: 0.15rem;
+ height: 0.24rem;
+ line-height: 0.24rem;
+ color: #2c2c2c;
+ border-color: #9e9e9e;
+}
- .paixu ::v-deep .el-input__inner {
- width: 1.09rem;
- font-size: .12rem;
- padding-left: .15rem;
- height: .24rem;
- line-height: .24rem;
- color: #2C2C2C;
- border-color: #9E9E9E;
- }
+.el-select-dropdown__item {
+ font-size: 0.12rem;
+ height: 0.2rem;
+ line-height: 0.2rem;
+}
- .el-select-dropdown__item {
- font-size: .12rem;
- height: .2rem;
- line-height: .2rem;
- }
+.rightList {
+ height: 1.6rem;
+ position: relative;
+ overflow: hidden;
+ margin-bottom: 0.2rem !important;
+ cursor: pointer;
+}
- .rightList {
- height: 1.6rem;
- position: relative;
- overflow: hidden;
- margin-bottom: .2rem !important;
- }
+.rightList ::v-deep .el-card__body {
+ padding: 0;
+}
- .rightList ::v-deep .el-card__body {
- padding: 0;
- }
+.rightList .RightListTop {
+ margin: 0.14rem 0;
+ font-size: 0.14rem;
+ height: 0.24rem;
+ line-height: 0.24rem;
+ display: flex;
+}
- .rightList .RightListTop {
- margin: .14rem 0;
- font-size: .14rem;
- height: .24rem;
- line-height: .24rem;
- display: flex;
- }
+.rightList .RightListTop .Topzhiwei {
+ min-width: 0.52rem;
+ margin-right: 0.08rem;
+ padding-right: 0.05rem;
+}
- .rightList .RightListTop .Topzhiwei {
- min-width: .52rem;
- margin-right: .08rem;
- padding-right: .05rem;
- }
+.rightList .RightListTop .TopName {
+ font-weight: 700;
+ color: #2c2c2c;
+ margin-right: 0.17rem;
+ overflow: hidden;
+ flex: 1;
+}
- .rightList .RightListTop .TopName {
- font-weight: 700;
- color: #2C2C2C;
- margin-right: .17rem;
- }
+.rightList .RightListTop .TopName .title {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
- .rightList .RightListTop .TopDynasty {
- /* width: .34rem; */
- height: .19rem;
- font-size: .12rem;
- line-height: .19rem;
- text-align: center;
- border-color: #9E9E9E;
- color: #9E9E9E;
- }
+.rightList .RightListTop .TopDynasty {
+ height: 0.19rem;
+ font-size: 0.12rem;
+ line-height: 0.19rem;
+ text-align: center;
+ border-color: #9e9e9e;
+ color: #9e9e9e;
+ border: 1px solid #d4d4d4;
+ font-weight: 500;
+ padding: 0 10rpx;
+ border-radius: 10rpx;
+ margin-left: 0.1rem;
+ min-width: max-content;
+}
- .rightList .desBox {
- padding: .14rem .2rem .23rem;
+.rightList .desBox {
+ padding: 0.14rem 0.2rem 0.23rem;
- /* position: relative; */
- .biecheng {
- height: .24rem;
- /* line-height: .24rem; */
- font-size: .12rem;
- padding-left: .1rem;
- background-color: #F0F0F0;
- display: flex;
- align-items: center;
- margin-bottom: .12rem;
- }
+ /* position: relative; */
+ .biecheng {
+ height: 0.24rem;
+ /* line-height: .24rem; */
+ font-size: 0.12rem;
+ padding-left: 0.1rem;
+ background-color: #f0f0f0;
+ display: flex;
+ align-items: center;
+ margin-bottom: 0.12rem;
+ }
- .describe {
- position: absolute;
- bottom: .1rem;
- left: 0;
- /* width: 100%; */
- padding: 0 .23rem;
- height: .49rem;
- line-height: .24rem;
- font-size: .12rem;
- }
- }
-</style>
\ No newline at end of file
+ .describe {
+ position: absolute;
+ bottom: 0.1rem;
+ left: 0;
+ /* width: 100%; */
+ padding: 0 0.23rem;
+ height: 0.49rem;
+ line-height: 0.24rem;
+ font-size: 0.12rem;
+ }
+}
+
+.nullBox {
+ width: 100%;
+}
+</style>
diff --git a/src/pages/academicGenres/index.vue b/src/pages/academicGenres/index.vue
new file mode 100644
index 0000000..d2e93ea
--- /dev/null
+++ b/src/pages/academicGenres/index.vue
@@ -0,0 +1,275 @@
+<template>
+ <view>
+ <!-- 椤堕儴瀵艰埅 -->
+ <headNav :idIndex="idIndex" text="鍘嗕唬瀛︽湳娴佹淳" />
+ <!-- 瀛︽淳 -->
+ <view class="flex flex-center" style="width: 100%; margin: 0.2rem 0">
+ <ul class="flex">
+ <li style="" v-for="(item, index) in dynasty" :key="item.id">
+ <view
+ @click="SchoolClick(item.id)"
+ class="flex flex-center font-family school"
+ :style="{
+ marginRight: index === dynasty.length - 1 ? '0' : '0.03rem'
+ }"
+ style="
+ font-weight: 500;
+ border-radius: 0.3rem;
+ padding: 0.06rem 0.15rem;
+ color: #2c2c2c;
+ font-size: 0.12rem;
+ margin-top: 0.03rem;
+ margin-right: 0.1rem;
+ background-color: #fff;
+ "
+ >
+ <view
+ class=""
+ :style="{ background: item.color }"
+ style="
+ margin-right: 0.07rem;
+ width: 0.12rem;
+ height: 0.12rem;
+ border-radius: 50%;
+ "
+ ></view>
+ <view class="" style="color: #2c2c2c; font-size: 0.12rem">{{
+ item.name
+ }}</view>
+ </view>
+ </li>
+ </ul>
+ </view>
+ <view class="" style="background-color: #fff">
+ <view id="line-chart" style="width: 100vw"></view>
+ </view>
+ </view>
+</template>
+
+<script>
+import { getDynasty, getDynastyStatistics } from "@/api/index.js";
+import * as echarts from "echarts";
+import axios from "axios";
+export default {
+ data() {
+ return {
+ // 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
+ idIndex: 0,
+ // 鏈濅唬
+ dynasty: [
+ {
+ name: "鍖荤粡瀛︽淳",
+ color: "#90BBD8",
+ id: 1
+ },
+ {
+ name: "缁忔柟瀛︽淳",
+ color: "#EDD28B",
+ id: 2
+ },
+ {
+ name: "浼ゅ瘨瀛︽淳",
+ color: "#CF746D",
+ id: 3
+ },
+ {
+ name: "娌抽棿瀛︽淳",
+ color: "#9CC27A",
+ id: 4
+ },
+ {
+ name: "鏀婚偑瀛︽淳",
+ color: "#5B6CB9",
+ id: 5
+ },
+ {
+ name: "婊嬮槾瀛︽淳",
+ color: "#8860A8",
+ id: 6
+ },
+ {
+ name: "鏄撴按瀛︽淳",
+ color: "#DE8E66",
+ id: 7
+ },
+ {
+ name: "娓╄ˉ瀛︽淳",
+ color: "#7FAC8C",
+ id: 8
+ }
+ ],
+ chartData: [
+ {
+ name: "缁忔柟瀛︽淳",
+ values: [30, 10, 100, 400, 30, 70]
+ },
+ {
+ name: "浼ゅ瘨瀛︽淳",
+ values: [23, 30, 140, 200, 230, 470, 230, 470]
+ }
+ ],
+ xAxisData: []
+ };
+ },
+ onLoad(options) {
+ this.idIndex = options.id;
+ // 鑾峰彇鏈濅唬
+ this.getDynastyData();
+ },
+ methods: {
+ getDynastyData() {
+ getDynasty().then((res) => {
+ res.list.sort((a, b) => a.end - b.end);
+ this.xAxisData = res.list.map((item) => item.dynasty);
+ console.log(this.xAxisData);
+ this.getData();
+ });
+ },
+ getData() {
+ getDynastyStatistics().then((res) => {
+ console.log(res);
+ });
+ },
+ SchoolClick(id) {
+ uni.navigateTo({
+ url: "/pages/interchannel/interchannel?id=" + this.idIndex
+ });
+ },
+ // 闅忔満鑹�
+ getRandomColor() {
+ var letters = "0123456789ABCDEF";
+ var color = "#";
+ for (var i = 0; i < 6; i++) {
+ color += letters[Math.floor(Math.random() * 16)];
+ }
+ return color;
+ },
+ renderChart() {
+ const chart = echarts.init(document.getElementById("line-chart"));
+ // 鏆傚瓨涓�涓�
+ let chartData1 = this.chartData;
+ let color = [];
+
+ const series = this.chartData.map((item, i) => {
+ color.push(this.getRandomColor());
+ return {
+ name: item.name,
+ type: "line",
+ data: item.values,
+ smooth: 0.5,
+ // 璁剧疆绾挎潯鐨勯鑹�
+ itemStyle: {
+ normal: {
+ color: "lineColor", // 鏀瑰彉鎶樼嚎鐐圭殑棰滆壊
+ lineStyle: {
+ color: color[i], // 鏀瑰彉鎶樼嚎棰滆壊
+ width: 3
+ }
+ }
+ },
+ // 璁剧疆绾挎潯鍙充晶鐨勫瓧浣撻鑹茬瓑
+ label: {
+ show: true, // 鏄剧ず鏍囩
+ position: "right", // 鏍囩浣嶇疆锛氬彸渚�
+ formatter: function (param) {
+ if (chartData1[i].values.length - 1 === param.dataIndex) {
+ return param.seriesName + " " + param.value;
+ } else {
+ return "";
+ }
+ },
+ color: color[i]
+ }
+ };
+ });
+
+ console.log(series, "series");
+
+ const option = {
+ // legend: {
+ // data: this.chartData.map(item => item.name),
+ // },
+ zoom: 8, // 杩欓噷鍙互鏍规嵁闇�瑕佽皟鏁寸缉鏀剧骇鍒�
+
+ xAxis: {
+ type: "category",
+ data: this.xAxisData,
+ axisLabel: {
+ fontSize: 32 // 璁剧疆 x 杞翠笂鏂囧瓧鐨勫瓧浣撳ぇ灏忎负 12 鍍忕礌
+ },
+ axisLine: {
+ lineStyle: {
+ width: 4 // 璁剧疆x杞寸嚎鏉″搴︿负2鍍忕礌
+ }
+ }
+ },
+ yAxis: {
+ type: "value",
+ axisLabel: {
+ fontSize: 32 // 璁剧疆 x 杞翠笂鏂囧瓧鐨勫瓧浣撳ぇ灏忎负 12 鍍忕礌
+ },
+ axisLine: {
+ lineStyle: {
+ width: 10 // 璁剧疆x杞寸嚎鏉″搴︿负2鍍忕礌
+ }
+ }
+ },
+ series: series,
+ // 鍏朵粬閰嶇疆椤�...
+ textStyle: {
+ fontSize: 30 // 璁剧疆鍏ㄥ眬鏂囧瓧鐨勫瓧浣撳ぇ灏�
+ }
+ };
+
+ chart.setOption(option);
+ }
+ },
+ mounted() {
+ this.renderChart();
+ }
+};
+</script>
+
+<style>
+view {
+ color: #fff;
+}
+
+.school {
+}
+
+.bag {
+ height: 100vh;
+ background-color: #fff;
+}
+
+.NavTop {
+ background-color: #0c274c;
+ padding: 25rpx;
+
+ img {
+ width: 30rpx;
+ height: 30rpx;
+ vertical-align: middle;
+ }
+
+ .NavTopr {
+ img {
+ margin-right: 10rpx;
+ }
+ }
+}
+
+.mImage {
+ width: 100%;
+ height: 40rpx;
+
+ img {
+ vertical-align: top;
+ }
+}
+
+#line-chart {
+ height: 6rem;
+}
+</style>
diff --git a/src/pages/character/index.vue b/src/pages/character/index.vue
index 0dca248..a8ae2b7 100644
--- a/src/pages/character/index.vue
+++ b/src/pages/character/index.vue
@@ -272,7 +272,7 @@
methods: {
getData() {
getPersonList({
- keywords: "妤�", //鎼滅储妗嗘绱�
+ keywords: "", //鎼滅储妗嗘绱�
name: "", //濮撳悕
alias: "", //鍒悕
nativePlace: "", //鏈哄叧
diff --git a/src/pages/dataDisplay/dataDisplay.vue b/src/pages/dataDisplay/dataDisplay.vue
deleted file mode 100644
index 3ef458a..0000000
--- a/src/pages/dataDisplay/dataDisplay.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
- <view>
- <!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="idIndex" text="鍘嗕唬瀛︽湳娴佹淳" />
- <!-- 瀛︽淳 -->
- <view class="flex flex-center" style="width: 100%; margin: .2rem 0;">
- <ul class="flex">
- <li style="" v-for="(item,index) in dynasty" :key="item.id">
- <view @click="SchoolClick(item.id)" class="flex flex-center font-family school"
- :style="{'marginRight': index === dynasty.length - 1 ? '0' : '0.03rem'}"
- style="font-weight: 500; border-radius: .3rem; padding: .06rem .15rem; color: #2C2C2C; font-size: .12rem; margin-top: .03rem;margin-right: .1rem;background-color: #fff;">
- <view class="" :style="{background:item.color}"
- style="margin-right: .07rem; width: .12rem;height: .12rem;border-radius: 50%;"></view>
- <view class="" style="color: #2C2C2C;font-size: .12rem;">{{item.name}}</view>
- </view>
- </li>
- </ul>
- </view>
- <view class="" style="background-color: #fff;">
- <view id="line-chart" style="width: 100vw;"></view>
- </view>
- </view>
-</template>
-
-<script>
- import * as echarts from 'echarts';
- import axios from 'axios';
- export default {
- data() {
- return {
- // 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
- idIndex: 0,
- // 鏈濅唬
- dynasty: [{
- name: '鍖荤粡瀛︽淳',
- color: '#90BBD8',
- id: 1
- }, {
- name: '缁忔柟瀛︽淳',
- color: '#EDD28B',
- id: 2
- }, {
- name: '浼ゅ瘨瀛︽淳',
- color: '#CF746D',
- id: 3
- }, {
- name: '娌抽棿瀛︽淳',
- color: '#9CC27A',
- id: 4
- }, {
- name: '鏀婚偑瀛︽淳',
- color: '#5B6CB9',
- id: 5
- }, {
- name: '婊嬮槾瀛︽淳',
- color: '#8860A8',
- id: 6
- }, {
- name: '鏄撴按瀛︽淳',
- color: '#DE8E66',
- id: 7
- }, {
- name: '娓╄ˉ瀛︽淳',
- color: '#7FAC8C',
- id: 8
- }],
- chartData: [{
- name: '缁忔柟瀛︽淳',
- values: [30, 10, 100, 400, 30, 70]
- }, {
- name: '浼ゅ瘨瀛︽淳',
- values: [23, 30, 140, 200, 230, 470,230, 470]
- }]
- }
- },
- onLoad(options) {
- this.idIndex = options.id
- console.log('optionsoptionsoptions', options.id);
- },
- methods: {
- //
- SchoolClick(id) {
- console.log(id);
- uni.navigateTo({
- url: '/pages/interchannel/interchannel?id=' + this.idIndex
- })
- },
- // 闅忔満鑹�
- getRandomColor() {
- var letters = '0123456789ABCDEF';
- var color = '#';
- for (var i = 0; i < 6; i++) {
- color += letters[Math.floor(Math.random() * 16)];
- }
- return color;
- },
- renderChart() {
- const chart = echarts.init(document.getElementById('line-chart'));
- const xAxisData = ['1950', '1955', '1960', '1965', '1970', '1975', '123','1950', ];
- // 鏆傚瓨涓�涓�
- let chartData1 = this.chartData
- let color = []
-
- const series = this.chartData.map((item, i) => {
- color.push(this.getRandomColor())
- return {
- name: item.name,
- type: 'line',
- data: item.values,
- smooth: 0.5,
- // 璁剧疆绾挎潯鐨勯鑹�
- itemStyle: {
- normal: {
- color: 'lineColor', // 鏀瑰彉鎶樼嚎鐐圭殑棰滆壊
- lineStyle: {
- color: color[i], // 鏀瑰彉鎶樼嚎棰滆壊
- width: 3
- }
- }
- },
- // 璁剧疆绾挎潯鍙充晶鐨勫瓧浣撻鑹茬瓑
- label: {
- show: true, // 鏄剧ず鏍囩
- position: 'right', // 鏍囩浣嶇疆锛氬彸渚�
- formatter: function(param) {
- if (chartData1[i].values.length - 1 === param.dataIndex) {
- return param.seriesName + ' ' + param.value;
- } else {
- return ''
- }
- },
- color: color[i]
- }
- };
- });
-
- const option = {
- // legend: {
- // data: this.chartData.map(item => item.name),
- // },
- zoom: 8, // 杩欓噷鍙互鏍规嵁闇�瑕佽皟鏁寸缉鏀剧骇鍒�
-
- xAxis: {
- type: 'category',
- data: xAxisData,
- axisLabel: {
- fontSize: 32 // 璁剧疆 x 杞翠笂鏂囧瓧鐨勫瓧浣撳ぇ灏忎负 12 鍍忕礌
- },
- axisLine: {
- lineStyle: {
- width: 4 // 璁剧疆x杞寸嚎鏉″搴︿负2鍍忕礌
- }
- }
- },
- yAxis: {
- type: 'value',
- axisLabel: {
- fontSize: 32 // 璁剧疆 x 杞翠笂鏂囧瓧鐨勫瓧浣撳ぇ灏忎负 12 鍍忕礌
- },
- axisLine: {
- lineStyle: {
- width: 10 // 璁剧疆x杞寸嚎鏉″搴︿负2鍍忕礌
- }
- }
- },
- series: series,
- // 鍏朵粬閰嶇疆椤�...
- textStyle: {
- fontSize: 30 // 璁剧疆鍏ㄥ眬鏂囧瓧鐨勫瓧浣撳ぇ灏�
- },
- };
-
- chart.setOption(option);
- }
- },
- mounted() {
- this.renderChart();
- }
- }
-</script>
-
-<style>
- view {
- color: #fff;
- }
-
- .school {}
-
- .bag {
- height: 100vh;
- background-color: #fff;
- }
-
- .NavTop {
- background-color: #0c274c;
- padding: 25rpx;
-
- img {
- width: 30rpx;
- height: 30rpx;
- vertical-align: middle;
- }
-
- .NavTopr {
- img {
- margin-right: 10rpx;
- }
- }
- }
-
- .mImage {
- width: 100%;
- height: 40rpx;
-
- img {
- vertical-align: top;
- }
- }
-
- #line-chart {
- height: 6rem;
- }
-</style>
\ No newline at end of file
diff --git a/src/pages/fileDetail/index.vue b/src/pages/fileDetail/index.vue
new file mode 100644
index 0000000..ad77e4c
--- /dev/null
+++ b/src/pages/fileDetail/index.vue
@@ -0,0 +1,38 @@
+<template>
+ <view id="box">
+ <!-- RDF瀵瑰簲鐨勫弬鏁� -->
+ {{data}}
+ </view>
+</template>
+
+<script>
+import { getMedicalDataOutput } from "@/api/index.js";
+export default {
+ data() {
+ return {
+ Obj: {},
+ data: ""
+ };
+ },
+ onLoad(options) {
+ this.Obj = options;
+ },
+ mounted() {
+ this.innt();
+ },
+ methods: {
+ innt() {
+ getMedicalDataOutput(this.Obj).then((res) => {
+ console.log(res);
+ this.data = res;
+ });
+ }
+ }
+};
+</script>
+
+<style>
+ #box{
+ font-size: 14px;
+ }
+</style>
diff --git a/src/pages/forgetPass/forgetPass.vue b/src/pages/forgetPass/forgetPass.vue
index b642bd0..c613901 100644
--- a/src/pages/forgetPass/forgetPass.vue
+++ b/src/pages/forgetPass/forgetPass.vue
@@ -207,7 +207,7 @@
// })
} else if (item.id == 3) {
uni.navigateTo({
- url: '/pages/dataDisplay/dataDisplay?id=' + item.id
+ url: '/pages/academicGenres/index?id=' + item.id
})
} else if (item.id == 4) {
uni.navigateTo({
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 4cc380d..f26bc15 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -195,7 +195,7 @@
// })
} else if (item.id == 3) {
uni.navigateTo({
- url: '/pages/dataDisplay/dataDisplay?id=' + item.id
+ url: '/pages/academicGenres/index?id=' + item.id
})
} else if (item.id == 4) {
uni.navigateTo({
@@ -486,7 +486,7 @@
}
}
- @media screen and (min-width:1366px) and (max-width:1920px) {
+ @media screen and (min-width:1366px) {
.Ttop {
margin-bottom: .6rem !important;
}
@@ -530,9 +530,7 @@
width: 2rem !important;
}
- .hua {
- height: 4rem !important;
- }
+
}
diff --git a/src/static/initialize.css b/src/static/initialize.css
index 26e27fc..7e999de 100644
--- a/src/static/initialize.css
+++ b/src/static/initialize.css
@@ -1,116 +1,116 @@
- * {
- margin: 0%;
- padding: 0;
- box-sizing: border-box;
- }
+* {
+ margin: 0%;
+ padding: 0;
+ box-sizing: border-box;
+}
- html {
- font-size: calc(100 * 100vw / 1440) !important;
- /* font-size: 10px; */
- }
+html {
+ font-size: calc(100vw / 1440 * 96) !important;
+ /* font-size: 10px; */
+}
- body {
- font-size: .16rem !important;
- }
+body {
+ font-size: 0.16rem !important;
+}
- .flex {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
+.flex {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
- .flex-column {
- flex-direction: column;
- }
+.flex-column {
+ flex-direction: column;
+}
- .flex-wrap {
- flex-wrap: wrap;
- }
+.flex-wrap {
+ flex-wrap: wrap;
+}
- .flex-center {
- align-items: center;
- justify-content: center;
- }
+.flex-center {
+ align-items: center;
+ justify-content: center;
+}
- .flex-grow {
- flex-grow: 1;
- }
+.flex-grow {
+ flex-grow: 1;
+}
- .flex-column {
- flex-direction: column;
- }
+.flex-column {
+ flex-direction: column;
+}
- .flex-shrink {
- flex-shrink: 0;
- }
+.flex-shrink {
+ flex-shrink: 0;
+}
- .flex-start {
- justify-content: flex-start
- }
+.flex-start {
+ justify-content: flex-start;
+}
- .flex-content {
- justify-content: space-around;
- }
+.flex-content {
+ justify-content: space-around;
+}
- .flex-items-start {
- align-items: flex-start;
- }
+.flex-items-start {
+ align-items: flex-start;
+}
- .relative {
- position: relative;
- /* z-index: 99999 !important; */
- z-index: 1;
- }
+.relative {
+ position: relative;
+ /* z-index: 99999 !important; */
+ z-index: 1;
+}
- /* 瀛椾綋瀹嬩綋 */
- .font-family {
- font-family: 瀹嬩綋;
- }
- .fontFamily{
- font-family:"simsun","瀹嬩綋",serif;
- font-weight: bolder;
- }
+/* 瀛椾綋瀹嬩綋 */
+.font-family {
+ font-family: 瀹嬩綋;
+}
+.fontFamily {
+ font-family: "simsun", "瀹嬩綋", serif;
+ font-weight: bolder;
+}
- /* 瓒呭嚭闅愯棌1 */
- .BeyondHiding1 {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- /* 瓒呭嚭闅愯棌2 */
- .BeyondHiding2 {
- display: -webkit-box;
- -webkit-line-clamp: 2;
- /* 璁剧疆瑕佹樉绀虹殑琛屾暟 */
- -webkit-box-orient: vertical;
- /* 璁剧疆鏄剧ず鏂瑰紡涓哄瀭鐩存柟鍚� */
- overflow: hidden;
- /* 闅愯棌瓒呭嚭鐨勫唴瀹� */
- }
- /* 瓒呭嚭闅愯棌3 */
- .BeyondHiding3 {
- display: -webkit-box;
- -webkit-line-clamp: 3;
- /* 璁剧疆瑕佹樉绀虹殑琛屾暟 */
- -webkit-box-orient: vertical;
- /* 璁剧疆鏄剧ず鏂瑰紡涓哄瀭鐩存柟鍚� */
- overflow: hidden;
- /* 闅愯棌瓒呭嚭鐨勫唴瀹� */
- }
- /* 鎵嬪娍 */
- .cursor{
- cursor: pointer;
- }
- ul {
- list-style: none;
- }
+/* 瓒呭嚭闅愯棌1 */
+.BeyondHiding1 {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+/* 瓒呭嚭闅愯棌2 */
+.BeyondHiding2 {
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ /* 璁剧疆瑕佹樉绀虹殑琛屾暟 */
+ -webkit-box-orient: vertical;
+ /* 璁剧疆鏄剧ず鏂瑰紡涓哄瀭鐩存柟鍚� */
+ overflow: hidden;
+ /* 闅愯棌瓒呭嚭鐨勫唴瀹� */
+}
+/* 瓒呭嚭闅愯棌3 */
+.BeyondHiding3 {
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ /* 璁剧疆瑕佹樉绀虹殑琛屾暟 */
+ -webkit-box-orient: vertical;
+ /* 璁剧疆鏄剧ず鏂瑰紡涓哄瀭鐩存柟鍚� */
+ overflow: hidden;
+ /* 闅愯棌瓒呭嚭鐨勫唴瀹� */
+}
+/* 鎵嬪娍 */
+.cursor {
+ cursor: pointer;
+}
+ul {
+ list-style: none;
+}
- html {
- color: #fff;
- background-color: #fff;
- }
+html {
+ color: #fff;
+ background-color: #fff;
+}
- img {
- width: 100%;
- height: 100%;
- }
\ No newline at end of file
+img {
+ width: 100%;
+ height: 100%;
+}
diff --git a/src/uni_modules/next-search-more/components/next-search-more/next-search-more.vue b/src/uni_modules/next-search-more/components/next-search-more/next-search-more.vue
index 3063357..5e64190 100644
--- a/src/uni_modules/next-search-more/components/next-search-more/next-search-more.vue
+++ b/src/uni_modules/next-search-more/components/next-search-more/next-search-more.vue
@@ -1,28 +1,55 @@
<template>
- <view class="next-search-more">
- <view class="search" :style="{ backgroundColor: backgroundColor }">
- <!-- 涓嬫媺鑿滃崟 -->
- <template>
- <view class="button xiala active" @click="selectMore">
- <view class="button-item">
- <!-- <text class="icon icon-more"></text> -->
- <uni-data-select style="width: 100%;" v-model="val" :localdata="selectValue" @change="change"
- :clear="false" ></uni-data-select>
- </view>
- </view>
- </template>
- <view class="content" :style="{ 'border-radius': radius + 'px', border: border }">
- <view class="content-box" :class="{ center: mode === 'center' }">
- <!-- <text class="icon icon-search"></text> -->
- <text style="display: inline-block;padding-left: 20rpx;"></text>
- <input class="input" @confirm="search" :class="{ center: !active && mode === 'center' }" :focus="isFocus"
- :placeholder="' '+placeholder" v-model="inputVal" id="sdf" @input="input" @focus="focus" @blur="blur" />
- <text v-if="isDelShow" class="icon icon-del" @click="clear"></text>
- </view>
- <view v-show="(active && isFixedSearchBtn && button === 'inside') || (isDelShow && button === 'inside')"
- class="searchBtn" @click="search">鎼滅储</view>
- </view>
- <!-- <template v-if="mode === 'common' || mode ==='center'">
+ <view class="next-search-more">
+ <view class="search" :style="{ backgroundColor: backgroundColor }">
+ <!-- 涓嬫媺鑿滃崟 -->
+ <template>
+ <view class="button xiala active" @click="selectMore">
+ <view class="button-item">
+ <!-- <text class="icon icon-more"></text> -->
+ <uni-data-select
+ style="width: 100%"
+ v-model="val"
+ :localdata="selectValue"
+ @change="change"
+ :clear="false"
+ ></uni-data-select>
+ </view>
+ </view>
+ </template>
+ <view
+ class="content"
+ :style="{ 'border-radius': radius + 'px', border: border }"
+ >
+ <view class="content-box" :class="{ center: mode === 'center' }">
+ <!-- <text class="icon icon-search"></text> -->
+ <text style="display: inline-block; padding-left: 20rpx"></text>
+ <input
+ class="input"
+ @confirm="search"
+ :class="{ center: !active && mode === 'center' }"
+ :focus="isFocus"
+ :placeholder="' ' + placeholder"
+ v-model="inputVal"
+ id="sdf"
+ @input="input"
+ @focus="focus"
+ @blur="blur"
+ />
+ <text v-if="isDelShow" class="icon icon-del" @click="clear"
+ ></text
+ >
+ </view>
+ <view
+ v-show="
+ (active && isFixedSearchBtn && button === 'inside') ||
+ (isDelShow && button === 'inside')
+ "
+ class="searchBtn"
+ @click="search"
+ >鎼滅储</view
+ >
+ </view>
+ <!-- <template v-if="mode === 'common' || mode ==='center'">
<view v-if="button === 'outside'" class="button" :class="{ active: isFixedSearchBtn || active }" @click="search">
<view class="button-item">{{ !isFixedSearchBtn ? searchName : '鎼滅储' }}</view>
</view>
@@ -32,279 +59,296 @@
<view class="button-item"><text class="icon icon-more"></text></view>
</view>
</template> -->
- <template>
- <view class="button btnn" :class="{ active: isFixedSearchBtn || active }" @click="search">
- <view class="button-item btn">{{ !isFixedSearchBtn ? searchName : '鎼滅储' }}</view>
- </view>
- </template>
-
- </view>
- <view class="more-container-parent">
- <view v-if="mode === 'more' && showMore" class="more-container">
- <slot name="more"></slot>
- </view>
- </view>
- </view>
+ <template>
+ <view
+ class="button btnn"
+ :class="{ active: isFixedSearchBtn || active }"
+ @click="search"
+ >
+ <view class="button-item btn">{{
+ !isFixedSearchBtn ? searchName : "鎼滅储"
+ }}</view>
+ </view>
+ </template>
+ </view>
+ <view class="more-container-parent">
+ <view v-if="mode === 'more' && showMore" class="more-container">
+ <slot name="more"></slot>
+ </view>
+ </view>
+ </view>
</template>
<script>
- export default {
- props: {
- val:{
- type: Number,
- default: 0
- },
- selectValue: {
- type: Array,
- default () {
- return [{
- value: 0,
- text: '绡悆sdf'
- }]
- }
- },
- mode: {
- type: String,
- default: 'common'
- },
- button: {
- type: String,
- default: 'outside'
- },
- isFixedSearchBtn: {
- type: Boolean,
- default: true
- },
- radius: {
- type: String,
- default: '60'
- },
- placeholder: {
- type: String,
- default: '璇疯緭鍏ユ悳绱㈠唴瀹�'
- },
- backgroundColor: {
- type: String,
- default: '#fff'
- },
- showMore: {
- type: Boolean,
- default: false
- },
- border: {
- type: String,
- default: '1px #f5f5f5 solid'
- }
-
- },
- data() {
- return {
- active: false,
- inputVal: '',
- searchName: '鍙栨秷',
- isDelShow: false,
- isFocus: false,
- timer: 0
- };
- },
- methods: {
- focus() {
- this.active = true;
- },
- blur() {
- this.isFocus = false;
- if (!this.inputVal) {
- this.active = false;
- }
- },
- input() {
- clearInterval(this.timer)
- this.timer = setTimeout(() => {
- this.$emit('input', this.inputVal);
- }, 500)
- },
- clear() {
- this.inputVal = '';
- this.active = false;
- this.$emit('input', this.inputVal);
- this.$emit('search', '');
- },
- getFocus() {
- this.isFocus = true;
- },
- // 鎼滅储
- search() {
- if (!this.inputVal) return;
- // console.log(this.inputVal);
- this.$emit('search', this.inputVal);
- },
- selectMore() {
- this.$emit('moreClick')
- },
- // 鎼滅储涓嬫媺妗�
- change(e){
- this.$emit('select',e)
- console.log(e);
- }
- },
- created() {
- this.$watch(() => this.inputVal, (newVal) => {
- if (newVal) {
- this.searchName = '鎼滅储';
- this.isDelShow = true;
- } else {
- this.searchName = '鍙栨秷';
- this.isDelShow = false;
- }
- })
- }
- };
+export default {
+ props: {
+ val: {
+ type: Number,
+ default: 0
+ },
+ selectValue: {
+ type: Array,
+ default() {
+ return [
+ {
+ value: 0,
+ text: ""
+ }
+ ];
+ }
+ },
+ mode: {
+ type: String,
+ default: "common"
+ },
+ button: {
+ type: String,
+ default: "outside"
+ },
+ isFixedSearchBtn: {
+ type: Boolean,
+ default: true
+ },
+ radius: {
+ type: String,
+ default: "60"
+ },
+ placeholder: {
+ type: String,
+ default: "璇疯緭鍏ユ悳绱㈠唴瀹�"
+ },
+ backgroundColor: {
+ type: String,
+ default: "#fff"
+ },
+ showMore: {
+ type: Boolean,
+ default: false
+ },
+ border: {
+ type: String,
+ default: "1px #f5f5f5 solid"
+ },
+ keyword: {
+ type: String
+ }
+ },
+ data() {
+ return {
+ active: false,
+ inputVal: "",
+ searchName: "鍙栨秷",
+ isDelShow: false,
+ isFocus: false,
+ timer: 0
+ };
+ },
+ methods: {
+ focus() {
+ this.active = true;
+ },
+ blur() {
+ this.isFocus = false;
+ if (!this.inputVal) {
+ this.active = false;
+ }
+ },
+ input() {
+ clearInterval(this.timer);
+ this.timer = setTimeout(() => {
+ this.$emit("input", this.inputVal);
+ }, 500);
+ },
+ clear() {
+ this.inputVal = "";
+ this.active = false;
+ this.$emit("input", this.inputVal);
+ this.$emit("search", "");
+ },
+ getFocus() {
+ this.isFocus = true;
+ },
+ // 鎼滅储
+ search() {
+ this.$emit("search", this.inputVal);
+ },
+ selectMore() {
+ this.$emit("moreClick");
+ },
+ // 鎼滅储涓嬫媺妗�
+ change(e) {
+ this.$emit("select", e);
+ console.log(e);
+ }
+ },
+ created() {
+ this.inputVal = this.keyWord;
+ this.$watch(
+ () => this.inputVal,
+ (newVal) => {
+ if (newVal) {
+ this.searchName = "鎼滅储";
+ this.isDelShow = true;
+ } else {
+ this.searchName = "鍙栨秷";
+ this.isDelShow = false;
+ }
+ }
+ );
+ },
+ watch: {
+ keyword(value) {
+ console.log(value);
+ this.inputVal = value;
+ }
+ }
+};
</script>
<style lang="scss" scoped>
- ::v-deep .uni-select{
- border-style: none;
- }
- ::v-deep .content{
- border-radius: 0 !important;
- // border: 1px solid #7d8ea5 !important;
- }
- ::v-deep .button-item {
- width: 100% !important;
- }
-
- .xiala {
- width: 200rpx !important;
- }
- .next-search-more {
- .search {
- display: flex;
- width: 100%;
- border-bottom: 1px #f5f5f5 solid;
- box-sizing: border-box;
- // padding: 15upx;
- border-radius: 35rpx;
- font-size: $uni-font-size-base;
- background: #fff;
- border: 1px solid #7d8ea5 ;
- margin: 30rpx 0;
+::v-deep .uni-select {
+ border-style: none;
+}
+::v-deep .content {
+ border-radius: 0 !important;
+ // border: 1px solid #7d8ea5 !important;
+}
+::v-deep .button-item {
+ width: 100% !important;
+}
- .content {
- display: flex;
- align-items: center;
- width: 100%;
- height: 60upx;
- border: 1px #ccc solid;
- background: #fff;
- overflow: hidden;
- transition: all 0.2s linear;
- border-radius: 30px;
+.xiala {
+ width: 200rpx !important;
+}
+.next-search-more {
+ .search {
+ display: flex;
+ width: 100%;
+ border-bottom: 1px #f5f5f5 solid;
+ box-sizing: border-box;
+ // padding: 15upx;
+ border-radius: 35rpx;
+ font-size: $uni-font-size-base;
+ background: #fff;
+ border: 1px solid #7d8ea5;
+ margin: 30rpx 0;
- .content-box {
- width: 100%;
- display: flex;
- align-items: center;
+ .content {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ height: 60upx;
+ border: 1px #ccc solid;
+ background: #fff;
+ overflow: hidden;
+ transition: all 0.2s linear;
+ border-radius: 30px;
- &.center {
- justify-content: center;
- }
+ .content-box {
+ width: 100%;
+ display: flex;
+ align-items: center;
- .icon {
- padding: 0 15upx;
+ &.center {
+ justify-content: center;
+ }
- &.icon-del {
- font-size: 38upx;
- }
- }
+ .icon {
+ padding: 0 15upx;
- .input {
- width: 100%;
- max-width: 100%;
- line-height: 60upx;
- height: 60upx;
- transition: all 0.2s linear;
+ &.icon-del {
+ font-size: 38upx;
+ }
+ }
- &.center {
- width: 200upx;
- }
+ .input {
+ width: 100%;
+ max-width: 100%;
+ line-height: 60upx;
+ height: 60upx;
+ transition: all 0.2s linear;
- &.sub {
- // position: absolute;
- width: auto;
- color: grey;
- }
- }
- }
+ &.center {
+ width: 200upx;
+ }
- .searchBtn {
- height: 100%;
- flex-shrink: 0;
- padding: 0 30upx;
- background: $uni-color-success;
- line-height: 60upx;
- color: #fff;
- border-left: 1px #ccc solid;
- transition: all 0.3s;
- }
- }
+ &.sub {
+ // position: absolute;
+ width: auto;
+ color: grey;
+ }
+ }
+ }
- .button {
- display: flex;
- align-items: center;
- justify-content: center;
- position: relative;
- flex-shrink: 0;
- // width: 0;
- transition: all 0.2s linear;
- white-space: nowrap;
- // overflow: hidden;
- &.active {
- padding-left: 15upx;
- width: 100upx;
- }
+ .searchBtn {
+ height: 100%;
+ flex-shrink: 0;
+ padding: 0 30upx;
+ background: $uni-color-success;
+ line-height: 60upx;
+ color: #fff;
+ border-left: 1px #ccc solid;
+ transition: all 0.3s;
+ }
+ }
- .icon-more {
- font-size: 48upx;
- }
- }
- }
+ .button {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+ flex-shrink: 0;
+ // width: 0;
+ transition: all 0.2s linear;
+ white-space: nowrap;
+ // overflow: hidden;
+ &.active {
+ width: 100upx;
+ }
- .more-container-parent {
- flex-shrink: 0;
- width: 100%;
- // position: fixed;
- // position: sticky;
- z-index: 997;
- flex-wrap: nowrap;
- display: flex;
- flex-direction: row;
- position: relative;
- flex-direction: column;
+ .icon-more {
+ font-size: 48upx;
+ }
+ }
+ }
- .more-container {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: auto;
- background-color: #ffffff;
- padding: 20rpx;
- border-radius: 0 0 30rpx 30rpx;
- box-sizing: border-box;
- overflow: hidden;
- }
- }
- }
+ .more-container-parent {
+ flex-shrink: 0;
+ width: 100%;
+ // position: fixed;
+ // position: sticky;
+ z-index: 997;
+ flex-wrap: nowrap;
+ display: flex;
+ flex-direction: row;
+ position: relative;
+ flex-direction: column;
- @font-face {
- font-family: 'iconfont';
- src: url('https://at.alicdn.com/t/c/font_4110624_nikfg21uyk8.ttf?t=1686190660183') format('truetype');
- }
+ .more-container {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: auto;
+ background-color: #ffffff;
+ padding: 20rpx;
+ border-radius: 0 0 30rpx 30rpx;
+ box-sizing: border-box;
+ overflow: hidden;
+ }
+ }
+}
- .icon {
- font-family: iconfont;
- font-size: 32upx;
- font-style: normal;
- color: #999;
- }
-</style>
\ No newline at end of file
+@font-face {
+ font-family: "iconfont";
+ src: url("https://at.alicdn.com/t/c/font_4110624_nikfg21uyk8.ttf?t=1686190660183")
+ format("truetype");
+}
+
+.icon {
+ font-family: iconfont;
+ font-size: 32upx;
+ font-style: normal;
+ color: #999;
+}
+</style>
diff --git a/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 9b32348..b3d8ca7 100644
--- a/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -503,7 +503,6 @@
.uni-select__input-placeholder {
color: $uni-base-color;
- font-size: 12px;
}
.uni-select--mask {
diff --git a/src/utils/request/req1.js b/src/utils/request/req1.js
index c6551d3..1148bdb 100644
--- a/src/utils/request/req1.js
+++ b/src/utils/request/req1.js
@@ -14,6 +14,7 @@
(config) => {
// 鎼哄甫token鍙傛暟锛屼竴鑸細鍔犺浇header Authorization
config.headers.Authorization = localStorage.getItem("access_token");
+ config.headers.token = localStorage.getItem("access_token");
return config;
},
(error) => {
--
Gitblit v1.9.1