From 0edf94722a0dcc338567fec7df76b2e0acd39b92 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 27 五月 2024 15:30:48 +0800
Subject: [PATCH] 调整
---
src/pages.json | 21
src/pages/character/index.vue | 38
src/pages/territory/territory.vue | 119 +-
src/uni_modules/uni-easyinput/components/uni-easyinput/common.js | 2
src/pages/academicGenres/index.vue | 2
src/pages/changePassword/changePassword.vue | 24
src/store/module/user.js | 2
src/pages/knowledgeBase/knowledgeBase.vue | 53
src/uni_modules/jc-form/components/jc-form/jc-form.vue | 9
src/components/advancedSearch/advancedSearch.vue | 4
src/pages/Register/Register.vue | 110 -
src/api/index.js | 2
src/pages/repository/repository.vue | 27
src/components/form/form.vue | 5
src/pages/academicGenres/detail.vue | 11
src/pages/character/detail.vue | 9
public/index.html | 51
src/pages/fileDetail/index.vue | 2
src/store/index.js | 3
src/utils/request/req1.js | 5
src/pages/inherit/list.vue | 14
src/pages/index/index.vue | 1219 ++++++++++++-----------
src/components/loginAndRegister/loginAndRegister.vue | 17
src/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue | 1
src/uni_modules/next-search-more/components/next-search-more/next-search-more.vue | 2
src/pages/academicGenres/chart.vue | 10
src/pages/characterMap/characterMap.vue | 12
src/pages/zhongyi/zhongyi.vue | 5
src/components/headNav/headNav.vue | 52
public/logo.ico | 0
src/components/footer/footer.vue | 4
src/pages/inherit/index.vue | 10
src/pages/Login/Login.vue | 1113 +++++++++++----------
src/pages/forgetPass/forgetPass.vue | 15
src/pages/TcmSystem/TcmSystem.vue | 9
35 files changed, 1,442 insertions(+), 1,540 deletions(-)
diff --git a/public/index.html b/public/index.html
index ff730ce..88d9766 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,25 +1,32 @@
<!DOCTYPE html>
<html lang="zh-CN">
+ <head>
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <link rel="icon" href="./logo.ico">
+ <title>涓浗鍖诲浜虹墿鐭ヨ瘑搴�</title>
+ <script>
+ var coverSupport =
+ "CSS" in window &&
+ typeof CSS.supports === "function" &&
+ (CSS.supports("top: env(a)") || CSS.supports("top: constant(a)"));
+ document.write(
+ '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+ (coverSupport ? ", viewport-fit=cover" : "") +
+ '" />'
+ );
+ </script>
+ <link
+ rel="stylesheet"
+ href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css"
+ />
+ </head>
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>
- <%= htmlWebpackPlugin.options.title %>
- </title>
- <script>
- var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
- document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
- </script>
- <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
- </head>
-
- <body>
- <noscript>
- <strong>Please enable JavaScript to continue.</strong>
- </noscript>
- <div id="app"></div>
- <!-- built files will be auto injected -->
- </body>
-
-</html>
\ No newline at end of file
+ <body>
+ <noscript>
+ <strong>Please enable JavaScript to continue.</strong>
+ </noscript>
+ <div id="app"></div>
+ <!-- built files will be auto injected -->
+ </body>
+</html>
diff --git a/public/logo.ico b/public/logo.ico
new file mode 100644
index 0000000..98db7ea
--- /dev/null
+++ b/public/logo.ico
Binary files differ
diff --git a/src/api/index.js b/src/api/index.js
index 343f388..31f915a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -12,7 +12,6 @@
// 楠岃瘉鐮� /account/verifyCode
export const getverifyCode = (req) => {
- console.log(req, qs.encode(req), "rrr");
return req1({
url: "/account/verifyCode",
method: "post",
@@ -25,7 +24,6 @@
// login 鐧诲綍
export const getLogin = (req) => {
- console.log(req, qs.encode(req), "rrr");
return req1({
url: "/account/verification",
method: "post",
diff --git a/src/components/advancedSearch/advancedSearch.vue b/src/components/advancedSearch/advancedSearch.vue
index c39dbff..4f93d7f 100644
--- a/src/components/advancedSearch/advancedSearch.vue
+++ b/src/components/advancedSearch/advancedSearch.vue
@@ -28,7 +28,7 @@
v-if="isAdvancedSearch"
style="padding: 0 1.24rem; margin-bottom: 0.18rem"
>
- <view style="background-color: #fff; padding: 0.29rem" class="">
+ <view style="background-color: #fff; padding: 0.29rem" >
<h3>楂樼骇鎼滅储</h3>
<MyForm @submit="onSubmit" :from="from" />
</view>
@@ -154,7 +154,6 @@
// var box1Height = document.querySelector('.fbox').offsetHeight;
// // let box2Height= document.querySelector('.fbox1').style.height = box1Height + 'px';
// let box2Height = document.querySelector('.fbox1').offsetHeight
- // console.log(box1Height, box2Height);
// if (box1Height <= box2Height) {
// document.querySelector('.fbox1').style.height = box1Height + 'px';
// }
@@ -165,7 +164,6 @@
},
onSubmit(val) {
this.$emit("onSubmit", val);
- // console.log(val);
}
}
};
diff --git a/src/components/footer/footer.vue b/src/components/footer/footer.vue
index 07cbb53..ec656e9 100644
--- a/src/components/footer/footer.vue
+++ b/src/components/footer/footer.vue
@@ -22,10 +22,10 @@
class="font-family"
style="color: #2c2c2c; font-size: 0.12rem; line-height: 1.5"
>
- <view class="">
+ <view >
漏2017 涓浗涓尰绉戝闄腑鍖昏嵂淇℃伅鐮旂┒鎵�鐗堟潈鎵�鏈� 浜琁CP澶�********鍙�
</view>
- <view class=""
+ <view
>鍦板潃锛氬寳浜競涓滃煄鍖轰笢鐩撮棬鍐呭崡灏忚16鍙� 閭紪锛�100700 鐢佃瘽锛�8610-64089611
Email: tcmtczy@mail.cintcm.ac.cn</view
>
diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index 12fdc49..3090bea 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -1,4 +1,4 @@
-<template class="">
+<template >
<div>
<el-form
size="mini"
@@ -46,7 +46,7 @@
style="background-color: #244a7b; color: #fff"
size="mini"
@click="handleSubmit"
- >鎻愪氦</el-button
+ >妫�绱�</el-button
>
<el-button type="info" plain size="mini" @click="handleReset"
>閲嶇疆</el-button
@@ -61,7 +61,6 @@
export default {
props: ["from"],
mounted(){
- console.log(this.from,"from");
},
methods: {
handleSubmit() {
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 958c87d..27a7c40 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -19,12 +19,7 @@
<view class="flex" style="letter-spacing: 5rpx">
<view class="logo"></view>
<view
- class=""
- style="
- margin-left: 0.19rem;
- font-size: 0.24rem;
- font-weight: 900;
- "
+ style="margin-left: 0.19rem; font-size: 0.24rem; font-weight: 900"
>
{{ text }}
</view>
@@ -40,7 +35,6 @@
justify-content: flex-end;
"
>
- <!-- overflow: hidden; -->
<input
:style="{ display: isExpanded == true ? 'block' : 'none' }"
type="text"
@@ -51,6 +45,7 @@
font-size: 0.13rem;
"
@blur="InputBlur"
+ @confirm="toggleSearch"
class="search-input"
v-model="searchInput"
placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
@@ -102,7 +97,7 @@
>
<!-- 鑳屾櫙 -->
<img class="leftListBgImage" src="@/static/image/leftListBg.png" alt="" />
- <view class="" style="position: relative; z-index: 999">
+ <view style="position: relative; z-index: 999">
<view class="flex flex-center LeftLogo">
<!-- <img src="@/static/image/logo.png" ></img> -->
<view class="img"></view>
@@ -123,7 +118,7 @@
<span slot="title">涓栧尰鍖诲鏁版嵁搴�</span>
</el-menu-item>
<el-menu-item index="3">
- <span slot="title">涓尰鍖诲娴佹淳</span>
+ <span slot="title">涓尰瀛︽湳娴佹淳</span>
</el-menu-item>
<el-menu-item index="4">
<span slot="title">涓尰鍦板煙鍥捐氨</span>
@@ -134,7 +129,7 @@
</el-menu>
</view>
</el-dialog>
- <!-- <view class="" style="position: fixed;right: 0;top: 0;" @click="dialogVisible = !dialogVisible">姘存按姘存按</view> -->
+ <!-- <view style="position: fixed;right: 0;top: 0;" @click="dialogVisible = !dialogVisible">姘存按姘存按</view> -->
<!-- <el-card v-if="menuNav"
style="position: fixed;left: 0;top: 0; z-index: 999999999; width: 240px;height: 100vh;">
@@ -191,26 +186,21 @@
// 淇敼瀵嗙爜
changePassword(index) {
if (index == 1) {
- // console.log('sdfdsf');
// 妫�鏌� localStorage 涓槸鍚﹀瓨鍦� token
if (localStorage.getItem("access_token")) {
// token 瀛樺湪
- console.log("access_token");
this.isCommand = true;
} else {
// token 涓嶅瓨鍦�
- // console.log('Token does not exist.');
this.isCommand = false;
// uni.navigateTo({
// url: '/pages/Login/Login'
// })
- console.log("涓嶅瓨鍦�");
uni.showModal({
// 璇㈤棶鐢ㄦ埛鏄惁閫�鍑虹櫥褰�
title: "璇烽噸鏂扮櫥褰�",
content: "鎮ㄧ‘瀹氳閲嶆柊鐧诲綍鍚�?",
success: async (res) => {
- console.log(res, "reresresrer");
if (res.confirm) {
setTimeout(() => {
uni.reLaunch({
@@ -219,10 +209,6 @@
}, 1500);
} else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- uni.showToast({
- title: "鐢ㄦ埛鐐瑰嚮鍙栨秷",
- icon: "none"
- });
}
}
});
@@ -237,52 +223,35 @@
// 淇敼鑾峰彇閫�鍑烘寜閽�
handleCommand(int) {
if (int == 1) {
- console.log("淇敼瀵嗙爜");
uni.navigateTo({
url: "/pages/changePassword/changePassword"
});
} else if (int == 2) {
- // console.log('閫�鍑虹櫥褰�');
uni.showModal({
// 璇㈤棶鐢ㄦ埛鏄惁閫�鍑虹櫥褰�
title: "閫�鍑虹櫥褰�",
content: "鎮ㄧ‘瀹氳閫�鍑虹櫥褰曞悧?",
- success: async (res) => {
- console.log(res, "reresresrer");
-
+ success: (res) => {
if (res.confirm) {
// 閫�鍑烘帴鍙�
- await getlogout().then((res) => {
+ getlogout().then((res) => {
//纭畾閫�鍑烘嬁鍒皌oken骞舵竻闄oken
let TOKEN = uni.getStorageSync("access_token");
uni.clearStorageSync();
//閫�鍑烘垚鍔燂紒骞惰烦杞埌鍏朵粬椤甸潰
- uni.showToast({
- title: "閫�鍑烘垚鍔�",
- icon: "none"
- });
- });
- setTimeout(() => {
+ this.$message.success("閫�鍑烘垚鍔�");
uni.reLaunch({
url: "/pages/Login/Login"
});
- }, 1500);
+ });
} else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- uni.showToast({
- title: "鐢ㄦ埛鐐瑰嚮鍙栨秷",
- icon: "none"
- });
}
}
});
}
},
- aaa() {
- console.log("ss");
- },
handleSelect(index) {
- console.log(index);
if (index === "0") {
uni.navigateTo({
url: "/pages/index/index?id=" + 0
@@ -323,10 +292,7 @@
url:
"/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput
});
- } else {
- console.log("涓嶆悳绱�");
}
-
this.searchInput = "";
});
}
diff --git a/src/components/loginAndRegister/loginAndRegister.vue b/src/components/loginAndRegister/loginAndRegister.vue
index eb6ddaf..f3c5750 100644
--- a/src/components/loginAndRegister/loginAndRegister.vue
+++ b/src/components/loginAndRegister/loginAndRegister.vue
@@ -1,9 +1,9 @@
<template>
<view>
<el-card :style="{width: width + 'px'}">
- <view class="" style="display: flex; justify-content: space-between;">
+ <view style="display: flex; justify-content: space-between;">
<h2 style="color: #244a7b;padding-bottom: 20rpx;">{{title}}</h2>
- <view class="" v-if="BackLoginTrue" style="cursor: pointer;font-size: 20rpx;color: #244a7b;">
+ <view v-if="BackLoginTrue" style="cursor: pointer;font-size: 20rpx;color: #244a7b;">
{{BackLogin}}
</view>
</view>
@@ -20,14 +20,14 @@
style="margin-top: 30rpx; font-weight:900;font-size: 30rpx; width: 100%;background-color: #244a7b;color: #fff;padding: 30rpx;"
size="medium" @click="Login">鐧诲綍</el-button>
</el-form-item>
- <view class=""
+ <view
style="font-size: 18rpx;color: #9E9E9E;text-align: center;line-height: 1;margin-bottom: 20rpx;">
鐢ㄦ埛娉ㄥ唽鍗充唬琛ㄥ悓鎰忋�婃湇鍔℃潯娆俱�嬪拰銆婄敤鎴烽殣绉佷繚鎶ゅ拰涓汉淇℃伅鏉℃銆�</view>
<!-- 鐧诲綍鏃� 蹇樿瀵嗙爜/蹇�熸敞鍐� -->
- <view class="" v-if="loginTrue" style="display: flex;font-size: 20rpx;" :style="{color:color}">
- <view class="" style="display: inline-block;cursor: pointer;" @click="forgetPass">蹇樿瀵嗙爜</view>
- <view class="" style="display: inline-block;margin: 0 20rpx;"> | </view>
- <view class="" style="display: inline-block;cursor: pointer;" @click="quickRegister">蹇�熸敞鍐�</view>
+ <view v-if="loginTrue" style="display: flex;font-size: 20rpx;" :style="{color:color}">
+ <view style="display: inline-block;cursor: pointer;" @click="forgetPass">蹇樿瀵嗙爜</view>
+ <view style="display: inline-block;margin: 0 20rpx;"> | </view>
+ <view style="display: inline-block;cursor: pointer;" @click="quickRegister">蹇�熸敞鍐�</view>
</view>
</el-form>
</el-card>
@@ -140,7 +140,6 @@
message: '璇疯緭鍏�' + item.lable,
trigger: ['blur', 'change']
}, )
- console.log(dynamicRules[item.id]);
// 鎵�鏈変笉鏄殑璧�
} else {
dynamicRules[item.id].push({
@@ -150,7 +149,6 @@
});
}
});
- console.log(dynamicRules);
return dynamicRules;
},
},
@@ -162,7 +160,6 @@
obj[item.name] = item.val
return obj
}, {})
- console.log(result);
this.$emit('Login', result)
},
// 蹇樿瀵嗙爜
diff --git a/src/pages.json b/src/pages.json
index 97f0ca2..a080930 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2,13 +2,11 @@
"pages": [{
"path": "pages/index/index",
"style": {
- // "navigationBarTitleText": "涓浗鍖诲浜虹墿鏁版嵁搴�",
"navigationStyle": "custom"
}
}, {
"path": "pages/Login/Login",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -17,7 +15,6 @@
{
"path": "pages/character/index",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -25,7 +22,6 @@
{
"path": "pages/character/detail",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -34,7 +30,6 @@
{
"path": "pages/academicGenres/index",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -42,7 +37,6 @@
{
"path": "pages/academicGenres/detail",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -50,7 +44,6 @@
{
"path": "pages/academicGenres/chart",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -58,7 +51,6 @@
{
"path": "pages/TcmSystem/TcmSystem",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -66,7 +58,6 @@
{
"path": "pages/territory/territory",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -75,7 +66,6 @@
{
"path": "pages/inherit/index",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -83,7 +73,6 @@
{
"path": "pages/inherit/list",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -91,7 +80,6 @@
{
"path": "pages/knowledgeBase/knowledgeBase",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -100,7 +88,6 @@
{
"path": "pages/characterMap/characterMap",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -109,7 +96,6 @@
{
"path": "pages/Register/Register",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -117,7 +103,6 @@
{
"path": "pages/forgetPass/forgetPass",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -125,7 +110,6 @@
{
"path": "pages/changePassword/changePassword",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -134,7 +118,6 @@
"path" : "pages/userAgreement/userAgreement",
"style" :
{
- "navigationBarTitleText" : "",
"enablePullDownRefresh" : false,
"navigationStyle": "custom"
}
@@ -143,7 +126,6 @@
"path" : "pages/fileDetail/index",
"style" :
{
- "navigationBarTitleText" : "",
"enablePullDownRefresh" : false,
"navigationStyle": "custom"
}
@@ -152,7 +134,6 @@
"path" : "pages/shiyiHome/shiyiHome",
"style" :
{
- "navigationBarTitleText" : "",
"enablePullDownRefresh" : false,
"navigationStyle": "custom"
}
@@ -160,7 +141,7 @@
],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "涓浗鍖诲浜虹墿鏁版嵁搴�",
+ "navigationBarTitleText": "涓浗鍖诲浜虹墿鐭ヨ瘑搴�",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index c874ce4..10ae216 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -1,331 +1,367 @@
<template>
- <view class="container flex flex-center" style="align-items: flex-start;">
- <view class="repository relative">
- <view class="Ttop flex flex-center flex-wrap" style="flex-direction: column;">
- <view class=""></view>
- <view class="" ref="Rtop">
- <text class="login"></text>
- <text
- style="font-size: .36rem;letter-spacing: 4rpx;vertical-align: middle;font-family: cursive;font-weight: bold;">涓浗鍖诲浜虹墿鐭ヨ瘑搴�</text>
- </view>
- <view></view>
- </view>
- <el-card>
- <!-- 鐢ㄦ埛鐧诲綍 v-if="isLogin"-->
- <view class="LoginTop"
- style="display: flex; justify-content: space-between;margin-bottom: .47rem;align-items: center;">
- <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛鐧诲綍</view> -->
- <view class="LoginBg"></view>
- <view class=""> </view>
- </view>
-
- <el-form :hide-required-asterisk="true" ref="formLogin1" label-position="top" :rules="rules1"
- :model="loginData">
- <el-form-item label="鐧诲綍璐﹀彿" prop="loginID">
- <el-input v-model="loginData.loginID"></el-input>
- </el-form-item>
- <el-form-item label="鐧诲綍瀵嗙爜" prop="pass">
- <el-input type="password" v-model="loginData.pass"></el-input>
- </el-form-item>
- <el-form-item class="btn">
- <el-button class="font-family"
- style="margin-top: .47rem; font-weight:900;font-size: .3rem; width: 100%;background-color:#244A7B;color: #fff;padding: .16rem;"
- size="medium" @click="Login('formLogin1')">鐧诲綍</el-button>
- </el-form-item>
- <view class="" style="display: flex;font-size: .14rem;color: #244A7B;">
- <view class="" style="display: inline-block;cursor: pointer;" @click="forgetPass">蹇樿瀵嗙爜
- </view>
- <view class="" style="display: inline-block;margin: 0 20rpx;"> | </view>
- <view class="" style="display: inline-block;cursor: pointer;" @click="quickRegister">蹇�熸敞鍐�
- </view>
- </view>
- </el-form>
- </el-card>
- </view>
- <view class="hua"></view>
- <!-- 搴曢儴浜虹墿鑳屾櫙鍥惧乏渚� -->
- <view class="fff"></view>
- <!-- 搴曢儴鑺辩殑鑳屾櫙鍥惧彸渚� -->
- <view class="rrr"></view>
+ <view class="container flex flex-center" style="align-items: flex-start">
+ <view class="repository relative">
+ <view
+ class="Ttop flex flex-center flex-wrap"
+ style="flex-direction: column"
+ >
+ <view ></view>
+ <view ref="Rtop">
+ <text class="login"></text>
+ <text
+ style="
+ font-size: 0.36rem;
+ letter-spacing: 4rpx;
+ vertical-align: middle;
+ font-family: cursive;
+ font-weight: bold;
+ "
+ >涓浗鍖诲浜虹墿鐭ヨ瘑搴�</text
+ >
+ </view>
+ <view></view>
+ </view>
+ <el-card>
+ <!-- 鐢ㄦ埛鐧诲綍 v-if="isLogin"-->
+ <view
+ class="LoginTop"
+ style="
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 0.47rem;
+ align-items: center;
+ "
+ >
+ <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛鐧诲綍</view> -->
+ <view class="LoginBg"></view>
+ <view > </view>
+ </view>
- <Footer1 />
- </view>
+ <el-form
+ :hide-required-asterisk="true"
+ ref="formLogin1"
+ label-position="top"
+ :rules="rules1"
+ :model="loginData"
+ >
+ <el-form-item label="鐧诲綍璐﹀彿" prop="loginID">
+ <el-input v-model="loginData.loginID"></el-input>
+ </el-form-item>
+ <el-form-item label="鐧诲綍瀵嗙爜" prop="pass">
+ <el-input type="password" v-model="loginData.pass"></el-input>
+ </el-form-item>
+ <el-form-item class="btn">
+ <el-button
+ class="font-family"
+ style="
+ margin-top: 0.47rem;
+ font-weight: 900;
+ font-size: 0.3rem;
+ width: 100%;
+ background-color: #244a7b;
+ color: #fff;
+ padding: 0.16rem;
+ "
+ size="medium"
+ @click="Login('formLogin1')"
+ >鐧诲綍</el-button
+ >
+ </el-form-item>
+ <view
+
+ style="display: flex; font-size: 0.14rem; color: #244a7b"
+ >
+ <view
+
+ style="display: inline-block; cursor: pointer"
+ @click="forgetPass"
+ >蹇樿瀵嗙爜
+ </view>
+ <view style="display: inline-block; margin: 0 20rpx">
+ |
+ </view>
+ <view
+
+ style="display: inline-block; cursor: pointer"
+ @click="quickRegister"
+ >蹇�熸敞鍐�
+ </view>
+ </view>
+ </el-form>
+ </el-card>
+ </view>
+ <view class="hua"></view>
+ <!-- 搴曢儴浜虹墿鑳屾櫙鍥惧乏渚� -->
+ <view class="fff"></view>
+ <!-- 搴曢儴鑺辩殑鑳屾櫙鍥惧彸渚� -->
+ <view class="rrr"></view>
+
+ <Footer1 />
+ </view>
</template>
<script>
- import {
- encryptAES,decryptAES
- } from '@/utils/Crypto.js'
- import {
- nextTick
- } from "vue";
- import {
- getLogin,
- getUserInfo
- } from '@/api/index.js'
- import Footer1 from '@/components/footer/footer.vue'
- export default {
- components: {
- Footer1
- },
- data() {
- // 瀵嗙爜
- var validatePass = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('璇疯緭鍏ュ瘑鐮�'));
- } else {
- if (this.registerData.checkPass !== '') {
- this.$nextTick(() => {
- this.$refs.formLogin.validateField('checkPass');
- });
- }
- callback();
- }
- };
- // 纭瀵嗙爜
- var validatePass2 = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('璇峰啀娆¤緭鍏ュ瘑鐮�'));
- } else if (value !== this.registerData.pass) {
- callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!'));
- } else {
- callback();
- }
- };
- return {
- // 鐢ㄦ埛娉ㄥ唽
- isRegister: false,
- // 鐢ㄦ埛鐧诲綍
- isLogin: true,
- // 淇敼瀵嗙爜
- isAmendPass: false,
- // 閲嶇疆瀵嗙爜
- isResetPass: false,
- // 娉ㄥ唽鐢ㄦ埛璐﹀彿鐨勬牎楠�
- rules: {
- loginID: [{
- required: true,
- message: '璇疯緭鍏ョ櫥褰曡处鍙�',
- trigger: 'blur'
- },
-
- ],
- pass: [{
- required: true,
- message: '璇疯緭鍏ュ瘑鐮�',
- trigger: 'blur'
- },
- {
- min: 6,
- max: 12,
- message: '瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�',
- trigger: 'blur'
- },
- {
- validator: validatePass,
- trigger: 'blur'
- }
- ],
- checkPass: [{
- validator: validatePass2,
- trigger: 'blur'
- }],
- cellphoneORmailbox: [{
- required: true,
- message: '璇疯緭鍏ラ偖绠卞湴鍧�',
- trigger: 'blur'
- },
- {
- type: 'email',
- message: '璇疯緭鍏ユ纭殑閭鍦板潃',
- trigger: ['blur', 'change']
- }
- ],
- verifyCode: [{
- required: true,
- message: '璇疯緭鍏ラ獙璇佺爜',
- trigger: 'blur'
- },
- {
- validator: (rule, value, callback) => this.validateVerificationCode(rule, value, callback),
- trigger: 'blur'
- }
- ]
- },
- rules1: {
- loginID: [{
- required: true,
- message: '璇疯緭鍏ョ櫥褰曡处鍙�',
- trigger: 'blur'
- }],
- pass: [{
- required: true,
- message: '璇疯緭鍏ュ瘑鐮�',
- trigger: 'blur'
- },
- {
- min: 6,
- max: 12,
- message: '瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�',
- trigger: 'blur'
- }
- ],
- },
+import { encryptAES, decryptAES } from "@/utils/Crypto.js";
+import { nextTick } from "vue";
+import { getLogin, getUserInfo } from "@/api/index.js";
+import Footer1 from "@/components/footer/footer.vue";
+export default {
+ components: {
+ Footer1
+ },
+ data() {
+ // 瀵嗙爜
+ var validatePass = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("璇疯緭鍏ュ瘑鐮�"));
+ } else {
+ if (this.registerData.checkPass !== "") {
+ this.$nextTick(() => {
+ this.$refs.formLogin.validateField("checkPass");
+ });
+ }
+ callback();
+ }
+ };
+ // 纭瀵嗙爜
+ var validatePass2 = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("璇峰啀娆¤緭鍏ュ瘑鐮�"));
+ } else if (value !== this.registerData.pass) {
+ callback(new Error("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!"));
+ } else {
+ callback();
+ }
+ };
+ return {
+ // 鐢ㄦ埛娉ㄥ唽
+ isRegister: false,
+ // 鐢ㄦ埛鐧诲綍
+ isLogin: true,
+ // 淇敼瀵嗙爜
+ isAmendPass: false,
+ // 閲嶇疆瀵嗙爜
+ isResetPass: false,
+ // 娉ㄥ唽鐢ㄦ埛璐﹀彿鐨勬牎楠�
+ rules: {
+ loginID: [
+ {
+ required: true,
+ message: "璇疯緭鍏ョ櫥褰曡处鍙�",
+ trigger: "blur"
+ }
+ ],
+ pass: [
+ {
+ required: true,
+ message: "璇疯緭鍏ュ瘑鐮�",
+ trigger: "blur"
+ },
+ {
+ min: 6,
+ max: 12,
+ message: "瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�",
+ trigger: "blur"
+ },
+ {
+ validator: validatePass,
+ trigger: "blur"
+ }
+ ],
+ checkPass: [
+ {
+ validator: validatePass2,
+ trigger: "blur"
+ }
+ ],
+ cellphoneORmailbox: [
+ {
+ required: true,
+ message: "璇疯緭鍏ラ偖绠卞湴鍧�",
+ trigger: "blur"
+ },
+ {
+ type: "email",
+ message: "璇疯緭鍏ユ纭殑閭鍦板潃",
+ trigger: ["blur", "change"]
+ }
+ ],
+ verifyCode: [
+ {
+ required: true,
+ message: "璇疯緭鍏ラ獙璇佺爜",
+ trigger: "blur"
+ },
+ {
+ validator: (rule, value, callback) =>
+ this.validateVerificationCode(rule, value, callback),
+ trigger: "blur"
+ }
+ ]
+ },
+ rules1: {
+ loginID: [
+ {
+ required: true,
+ message: "璇疯緭鍏ョ櫥褰曡处鍙�",
+ trigger: "blur"
+ }
+ ],
+ pass: [
+ {
+ required: true,
+ message: "璇疯緭鍏ュ瘑鐮�",
+ trigger: "blur"
+ },
+ {
+ min: 6,
+ max: 12,
+ message: "瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�",
+ trigger: "blur"
+ }
+ ]
+ },
- // 鐧诲綍娉ㄥ唽妗�
- loginTrue: true,
- Rtop1: 0,
- value: 'sdfdsf',
- // 鐧诲綍鐢ㄦ埛璐﹀彿
- loginData: {
- // 璐﹀彿
- loginID: '',
- pass: ''
- },
- // 涔︾睄鏁版嵁
- listData: [{
- name: '涓尰浜虹墿鏁版嵁搴�',
- id: 1,
- }, {
- name: '涓栧尰鍖诲鏁版嵁搴�',
- id: 2,
- }, {
- name: '涓尰瀛︽湳娴佹淳',
- id: 3,
- }, {
- name: '涓尰鍦板煙鍖昏氨',
- id: 4,
- }, {
- name: '涓尰鍖讳簨鍒跺害',
- id: 5,
- },
-
- ]
- }
- },
- onLoad() {
- uni.getSystemInfo({
- success: function(info) {
- // console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
- // console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
- }
- });
- },
- mounted() {
- this.getElementWidth();
- },
- methods: {
- // 鍒楄〃椤硅烦杞�
- listDataClick(item) {
- console.log(item);
- // 鍦ㄥ綋鍓嶉〉闈㈣缃叏灞�鍙橀噺
- // uni.setStorageSync('globalData', { id: 123, name: 'example' });
- if (item.id == 1) {
- uni.navigateTo({
- url: '/pages/character/detail?id=' + item.id
- })
- } else if (item.id == 2) {
- console.log(item.name);
- // uni.navigateTo({
- // url:'/pages/character/detail?id='+item.id
- // })
- } else if (item.id == 3) {
- uni.navigateTo({
- url: '/pages/academicGenres/index?id=' + item.id
- })
- } else if (item.id == 4) {
- uni.navigateTo({
- url: '/pages/territory/territory?id=' + item.id
- })
- } else if (item.id == 5) {
- uni.navigateTo({
- url: '/pages/TcmSystem/TcmSystem?id=' + item.id
- })
- }
-
- },
- // 蹇樿瀵嗙爜
- forgetPass() {
- uni.redirectTo({
- url: '/pages/forgetPass/forgetPass'
- })
- },
- // 蹇�熸敞鍐�
- quickRegister() {
- uni.redirectTo({
- url: '/pages/Register/Register'
- })
- },
- // 楠岃瘉鐮佹牎楠�
- validateVerificationCode(rule, value, callback) {
- if (value !== '123456') {
- callback(new Error('楠岃瘉鐮侀敊璇�'));
- } else {
- callback();
- }
- },
- getElementWidth() {
-
- this.$nextTick(() => {
- var width = this.$refs.Rtop.$el.clientWidth;
- this.Rtop1 = width + 50;
- console.log('Element width:', width);
- })
- },
- // 鐢ㄦ埛鐧诲綍
- async Login(formName) {
- console.log(decryptAES(this.loginData.pass),'this.loginData.pass');
- let Obj = {
- username: this.loginData.loginID,
- // encryptAES(this.loginData.pass) | this.loginData.pass
- password: encryptAES(this.loginData.pass),
- }
- console.log(Obj, 'Obj');
-
- let res = await getLogin(Obj)
- console.log(res, 'sfdsf');
- if (res.success) {
- uni.showToast({
- title: '鐧诲綍鎴愬姛',
- })
- // 灏唗oken瀛樺偍鍐嶆湰鍦颁腑
- window.localStorage.setItem("access_token", res.results.token)
- await getUserInfo().then(res => {
- console.log(res, 'rrrrrrrrrrsd');
- })
- // 灏嗚处鍙峰瓨鍏ュ埌vuex涓�
- this.$store.dispatch('setUserName',res.object.username)
-
- uni.redirectTo({
- url: '/pages/index/index'
- })
- } else {
- console.log('sdfdsfsdf');
- uni.showToast({
- title: res.errorText,
- icon: 'error'
- })
- // alert("sdfdsf")
- this.loginData.pass = ''
- }
- this.$refs[formName].validate(async (valid) => {
- if (valid) {
- // alert('submit!鎴愬姛');
- // uni.redirectTo({
- // url: '/pages/index/index'
- // })
- } else {
- console.log('error submit!!澶辫触');
- return false;
- }
- });
- }
- }
- }
+ // 鐧诲綍娉ㄥ唽妗�
+ loginTrue: true,
+ Rtop1: 0,
+ value: "sdfdsf",
+ // 鐧诲綍鐢ㄦ埛璐﹀彿
+ loginData: {
+ // 璐﹀彿
+ loginID: "",
+ pass: ""
+ },
+ // 涔︾睄鏁版嵁
+ listData: [
+ {
+ name: "涓尰浜虹墿鏁版嵁搴�",
+ id: 1
+ },
+ {
+ name: "涓栧尰鍖诲鏁版嵁搴�",
+ id: 2
+ },
+ {
+ name: "涓尰瀛︽湳娴佹淳",
+ id: 3
+ },
+ {
+ name: "涓尰鍦板煙鍖昏氨",
+ id: 4
+ },
+ {
+ name: "涓尰鍖讳簨鍒跺害",
+ id: 5
+ }
+ ]
+ };
+ },
+ onLoad() {
+ uni.getSystemInfo({
+ success: function (info) {
+ // console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
+ // console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
+ }
+ });
+ },
+ mounted() {
+ this.getElementWidth();
+ },
+ methods: {
+ // 鍒楄〃椤硅烦杞�
+ listDataClick(item) {
+ // 鍦ㄥ綋鍓嶉〉闈㈣缃叏灞�鍙橀噺
+ // uni.setStorageSync('globalData', { id: 123, name: 'example' });
+ if (item.id == 1) {
+ uni.navigateTo({
+ url: "/pages/character/detail?id=" + item.id
+ });
+ } else if (item.id == 2) {
+ // uni.navigateTo({
+ // url:'/pages/character/detail?id='+item.id
+ // })
+ } else if (item.id == 3) {
+ uni.navigateTo({
+ url: "/pages/academicGenres/index?id=" + item.id
+ });
+ } else if (item.id == 4) {
+ uni.navigateTo({
+ url: "/pages/territory/territory?id=" + item.id
+ });
+ } else if (item.id == 5) {
+ uni.navigateTo({
+ url: "/pages/TcmSystem/TcmSystem?id=" + item.id
+ });
+ }
+ },
+ // 蹇樿瀵嗙爜
+ forgetPass() {
+ uni.redirectTo({
+ url: "/pages/forgetPass/forgetPass"
+ });
+ },
+ // 蹇�熸敞鍐�
+ quickRegister() {
+ uni.redirectTo({
+ url: "/pages/Register/Register"
+ });
+ },
+ // 楠岃瘉鐮佹牎楠�
+ validateVerificationCode(rule, value, callback) {
+ if (value !== "123456") {
+ callback(new Error("楠岃瘉鐮侀敊璇�"));
+ } else {
+ callback();
+ }
+ },
+ getElementWidth() {
+ this.$nextTick(() => {
+ var width = this.$refs.Rtop.$el.clientWidth;
+ this.Rtop1 = width + 50;
+ });
+ },
+ // 鐢ㄦ埛鐧诲綍
+ async Login(formName) {
+ let Obj = {
+ username: this.loginData.loginID,
+ // encryptAES(this.loginData.pass) | this.loginData.pass
+ password: encryptAES(this.loginData.pass)
+ };
+ let res = await getLogin(Obj);
+ if (res.success) {
+ this.$message.success("鐧诲綍鎴愬姛");
+ // 灏唗oken瀛樺偍鍐嶆湰鍦颁腑
+ window.localStorage.setItem("access_token", res.results.token);
+ // await getUserInfo().then((res) => {
+ // });
+ // 灏嗚处鍙峰瓨鍏ュ埌vuex涓�
+ this.$store.dispatch("setUserName", res.object.username);
+ uni.redirectTo({
+ url: "/pages/index/index"
+ });
+ } else {
+ this.$message.error(res.errorText);
+ this.loginData.pass = "";
+ }
+ this.$refs[formName].validate(async (valid) => {
+ if (valid) {
+ // alert('submit!鎴愬姛');
+ // uni.redirectTo({
+ // url: '/pages/index/index'
+ // })
+ } else {
+ console.log("error submit!!澶辫触");
+ return false;
+ }
+ });
+ }
+ }
+};
</script>
<style scoped>
- /* @media screen and (max-width:1366px) {
+/* @media screen and (max-width:1366px) {
::v-deep .el-card {
top: 50% !important;
}
@@ -377,11 +413,11 @@
}
} */
- ::v-deep .el-form-item__error {
- font-size: .13rem !important;
- }
+::v-deep .el-form-item__error {
+ font-size: 0.13rem !important;
+}
- /*
+/*
@media screen and (min-width: 1920px) and (max-width:2560px) {
::v-deep .el-card {
top: 80% !important;
@@ -430,7 +466,7 @@
}
} */
- /* @media screen and (min-width:2560px)and (max-width:3840px) {
+/* @media screen and (min-width:2560px)and (max-width:3840px) {
.LoginBg {
margin: 0 !important;
}
@@ -506,270 +542,255 @@
} */
+.LoginBg {
+ width: 1.2rem;
+ height: 0.37rem;
+ background: url(@/static/image/鐢ㄦ埛鐧诲綍.png) no-repeat 0 0;
+ background-size: 100%;
+ margin-bottom: 0.47rem;
+}
- .LoginBg {
- width: 1.2rem;
- height: .37rem;
- background: url(@/static/image/鐢ㄦ埛鐧诲綍.png) no-repeat 0 0;
- background-size: 100%;
- margin-bottom: .47rem;
- }
+::v-deep .el-card {
+ border-radius: 0;
+ width: 5.42rem;
+ /* height: 4.75rem; */
+ position: absolute;
+ top: 80%;
+}
+::v-deep .el-card__body {
+ padding: 0.17rem 0.58rem;
+}
- ::v-deep .el-card {
- border-radius: 0;
- width: 5.42rem;
- /* height: 4.75rem; */
- position: absolute;
- top: 80%;
- }
+.btn >>> .el-form-item__content {
+ margin-left: 0 !important;
+}
- ::v-deep .el-card__body {
- padding: .17rem .58rem;
- }
+::v-deep .el-input__inner {
+ border: none;
+ border-bottom: 1px solid #2d476a;
+ border-radius: 0;
+}
- .btn>>>.el-form-item__content {
- margin-left: 0 !important;
- }
+::v-deep .el-form-item__error {
+ /* display: none; */
+}
+::v-deep .input.invalid:focus {
+ border-color: #2d476a !important;
+}
- ::v-deep .el-input__inner {
- border: none;
- border-bottom: 1px solid #2d476a;
- border-radius: 0;
+::v-deep .el-input__inner:invalid {
+ border-color: #2d476a !important;
+}
- }
+::v-deep .el-form-item__label {
+ padding: 0;
+ color: #244a7b;
+ font-size: 0.14rem;
+ font-weight: 500;
+}
- ::v-deep .el-form-item__error {
- /* display: none; */
- }
+::v-deep .el-form-item {
+ margin-bottom: 0.25rem;
+}
- ::v-deep .input.invalid:focus {
- border-color: #2d476a !important;
- }
+.ss1 {
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ width: 40rpx;
+ height: 40rpx;
+ background-size: 100% 100%;
+}
- ::v-deep .el-input__inner:invalid {
- border-color: #2d476a !important;
- }
+.s1 {
+ background-image: url(@/static/image/search.png);
+}
+.s2 {
+ background-image: url(@/static/image/question.png);
+}
- ::v-deep .el-form-item__label {
- padding: 0;
- color: #244A7B;
- font-size: .14rem;
- font-weight: 500;
- }
+.s3 {
+ background-image: url(@/static/image/question.png);
+}
- ::v-deep .el-form-item {
- margin-bottom: .25rem;
- }
+.container {
+ background: url(@/static/image/bg1.png);
+ width: 100vw;
+ height: 100vh;
- .ss1 {
- background-repeat: no-repeat;
- background-size: 100% 100%;
- width: 40rpx;
- height: 40rpx;
- background-size: 100% 100%;
- }
+ color: #fff;
- .s1 {
- background-image: url(@/static/image/search.png);
+ .repository {
+ width: 100% !important;
+ /* margin-top: 19px; */
+ /* height: 68%; */
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
- }
+ .Ttop {
+ margin-top: 0.38rem;
+ margin-bottom: 1.22rem;
+ }
- .s2 {
- background-image: url(@/static/image/question.png);
- }
+ .r-top {
+ font-size: 40rpx !important;
+ margin: 10rpx 0;
+ }
+ }
+}
- .s3 {
- background-image: url(@/static/image/question.png);
- }
+.login {
+ width: 0.52rem;
+ height: 0.52rem;
+ display: inline-block;
+ vertical-align: middle;
+ margin-right: 0.19rem;
+ background: url(@/static/image/logo.png) no-repeat 0 0;
+ background-size: 100% 100%;
+}
- .container {
- background: url(@/static/image/bg1.png);
- width: 100vw;
- height: 100vh;
+.rrr {
+ position: absolute;
+ right: 0.53rem;
+ bottom: 0.36rem;
+ width: 2.5rem;
+ height: 3.07rem;
+ opacity: 1;
+ background: url(@/static/image/bg4.png);
+ background-size: 100% 100%;
+}
- color: #fff;
+.hua {
+ width: 13.81rem;
+ height: 5.965rem;
+ position: absolute;
+ background: url(@/static/image/bg3.png) no-repeat 0 0;
+ background-size: 100% 100%;
+}
- .repository {
- width: 100% !important;
- /* margin-top: 19px; */
- /* height: 68%; */
- display: flex;
- flex-direction: column;
- justify-content: space-around;
- align-items: center;
+/* 搴曢儴浜虹墿鑳屾櫙鍥� */
+.fff {
+ background: url(@/static/image/bg2.png) no-repeat 0 0;
+ background-size: 100% 100%;
+ width: 2.74rem;
+ height: 4.52rem;
+ position: fixed;
+ bottom: 0;
+ z-index: 9999999999999;
+ left: 0;
+}
- .Ttop {
- margin-top: .38rem;
- margin-bottom: 1.22rem;
- }
+::v-deep .uni-easyinput__content {
+ border-radius: 30rpx !important;
+ /* height: 52rpx; */
+}
- .r-top {
- font-size: 40rpx !important;
- margin: 10rpx 0;
- }
- }
+.secretary {
+ width: 1300rpx !important;
+ height: 50rpx;
+ /* height: 80%; */
+ /* flex-wrap: wrap; */
+ padding: 0 20px;
+ text-align: center;
- }
+ li {
+ background-color: #fff;
+ color: black;
+ height: 600rpx;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ align-items: center;
+ border: 1rpx solid #fff;
+ padding: 50rpx 65rpx;
+ /* padding: 58rpx 128rpx 88rpx; */
+ text-align: center;
+ background: #ebf4ff;
+ }
+}
- .login {
- width: .52rem;
- height: .52rem;
- display: inline-block;
- vertical-align: middle;
- margin-right: .19rem;
- background: url(@/static/image/logo.png) no-repeat 0 0;
- background-size: 100% 100%;
- }
+.Bbottom {
+ display: flex;
+ justify-content: center;
+}
- .rrr {
- position: absolute;
- right: .53rem;
- bottom: .36rem;
- width: 2.5rem;
- height: 3.07rem;
- opacity: 1;
- background: url(@/static/image/bg4.png);
- background-size: 100% 100%;
- }
+.LoginBg {
+ margin: 0 !important;
+}
- .hua {
- width: 13.81rem;
- height: 5.965rem;
- position: absolute;
- background: url(@/static/image/bg3.png) no-repeat 0 0;
- background-size: 100% 100%;
- }
+::v-deep .el-card {
+ top: 85% !important;
+}
- /* 搴曢儴浜虹墿鑳屾櫙鍥� */
- .fff {
- background: url(@/static/image/bg2.png) no-repeat 0 0;
- background-size: 100% 100%;
- width: 2.74rem;
- height: 4.52rem;
- position: fixed;
- bottom: 0;
- z-index: 9999999999999;
- left: 0;
- }
+::v-deep .el-input__inner {
+ height: 0.4rem !important;
+ font-size: 0.14rem;
+}
- ::v-deep .uni-easyinput__content {
- border-radius: 30rpx !important;
- /* height: 52rpx; */
- }
+.hua {
+ height: 4rem !important;
+}
+.LoginBg {
+ margin: 0 !important;
+ height: 0.3rem !important;
+}
- .secretary {
- width: 1300rpx !important;
- height: 50rpx;
- /* height: 80%; */
- /* flex-wrap: wrap; */
- padding: 0 20px;
- text-align: center;
+::v-deep .el-card {
+ top: 80% !important;
+ padding: 0 !important;
+}
+::v-deep .el-card__body {
+ padding: 0.25rem 0.5rem !important;
+}
+::v-deep .el-form {
+ padding-left: 0.1rem !important;
+}
+::v-deep .el-form-item__error {
+ font-size: 0.13rem !important;
+}
- li {
- background-color: #fff;
- color: black;
- height: 600rpx;
- display: flex;
- justify-content: space-between;
- flex-direction: column;
- align-items: center;
- border: 1rpx solid #fff;
- padding: 50rpx 65rpx;
- /* padding: 58rpx 128rpx 88rpx; */
- text-align: center;
- background: #EBF4FF;
- }
- }
+::v-deep .el-input__inner {
+ height: 0.44rem !important;
+}
+.hua {
+ height: 5rem !important;
+}
+.LoginTop {
+ margin-bottom: 0.4rem !important;
+}
- .Bbottom {
- display: flex;
- justify-content: center;
+.yzm {
+ top: 15% !important;
+}
- }
+.fff {
+ width: 2.4rem !important;
+ height: 4rem !important;
+}
+.rrr {
+ width: 2rem !important;
+ height: 2.5rem !important;
+}
- .LoginBg {
- margin: 0 !important;
- }
-
- ::v-deep .el-card {
- top: 85% !important;
- }
-
- ::v-deep .el-input__inner {
- height: .4rem !important;
- font-size: .14rem;
- }
-
- .hua {
- height: 4rem !important;
- }
-
- .LoginBg {
- margin: 0 !important;
- height: .3rem !important;
- }
-
- ::v-deep .el-card {
- top: 80% !important;
- padding: 0 !important;
- }
-
- ::v-deep .el-card__body {
- padding: .25rem .5rem !important;
- }
-
- ::v-deep .el-form {
- padding-left: .1rem !important;
- }
-
- ::v-deep .el-form-item__error {
- font-size: .13rem !important;
- }
-
- ::v-deep .el-input__inner {
- height: .44rem !important;
- }
-
- .hua {
- height: 5rem !important;
- }
-
- .LoginTop {
- margin-bottom: .4rem !important;
- }
-
- .yzm {
- top: 15% !important;
- }
-
- .fff {
- width: 2.4rem !important;
- height: 4rem !important;
- }
-
- .rrr {
- width: 2rem !important;
- height: 2.5rem !important;
- }
-
- .btn ::v-deep .el-button {
- margin-top: 0.2rem !important;
- /* font-size: 0.2rem !important;
+.btn ::v-deep .el-button {
+ margin-top: 0.2rem !important;
+ /* font-size: 0.2rem !important;
width: 100%;
padding: 0.12rem !important; */
- }
+}
- .asdf {
- margin-bottom: .1rem !important;
- }
-</style>
\ No newline at end of file
+.asdf {
+ margin-bottom: 0.1rem !important;
+}
+</style>
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 2466e6d..532fc67 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -5,8 +5,8 @@
class="Ttop flex flex-center flex-wrap"
style="flex-direction: column"
>
- <view class=""></view>
- <view class="" ref="Rtop">
+ <view ></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -32,10 +32,10 @@
align-items: center;
"
>
- <!-- <view class="" style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
+ <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
<view class="LoginBg"></view>
<view
- class=""
+
@click="BacktoLogin"
style="
cursor: pointer;
@@ -159,7 +159,7 @@
import Footer1 from "@/components/footer/footer.vue";
export default {
components: {
- Footer1,
+ Footer1
},
data() {
// 瀵嗙爜
@@ -202,55 +202,55 @@
{
required: true,
message: "璇疯緭鍏ョ櫥褰曡处鍙�",
- trigger: "blur",
+ trigger: "blur"
},
{
pattern: /^[a-zA-Z0-9]{3,15}$/,
message: "璇疯緭鍏�3-15涓瓧绗︾殑瀛楁瘝鎴栨暟瀛�",
- trigger: "blur",
- }, // 鑷畾涔夋牎楠岃鍒欙紝浣跨敤姝ｅ垯琛ㄨ揪寮�
+ trigger: "blur"
+ } // 鑷畾涔夋牎楠岃鍒欙紝浣跨敤姝ｅ垯琛ㄨ揪寮�
],
pass: [
{
required: true,
message: "璇疯緭鍏ュ瘑鐮�",
- trigger: "blur",
+ trigger: "blur"
},
{
min: 6,
max: 10,
message: "瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�",
- trigger: "blur",
+ trigger: "blur"
},
{
validator: validatePass,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
checkPass: [
{
validator: validatePass2,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
cellphoneORmailbox: [
{
required: true,
message: "璇疯緭鍏ユ墜鏈�",
- trigger: "blur",
+ trigger: "blur"
},
{
validator: this.validateContact,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
verifyCode: [
{
required: true,
message: "璇疯緭鍏ラ獙璇佺爜",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// 鐧诲綍娉ㄥ唽妗�
loginTrue: true,
@@ -262,51 +262,51 @@
pass: "",
checkPass: "",
cellphoneORmailbox: null,
- verifyCode: "",
+ verifyCode: ""
},
// 鐧诲綍鐢ㄦ埛璐﹀彿
loginData: {
// 璐﹀彿
loginID: "",
- pass: "",
+ pass: ""
},
// 閲嶇疆瀵嗙爜
resetDataPass: {
cellphoneORmailbox: null,
verifyCode: "",
newPass: "",
- checkPass: "",
+ checkPass: ""
},
// 淇敼瀵嗙爜
amendDataPass: {
loginID: "",
originalPass: "",
newPass: "",
- checkPass: "",
+ checkPass: ""
},
// 涔︾睄鏁版嵁
listData: [
{
name: "涓尰浜虹墿鏁版嵁搴�",
- id: 1,
+ id: 1
},
{
name: "涓栧尰鍖诲鏁版嵁搴�",
- id: 2,
+ id: 2
},
{
name: "涓尰瀛︽湳娴佹淳",
- id: 3,
+ id: 3
},
{
name: "涓尰鍦板煙鍖昏氨",
- id: 4,
+ id: 4
},
{
name: "涓尰鍖讳簨鍒跺害",
- id: 5,
- },
- ],
+ id: 5
+ }
+ ]
};
},
onLoad() {
@@ -314,7 +314,7 @@
success: function (info) {
// console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
// console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
- },
+ }
});
},
mounted() {
@@ -323,22 +323,16 @@
methods: {
// 鏈嶅姟鏉℃
termOfServiceClick(number) {
- // console.log(number);
if (number == 1) {
- console.log("鏈嶅姟鏉℃");
window.open(`#/pages/userAgreement/userAgreement`);
- // uni.navigateTo({
- // url: '/pages/userAgreement/userAgreement'
- // })
} else if (number == 2) {
window.open(`#/pages/userAgreement/userAgreement`);
- console.log("鐢ㄦ埛闅愮淇濇姢鍜屼釜浜轰俊鎭潯娆�");
}
},
// 宸叉湁璐﹀彿锛熻繑鍥炵櫥褰�
BacktoLogin() {
uni.redirectTo({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
},
// 鑾峰彇楠岃瘉鐮�
@@ -346,7 +340,7 @@
if (!this.registerData.cellphoneORmailbox) {
this.$message({
message: "璇疯緭鍏ユ墜鏈猴紒",
- type: "warning",
+ type: "warning"
});
return false;
@@ -355,7 +349,7 @@
return;
}
let Obj = {
- communicateParam: this.registerData.cellphoneORmailbox,
+ communicateParam: this.registerData.cellphoneORmailbox
};
this.countdown = 60;
const intervalId = setInterval(() => {
@@ -366,13 +360,11 @@
}
}, 1000);
let code = await getverifyCode(Obj);
-
},
// 鎵嬫満鍙�/鎴栬�呴偖绠�
validateContact(rule, value, callback) {
const regPhone = /^1[0-9]{10}$/;
const regEmail = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
- console.log(value, regPhone.test(value), regEmail.test(value));
if (regPhone.test(value) || regEmail.test(value)) {
callback(); // 鏍￠獙閫氳繃
} else {
@@ -383,55 +375,35 @@
this.$nextTick(() => {
var width = this.$refs.Rtop.$el.clientWidth;
this.Rtop1 = width + 50;
- console.log("Element width:", width);
});
},
// 鐢ㄦ埛娉ㄥ唽
async Login(formName) {
- console.log(formName);
let Obj = {
username: this.registerData.loginID,
password: encryptAES(this.registerData.pass),
communicateParam: this.registerData.cellphoneORmailbox,
- verifyCode: this.registerData.verifyCode,
+ verifyCode: this.registerData.verifyCode
};
this.$refs[formName].validate(async (valid) => {
if (valid) {
- // alert('submit!');
- console.log("sdfds");
await getaddLogin(Obj).then((res) => {
- console.log(res, "娉ㄥ唽鎴愬姛");
if (res.success == true) {
- uni.showToast({
- title: res.errorText,
- icon: "success",
- });
+ this.$message.success("娉ㄥ唽鎴愬姛");
uni.navigateTo({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
} else {
- uni.showToast({
- title: res.errorText,
- icon: "error",
- });
+ this.$message.error(res.errorText);
}
});
- // encryptAES
- // uni.navigateTo({
- // url: '/pages/Login/Login'
- // })
} else {
console.log("error submit!!");
return false;
}
});
-
- // console.log(Obj, '鐢ㄦ埛鐧诲綍鐨勭櫥褰曟寜閽�');
-
- // let res = await getaddLogin(Obj)
- // console.log('sdfdsfs', res);
- },
- },
+ }
+ }
};
</script>
<style scoped>
diff --git a/src/pages/TcmSystem/TcmSystem.vue b/src/pages/TcmSystem/TcmSystem.vue
index cec201f..288342f 100644
--- a/src/pages/TcmSystem/TcmSystem.vue
+++ b/src/pages/TcmSystem/TcmSystem.vue
@@ -546,12 +546,12 @@
});
},
// 鍙充晶鐨刲ist鏁版嵁
- getMList(obj) {
+ getMList(key) {
this.pageLoading = true;
let Obj = {
medicalSearchType: this.searchType,
type: this.classifyType, //鏌ヨ绫诲瀷 鍙栧�硷細OFFICIAL->鑱屽畼 INSTITUTION->鏈烘瀯 ALL->鑱屽畼銆佹満鏋�
- name: this.SearchValue, //鎼滅储妗嗘绱�
+ name: key ? key : this.SearchValue, //鎼滅储妗嗘绱�
dynastyId: this.classifyId, //鐐瑰嚮鏈濅唬鏌ヨ鏁版嵁鏃讹紝甯︿笂姝ゅ弬鏁�
sort: this.rankVal, //鎺掑簭鏂瑰紡 鍙栧�硷細CREATE鍒涘缓鏃堕棿锛孨AME鍚嶇О
page: this.CurrentPage, //绗嚑椤�
@@ -577,7 +577,6 @@
},
// list鏁扮粍 鑾峰彇list閲岄潰鐨勮鎯卻huju
ListClick(item, index) {
- console.log(item, "item");
let Obj = {
rowId: item.requestId,
medicalSearchType: this.searchType,
@@ -689,8 +688,8 @@
},
// 鐑棬鎼滅储
HotClick(val) {
- this.SearchValue = val;
- this.getMList();
+ // this.SearchValue = val;
+ this.getMList(val);
},
// 鎸夌収浠�涔堟帓搴�
selectChange(e) {
diff --git a/src/pages/academicGenres/chart.vue b/src/pages/academicGenres/chart.vue
index 4e8faa4..5136fb3 100644
--- a/src/pages/academicGenres/chart.vue
+++ b/src/pages/academicGenres/chart.vue
@@ -3,7 +3,7 @@
style="width: 100%; height: 100%; display: flex; flex-direction: column"
>
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="3 + ''" text="鍘嗕唬瀛︽湳娴佹淳" />
+ <headNav :idIndex="3 + ''" text="涓尰瀛︽湳娴佹淳" />
<view class="Midde flex">
<!-- <view class="MiddeBack">杩斿洖</view> -->
<el-button class="MiddeBack flex flex-center" @click="goBack"
@@ -11,7 +11,6 @@
>
<view class="flex flex-center flex-column">
<view
- class=""
style="
font-weight: 900;
margin-bottom: 0.2rem;
@@ -51,7 +50,6 @@
"
>
<view
- class=""
:style="{ background: item.color }"
style="
margin-right: 0.07rem;
@@ -60,7 +58,7 @@
border-radius: 50%;
"
></view>
- <view class="" style="color: #2c2c2c; font-size: 0.12rem">{{
+ <view style="color: #2c2c2c; font-size: 0.12rem">{{
item.name
}}</view>
</view>
@@ -209,7 +207,6 @@
searchSchoolPerson({
keyword: item
}).then((res) => {
- console.log(res.list, i);
for (let i = 0; i < res.list.length; i++) {
const citem = res.list[i];
// 鑺傜偣
@@ -355,6 +352,9 @@
height: 0.24rem;
font-size: 0.12rem;
padding: 0;
+ border-radius: 0;
+ border: 1px solid #9e9e9e;
+ color: #000;
}
.Lists {
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 1be251f..64a5931 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -1,7 +1,7 @@
<template>
<view class="bag">
<!-- 椤堕儴瀵艰埅 -->
- <headNav idIndex="3" text="鍘嗕唬瀛︽湳娴佹淳" />
+ <headNav idIndex="3" text="涓尰瀛︽湳娴佹淳" />
<view class="Midde flex">
<!-- <view class="MiddeBack">杩斿洖</view> -->
<el-button class="MiddeBack flex flex-center" @click="goBack"
@@ -9,7 +9,7 @@
>
<view class="flex flex-center flex-column">
<view
- class=""
+
style="
font-weight: 900;
margin-bottom: 0.2rem;
@@ -25,7 +25,7 @@
</li>
</ul>
</view>
- <view class=""></view>
+ <view ></view>
</view>
<view class="Bottom">
<view class="Bottom_top flex">
@@ -169,7 +169,6 @@
methods: {
getData() {
getIntroduction(Number(this.idIndex)).then((res) => {
- console.log(res,"rrrr");
this.detailData = {
name: res.object.school_NAME[0].content,
icon:
@@ -248,7 +247,6 @@
})
: []
};
- console.log(this.detailData,"detailDatadetailData");
});
},
goBack() {
@@ -320,6 +318,9 @@
height: 0.24rem;
font-size: 0.12rem;
padding: 0;
+ border-radius: 0;
+ border: 1px solid #9e9e9e;
+ color: #000;
}
.Lists {
diff --git a/src/pages/academicGenres/index.vue b/src/pages/academicGenres/index.vue
index bced621..5bd2939 100644
--- a/src/pages/academicGenres/index.vue
+++ b/src/pages/academicGenres/index.vue
@@ -1,7 +1,7 @@
<template>
<view style="width: 100%;height: 100%;display: flex;flex-direction: column;">
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="idIndex" text="鍘嗕唬瀛︽湳娴佹淳" />
+ <headNav :idIndex="idIndex" text="涓尰瀛︽湳娴佹淳" />
<view id="line-chart" style="flex: 1;overflow: hidden;padding: 50px;"></view>
</view>
</template>
diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue
index f09b69d..61a81bc 100644
--- a/src/pages/changePassword/changePassword.vue
+++ b/src/pages/changePassword/changePassword.vue
@@ -5,8 +5,8 @@
class="Ttop flex flex-center flex-wrap"
style="flex-direction: column"
>
- <view class=""></view>
- <view class="" ref="Rtop">
+ <view ></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -32,10 +32,10 @@
align-items: center;
"
>
- <!-- <view class="" style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
+ <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
<view class="LoginBg"></view>
<view
- class=""
+
@click="BacktoLogin"
style="
cursor: pointer;
@@ -275,7 +275,6 @@
this.$nextTick(() => {
var width = this.$refs.Rtop.$el.clientWidth;
this.Rtop1 = width + 50;
- console.log("Element width:", width);
});
},
// 蹇樿瀵嗙爜
@@ -285,24 +284,15 @@
password: encryptAES(this.amendDataPass.rawPass),
newPassword: encryptAES(this.amendDataPass.newPass)
};
- console.log(Obj);
this.$refs[formName].validate(async (valid) => {
if (valid) {
// alert('submit!鎴愬姛');
- await getchangePassword(Obj).then((res) => {
- // console.log(res,'淇敼瀵嗙爜鎴愬姛');
+ getchangePassword(Obj).then((res) => {
if (res.success == true) {
- uni.showToast({
- title: res.object,
- icon: "none"
- });
+ this.$message.success('淇敼鎴愬姛');
uni.navigateBack();
- console.log("淇敼鎴愬姛", res);
} else {
- uni.showToast({
- title: res.errorText,
- icon: "none"
- });
+ this.$message.error(res.errorText);
}
});
// uni.redirectTo({ encryptAES
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index c3f47f7..e1e94ec 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -507,7 +507,6 @@
},
methods: {
copyText() {
- console.log(navigator.clipboard);
const textToCopy = this.biogData[0].content + ";鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╂暟鎹簱";
const textarea = document.createElement("textarea");
textarea.value = textToCopy;
@@ -542,7 +541,6 @@
: fieldItem.content1;
}
}
- console.log(obj);
this.detailInfo = obj;
// 鍏崇郴鍥捐氨
this.getMappingData(this.detailInfo.NAME);
@@ -557,7 +555,6 @@
getPersonRelationAtSchool({
personId: this.detailId,
}).then((res) => {
- console.log(res, "PERSON_RELATIONS");
// this.personRelationList = res.object.personRelationList;
// if (this.personRelationList.length) {
// this.tableData4 = this.personRelationList.map((f) => {
@@ -571,11 +568,9 @@
getWebBasic({
personId: this.detailId,
}).then((res) => {
- console.log(res, "resres");
const obj = res.object;
if (obj.school) {
getIntroduction(Number(obj.school)).then((sres) => {
- console.log(sres, "sres");
this.handleData(obj, sres);
});
} else {
@@ -700,9 +695,8 @@
getRelationship() {
getPersonRelationAtSchool({
personId: this.detailId,
- // relationSearchTypeEO: "SOCIAL"
+ relationSearchTypeEO: "KINSHIP"
}).then((res) => {
- console.log(res, "getPersonRelationAtSchool");
// 杩欓噷鎺ュ彛鏈夐棶棰�
});
},
@@ -748,7 +742,6 @@
getSpaceTime({
personId: this.detailId,
}).then((res) => {
- console.log(res, "getSpaceTime");
const data = res.list.map((item) => {
return {
name: item.activityName,
diff --git a/src/pages/character/index.vue b/src/pages/character/index.vue
index 8f7acbe..fded48b 100644
--- a/src/pages/character/index.vue
+++ b/src/pages/character/index.vue
@@ -1,5 +1,7 @@
<template>
- <view>
+ <view
+ style="width: 100%; height: 100%; display: flex; flex-direction: column"
+ >
<headNav idIndex="1" text="涓尰浜虹墿鏁版嵁搴�" />
<!-- 楂樼骇鎼滅储 -->
<view style="margin: 0.35rem 0 0.16rem 0">
@@ -26,14 +28,29 @@
</li>
</ul>
</view>
- <view class="" style="margin-left: 0.2rem">涔︿腑鏈�甯告彁鍒扮殑100浣嶄汉鐗�</view>
+ <view style="margin-left: 0.2rem">涔︿腑鏈�甯告彁鍒扮殑100浣嶄汉鐗�</view>
<!-- 鍏崇郴琛ㄥ湴鍥� -->
- <view id="relation" style="margin-top: 0.2rem; height: 70vh; width: 100%;position: relative;"
- ><div v-if="!loading && relationships.length == 0" style="position: absolute;top: 30%;left: 0;right: 0;text-align: center;font-size: 0.20rem;color: #666;">鏆傛棤鐩稿叧鏁版嵁</div></view
+ <view
+ id="relation"
+ style="margin-top: 0.2rem; flex: 1; width: 100%; position: relative"
+ ><div
+ v-if="!loading && relationships.length == 0"
+ style="
+ position: absolute;
+ top: 30%;
+ left: 0;
+ right: 0;
+ text-align: center;
+ font-size: 0.2rem;
+ color: #666;
+ "
+ >
+ 鏆傛棤鐩稿叧鏁版嵁
+ </div></view
>
<!-- 鏈濅唬 -->
- <view
+ <!-- <view
class="flex flex-center"
style="width: 100%; position: fixed; bottom: 0.33rem; left: 0"
>
@@ -70,7 +87,7 @@
</view>
</li>
</ul>
- </view>
+ </view> -->
</view>
</template>
@@ -275,9 +292,9 @@
this.searchKey = options.keyword;
},
methods: {
- getData() {
+ getData(key) {
getFuzzySearch({
- keyword: this.searchKey ? this.searchKey : ""
+ keyword: key ? key : this.searchKey ? this.searchKey : ""
}).then((res) => {
this.nodes = [];
this.relationships = [];
@@ -457,7 +474,6 @@
// 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
myChart.off("click");
myChart.on("click", (params) => {
- console.log(params);
if (params.dataType === "node") {
this.spaceTimeArr(params.data.id);
}
@@ -466,8 +482,8 @@
},
// 鍩虹鎼滅储
onSearch(val) {
- this.searchKey = val.text;
- this.getData();
+ // this.searchKey = val.text;
+ this.getData(val.text);
},
// 楂樼骇鎼滅储
onSubmit(val) {
diff --git a/src/pages/characterMap/characterMap.vue b/src/pages/characterMap/characterMap.vue
index b613e8a..df06f02 100644
--- a/src/pages/characterMap/characterMap.vue
+++ b/src/pages/characterMap/characterMap.vue
@@ -108,7 +108,6 @@
// this.aaa();
// });
this.$route;
- console.log(this.$route, "this.$route");
this.getPersonInfoFun();
this.getBasicInfo();
},
@@ -181,7 +180,6 @@
id: this.$route.query.id,
type: "PERSON_SPACE_TIME"
}).then((res) => {
- console.log(res, "res");
this.initMap(res.object.personSpaceTimeList);
});
},
@@ -191,7 +189,6 @@
id: this.$route.query.id,
type: "PERSON_BASIC"
}).then((res) => {
- console.log(res, "res");
this.basicInfo.name = res.object.personFieldList.find(
(f) => f.fieldName == "WEAK_NAME"
).content1;
@@ -212,11 +209,9 @@
},
creatMX(len) {
- console.log(len);
let width = len * 50 + 10;
// this.MX.style.width = `${width}px`
// this.scales.style.width = `${width}px`
- // console.log(this.box.style.width);
},
creatScale() {
// for (let i = 0; i < this.yearArr.length; i++) {
@@ -226,7 +221,6 @@
// scale.addEventListener("click", this.scaleClick)
// scales.appendChild(scale)
// }
- // console.log(arr[0]);
},
handleSliderChange(value) {
@@ -234,16 +228,13 @@
},
scaleClick(i) {
// let i = Number(this.getAttribute("data-index"))
- console.log(i, this.cursorML);
if (i > this.yearIndex) {
this.cursorML += (i - this.yearIndex + +("0.0" + this.yearIndex)) / 1.9;
// this.spanML += 50 * (i - this.yearIndex)
- console.log(i - this.yearIndex + 0.2, "aaaa");
} else {
this.cursorML -= (this.yearIndex - i) / 2 + 0.04;
// this.spanML -= 50 * (this.yearIndex - i)
- console.log(this.yearIndex, i, "bbbb");
}
this.yearIndex = i;
},
@@ -459,12 +450,10 @@
// 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
myChart.on("click", (params) => {
// menuNav2 = !menuNav1
- // console.log(menuNav);
if (params.componentType === "series") {
var dataName = params.data.name; // 鑾峰彇鐐瑰嚮鐨勬暟鎹悕绉�
var dataValue = params.data.value; // 鑾峰彇鐐瑰嚮鐨勬暟鎹��
// 鍦ㄨ繖閲屽彲浠ユ牴鎹渶瑕佸鐞嗙偣鍑讳簨浠讹紝姣斿寮瑰嚭瀵瑰簲鏁版嵁鐨勮缁嗕俊鎭瓑鎿嶄綔
- // console.log('鐐瑰嚮浜�', dataName, '鏁版嵁锛屾暟鍊间负', dataValue);
// 杩欓噷鍙互缂栧啓瑙﹀彂鏃堕棿鑾峰彇瀵瑰簲鏁版嵁淇℃伅鐨勯�昏緫
this.spaceTimeArr(params);
}
@@ -477,7 +466,6 @@
// 淇敼 Vue 缁勪欢鐨勬暟鎹紝渚嬪鏄剧ず鑿滃崟瀵艰埅
this.menuNav = !this.menuNav;
// 鏃剁┖鍦板浘鐨勬暟鎹�
- console.log(Arr);
}
}
};
diff --git a/src/pages/fileDetail/index.vue b/src/pages/fileDetail/index.vue
index c099b5d..dceaaaf 100644
--- a/src/pages/fileDetail/index.vue
+++ b/src/pages/fileDetail/index.vue
@@ -30,12 +30,10 @@
personId: this.options.id,
dataTypeEO: this.options.outputType
}).then((res) => {
- console.log(res);
this.data = res;
});
} else {
getMedicalDataOutput(this.options).then((res) => {
- console.log(res);
this.data = res;
});
}
diff --git a/src/pages/forgetPass/forgetPass.vue b/src/pages/forgetPass/forgetPass.vue
index b322659..bcaf9db 100644
--- a/src/pages/forgetPass/forgetPass.vue
+++ b/src/pages/forgetPass/forgetPass.vue
@@ -5,8 +5,8 @@
class="Ttop flex flex-center flex-wrap"
style="flex-direction: column"
>
- <view class=""></view>
- <view class="" ref="Rtop">
+ <view ></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -32,10 +32,10 @@
align-items: center;
"
>
- <!-- <view class="" style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
+ <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
<view class="LoginBg"></view>
<view
- class=""
+
@click="BacktoLogin"
style="
cursor: pointer;
@@ -273,7 +273,6 @@
},
// 鍒楄〃椤硅烦杞�
listDataClick(item) {
- console.log(item);
// 鍦ㄥ綋鍓嶉〉闈㈣缃叏灞�鍙橀噺
// uni.setStorageSync('globalData', { id: 123, name: 'example' });
if (item.id == 1) {
@@ -281,7 +280,6 @@
url: "/pages/character/detail?id=" + item.id,
});
} else if (item.id == 2) {
- console.log(item.name);
// uni.navigateTo({
// url:'/pages/character/detail?id='+item.id
// })
@@ -304,7 +302,6 @@
validateContact(rule, value, callback) {
const regPhone = /^1[0-9]{10}$/;
const regEmail = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
- console.log(value, regPhone.test(value), regEmail.test(value));
if (regPhone.test(value) || regEmail.test(value)) {
callback(); // 鏍￠獙閫氳繃
} else {
@@ -315,7 +312,6 @@
this.$nextTick(() => {
var width = this.$refs.Rtop.$el.clientWidth;
this.Rtop1 = width + 50;
- console.log("Element width:", width);
});
},
// 蹇樿瀵嗙爜
@@ -325,13 +321,10 @@
verifyCode: this.resetDataPass.verifyCode, //楠岃瘉鐮�
newPassword: encryptAES(this.resetDataPass.newPass), //鏂板瘑鐮�
};
- console.log(Obj);
this.$refs[formName].validate(async (valid) => {
if (valid) {
await getRestPassword(Obj).then((res) => {
- console.log(res, "鎺ュ彛");
if (res.success) {
- console.log("蹇樿瀵嗙爜鐨勬帴鍙ｆ嬁鍒版暟鎹簡");
uni.navigateTo({
url: "/pages/Login/Login",
});
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index c7c1dca..85e7dd3 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,314 +1,373 @@
<template>
- <view class="container flex flex-center" style="align-items: flex-start;">
- <view class="repository relative">
- <view class="flex Ttop flex-column" style="width: 100%;">
- <view class="flex" style="width: 100%;">
- <view class="" style="padding-left: 4rem;"></view>
- <view class=" flex flex-center flex-wrap" style="width: 100%; flex-direction: column;">
- <view class=""></view>
- <view class="" ref="Rtop">
- <text class="login"></text>
- <text style="font-size: .36rem;letter-spacing: 4rpx;vertical-align: middle;font-family: cursive;font-weight: bold;">涓浗鍖诲浜虹墿鐭ヨ瘑搴�</text>
- </view>
- </view>
- <view class="flex relative" style="height: .5rem;">
- <!-- 灏忔悳绱㈠浘鐗� -->
- <view class="flex searchCss" :style="{'backgroundColor': isExpanded==true?'#fff':''}"
- style="border-radius: .5rem; height: 75%; width: 2.33rem;margin-right: .30rem;justify-content: flex-end;">
- <!-- overflow: hidden; -->
- <input :style="{'display': isExpanded == true ? 'block' : 'none'}" @confirm="toggleSearch" type="text"
- style="margin-left: .05rem;color: #2C2C2C; flex: 1; background-color: #fff; font-size: .13rem;"
- class="search-input" v-model="searchInput" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" />
- <view class="search-logo" @click="toggleSearch"
- style="background-color: #244A7B;border-radius: 50%;margin-top: -4rpx;"></view>
- </view>
- <el-dropdown trigger="click" @command="handleCommand" style="margin-right: .3rem;">
- <view @click="iconClick(2)" class="s2 ss1 "></view>
- <el-dropdown-menu v-if="isCommand" slot="dropdown">
- <el-dropdown-item command="1" >淇敼瀵嗙爜</el-dropdown-item>
- <el-dropdown-item command="2" >閫�鍑虹櫥褰�</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- <view @click="iconClick(item+2)" v-for="item in 1" :key="item" :class="'s'+(item+2)"
- class="ss1 cursor" style="margin-right: .3rem;">
- </view>
- </view>
- </view>
- <!-- 楂樼骇鎼滅储 -->
- <view v-if="isSearchTrue" class="Search" style="margin: .35rem 0 .16rem 0; height: .52rem;">
- <advancedSearch @onSearch="onSearch" placehold="" :isAvancedTrue="false" :isSearchTrue="false" />
- </view>
- </view>
- <view class="Bbottom ">
- <!-- 閫夐」鍗� -->
- <ul class="secretary flex ">
- <li @click="listDataClick(item)" v-for="(item,index) in listData" :key="index">
- <span class="font-family"
- style="font-weight: 700;color: #2C2C2C; width: .36rem;display: inline-block; font-size: .32rem;overflow: hidden;height: 80%;line-height: 1.5;">{{item.name}}</span>
- <view class="flex flex-content"
- style="width: .5rem;height: .5rem;border-radius: 50%;background-color: #244A7B;">
- <image style="width: 40%;height: 20%;" src="@/static/image/eResize.png" mode=""></image>
- </view>
- </li>
- </ul>
- </view>
- </view>
- <view class="hua"></view>
- <!-- 搴曢儴浜虹墿鑳屾櫙鍥惧乏渚� -->
- <view class="fff"></view>
- <!-- 搴曢儴鑺辩殑鑳屾櫙鍥惧彸渚� -->
- <view class="rrr"></view>
- <Footer1 />
- </view>
+ <view class="container flex flex-center" style="align-items: flex-start">
+ <view class="repository relative">
+ <view class="flex Ttop flex-column" style="width: 100%">
+ <view class="flex" style="width: 100%">
+ <view style="padding-left: 4rem"></view>
+ <view
+ class="flex flex-center flex-wrap"
+ style="width: 100%; flex-direction: column"
+ >
+ <view ></view>
+ <view ref="Rtop">
+ <text class="login"></text>
+ <text
+ style="
+ font-size: 0.36rem;
+ letter-spacing: 4rpx;
+ vertical-align: middle;
+ font-family: cursive;
+ font-weight: bold;
+ "
+ >涓浗鍖诲浜虹墿鐭ヨ瘑搴�</text
+ >
+ </view>
+ </view>
+ <view class="flex relative" style="height: 0.5rem">
+ <!-- 灏忔悳绱㈠浘鐗� -->
+ <view
+ class="flex searchCss"
+ :style="{ backgroundColor: isExpanded == true ? '#fff' : '' }"
+ style="
+ border-radius: 0.5rem;
+ height: 75%;
+ width: 2.33rem;
+ margin-right: 0.3rem;
+ justify-content: flex-end;
+ "
+ >
+ <!-- overflow: hidden; -->
+ <input
+ :style="{ display: isExpanded == true ? 'block' : 'none' }"
+ @confirm="toggleSearch"
+ type="text"
+ style="
+ margin-left: 0.05rem;
+ color: #2c2c2c;
+ flex: 1;
+ background-color: #fff;
+ font-size: 0.13rem;
+ "
+ class="search-input"
+ v-model="searchInput"
+ placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
+ />
+ <view
+ class="search-logo"
+ @click="toggleSearch"
+ style="
+ background-color: #244a7b;
+ border-radius: 50%;
+ margin-top: -4rpx;
+ "
+ ></view>
+ </view>
+ <el-dropdown
+ trigger="click"
+ @command="handleCommand"
+ style="margin-right: 0.3rem"
+ >
+ <view @click="iconClick(2)" class="s2 ss1"></view>
+ <el-dropdown-menu v-if="isCommand" slot="dropdown">
+ <el-dropdown-item command="1">淇敼瀵嗙爜</el-dropdown-item>
+ <el-dropdown-item command="2">閫�鍑虹櫥褰�</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ <view
+ @click="iconClick(item + 2)"
+ v-for="item in 1"
+ :key="item"
+ :class="'s' + (item + 2)"
+ class="ss1 cursor"
+ style="margin-right: 0.3rem"
+ >
+ </view>
+ </view>
+ </view>
+ <!-- 楂樼骇鎼滅储 -->
+ <view
+ v-if="isSearchTrue"
+ class="Search"
+ style="margin: 0.35rem 0 0.16rem 0; height: 0.52rem"
+ >
+ <advancedSearch
+ @onSearch="onSearch"
+ placehold=""
+ :isAvancedTrue="false"
+ :isSearchTrue="false"
+ />
+ </view>
+ </view>
+ <view class="Bbottom">
+ <!-- 閫夐」鍗� -->
+ <ul class="secretary flex">
+ <li
+ @click="listDataClick(item)"
+ v-for="(item, index) in listData"
+ :key="index"
+ >
+ <span
+ class="font-family"
+ style="
+ font-weight: 700;
+ color: #2c2c2c;
+ width: 0.36rem;
+ display: inline-block;
+ font-size: 0.32rem;
+ overflow: hidden;
+ height: 80%;
+ line-height: 1.5;
+ "
+ >{{ item.name }}</span
+ >
+ <view
+ class="flex flex-content"
+ style="
+ width: 0.5rem;
+ height: 0.5rem;
+ border-radius: 50%;
+ background-color: #244a7b;
+ "
+ >
+ <image
+ style="width: 40%; height: 20%"
+ src="@/static/image/eResize.png"
+ mode=""
+ ></image>
+ </view>
+ </li>
+ </ul>
+ </view>
+ </view>
+ <view class="hua"></view>
+ <!-- 搴曢儴浜虹墿鑳屾櫙鍥惧乏渚� -->
+ <view class="fff"></view>
+ <!-- 搴曢儴鑺辩殑鑳屾櫙鍥惧彸渚� -->
+ <view class="rrr"></view>
+ <Footer1 />
+ </view>
</template>
<script>
- import {
- nextTick
- } from "vue";
- import {
- getlogout
- } from '@/api/index.js'
- import Footer1 from '@/components/footer/footer.vue'
- export default {
- components: {
- Footer1
- },
- data() {
- return {
- isCommand: true,
- // 鎼滅储鐨勬樉绀�
- isSearchTrue: true,
- isExpanded: false, // 鎺у埗鎼滅储妗嗘槸鍚﹀睍寮�
- searchInput: '', //灏忓浘鏍囩殑鎼滅储妗�
- // 鐧诲綍娉ㄥ唽妗�
- loginTrue: true,
- Rtop1: 0,
- value: 'sdfdsf',
- // 娉ㄥ唽鐢ㄦ埛瀵瑰簲鐨勬暟鎹�
- registerData: {
- loginID: '',
- pass: '',
- checkPass: '',
- cellphoneORmailbox: '',
- verifyCode: ''
- },
- // 鐧诲綍鐢ㄦ埛璐﹀彿
- loginData: {
- // 璐﹀彿
- loginID: '',
- pass: ''
- },
- // 閲嶇疆瀵嗙爜
- resetDataPass: {
- cellphoneORmailbox: '',
- verifyCode: "",
- newPass: "",
- checkPass: ""
- },
- // 淇敼瀵嗙爜
- amendDataPass: {
- loginID: '',
- originalPass: "",
- newPass: "",
- checkPass: ""
- },
- // 涔︾睄鏁版嵁
- listData: [{
- name: '涓尰浜虹墿鏁版嵁搴�',
- id: 1,
- }, {
- name: '涓栧尰鍖诲鏁版嵁搴�',
- id: 2,
- }, {
- name: '涓尰瀛︽湳娴佹淳',
- id: 3,
- }, {
- name: '涓尰鍦板煙鍖昏氨',
- id: 4,
- }, {
- name: '涓尰鍖讳簨鍒跺害',
- id: 5,
- },
+import { nextTick } from "vue";
+import { getlogout } from "@/api/index.js";
+import Footer1 from "@/components/footer/footer.vue";
+export default {
+ components: {
+ Footer1
+ },
+ data() {
+ return {
+ isCommand: true,
+ // 鎼滅储鐨勬樉绀�
+ isSearchTrue: true,
+ isExpanded: false, // 鎺у埗鎼滅储妗嗘槸鍚﹀睍寮�
+ searchInput: "", //灏忓浘鏍囩殑鎼滅储妗�
+ // 鐧诲綍娉ㄥ唽妗�
+ loginTrue: true,
+ Rtop1: 0,
+ value: "sdfdsf",
+ // 娉ㄥ唽鐢ㄦ埛瀵瑰簲鐨勬暟鎹�
+ registerData: {
+ loginID: "",
+ pass: "",
+ checkPass: "",
+ cellphoneORmailbox: "",
+ verifyCode: ""
+ },
+ // 鐧诲綍鐢ㄦ埛璐﹀彿
+ loginData: {
+ // 璐﹀彿
+ loginID: "",
+ pass: ""
+ },
+ // 閲嶇疆瀵嗙爜
+ resetDataPass: {
+ cellphoneORmailbox: "",
+ verifyCode: "",
+ newPass: "",
+ checkPass: ""
+ },
+ // 淇敼瀵嗙爜
+ amendDataPass: {
+ loginID: "",
+ originalPass: "",
+ newPass: "",
+ checkPass: ""
+ },
+ // 涔︾睄鏁版嵁
+ listData: [
+ {
+ name: "涓尰浜虹墿鏁版嵁搴�",
+ id: 1
+ },
+ {
+ name: "涓栧尰鍖诲鏁版嵁搴�",
+ id: 2
+ },
+ {
+ name: "涓尰瀛︽湳娴佹淳",
+ id: 3
+ },
+ {
+ name: "涓尰鍦板煙鍖昏氨",
+ id: 4
+ },
+ {
+ name: "涓尰鍖讳簨鍒跺害",
+ id: 5
+ }
+ ]
+ };
+ },
+ onLoad() {
- ]
- }
- },
- onLoad() {
- // console.log(,';dsfdsf');
-
- uni.getSystemInfo({
- success: function(info) {
- // console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
- // console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
- }
- });
- },
- mounted() {
- this.getElementWidth();
- // this.$store.commit('set_id',1)
- },
- methods: {
- // 鎼滅储
- onSearch(val) {
- uni.navigateTo({
- url: '/pages/knowledgeBase/knowledgeBase?keyword=' + val.text
- })
- },
- // 鎼滅储
- // 鍒囨崲鎼滅储妗嗙殑灞曞紑鍜屾敹璧风姸鎬�
- toggleSearch() {
- this.isExpanded = !this.isExpanded;
- this.$nextTick(() => {
- if (this.searchInput.trim() !== '') {
- uni.navigateTo({
- url: '/pages/knowledgeBase/knowledgeBase?keyword=' + this.searchInput
- })
- } else {
- console.log('涓嶆悳绱�');
- }
- this.searchInput = '';
- })
- },
- // 鍒楄〃椤硅烦杞�
- listDataClick(item) {
- console.log(item);
- // 鍦ㄥ綋鍓嶉〉闈㈣缃叏灞�鍙橀噺
- // uni.setStorageSync('globalData', { id: 123, name: 'example' });
- if (item.id == 1) {
- uni.navigateTo({
- // url: '/pages/character/detail?id=' + item.id
- url: '/pages/character/index?id=' + item.id
- })
- } else if (item.id == 2) {
- console.log(item.name);
- uni.navigateTo({
- url: '/pages/inherit/index?id=' + item.id
- })
- // uni.navigateTo({
- // url: '/pages/shiyiHome/shiyiHome'
- // })
- } else if (item.id == 3) {
- uni.navigateTo({
- url: '/pages/academicGenres/index?id=' + item.id
- })
- } else if (item.id == 4) {
- uni.navigateTo({
- url: '/pages/territory/territory?id=' + item.id
- })
- } else if (item.id == 5) {
- uni.navigateTo({
- url: '/pages/TcmSystem/TcmSystem?id=' + item.id
- })
- }
+ uni.getSystemInfo({
+ success: function (info) {
+ // console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
+ // console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
+ }
+ });
+ },
+ mounted() {
+ this.getElementWidth();
+ // this.$store.commit('set_id',1)
+ },
+ methods: {
+ // 鎼滅储
+ onSearch(val) {
+ uni.navigateTo({
+ url: "/pages/knowledgeBase/knowledgeBase?keyword=" + val.text
+ });
+ },
+ // 鎼滅储
+ // 鍒囨崲鎼滅储妗嗙殑灞曞紑鍜屾敹璧风姸鎬�
+ toggleSearch() {
+ this.isExpanded = !this.isExpanded;
+ this.$nextTick(() => {
+ if (this.searchInput.trim() !== "") {
+ uni.navigateTo({
+ url:
+ "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput
+ });
+ }
+ this.searchInput = "";
+ });
+ },
+ // 鍒楄〃椤硅烦杞�
+ listDataClick(item) {
+ // 鍦ㄥ綋鍓嶉〉闈㈣缃叏灞�鍙橀噺
+ // uni.setStorageSync('globalData', { id: 123, name: 'example' });
+ if (item.id == 1) {
+ uni.navigateTo({
+ // url: '/pages/character/detail?id=' + item.id
+ url: "/pages/character/index?id=" + item.id
+ });
+ } else if (item.id == 2) {
+ uni.navigateTo({
+ url: "/pages/inherit/index?id=" + item.id
+ });
+ // uni.navigateTo({
+ // url: '/pages/shiyiHome/shiyiHome'
+ // })
+ } else if (item.id == 3) {
+ uni.navigateTo({
+ url: "/pages/academicGenres/index?id=" + item.id
+ });
+ } else if (item.id == 4) {
+ uni.navigateTo({
+ url: "/pages/territory/territory?id=" + item.id
+ });
+ } else if (item.id == 5) {
+ uni.navigateTo({
+ url: "/pages/TcmSystem/TcmSystem?id=" + item.id
+ });
+ }
+ },
- },
-
- // 楠岃瘉鐮佹牎楠�
- validateVerificationCode(rule, value, callback) {
- if (value !== '123456') {
- callback(new Error('楠岃瘉鐮侀敊璇�'));
- } else {
- callback();
- }
- },
- getElementWidth() {
-
- this.$nextTick(() => {
- var width = this.$refs.Rtop.$el.clientWidth;
- this.Rtop1 = width + 50;
- console.log('Element width:', width);
- })
- },
- iconClick(index) {
- console.log(index);
- // 鎼滅储鐨勬樉绀�
- if (index == 1) {
- // this.isSearchTrue = !this.isSearchTrue
- } else if (index == 2) {
- // 妫�鏌� localStorage 涓槸鍚﹀瓨鍦� token
- if (localStorage.getItem('access_token')) {
- // token 瀛樺湪
- console.log('access_token');
- this.isCommand = true
- } else {
- // token 涓嶅瓨鍦�
- // console.log('Token does not exist.');
- this.isCommand = false
- uni.navigateTo({
- url: '/pages/Login/Login'
- })
- }
-
- } else if (index == 3) {
- console.log('甯姪');
- }
- },
- // 淇敼鑾峰彇閫�鍑烘寜閽�
- handleCommand(int) {
- if (int == 1) {
- console.log('淇敼瀵嗙爜');
- uni.navigateTo({
- url: '/pages/changePassword/changePassword'
- })
- } else if (int == 2) {
- // console.log('閫�鍑虹櫥褰�');
- uni.showModal({
- // 璇㈤棶鐢ㄦ埛鏄惁閫�鍑虹櫥褰�
- title: '閫�鍑虹櫥褰�',
- content: '鎮ㄧ‘瀹氳閫�鍑虹櫥褰曞悧?',
- success: async (res) => {
- console.log(res, 'reresresrer');
-
- if (res.confirm) {
- // 閫�鍑烘帴鍙�
- await getlogout().then(res => {
- //纭畾閫�鍑烘嬁鍒皌oken骞舵竻闄oken
- let TOKEN = uni.getStorageSync('缂撳瓨鍚嶇О');
- uni.clearStorageSync();
- //閫�鍑烘垚鍔燂紒骞惰烦杞埌鍏朵粬椤甸潰
- uni.showToast({
- title: '閫�鍑烘垚鍔�',
- icon: 'none',
- });
- })
- // setTimeout(() => {
- // uni.reLaunch({
- // url: '閫�鍑哄悗璺宠浆鍦板潃',
- // });
- // }, 1500);
- } else if (res.cancel) {
- // console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- uni.showToast({
- title: '鐢ㄦ埛鐐瑰嚮鍙栨秷',
- icon: 'none',
- });
- }
- },
- });
- }
- },
-
- }
- }
+ // 楠岃瘉鐮佹牎楠�
+ validateVerificationCode(rule, value, callback) {
+ if (value !== "123456") {
+ callback(new Error("楠岃瘉鐮侀敊璇�"));
+ } else {
+ callback();
+ }
+ },
+ getElementWidth() {
+ this.$nextTick(() => {
+ var width = this.$refs.Rtop.$el.clientWidth;
+ this.Rtop1 = width + 50;
+ });
+ },
+ iconClick(index) {
+ // 鎼滅储鐨勬樉绀�
+ if (index == 1) {
+ // this.isSearchTrue = !this.isSearchTrue
+ } else if (index == 2) {
+ // 妫�鏌� localStorage 涓槸鍚﹀瓨鍦� token
+ if (localStorage.getItem("access_token")) {
+ // token 瀛樺湪
+ this.isCommand = true;
+ } else {
+ // token 涓嶅瓨鍦�
+ this.isCommand = false;
+ uni.navigateTo({
+ url: "/pages/Login/Login"
+ });
+ }
+ } else if (index == 3) {
+ console.log("甯姪");
+ }
+ },
+ // 淇敼鑾峰彇閫�鍑烘寜閽�
+ handleCommand(int) {
+ if (int == 1) {
+ uni.navigateTo({
+ url: "/pages/changePassword/changePassword"
+ });
+ } else if (int == 2) {
+ uni.showModal({
+ // 璇㈤棶鐢ㄦ埛鏄惁閫�鍑虹櫥褰�
+ title: "閫�鍑虹櫥褰�",
+ content: "鎮ㄧ‘瀹氳閫�鍑虹櫥褰曞悧?",
+ success: (res) => {
+ if (res.confirm) {
+ // 閫�鍑烘帴鍙�
+ getlogout().then((res) => {
+ //纭畾閫�鍑烘嬁鍒皌oken骞舵竻闄oken
+ let TOKEN = uni.getStorageSync("缂撳瓨鍚嶇О");
+ uni.clearStorageSync();
+ //閫�鍑烘垚鍔燂紒骞惰烦杞埌鍏朵粬椤甸潰
+ this.$message.success("閫�鍑烘垚鍔�");
+ uni.reLaunch({
+ url: "/pages/Login/Login"
+ });
+ });
+ }
+ }
+ });
+ }
+ }
+ }
+};
</script>
<style scoped lang="scss">
- .search-logo {
- width: .34rem;
- /* logo鍥炬爣鐨勫搴� */
- height: .34rem;
- /* logo鍥炬爣鐨勯珮搴� */
- margin-left: 10rpx;
- /* 涓庤緭鍏ユ涔嬮棿鐨勯棿璺� */
- cursor: pointer;
- background-image: url(@/static/image/search.svg);
- background-size: 100% 100%;
- }
+.search-logo {
+ width: 0.34rem;
+ /* logo鍥炬爣鐨勫搴� */
+ height: 0.34rem;
+ /* logo鍥炬爣鐨勯珮搴� */
+ margin-left: 10rpx;
+ /* 涓庤緭鍏ユ涔嬮棿鐨勯棿璺� */
+ cursor: pointer;
+ background-image: url(@/static/image/search.svg);
+ background-size: 100% 100%;
+}
- /*
+/*
鍦ㄥ睆骞曞搴﹁秴杩� 1440px 鏃剁殑鏍峰紡璁剧疆 */
- /* @media screen and (min-width: 1441px) {
+/* @media screen and (min-width: 1441px) {
::v-deep .el-card {
top: 60% !important;
}
@@ -351,351 +410,341 @@
height: 2.5rem !important;
}
} */
- @media screen and (min-width:2560px)and (max-width:3840px) {
- .Ttop {
- margin-bottom: .7rem !important;
- margin-top: .3rem !important;
- }
+@media screen and (min-width: 2560px) and (max-width: 3840px) {
+ .Ttop {
+ margin-bottom: 0.7rem !important;
+ margin-top: 0.3rem !important;
+ }
- .login {
- width: .52rem !important;
- height: .52rem !important;
- }
+ .login {
+ width: 0.52rem !important;
+ height: 0.52rem !important;
+ }
- .LoginBg {
- margin: 0 !important;
- height: .3rem !important;
- }
+ .LoginBg {
+ margin: 0 !important;
+ height: 0.3rem !important;
+ }
- ::v-deep .Bbar img {
- width: .52rem !important;
- height: .52rem !important;
- }
+ ::v-deep .Bbar img {
+ width: 0.52rem !important;
+ height: 0.52rem !important;
+ }
- ::v-deep .el-card {
- top: 90% !important;
- padding: 0 !important;
- }
+ ::v-deep .el-card {
+ top: 90% !important;
+ padding: 0 !important;
+ }
- ::v-deep .el-card__body {
- padding: .25rem .5rem !important;
- }
+ ::v-deep .el-card__body {
+ padding: 0.25rem 0.5rem !important;
+ }
- .Search ::v-deep .flex-center {
- height: 80% !important;
- }
+ .Search ::v-deep .flex-center {
+ height: 80% !important;
+ }
- ::v-deep .searchBg {
- width: .35rem;
- height: .35rem;
- margin-right: .03rem;
- }
+ ::v-deep .searchBg {
+ width: 0.35rem;
+ height: 0.35rem;
+ margin-right: 0.03rem;
+ }
- ::v-deep .ffff {
- border-radius: .3rem !important;
- }
+ ::v-deep .ffff {
+ border-radius: 0.3rem !important;
+ }
- ::v-deep .searchBg {
- border-radius: inherit !important;
- }
+ ::v-deep .searchBg {
+ border-radius: inherit !important;
+ }
- ::v-deep .uni-input-placeholder {
- font-size: .14rem;
- height: 100%;
- display: flex;
- align-content: center;
- align-items: center;
- }
+ ::v-deep .uni-input-placeholder {
+ font-size: 0.14rem;
+ height: 100%;
+ display: flex;
+ align-content: center;
+ align-items: center;
+ }
- ::v-deep .el-form {
- padding-left: .1rem !important;
- }
+ ::v-deep .el-form {
+ padding-left: 0.1rem !important;
+ }
- ::v-deep .el-form-item__error {
- font-size: .13rem !important;
- }
+ ::v-deep .el-form-item__error {
+ font-size: 0.13rem !important;
+ }
- ::v-deep .el-input__inner {
- height: .35rem !important;
- font-size: .14rem;
- }
+ ::v-deep .el-input__inner {
+ height: 0.35rem !important;
+ font-size: 0.14rem;
+ }
- ::v-deep .el-form-item__label {
- display: flex;
- align-items: center;
- justify-content: flex-end;
- margin-right: .2rem !important;
- width: .7rem;
- }
+ ::v-deep .el-form-item__label {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ margin-right: 0.2rem !important;
+ width: 0.7rem;
+ }
+ .secretary li {
+ width: 1.3rem !important;
+ height: 4rem !important;
- .secretary li {
- width: 1.3rem !important;
- height: 4rem !important;
+ span {
+ width: 0.5rem !important;
+ height: 70% !important;
+ font-size: 0.25rem !important;
+ }
+ }
- span {
- width: .5rem !important;
- height: 70% !important;
- font-size: 0.25rem !important;
- }
- }
+ .hua {
+ height: 5rem !important;
+ }
- .hua {
- height: 5rem !important;
- }
+ .LoginTop {
+ margin-bottom: 0.4rem !important;
+ }
- .LoginTop {
- margin-bottom: .4rem !important;
- }
+ .yzm {
+ top: 15% !important;
+ }
- .yzm {
- top: 15% !important;
- }
+ .fff {
+ width: 2.4rem !important;
+ height: 4rem !important;
+ }
- .fff {
- width: 2.4rem !important;
- height: 4rem !important;
- }
+ .rrr {
+ width: 2rem !important;
+ }
- .rrr {
- width: 2rem !important;
- }
+ .btn {
+ margin-bottom: 0.1rem !important;
+ }
- .btn {
- margin-bottom: .1rem !important;
- }
+ .btn ::v-deep .el-button {
+ margin-top: 0.2rem !important;
+ font-size: 0.2rem !important;
+ width: 100%;
+ padding: 0.12rem !important;
- .btn ::v-deep .el-button {
- margin-top: 0.2rem !important;
- font-size: 0.2rem !important;
- width: 100%;
- padding: 0.12rem !important;
+ span {
+ font-weight: bold !important;
+ }
+ }
- span {
- font-weight: bold !important;
- }
- }
+ .asdf {
+ margin-bottom: 0.1rem !important;
+ }
+}
- .asdf {
- margin-bottom: .1rem !important;
- }
- }
+@media screen and (min-width: 1366px) {
+ .Ttop {
+ margin-bottom: 0.6rem !important;
+ }
- @media screen and (min-width:1366px) {
- .Ttop {
- margin-bottom: .6rem !important;
- }
+ ::v-deep .uni-input-placeholder {
+ font-size: 0.14rem;
+ height: 100%;
+ display: flex;
+ align-content: center;
+ align-items: center;
+ }
- ::v-deep .uni-input-placeholder {
- font-size: .14rem;
- height: 100%;
- display: flex;
- align-content: center;
- align-items: center;
- }
+ .secretary li {
+ width: 1.3rem !important;
+ height: 4rem !important;
- .secretary li {
- width: 1.3rem !important;
- height: 4rem !important;
+ span {
+ width: 0.5rem !important;
+ height: 70% !important;
+ font-size: 0.25rem !important;
+ }
+ }
- span {
- width: .5rem !important;
- height: 70% !important;
- font-size: 0.25rem !important;
- }
- }
+ /* 楂樼骇鎼滅储 */
+ .Search ::v-deep .flex-center {
+ height: 80% !important;
+ }
- /* 楂樼骇鎼滅储 */
- .Search ::v-deep .flex-center {
- height: 80% !important;
- }
+ ::v-deep .searchBg {
+ width: 0.35rem;
+ height: 0.35rem;
+ margin-right: 0.03rem;
+ }
- ::v-deep .searchBg {
- width: .35rem;
- height: .35rem;
- margin-right: .03rem;
- }
+ .fff {
+ width: 2.4rem !important;
+ height: 4rem !important;
+ }
- .fff {
- width: 2.4rem !important;
- height: 4rem !important;
- }
+ .rrr {
+ width: 2rem !important;
+ }
+}
- .rrr {
- width: 2rem !important;
- }
-
-
- }
-
-
-
- .btn>>>.el-form-item__content {
- margin-left: 0 !important;
- }
-
- ::v-deep .el-form-item__label {
- color: #244a7b;
- }
-
- ::v-deep .el-input__inner {
- border: none;
- border-bottom: 1px solid #2d476a;
- border-radius: 0;
- }
-
- ::v-deep .el-form-item__error {
- /* display: none; */
- }
-
- ::v-deep .input.invalid:focus {
- border-color: #2d476a !important;
- }
-
- ::v-deep .el-input__inner:invalid {
- border-color: #2d476a !important;
- }
+.btn >>> .el-form-item__content {
+ margin-left: 0 !important;
+}
- ::v-deep .el-form-item__label {
- padding: 0;
- }
+::v-deep .el-form-item__label {
+ color: #244a7b;
+}
- ::v-deep .el-form-item__label {
- color: #2d476a;
- }
+::v-deep .el-input__inner {
+ border: none;
+ border-bottom: 1px solid #2d476a;
+ border-radius: 0;
+}
- ::v-deep .el-form-item {
- margin-bottom: 32rpx;
- }
+::v-deep .el-form-item__error {
+ /* display: none; */
+}
- .ss1 {
- background-repeat: no-repeat;
- background-size: 100% 100%;
- width: .34rem;
- height: .34rem;
- background-size: 100% 100%;
- }
+::v-deep .input.invalid:focus {
+ border-color: #2d476a !important;
+}
- .s1 {
- background-image: url(@/static/image/search.svg);
+::v-deep .el-input__inner:invalid {
+ border-color: #2d476a !important;
+}
- }
+::v-deep .el-form-item__label {
+ padding: 0;
+}
- .s2 {
- background-image: url(@/static/image/profile.svg);
- }
+::v-deep .el-form-item__label {
+ color: #2d476a;
+}
- .s3 {
- background-image: url(@/static/image/quote.svg);
- margin-right: .59rem !important;
- }
+::v-deep .el-form-item {
+ margin-bottom: 32rpx;
+}
- .container {
- background: url(@/static/image/bg1.png);
- width: 100vw;
- height: 100vh;
+.ss1 {
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ width: 0.34rem;
+ height: 0.34rem;
+ background-size: 100% 100%;
+}
- color: #fff;
+.s1 {
+ background-image: url(@/static/image/search.svg);
+}
- .repository {
- width: 100% !important;
- /* margin-top: 19px; */
- /* height: 68%; */
- display: flex;
- flex-direction: column;
- justify-content: space-around;
- align-items: center;
+.s2 {
+ background-image: url(@/static/image/profile.svg);
+}
- .Ttop {
- margin-top: .38rem;
- margin-bottom: 1.22rem;
- }
+.s3 {
+ background-image: url(@/static/image/quote.svg);
+ margin-right: 0.59rem !important;
+}
- .r-top {
- font-size: 40rpx !important;
- margin: 10rpx 0;
- }
- }
+.container {
+ background: url(@/static/image/bg1.png);
+ width: 100vw;
+ height: 100vh;
- }
+ color: #fff;
- .login {
- width: .52rem;
- height: .52rem;
- display: inline-block;
- vertical-align: middle;
- margin-right: .2rem;
- background: url(@/static/image/logo.png) no-repeat 0 0;
- background-size: 100% 100%;
- }
+ .repository {
+ width: 100% !important;
+ /* margin-top: 19px; */
+ /* height: 68%; */
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
- .rrr {
- position: absolute;
- right: .53rem;
- bottom: .36rem;
- width: 2.5rem;
- height: 3.07rem;
- opacity: 1;
- background: url(@/static/image/bg4.png);
- background-size: 100% 100%;
- }
+ .Ttop {
+ margin-top: 0.38rem;
+ margin-bottom: 1.22rem;
+ }
- .hua {
- width: 13.81rem;
- height: 5.965rem;
- position: absolute;
- background: url(@/static/image/bg3.png) no-repeat 0 0;
- background-size: 100% 100%;
- }
+ .r-top {
+ font-size: 40rpx !important;
+ margin: 10rpx 0;
+ }
+ }
+}
- /* 搴曢儴浜虹墿鑳屾櫙鍥� */
- .fff {
- background: url(@/static/image/bg2.png) no-repeat 0 0;
- background-size: 100% 100%;
- width: 2.74rem;
- height: 4.52rem;
- position: fixed;
- bottom: 0;
- z-index: 9999999999999;
- left: 0;
- }
+.login {
+ width: 0.52rem;
+ height: 0.52rem;
+ display: inline-block;
+ vertical-align: middle;
+ margin-right: 0.2rem;
+ background: url(@/static/image/logo.png) no-repeat 0 0;
+ background-size: 100% 100%;
+}
- ::v-deep .uni-easyinput__content {
- border-radius: 30rpx !important;
- /* height: 52rpx; */
- }
+.rrr {
+ position: absolute;
+ right: 0.53rem;
+ bottom: 0.36rem;
+ width: 2.5rem;
+ height: 3.07rem;
+ opacity: 1;
+ background: url(@/static/image/bg4.png);
+ background-size: 100% 100%;
+}
+.hua {
+ width: 13.81rem;
+ height: 5.965rem;
+ position: absolute;
+ background: url(@/static/image/bg3.png) no-repeat 0 0;
+ background-size: 100% 100%;
+}
- .secretary {
- /* width: 1300rpx !important; */
- /* height: 50rpx; */
- /* height: 80%; */
- /* flex-wrap: wrap; */
- padding: 0 20px;
- text-align: center;
+/* 搴曢儴浜虹墿鑳屾櫙鍥� */
+.fff {
+ background: url(@/static/image/bg2.png) no-repeat 0 0;
+ background-size: 100% 100%;
+ width: 2.74rem;
+ height: 4.52rem;
+ position: fixed;
+ bottom: 0;
+ z-index: 9999999999999;
+ left: 0;
+}
- li {
- background-color: #fff;
- color: black;
- width: 1.6rem;
- height: 4.8rem;
- display: flex;
- justify-content: center;
- flex-direction: column;
- align-items: center;
- text-align: center;
- background: #EBF4FF;
- font-weight: 600;
- margin: 0 .21rem;
- cursor: pointer;
- }
- }
+::v-deep .uni-easyinput__content {
+ border-radius: 30rpx !important;
+ /* height: 52rpx; */
+}
+.secretary {
+ /* width: 1300rpx !important; */
+ /* height: 50rpx; */
+ /* height: 80%; */
+ /* flex-wrap: wrap; */
+ padding: 0 20px;
+ text-align: center;
+ li {
+ background-color: #fff;
+ color: black;
+ width: 1.6rem;
+ height: 4.8rem;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ align-items: center;
+ text-align: center;
+ background: #ebf4ff;
+ font-weight: 600;
+ margin: 0 0.21rem;
+ cursor: pointer;
+ }
+}
- /* .Bbottom {
+/* .Bbottom {
display: flex;
justify-content: center;
} */
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/inherit/index.vue b/src/pages/inherit/index.vue
index f318915..91659ac 100644
--- a/src/pages/inherit/index.vue
+++ b/src/pages/inherit/index.vue
@@ -1,5 +1,5 @@
<template>
- <view class="">
+ <view >
<headNav
idIndex="2"
:searchBg="false"
@@ -111,7 +111,6 @@
},
onLoad(options) {
this.idIndex = options.id;
- console.log("optionsoptionsoptions", options.id);
},
mounted() {
this.getStatistics();
@@ -127,7 +126,7 @@
getData() {
this.nodeData = [];
// const defaultDynasty = this.dynasty.find(f.dynasty == "瀹�");
-
+ this.showTool = false;
inheritMedicalList({
keywords: this.keyword,
dynastyId: this.activeId,
@@ -252,7 +251,6 @@
}
});
myChart.on("click", (params) => {
- console.log(params.event.offsetX, params.event.offsetY);
if (params.componentType === "series") {
this.showTool = true;
this.toolTop = params.event.offsetY + "px";
@@ -400,11 +398,11 @@
border: none;
outline: none;
margin: auto;
- width: 100%;
+ flex: 1;
+ overflow: hidden;
padding-left: 20px;
}
.searchBox > button {
- width: 10%;
color: white;
height: 40px;
line-height: 40px;
diff --git a/src/pages/inherit/list.vue b/src/pages/inherit/list.vue
index 43c79ea..59f24e5 100644
--- a/src/pages/inherit/list.vue
+++ b/src/pages/inherit/list.vue
@@ -87,7 +87,7 @@
v-if="!culture1 && !culture2 && !culture3"
style="color: #666; text-align: center; font-size: 16px"
>
- 鏆傛棤鏁版嵁
+ 涓栧尰鏂囧寲鏃犳暟鎹�
</div>
</view>
</view>
@@ -132,7 +132,6 @@
identifier: this.idIndex,
socialFlag: true
}).then((res) => {
- console.log(res);
let data = res.object;
// 澶勭悊鑺傜偣棰滆壊
this.links = [];
@@ -195,8 +194,6 @@
}
};
});
- console.log(this.dataList);
- console.log(this.links);
this.initBarChart(this.dataList, this.links);
});
@@ -204,9 +201,9 @@
inheritMedicalCultureList({
identifier: this.idIndex
}).then((res) => {
- this.culture1 = res.list.find(item=>item.typeName == "瀹堕")
- this.culture2 = res.list.find(item=>item.typeName == "鍖诲痉")
- this.culture3 = res.list.find(item=>item.typeName == "瀹惰")
+ this.culture1 = res.list.find((item) => item.typeName == "瀹堕");
+ this.culture2 = res.list.find((item) => item.typeName == "鍖诲痉");
+ this.culture3 = res.list.find((item) => item.typeName == "瀹惰");
});
},
showSocialMapping() {
@@ -338,6 +335,9 @@
height: 0.24rem;
font-size: 0.12rem;
padding: 0;
+ border: 1px solid #9e9e9e;
+ border-radius: 0;
+ color: #000;
}
.barChart {
width: 100vw;
diff --git a/src/pages/knowledgeBase/knowledgeBase.vue b/src/pages/knowledgeBase/knowledgeBase.vue
index c478af6..74eb53c 100644
--- a/src/pages/knowledgeBase/knowledgeBase.vue
+++ b/src/pages/knowledgeBase/knowledgeBase.vue
@@ -7,7 +7,7 @@
<!-- <luanqing-search class="search_bar" @onSearch="onSearch"></luanqing-search> -->
<advancedSearch
@onSearch="onSearch"
- placehold="杈撳叆濮撳悕/鍒悕/鏃舵湡/浼犱富鑱屼笟鎼滅储"
+ placehold="杈撳叆濮撳悕/鍒悕/鏈濅唬/浼犱富鑱屼笟鎼滅储"
:isAvancedTrue="false"
:keyword="keywords"
/>
@@ -15,7 +15,7 @@
class="advancedSea"
@click="isAvancedClick"
style="color: #244a7b; cursor: pointer"
- >楂樼骇鎼滅储 鈭�</view
+ >楂樼骇鎼滅储 {{isAdvancedSearch ? "鈭�" : "鈭�"}}</view
>
</view>
<!-- 鐑棬鎼滅储 -->
@@ -84,8 +84,8 @@
style="padding: 0 20rpx; line-height: 0.3rem; height: 0.3rem"
@click="handInstitCLick(item, 'a')"
>
- <view class="">{{ item.tagName }}</view>
- <view class="">{{ item.count }}</view>
+ <view >{{ item.tagName }}</view>
+ <view >{{ item.count }}</view>
</li>
</ul>
<view v-if="profession.list.length - 1 > 3" class="flex flex-center">
@@ -122,8 +122,8 @@
style="padding: 0 20rpx"
@click="handInstitCLick(item, 'b')"
>
- <view class="">{{ item.dynastyName }}</view>
- <view class="">{{ item.count }}</view>
+ <view >{{ item.dynastyName }}</view>
+ <view >{{ item.count }}</view>
</li>
</ul>
<view v-if="dynasty.list.length - 1 > 3" class="flex flex-center">
@@ -160,7 +160,7 @@
style="padding: 0 20rpx; color: #244a7b"
@click="handInstitCLick(item, 'c')"
>
- <view class="">{{ index + 1 + ". " + item.source }}</view>
+ <view >{{ index + 1 + ". " + item.source }}</view>
</li>
</ul>
<!-- <view class="flex flex-center">
@@ -182,10 +182,10 @@
"
>
<view class="flex lightTop" style="width: 100%; margin: 0.1rem 0">
- <view class="" style="color: #2c2c2c">鍏眥{ total }}鏉�</view>
+ <view style="color: #2c2c2c">鍏眥{ total }}鏉�</view>
<el-button size="small" @click="exportClick">涓嬭浇</el-button>
</view>
- <el-table :data="tableData" class="lightBo" style="width: 100%">
+ <el-table :data="tableData" class="lightBo" style="width: 100%" empty-text="鏆傛棤鎼滅储淇℃伅">
<el-table-column prop="id" label="搴忓彿" width="110"></el-table-column>
<el-table-column prop="personName" label="濮撳悕"></el-table-column>
<el-table-column prop="personAlias" label="鍒悕"></el-table-column>
@@ -194,7 +194,7 @@
label="鎬у埆"
width="70"
></el-table-column>
- <el-table-column prop="period" label="鏃舵湡"></el-table-column>
+ <el-table-column prop="period" label="鏃朵唬"></el-table-column>
<el-table-column
prop="birthYear"
label="鐢熷勾"
@@ -322,7 +322,7 @@
},
{
type: "input",
- label: "鏃舵湡",
+ label: "鏃堕棿",
name: "dynasty",
value: "",
},
@@ -350,7 +350,7 @@
activeBox: null,
// 鏃舵湡
dynasty: {
- title: "鏃舵湡",
+ title: "鏃朵唬",
id: "",
index: "",
list: [],
@@ -386,7 +386,6 @@
};
},
onLoad(options) {
- console.log(options.keyword);
this.onSearch({ text: options.keyword });
},
mounted() {
@@ -407,7 +406,6 @@
// 涓嬭浇鎸夐挳
async exportClick() {
const dataList = this.tableData;
- console.log(this.keywords, "keywords");
let Obj = {
keywords: "", //鎼滅储妗嗘绱�
// keywords: this.keywords, //鎼滅储妗嗘绱�
@@ -424,12 +422,9 @@
page: 1,
pageSize: 1,
};
- console.log(Obj, "Obj");
// // 鎼滅储
await getPDownload(Obj).then((res) => {
- console.log(res, "exportClick");
// if (res.success) {
- // console.log(res, "鎼滅储鎺ュ彛");
// this.tableData = res.list;
// // 鎬绘暟閲�
// this.total = res.npage.totalCount;
@@ -499,7 +494,6 @@
async getStatistics() {
// 鐑棬鎼滅储
await getHotSearch().then((res) => {
- console.log(res, "鐑棬鎼滅储");
this.hot = Object.keys(res.object).map((key) => {
return {
id: parseInt(key),
@@ -509,7 +503,6 @@
});
// 鍙充晶鑱屼笟銆佹椂鏈熴�佹潵婧愮殑鏁版嵁
await getPDataStatistics().then((res) => {
- console.log(res, "鎺ュ彛鎴愬姛sdsdfsdsfs");
let totalCount1 = res.object.occupationStatistic.details.reduce(
(total, item) => total + item.count,
0
@@ -554,7 +547,6 @@
// 鐑棬鎼滅储
hotSearchClick(item) {
this.onSearch({ text: item.name });
- console.log(item, "鐑棬鎼滅储");
},
// 宸︿晶鐨勬満鏋勭粺璁＄瓑绛夋寜閽�
handInstitCLick(item, name) {
@@ -570,16 +562,13 @@
this.dynasty.index = item.dynastyId;
this.dynasty.id = item.dynastyId;
this.CurrentPage = 1;
- console.log(item);
} else if (name == "c") {
this.source.index = item.bookId;
this.source.id = item.bookId;
this.CurrentPage = 1;
- console.log("鏉ユ簮");
}
this.onSearch("");
- console.log(item, name);
},
isAvancedClick() {
this.isAdvancedSearch = !this.isAdvancedSearch;
@@ -594,7 +583,6 @@
},
// 楂樼骇鎼滅储
async onSubmit(val) {
- console.log(val);
this.profession.index = Number(val.tagId);
this.profession.id = Number(val.tagId);
const currentDynasty = this.dynasty.list.find(
@@ -623,15 +611,12 @@
};
// // 鎼滅储
await getPersonList(Obj).then((res) => {
- console.log(res);
if (res.success) {
- console.log(res, "鎼滅储鎺ュ彛");
this.tableData = res.list;
// 鎬绘暟閲�
this.total = res.npage.totalCount;
}
});
- console.log(val);
},
// 鍩虹鎼滅储
async onSearch(val) {
@@ -651,38 +636,30 @@
page: this.CurrentPage,
pageSize: this.pageSize,
};
- console.log(Obj, "ObjObjObj");
// // 鎼滅储
await getPersonList(Obj).then((res) => {
if (res.success) {
- console.log(res, "鎼滅储鎺ュ彛");
this.tableData = res.list;
// 鎬绘暟閲�
this.total = res.npage.totalCount;
}
});
- // 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;
}
});
},
// 灞曞紑鏀剁缉
shrinkClick(box, name) {
- console.log(box);
- console.log(this.dynasty.list);
// this.activeBox = this.activeBox === 'a' ? null : 'a';
if (name == "鑱屼笟") {
- console.log("鑱屼笟");
this.professionIndex =
this.professionIndex < this.profession.list.length
? this.profession.list.length
@@ -690,7 +667,6 @@
this.dynastyIndex = 4;
this.activeBox = this.activeBox === "a" ? null : "a";
} else {
- console.log("鏃舵湡");
this.dynastyIndex =
this.dynastyIndex < this.dynasty.list.length
? this.dynasty.list.length
@@ -703,7 +679,6 @@
CurrentChange(val) {
if (this.CurrentPage != val) {
this.CurrentPage = val;
- console.log("褰撳墠椤�", val);
this.onSearch("");
}
},
@@ -711,17 +686,13 @@
PrevClick(val) {
if (this.CurrentPage != val) {
this.CurrentPage = val;
- // console.log('涓婁竴椤�', val);
- // console.log(this.CurrentPage);
this.onSearch("");
}
},
// 涓嬩竴椤�
NextClick(val) {
if (this.CurrentPage != val) {
- // console.log('涓嬩竴椤�',val);
this.CurrentPage = val;
- // console.log(this.CurrentPage);
this.onSearch("");
}
},
diff --git a/src/pages/repository/repository.vue b/src/pages/repository/repository.vue
index 7bac2d9..7d3d912 100644
--- a/src/pages/repository/repository.vue
+++ b/src/pages/repository/repository.vue
@@ -4,7 +4,7 @@
<view class="Midde flex">
<el-button class="MiddeBack flex flex-center" @click="goBack">杩斿洖</el-button>
<view style="width: 70%;" class="flex flex-center flex-column">
- <view class="" style="font-weight: bold;font-size: .20rem;">鏉庢椂鐝�</view>
+ <view style="font-weight: bold;font-size: .20rem;">鏉庢椂鐝�</view>
<ul class="flex" style="line-height: 1.2;margin: .15rem 0 ;">
<li v-for="item in 4"
style="background-color: #fff; padding: 0 .08rem ; border: .01rem solid #000;border-radius:.1rem ;font-size: .12rem;text-align: center;margin-right: .15rem;">
@@ -16,15 +16,15 @@
涓滅挧锛屾椂浜鸿皳涔�:鏉庝笢鐠с�傚彿婵掓箹锛屾櫄骞磋嚜鍙锋繏婀栧北浜猴紝婀栧寳钖窞(浠婃箹鍖楃渷榛勫唸甯傝柂鏄ュ幙钖窞闀�)浜猴紝姹夋棌锛岀敓浜庢槑姝﹀畻姝ｅ痉鍗佷笁骞�(鍏厓1518骞�)锛屽崚浜庣瀹椾竾鍘嗕簩鍗佷簩骞�(鍏厓1593骞�)銆傛槸涓浗鏄庝唬涓庝竾瀵嗘枊榻愬悕鐨勫尰瀛﹀銆佽嵂鐗╁瀹躲�佸崥鐗╁瀹躲�佽憲杩板銆傛潕鏃剁弽瀵归亾瀹跺尰瀛︾殑缁ф壙鏄鏂归潰鐨勶紝鏇惧弬鑰冨巻浠ｆ湁鍏冲尰鑽強鍏跺鏈功绫嶅叓鐧句綑绉嶏紝缁撳悎鑷韩缁忛獙鍜岃皟鏌ョ爺绌讹紝鍘嗘椂27骞寸紪鎴愩�婃湰鑽夌翰鐩�嬩竴涔︼紝鏄垜鍥藉彜浠ｈ嵂鐗╁鐨勬�荤粨鎬у法钁楋紝鍦ㄥ浗鍐呭鍧囨湁寰堥珮鐨勮瘎浠凤紝宸叉湁鍑犵鏂囧瓧鐨勮瘧鏈垨鑺傝瘧鏈紝鍏惰憲鏈夈�婃繏婀栬剦瀛︺��
</view>
<view class="flex" style="width: 100%;margin: .25rem 0 .15rem 0;">
- <view class="">
+ <view >
<!-- <el-button style="padding: 10rpx;" size="mini" icon="el-icon-folder-add">鏀惰棌</el-button> -->
<el-button style="padding: .05rem .085rem;" class="yinyong flex">
<img src="@/static/image/yinyong.png" alt="" />寮曠敤</el-button>
</view>
- <view class="" style="font-size: .12rem;color: #244A7B;" @click="ProfileClick">闃呰鏇村></view>
+ <view style="font-size: .12rem;color: #244A7B;" @click="ProfileClick">闃呰鏇村></view>
</view>
</view>
- <view class="" style="width: 5%;"></view>
+ <view style="width: 5%;"></view>
</view>
<el-row style="padding: 0 1.2rem 0;padding-top: .24rem;">
<!-- 宸︿晶 -->
@@ -123,15 +123,15 @@
<view class="ProfileNav flex flex-center">
涓汉灏忎紶
</view>
- <view class="" style="padding: .44rem .3rem;min-height: 7.32rem;">
- <view class=""
+ <view style="padding: .44rem .3rem;min-height: 7.32rem;">
+ <view
style="margin-bottom: .2rem; background-color: #F0F0F0;padding: .18rem .1rem .1rem .27rem;font-size: .12rem;line-height: .24rem;font-weight: 400;">
- <view class="" style="color: #2C2C2C;">
+ <view style="color: #2C2C2C;">
钑欏睍涓佷笐鍚岄噷鏃ュ博棰濆簭鍏堣�冩湀姹犵縼钁椼�婂洓褰吀鏄庛�嬪叓鍗凤紝鐨嗙簿鎸囧ゥ瀹わ紝鑼傜妧鏈兘鐤�狅紝鐝嶅洜鎾补鎯宠彍锛屽兊鎾版鍞愶紝浠ヤ究鏅虹潧锛屾湇鎸囧崡銆備笘涔嬮浄鐥呴洦瀹讹紝鍜镐互鏈嶇剦棣栧姟锛屼笉鐭ユ淳涔冨洓鑳戒箣鏈紝璋撲箣宸ц�呴洦銆備笂澹鑸嶅叾鍏紝闈炲洓涓嶅彲銆�
</view>
<view class="flex">
- <view class=""></view>
- <view class="" style="font-weight: 700;color: #2C2C2C;">鈥斺�斻�婂鍏湇鑰冦�婸 3</view>
+ <view ></view>
+ <view style="font-weight: 700;color: #2C2C2C;">鈥斺�斻�婂鍏湇鑰冦�婸 3</view>
</view>
</view>
</view>
@@ -258,7 +258,6 @@
},
onLoad(options) {
this.idIndex = options.id
- console.log('optionsoptionsoptions', options.id);
},
mounted() {
@@ -272,7 +271,6 @@
// 鑾峰彇绗竴涓�夐」鍗＄殑 DOM 鍏冪礌
const firstTab = this.$refs.tabs.$el.querySelector('.el-tabs__active-bar');
firstTab.style.transform = 'translateX(' + '-.2rem' + ')'
- console.log(firstTab);
});
@@ -282,9 +280,7 @@
methods: {
// 鏀惧ぇ鍦板浘璺宠浆
fangdaClick(index) {
- console.log(index);
if (index == 1) {
- console.log('璺宠浆鍏崇郴鍦板浘');
uni.navigateTo({
url: '/pages/character/index'
})
@@ -292,7 +288,6 @@
uni.navigateTo({
url: '/pages/characterMap/characterMap'
})
- console.log('璺宠浆鏃剁┖鍦板浘');
}
},
// 灏忎紶
@@ -305,7 +300,6 @@
},
// 杩斿洖椤堕儴
scrollToTop() {
- console.log('ss');
window.scrollTo({
top: 0,
behavior: "smooth" // 浣跨敤骞虫粦婊氬姩
@@ -316,7 +310,6 @@
this.$nextTick(() => {
let firstTab = this.$refs.tabs.$el.querySelector('.el-tabs__active-bar');
if (index == 0) {
- console.log('sss');
firstTab.style.transform = 'translateX(-' + .2 + 'rem)'
} else if (index == 1) {
firstTab.style.transform = 'translateX(' + .85 * index + 'rem)'
@@ -330,7 +323,6 @@
let firstTab = this.$refs.tabs.$el.querySelector('.el-tabs__active-bar');
firstTab.style.transform = 'translateX(' + '-.2' + 'rem)'
}
- // console.log(firstTab);
})
},
// 鍏崇郴鍥捐氨
@@ -372,7 +364,6 @@
}
});
- console.log(links);
let FontSize = 12; // 瀛椾綋澶у皬
let BorderWidth = 2; // 杈规澶у皬
let SymbolSize = 80; // 灏哄璺濈
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index e131ec5..2d7274d 100644
--- a/src/pages/territory/territory.vue
+++ b/src/pages/territory/territory.vue
@@ -19,7 +19,7 @@
@click="SchoolClick(item.id)"
class="flex flex-center font-family school"
:style="{
- marginRight: index === dynasty.length - 1 ? '0' : '0.03rem',
+ marginRight: index === dynasty.length - 1 ? '0' : '0.03rem'
}"
style="
font-weight: 500;
@@ -33,7 +33,6 @@
"
>
<view
- class=""
:style="{ background: item.color }"
style="
margin-right: 0.07rem;
@@ -42,7 +41,7 @@
border-radius: 50%;
"
></view>
- <view class="" style="color: #2c2c2c; font-size: 0.12rem">{{
+ <view style="color: #2c2c2c; font-size: 0.12rem">{{
item.name
}}</view>
</view>
@@ -76,7 +75,7 @@
>鍏抽棴</el-button
>
</div>
- <view class="" style="overflow: auto; height: 2.5rem">
+ <view style="overflow: auto; height: 2.5rem">
<ul
class="information"
v-for="(item, index) in SearchArr"
@@ -155,7 +154,9 @@
position: fixed;
bottom: 0.33rem;
left: 0;
+ right: 0;
z-index: 99;
+ overflow: auto;
"
>
<ul class="flex">
@@ -173,9 +174,10 @@
<view
class="flex flex-center font-family"
style="
- padding: 0.05rem 0.19rem;
+ min-width: 0.6rem;
height: 0.3rem;
line-height: 0.3rem;
+ text-align: center;
color: #fff;
font-size: 0.14rem;
margin-top: 0.03rem;
@@ -184,7 +186,7 @@
"
:style="{
marginRight: index === dynasty1.length - 1 ? '0' : '0.03rem',
- background: dynasty1Color == item.id ? '#244A7B' : '#597AA5',
+ background: dynasty1Color == item.id ? '#244A7B' : '#597AA5'
}"
>
{{ item.dynastyChs }}
@@ -216,25 +218,25 @@
information: [
{
label: "濮撳悕",
- content: "鏉庢椂鐝�",
+ content: "鏉庢椂鐝�"
},
{
label: "鍒悕",
- content: "涓滀附鍏堢敓",
+ content: "涓滀附鍏堢敓"
},
{
label: "绫嶈疮",
- content: "婀栧寳",
+ content: "婀栧寳"
},
{
label: "鍖诲鍒嗙",
- content: "涓嵂,閽堢伕",
+ content: "涓嵂,閽堢伕"
},
{
label: "灏忎紶",
content:
- "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�...",
- },
+ "鏉庢椂鐝�(绾�1518骞磣1593 骞�)锛� 瀛椾笢鐠э紝 鏅氬勾鑷彿婵掓箹灞变汉锛� 婀栧箍榛勫窞搴滆柂宸�(浠婃箹鍖楃渷钖槬鍘�) 浜猴紝 鏄庝唬钁楀悕鍖昏嵂瀛﹀銆� 涓庘�� 鍖诲湥鈥� 涓囧瘑鏂嬮綈鍚嶏紝 鍙ゆ湁鈥� 涓囧瘑鏂嬬殑鏂癸紝 鏉庢椂鐝嶇殑鑽�� 涔嬭銆� 鍚庝负妤氬共搴�..."
+ }
],
// 涓嬮潰鐨勬湞浠�1
dynasty1Color: "",
@@ -242,78 +244,78 @@
{
name: "澶忔湞",
coord: "2070BC",
- id: 1,
+ id: 1
},
{
name: "鍟嗘湞",
id: 2,
- coord: "1600BC",
+ coord: "1600BC"
},
{
name: "瑗垮懆",
id: 3,
- coord: "1600BC",
+ coord: "1600BC"
},
{
name: "鏄ョ鎴樺浗",
id: 4,
- coord: "770BC",
+ coord: "770BC"
},
{
name: "绉︽湞",
id: 5,
- coord: "221BC",
+ coord: "221BC"
},
{
name: "姹夋湞",
id: 6,
- coord: "202BC",
+ coord: "202BC"
},
{
name: "涓夊浗涓ゆ檵鍗楀寳鏈�",
id: 7,
- coord: "184",
+ coord: "184"
},
{
name: "闅嬫湞",
id: 8,
- coord: "581",
+ coord: "581"
},
{
name: "鍞愭湞",
id: 9,
- coord: "618",
+ coord: "618"
},
{
name: "浜斾唬鍗佸浗",
id: 10,
- coord: "907",
+ coord: "907"
},
{
name: "杈藉閲�",
id: 11,
- coord: "907",
+ coord: "907"
},
{
name: "瀹嬫湞",
id: 12,
- coord: "960",
+ coord: "960"
},
{
name: "鍏冩湞",
id: 13,
- coord: "1271",
+ coord: "1271"
},
{
name: "鏄庢湞",
id: 14,
- coord: "1368",
+ coord: "1368"
},
{
name: "娓呮湞",
id: 15,
- coord: "1636",
- },
+ coord: "1636"
+ }
],
// 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
idIndex: 0,
@@ -322,43 +324,43 @@
{
name: "澶�",
color: "#90BBD8",
- id: 1,
+ id: 1
},
{
name: "鍟�",
color: "#EDD28B",
- id: 2,
+ id: 2
},
{
name: "瑗垮懆",
color: "#CF746D",
- id: 3,
+ id: 3
},
{
name: "绉�",
color: "#9CC27A",
- id: 4,
+ id: 4
},
{
name: "姹�",
color: "#5B6CB9",
- id: 5,
+ id: 5
},
{
name: "闅�",
color: "#8860A8",
- id: 6,
+ id: 6
},
{
name: "鍞�",
color: "#DE8E66",
- id: 7,
+ id: 7
},
{
name: "鏄�",
color: "#DE8E66",
- id: 8,
- },
+ id: 8
+ }
],
// 鎼滅储鍚庢槸鍚︽樉绀哄脊妗�
isSearch: false,
@@ -368,20 +370,19 @@
id: 1,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
},
{
id: 2,
name: "鏉庢椂鐝�",
birthAndDeath: "1518-1593",
- source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�",
- },
- ],
+ source: "鍥藉浘瑙勮寖妗ｏ紝CBDB锛屼笂鍥惧彜绫嶆暟鎹簱 绫嶈疮锛氭箹鍖�"
+ }
+ ]
};
},
onLoad(options) {
this.idIndex = options.id;
- console.log("optionsoptionsoptions", options.id);
},
mounted() {
this.getDynastyList();
@@ -391,14 +392,10 @@
methods: {
getDynastyList() {
getDynasty().then((res) => {
- console.log(res, "123123");
this.dynasty1 = res.list;
});
},
showCard(info) {
- console.log(info);
- console.log(this.markerList);
- console.log(this.map);
const item = this.markerList.find((f) => f.id == info.id);
var latlng = L.latLng(item.yCoord, item.xCoord);
this.map.setView(latlng, 10);
@@ -409,7 +406,6 @@
if (res.object) {
let markerList = [];
const listData = res.object.personList;
- console.log(listData, "listData");
for (let i = 0; i < listData.length; i++) {
const item = listData[i];
if (item.NATIVE_PLACE?.length > 0) {
@@ -426,7 +422,6 @@
});
}
}
- console.log(markerList, "markerList");
this.initMap(markerList);
this.SearchArr = markerList.map((item) => ({
birthAndDeath: item?.BIRTH_YEAR[0]?.content1
@@ -436,7 +431,7 @@
: "-",
name: item?.NAME[0]?.content1,
source: "-",
- id: item.id,
+ id: item.id
}));
this.markerList = markerList;
}
@@ -451,27 +446,27 @@
}
var map = L.map("map", {
preferCanvas: true,
- attributionControl: false,
+ attributionControl: false
}).setView([39.91667, 116.41667], 3);
L.tileLayer
.chinaProvider("TianDiTu.Normal.Map", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
- minZoom: 3,
+ minZoom: 3
})
.addTo(map);
let DefaultIcon1 = L.icon({
iconUrl: this.icoName,
iconSize: [24, 41], // 鍥炬爣鐨勫ぇ灏� 銆愬��1锛屽��2銆� 涓哄叿浣撲綘鑷畾涔夊浘鏍囩殑灏哄锛屾瘮濡傛垜鍥炬爣灏哄鏄�32脳52锛岃〃绀鸿鍥炬爣锛氬搴�32鍍忕礌锛岄珮搴︼細52鍍忕礌锛岄偅涔堝��1:灏辨槸32锛屽��2锛氬氨鏄�52
iconAnchor: [24, 41], // 鍥炬爣灏嗗搴旀爣璁扮偣鐨勪綅缃� 杩欎釜鏄噸鐐癸紝 銆愬��1锛屽��2銆戯紝鍊�1锛氫负鍥炬爣鍧愭爣绗竴涓��(鍗�32)鐨勪竴鍗婏紝鍊�2锛氫负鍥炬爣鍧愭爣绗簩涓��(鍗�52)
- popupAnchor: [1, -24], // 璇ョ偣鏄浉瀵逛簬iconAnchor寮瑰嚭淇℃伅鐨勪綅缃� 杩欎釜鏄垜鎵嬪姩璋冨嚭鏉ョ殑锛屾枃妗ｉ粯璁ゅ師濮嬪�兼槸[-1锛�-76]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
+ popupAnchor: [1, -24] // 璇ョ偣鏄浉瀵逛簬iconAnchor寮瑰嚭淇℃伅鐨勪綅缃� 杩欎釜鏄垜鎵嬪姩璋冨嚭鏉ョ殑锛屾枃妗ｉ粯璁ゅ師濮嬪�兼槸[-1锛�-76]锛屾垜鏄幓涓�鍗婂�硷紝鍙栦竴鍗婂�艰皟鍑烘潵鐨�
});
let icon = L.divIcon({
html: "<div class='map-circle-name '></div>",
iconSize: [80, 80],
- className: "map-circle",
+ className: "map-circle"
});
this.map = map;
if (markerList.length) {
@@ -507,10 +502,10 @@
let icon = L.divIcon({
html: `<div class='${currentClassName} ripple'></div>`,
iconSize: [80, 80],
- className: "map-circle",
+ className: "map-circle"
});
const temp_mark = L.marker([item.yCoord, item.xCoord], {
- icon: icon,
+ icon: icon
}).addTo(map);
temp_mark.on("click", (e) => {
this.isEchTrue = true;
@@ -519,7 +514,7 @@
nikeName: item?.ALIAS[0]?.content2,
nativePlace: item?.content1,
barnch: item?.MEDICAL_BRANCH[0]?.content1,
- medical: item?.MEDICAL_EXPERTISE[0]?.content1,
+ medical: item?.MEDICAL_EXPERTISE[0]?.content1
};
this.$nextTick(() => {
this.isTop =
@@ -538,7 +533,6 @@
// 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
dynastyBottomClick(id) {
- console.log(id);
this.dynasty1Color = id;
this.getDataList();
},
@@ -550,16 +544,14 @@
this.getDataList();
},
// 鐐瑰嚮涓婇潰鐨勬湞浠ｆ寜閽�
- SchoolClick(id) {
- console.log(id);
- },
+ SchoolClick(id) {},
// 鏌ョ湅鏇村>>
viewMoreClick() {
uni.navigateTo({
- url: "/pages/character/detail",
+ url: "/pages/character/detail"
});
- },
- },
+ }
+ }
};
</script>
@@ -747,7 +739,6 @@
}
::v-deep .ripple {
-
border-radius: 50%;
position: relative;
overflow: hidden;
diff --git a/src/pages/zhongyi/zhongyi.vue b/src/pages/zhongyi/zhongyi.vue
index 4b1add8..2d907e9 100644
--- a/src/pages/zhongyi/zhongyi.vue
+++ b/src/pages/zhongyi/zhongyi.vue
@@ -1,5 +1,5 @@
<template>
- <view class="">
+ <view >
<headNav :idIndex="idIndex" :searchBg="false" text="涓尰涓栧尰浼犳壙鏁版嵁搴�" bg="/static/image/topBg1.png"
bg1="/static/image/line1.png" />
@@ -12,7 +12,7 @@
<li style="background-color: #DA7A2B;color: #fff;">涓栧尰浼犳壙</li>
<li @click="ListClick" style="background-color: #fff;color: #DA7A2B;" >涓栧尰浼犳壙</li>
</ul>
- <view class="" style="width: 1rem;"></view>
+ <view style="width: 1rem;"></view>
</view>
<!-- echarts鍥� -->
<div class="barChart" ref="barChart"></div>
@@ -30,7 +30,6 @@
},
onLoad(options) {
this.idIndex = options.id
- console.log('optionsoptionsoptions', options.id);
},
mounted() {
// 鍒濆鍖� echarts
diff --git a/src/store/index.js b/src/store/index.js
index e97f289..d9aac7d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,7 +14,6 @@
getters,
mutations:{
Set_UserName(state,username){
- console.log(username,'uuu');
state.username=username
}
},
@@ -29,11 +28,9 @@
// 鐩戝惉mutaions 璁板綍state鍒版湰鍦板瓨鍌�
store.subscribe((mutation,state)=>{
uni.setStorageSync('state',state)
- console.log(state,'statestatestate');
})
// 璇诲彇缂撳瓨涓璼tate
if(uni.getStorageSync('state')){
- // console.log(state,'aaaaaaaaastatestatestate');
store.replaceState(Object.assign({},store.state,uni.getStorageSync('state')))
}
}]
diff --git a/src/store/module/user.js b/src/store/module/user.js
index 858f170..d626a6b 100644
--- a/src/store/module/user.js
+++ b/src/store/module/user.js
@@ -14,13 +14,11 @@
mutations: {
set_token: (state, params) => (state.token = params),
set_id: (state, params) => {
- console.log('sdf');
state.id = params
}
},
actions: {
isSet_id(store, role){
- console.log(role);
store.commit('set_id',role)
}
}
diff --git a/src/uni_modules/jc-form/components/jc-form/jc-form.vue b/src/uni_modules/jc-form/components/jc-form/jc-form.vue
index 3b09fb8..ef62689 100644
--- a/src/uni_modules/jc-form/components/jc-form/jc-form.vue
+++ b/src/uni_modules/jc-form/components/jc-form/jc-form.vue
@@ -166,10 +166,11 @@
function showToastError(errors) {
const { message } = errors.shift()
if (!message) return
- uni.showToast({
- icon: 'none',
- title: message
- })
+ // uni.showToast({
+ // icon: 'none',
+ // title: message
+ // })
+ this.$message.error(message);
}
function reset() {
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 5e64190..45a054a 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
@@ -178,7 +178,6 @@
// 鎼滅储涓嬫媺妗�
change(e) {
this.$emit("select", e);
- console.log(e);
}
},
created() {
@@ -198,7 +197,6 @@
},
watch: {
keyword(value) {
- console.log(value);
this.inputVal = value;
}
}
diff --git a/src/uni_modules/uni-easyinput/components/uni-easyinput/common.js b/src/uni_modules/uni-easyinput/components/uni-easyinput/common.js
index df9abe1..fde8d3c 100644
--- a/src/uni_modules/uni-easyinput/components/uni-easyinput/common.js
+++ b/src/uni_modules/uni-easyinput/components/uni-easyinput/common.js
@@ -6,9 +6,7 @@
*/
export const debounce = function(func, wait = 1000, immediate = true) {
let timer;
- console.log(1);
return function() {
- console.log(123);
let context = this,
args = arguments;
if (timer) clearTimeout(timer);
diff --git a/src/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/src/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
index 2c7993a..0213f69 100644
--- a/src/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/src/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -269,7 +269,6 @@
},
msg() {
- // console.log('computed', this.form, this.formItem);
// if (this.form) {
// return this.errorMessage || this.formItem.errMsg;
// }
diff --git a/src/utils/request/req1.js b/src/utils/request/req1.js
index 6bd9b0a..8c9cc0e 100644
--- a/src/utils/request/req1.js
+++ b/src/utils/request/req1.js
@@ -32,15 +32,10 @@
res.data.errorText == "闇�瑕侀獙璇佽韩浠�" &&
res.data.errorCode == "11"
) {
- console.log("token杩囨湡浜�");
Message.error(res.data.errorText || "");
// 娓呮token
uni.getStorageSync("access_token");
uni.clearStorageSync();
- uni.showToast({
- title: "璇烽噸鏂扮櫥褰�",
- icon: "none"
- });
uni.reLaunch({
url: "/pages/Login/Login"
});
--
Gitblit v1.9.1