Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/utils/constant.js
master
BeininX 11 months ago
commit 0d799efbe5

@ -1,53 +1,53 @@
<template> <template>
<div class="wrapper"> <div class="wrapper">
<div class="zombie"> <!-- <div class="zombie">-->
<div class="zombie__head"> <!-- <div class="zombie__head">-->
<div class="zombie__brain"></div> <!-- <div class="zombie__brain"></div>-->
<div class="zombie__cheeks"></div> <!-- <div class="zombie__cheeks"></div>-->
<div class="zombie__chin"></div> <!-- <div class="zombie__chin"></div>-->
<div class="zombie__eyes"> <!-- <div class="zombie__eyes">-->
<div class="eye left"> <!-- <div class="eye left">-->
<div class="eyebrow"></div> <!-- <div class="eyebrow"></div>-->
</div> <!-- </div>-->
<div class="eye right"> <!-- <div class="eye right">-->
<div class="eyebrow"></div> <!-- <div class="eyebrow"></div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="zombie__nose"></div> <!-- <div class="zombie__nose"></div>-->
<div class="zombie__mouth"> <!-- <div class="zombie__mouth">-->
<div class="tooth"> <!-- <div class="tooth">-->
<div class="tooth__top"></div> <!-- <div class="tooth__top"></div>-->
<div class="tooth__bottom"></div> <!-- <div class="tooth__bottom"></div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="zombie__body"> <!-- <div class="zombie__body">-->
<div class="zombie__chest"> <!-- <div class="zombie__chest">-->
<div class="zombie__arms"> <!-- <div class="zombie__arms">-->
<div class="arm left"> <!-- <div class="arm left">-->
<div class="arm__bone"></div> <!-- <div class="arm__bone"></div>-->
<div class="arm__sleeve"></div> <!-- <div class="arm__sleeve"></div>-->
</div> <!-- </div>-->
<div class="arm right"> <!-- <div class="arm right">-->
<div class="arm__details"> <!-- <div class="arm__details">-->
<div class="arm__biceps"></div> <!-- <div class="arm__biceps"></div>-->
<div class="arm__forearm"></div> <!-- <div class="arm__forearm"></div>-->
<div class="hands"> <!-- <div class="hands">-->
<div class="fingers"> <!-- <div class="fingers">-->
<div class="finger thumb"></div> <!-- <div class="finger thumb"></div>-->
<div class="finger middle"></div> <!-- <div class="finger middle"></div>-->
<div class="finger index"></div> <!-- <div class="finger index"></div>-->
<div class="finger ring"></div> <!-- <div class="finger ring"></div>-->
<div class="finger pinky"></div> <!-- <div class="finger pinky"></div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="arm__sleeve"></div> <!-- <div class="arm__sleeve"></div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="ground"> <div class="ground">
<div class="ground__hole"></div> <div class="ground__hole"></div>
<div class="ground__rocks"> <div class="ground__rocks">

@ -41,7 +41,7 @@
<!-- 爱情买卖 --> <!-- 爱情买卖 -->
<li @click="$router.push({path: '/love'})"> <li @click="$router.push({path: '/love'})">
<div class="my-menu"> <div class="my-menu">
💋 <span>爱情买卖</span> 💋 <span>预测研发流程</span>
</div> </div>
</li> </li>
@ -62,7 +62,7 @@
<!-- 聊天室 --> <!-- 聊天室 -->
<li @click="goIm()"> <li @click="goIm()">
<div class="my-menu"> <div class="my-menu">
💬 <span>非礼勿言</span> 💬 <span>聊天室</span>
</div> </div>
</li> </li>
<!-- 音乐 --> <!-- 音乐 -->

@ -18,11 +18,40 @@
fit="cover"> fit="cover">
<div slot="error" class="image-slot background-image-error"></div> <div slot="error" class="image-slot background-image-error"></div>
</el-image> </el-image>
<!-- 首页文字 --> <!-- 首页文字 -->
<div class="signature-wall myCenter my-animation-hideToShow"> <div class="signature-wall myCenter my-animation-hideToShow">
<h1 class="playful"> <h1 class="playful">
<span v-for="(a, index) in $store.state.webInfo.webTitle" :key="index">{{a}}</span> <span v-for="(a, index) in $store.state.webInfo.webTitle" :key="index">{{a}}</span>
</h1> </h1>
<!-- 搜索 -->
<div style="padding: 15px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out"
class="shadow-box background-opacity wow">
<div style="color: var(--lightGreen);font-size: 20px;font-weight: bold;margin-bottom: 10px">
查询DDI
</div>
<div style="display: flex">
<input class="ais-SearchBox-input" type="text"
v-model="queryParams.drug1"
placeholder="请输入药品A名称" maxlength="32">
<div style="width: 10px"></div>
<input class="ais-SearchBox-input" type="text"
v-model="queryParams.drug2"
placeholder="请输入药品B名称" maxlength="32">
<div class="ais-SearchBox-submit" @click="handleQuery()">
<svg style="margin-top: 3.5px;margin-left: 18px" viewBox="0 0 1024 1024" width="20" height="20">
<path
d="M51.2 508.8c0 256.8 208 464.8 464.8 464.8s464.8-208 464.8-464.8-208-464.8-464.8-464.8-464.8 208-464.8 464.8z"
fill="#51C492"></path>
<path
d="M772.8 718.4c48-58.4 76.8-132.8 76.8-213.6 0-186.4-151.2-337.6-337.6-337.6-186.4 0-337.6 151.2-337.6 337.6 0 186.4 151.2 337.6 337.6 337.6 81.6 0 156-28.8 213.6-76.8L856 896l47.2-47.2-130.4-130.4zM512 776c-149.6 0-270.4-121.6-270.4-271.2S363.2 233.6 512 233.6c149.6 0 271.2 121.6 271.2 271.2C782.4 654.4 660.8 776 512 776z"
fill="#FFFFFF"></path>
</svg>
</div>
</div>
</div>
<div class="printer" @click="getGuShi()"> <div class="printer" @click="getGuShi()">
<printer :printerInfo="printerInfo"> <printer :printerInfo="printerInfo">
<template slot="paper" slot-scope="scope"> <template slot="paper" slot-scope="scope">
@ -52,14 +81,54 @@
</div> </div>
</div> </div>
<articleList :articleList="articles"></articleList> <articleList :articleList="articles"></articleList>
<!-- <div class="pagination-wrap">-->
<!-- <div @click="pageArticles()" class="pagination" v-if="pagination.total !== articles.length">-->
<!-- 下一页-->
<!-- </div>-->
<!-- <div v-else style="user-select: none">-->
<!-- ~~到底啦~~-->
<!-- </div>-->
<!-- </div>-->
<template>
<div class="pagination-wrap"> <div class="pagination-wrap">
<div @click="pageArticles()" class="pagination" v-if="pagination.total !== articles.length"> <el-table :data="table1List">
下一页 <el-table-column prop="drug1" label="药品A"></el-table-column>
</div> <el-table-column prop="drug2" label="药品B"></el-table-column>
<div v-else style="user-select: none"> <el-table-column prop="reaction" label="相互作用效果"></el-table-column>
~~到底啦~~ </el-table>
<!-- <div @click="pageArticles()" class="pagination" v-if="pagination.total !== articles.length">-->
<!-- 下一页-->
<!-- </div>-->
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :page.sync="queryParams.pageNum"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
</div> </div>
<!-- <div style="user-select: none;text-align: center">-->
<!-- ~~到底啦~~-->
<!-- </div>-->
<!--分页组件-->
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
</el-pagination>
</div> </div>
</template>
</div> </div>
</div> </div>
</div> </div>
@ -72,6 +141,8 @@
</div> </div>
</template> </template>
<script> <script>
import {listTable1} from "@/utils/table1";
const loader = () => import( "./common/loader"); const loader = () => import( "./common/loader");
const zombie = () => import( "./common/zombie"); const zombie = () => import( "./common/zombie");
const printer = () => import( "./common/printer"); const printer = () => import( "./common/printer");
@ -91,6 +162,10 @@
data() { data() {
return { return {
currentPage1: 5,
currentPage2: 5,
currentPage3: 5,
currentPage4: 4,
loading: false, loading: false,
showAside: true, showAside: true,
printerInfo: "你看对面的青山多漂亮", printerInfo: "你看对面的青山多漂亮",
@ -108,7 +183,16 @@
"author": "", "author": "",
"category": "" "category": ""
}, },
articles: [] articles: [],
table1List: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
drug1: null,
drug2: null,
reaction: null
},
}; };
}, },
@ -117,12 +201,33 @@
created() { created() {
this.getGuShi(); this.getGuShi();
this.getArticles(); this.getArticles();
this.getList();
}, },
mounted() { mounted() {
}, },
methods: { methods: {
handleSizeChange(val) {
console.log(`每页 ${val}`);
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 查询药品作用管理列表 */
getList() {
// this.loading = true;
this.table1List = []; //
listTable1(this.queryParams).then(response => {
this.table1List = response;
console.log(this.table1List[0].reaction);
});
},
async selectSort(sort) { async selectSort(sort) {
this.pagination = { this.pagination = {
current: 1, current: 1,
@ -168,6 +273,7 @@
async getArticles() { async getArticles() {
await this.$http.post(this.$constant.baseURL + "/article/listArticle", this.pagination) await this.$http.post(this.$constant.baseURL + "/article/listArticle", this.pagination)
// await this.$http.post("http://localhost:81" + "/system/table1/list", this.pagination)
.then((res) => { .then((res) => {
if (!this.$common.isEmpty(res.data)) { if (!this.$common.isEmpty(res.data)) {
this.articles = this.articles.concat(res.data.records); this.articles = this.articles.concat(res.data.records);
@ -402,6 +508,18 @@
box-shadow: 0 0 5px var(--themeBackground); box-shadow: 0 0 5px var(--themeBackground);
} }
.ais-SearchBox-input {
padding: 0 14px;
height: 30px;
width: calc(100% - 50px);
outline: 0;
border: 2px solid var(--lightGreen);
border-right: 0;
border-radius: 40px;
color: var(--maxGreyFont);
background: var(--white);
}
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
.recent-posts { .recent-posts {
width: 100%; width: 100%;

@ -1,27 +1,27 @@
<template> <template>
<div> <div>
<!-- 网站信息 --> <!-- 网站信息 -->
<div class="card-content1 shadow-box background-opacity"> <!-- <div class="card-content1 shadow-box background-opacity">-->
<el-avatar style="margin-top: 20px" class="user-avatar" :size="120" :src="webInfo.avatar"></el-avatar> <!-- <el-avatar style="margin-top: 20px" class="user-avatar" :size="120" :src="webInfo.avatar"></el-avatar>-->
<div class="web-name">{{webInfo.webName}}</div> <!-- <div class="web-name">{{webInfo.webName}}</div>-->
<div class="web-info"> <!-- <div class="web-info">-->
<div class="blog-info-box"> <!-- <div class="blog-info-box">-->
<span>文章</span> <!-- <span>文章</span>-->
<span class="blog-info-num">{{ $store.getters.articleTotal }}</span> <!-- <span class="blog-info-num">{{ $store.getters.articleTotal }}</span>-->
</div> <!-- </div>-->
<div class="blog-info-box"> <!-- <div class="blog-info-box">-->
<span>分类</span> <!-- <span>分类</span>-->
<span class="blog-info-num">{{ sortInfo.length }}</span> <!-- <span class="blog-info-num">{{ sortInfo.length }}</span>-->
</div> <!-- </div>-->
<div class="blog-info-box"> <!-- <div class="blog-info-box">-->
<span>访问量</span> <!-- <span>访问量</span>-->
<span class="blog-info-num">{{ webInfo.historyAllCount }}</span> <!-- <span class="blog-info-num">{{ webInfo.historyAllCount }}</span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<a class="collection-btn" @click="showTip()"> <!-- <a class="collection-btn" @click="showTip()">-->
<i class="el-icon-star-off" style="margin-right: 2px"></i>朋友圈 <!-- <i class="el-icon-star-off" style="margin-right: 2px"></i>朋友圈-->
</a> <!-- </a>-->
</div> <!-- </div>-->
<!-- 搜索 --> <!-- 搜索 -->
<div style="padding: 15px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out" <div style="padding: 15px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out"
@ -32,7 +32,7 @@
<div style="display: flex"> <div style="display: flex">
<input class="ais-SearchBox-input" type="text" <input class="ais-SearchBox-input" type="text"
v-model="articleSearch" v-model="articleSearch"
placeholder="搜索文章" maxlength="32"> placeholder="搜索药品" maxlength="32">
<div class="ais-SearchBox-submit" @click="selectArticle()"> <div class="ais-SearchBox-submit" @click="selectArticle()">
<svg style="margin-top: 3.5px;margin-left: 18px" viewBox="0 0 1024 1024" width="20" height="20"> <svg style="margin-top: 3.5px;margin-left: 18px" viewBox="0 0 1024 1024" width="20" height="20">
<path <path
@ -111,46 +111,46 @@
</div> </div>
<!-- 赞赏 --> <!-- 赞赏 -->
<div class="shadow-box-mini background-opacity wow admire-box" <!-- <div class="shadow-box-mini background-opacity wow admire-box"-->
v-if="!$common.isEmpty(admires)"> <!-- v-if="!$common.isEmpty(admires)">-->
<div style="font-weight: bold;margin-bottom: 20px">🧨赞赏名单</div> <!-- <div style="font-weight: bold;margin-bottom: 20px">🧨赞赏名单</div>-->
<div> <!-- <div>-->
<vue-seamless-scroll :data="admires" style="height: 200px;overflow: hidden"> <!-- <vue-seamless-scroll :data="admires" style="height: 200px;overflow: hidden">-->
<div v-for="(item, i) in admires" <!-- <div v-for="(item, i) in admires"-->
style="display: flex;justify-content: space-between" <!-- style="display: flex;justify-content: space-between"-->
:key="i"> <!-- :key="i">-->
<div style="display: flex"> <!-- <div style="display: flex">-->
<el-avatar style="margin-bottom: 10px" :size="36" :src="item.avatar"></el-avatar> <!-- <el-avatar style="margin-bottom: 10px" :size="36" :src="item.avatar"></el-avatar>-->
<div style="margin-left: 10px;height: 36px;line-height: 36px;overflow: hidden;max-width: 80px"> <!-- <div style="margin-left: 10px;height: 36px;line-height: 36px;overflow: hidden;max-width: 80px">-->
{{ item.username }} <!-- {{ item.username }}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div style="height: 36px;line-height: 36px"> <!-- <div style="height: 36px;line-height: 36px">-->
{{ item.admire }} <!-- {{ item.admire }}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</vue-seamless-scroll> <!-- </vue-seamless-scroll>-->
</div> <!-- </div>-->
<div class="admire-btn" @click="showAdmire()"> <!-- <div class="admire-btn" @click="showAdmire()">-->
赞赏 <!-- 赞赏-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<!-- 微信 --> <!-- 微信 -->
<el-dialog title="赞赏" <!-- <el-dialog title="赞赏"-->
:visible.sync="showAdmireDialog" <!-- :visible.sync="showAdmireDialog"-->
width="25%" <!-- width="25%"-->
:append-to-body="true" <!-- :append-to-body="true"-->
destroy-on-close <!-- destroy-on-close-->
center> <!-- center>-->
<div> <!-- <div>-->
<div class="admire-image"></div> <!-- <div class="admire-image"></div>-->
<div> <!-- <div>-->
<div class="admire-content">1. 感谢老铁送来的666</div> <!-- <div class="admire-content">1. 感谢老铁送来的666</div>-->
<div class="admire-content">2. 申请通过后会加博客交流群不需要加群或者退群后会定期清理好友强迫症福利</div> <!-- <div class="admire-content">2. 申请通过后会加博客交流群不需要加群或者退群后会定期清理好友强迫症福利</div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-dialog> <!-- </el-dialog>-->
</div> </div>
</template> </template>
@ -159,7 +159,7 @@
export default { export default {
components: { components: {
vueSeamlessScroll // vueSeamlessScroll
}, },
data() { data() {
return { return {

@ -1,7 +1,7 @@
export default { export default {
baseURL: "http://172.20.10.3:8081", baseURL: "http://localhost:8081",
imBaseURL: "http://172.20.10.3:81", imBaseURL: "http://localhost:81",
webURL: "http://172.20.10.3", webURL: "http://localhost",
// baseURL: "https://poetize.cn/api", // baseURL: "https://poetize.cn/api",
// imBaseURL: "https://poetize.cn/im", // imBaseURL: "https://poetize.cn/im",
@ -18,7 +18,7 @@ export default {
//前后端定义的密钥AES使用16位 //前后端定义的密钥AES使用16位
cryptojs_key: "aoligeimeimaobin", cryptojs_key: "aoligeimeimaobin",
qiniuUrl: "https://upload.qiniup.com", qiniuUrl: "https://upload.qiniup.com",
qiniuDownload: "https://portal.qiniu.com/cdn/domain/s6q4ppvdk.hd-bkt.clouddn.com", qiniuDownload: "$$$$七牛云下载地址仿照【https://file.poetize.cn/】",
favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面", favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面",

@ -0,0 +1,43 @@
import axios from 'axios';
export function listTable1(query) {
const url = '/system/table1/list';
return axios.get(url, { params: query })
.then(response => response.data)
.catch(error => console.error(error));
}
// 查询药品作用管理详细
export function getTable1(id) {
return request({
url: '/system/table1/' + id,
method: 'get'
})
}
// // 新增药品作用管理
// export function addTable1(data) {
// return request({
// url: '/system/table1',
// method: 'post',
// data: data
// })
// }
//
// // 修改药品作用管理
// export function updateTable1(data) {
// return request({
// url: '/system/table1',
// method: 'put',
// data: data
// })
// }
//
// // 删除药品作用管理
// export function delTable1(id) {
// return request({
// url: '/system/table1/' + id,
// method: 'delete'
// })
// }
Loading…
Cancel
Save