From 66b12b3a0ec25605dfebe0e0af4dcbd99a663cee Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Sun, 16 Aug 2020 20:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=A6=E7=AD=BE=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E4=B8=BA=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/assets/styles/base.css | 113 +++++++----
ruoyi-ui/src/router/index.js | 14 +-
ruoyi-ui/src/views/bookmark/content/index.vue | 139 +++++++++++++
ruoyi-ui/src/views/bookmark/index/index.vue | 187 ++++++++++--------
4 files changed, 329 insertions(+), 124 deletions(-)
create mode 100644 ruoyi-ui/src/views/bookmark/content/index.vue
diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css
index 2cd07e50c..f9fb82c4e 100644
--- a/ruoyi-ui/src/assets/styles/base.css
+++ b/ruoyi-ui/src/assets/styles/base.css
@@ -1,25 +1,13 @@
-
-@media only screen and (min-width: 1600px) and (max-width: 1920px) {
-
- .sousouleft-switch{
- display: none;
- }
+/* pc width > 1920>>>xl */
+@media screen and (max-width: 1920px) {
+ .sousouleft-switch{
+ display: none;
+ }
}
-@media only screen and (min-width: 1130px) and (max-width: 1920px) {
-
- .sousouleft-switch{
- display: none;
- }
-
-
-}
-
-@media only screen and (min-width: 100px) and (max-width: 1000px) {
- .sousou-leftico{
- display: none;
- }
+/* ipad pro >>lg*/
+@media screen and (max-width: 1200px) {
.header-listtxet{
display: none;
}
@@ -30,35 +18,78 @@
}
-@media only screen and (min-width: 1130px) and (max-width: 1920px) {
+/* >>> md*/
+@media screen and (max-width: 992px) {
+
+}
+/* ipad >>> xs*/
+@media screen and (max-width: 768px) {
+ .sousou-leftico{
+ display: none;
+ }
+ .transition-box{
+ display: none;
+ }
.sousouleft-switch{
- display: none;
+ display: block;
}
+}
+/* iphone6 7 8 plus */
+@media screen and (max-width: 414px) {
+}
+/* iphoneX */
+@media screen and (max-width: 375px) and (-webkit-device-pixel-ratio: 3) {
+
+}
+/* iphone6 7 8 */
+@media screen and (max-width: 375px) and (-webkit-device-pixel-ratio: 2) {
+
+}
+/* iphone5 */
+@media screen and (max-width: 320px) {
}
-/*@media only screen and (min-width: 0px) and (max-width: 1264px) {*/
-
-/* !*右侧导航条*!*/
-/* .announcement{*/
-/* display: none!important;*/
-/* width: 0px!important;*/
-/* }*/
-/* !*书签列表*!*/
-/* .bookmarklist{*/
-/* width: 100%!important;*/
-/* }*/
-
-/*}*/
-
-@media only screen and (min-width: 1px) and (max-width: 660px) {
-
- .transition-box{
- display: none;
- }
-}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 48b8df278..5e587b5e7 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -13,6 +13,8 @@ import bookmarkmenu from '@/views/bookmark/menu';
import index3 from '@/views/bookmark/index';
+
+
/**
* Note: 路由配置项
*
@@ -137,12 +139,20 @@ export const constantRoutes = [
{
path: '/index2',
component: bookmarkmenu,
- hidden: true
+
},
{
path: '/index3',
component: index3,
- hidden: true
+ meta:{
+ requireAuth: false,
+ },
+ children: [
+ {
+ path: '/content',
+ component: resolve => require(['../views/bookmark/content/index.vue'], resolve),
+ }
+ ],redirect:'/content'
},
]
diff --git a/ruoyi-ui/src/views/bookmark/content/index.vue b/ruoyi-ui/src/views/bookmark/content/index.vue
new file mode 100644
index 000000000..a9466b9bb
--- /dev/null
+++ b/ruoyi-ui/src/views/bookmark/content/index.vue
@@ -0,0 +1,139 @@
+
+
+<template>
+ <div>
+
+ <div class="filter">
+ <div class="filter-sort">
+ <el-dropdown trigger="click" size="small">
+ <span class="el-dropdown-link">
+ <span>按时间排序(正)</span> <i class="el-icon-caret-bottom"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(正)</el-dropdown-item>
+ <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(反)</el-dropdown-item>
+ <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>
+ <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>
+ <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按网站A-Z排序</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+
+
+
+
+
+ </div>
+ <div >
+ <el-divider direction="vertical"></el-divider>
+ </div>
+ <div class="filler-tag">
+ <el-tag size="small">我的最爱</el-tag>
+ </div>
+ <div class="filler-tag">
+ <el-tag size="small" >小型标签</el-tag>
+ </div>
+ <div class="filler-tag">
+ <el-tag size="small" >小型标签</el-tag>
+ </div>
+ <div class="filler-tag">
+ <el-tag size="small" >小型标签</el-tag>
+ </div>
+ <div class="filler-tag">
+ <el-tag size="small" >小型标签</el-tag>
+ </div>
+ <div class="filler-tag">
+ <el-tag size="small" >小型标签</el-tag>
+ </div>
+ <div class="filler-tag">
+ <el-tag size="small" >...</el-tag>
+ </div>
+
+
+
+ </div>
+ <div class="bookmarklist">
+
+ <el-row>
+
+ <hr class="bookamrk-hr"/>
+ <el-col :span="24" v-for="bm in bookmark">
+
+ <div class="bookmark">
+ <p class="bookmark-title">{{bm.title}}</p>
+ <div class="">
+ <p class="description">{{bm.description}}</p>
+ </div>
+ <div class="info-wrap">
+ <div class="info">
+ <div class="bookmark-icon">
+ <img :err-src='bm.icon' :ng-src="bm.icon" :src="bm.icon" />
+ </div>
+ <div class="bookmark-official">{{bm.official}} · </div><div class="bookmark-time">{{bm.time}}</div>
+ </div>
+ </div>
+ </div>
+ <el-divider class="bookmark-hr"></el-divider>
+ </el-col>
+
+
+
+
+
+ </el-row>
+
+
+
+ </div>
+
+
+
+
+
+ </div>
+</template>
+
+
+
+<script>
+ export default {
+ components: {},
+
+ data: function () {
+ return {
+ bookmark:[
+ {id:1,title:"最大的骄傲于最大的自卑都表示心灵的最软弱无力。——斯宾诺莎",description:"阅读使人充实，会谈使人敏捷，写作使人精确。——培根",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+ {id:1,title:"意志坚强的人能把世界放在手中像泥块一样任意揉捏。——歌德",description:"最具挑战性的挑战莫过于提升自我。——迈克尔·F·斯特利",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+ {id:1,title:"要知道对好事的称颂过于夸大，也会招来人们的反感轻蔑和嫉妒。——培根",description:"意志命运往往背道而驰，决心到最后会全部推倒。——莎士比亚",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+ {id:1,title:"要使整个人生都过得舒适、愉快，这是不可能的，因为人类必须具备一种能应付逆境的态度。——卢梭",description:"只有把抱怨环境的心情，化为上进的力量，才是成功的保证。——罗曼·罗兰",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+ {id:1,title:"希望的灯一旦熄灭，生活刹那间变成了一片黑暗。——普列姆昌德",description:"到很多东西的诀窍，就是一下子不要学很多。——洛克",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+ {id:1,title:"我这个人走得很慢，但是我从不后退。——亚伯拉罕·林肯",description:"重复别人所说的话，只需要教育；而要挑战别人所说的话，则需要头脑。——玛丽·佩蒂博恩·普尔",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+ {id:1,title:"我们若已接受最坏的，就再没有什么损失。——卡耐基",description:"书籍把我们引入最美好的社会，使我们认识各个时代的伟大智者。——史美尔斯",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+ {id:1,title:"我的努力求学没有得到别的好处，只不过是愈来愈发觉自己的无知。——笛卡儿",description:"少而好学，如日出之阳；壮而好学，如日中之光；志而好学，如炳烛之光。——刘向",official:"www.baidu.com",time:"2020-10-08",icon:"https://favicon.lucq.fun/?url=https://www.sogou.com/"},
+
+ ],
+ }
+ },
+ methods: {}
+ }
+</script>
+
+
+
+<style>
+ .filler-tag span{
+ font-size: 12px;
+ margin-left: 5px;
+ background-color: #FFFFFF;
+ color: #399de0;
+ margin-bottom: 4px;
+ }
+
+ .filler-tag span:hover{
+ background-color: #E8F3FC;
+ color: #1988E0;
+ }
+ .bookamrk-hr{
+ margin-top: 0;
+ }
+
+</style>
diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue
index bbaf4ba05..57ff9e106 100644
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@@ -94,93 +94,96 @@
</el-header>
<el-main class="bookmarkmain" >
- <div class="filter">
- <div class="filter-sort">
- <el-dropdown trigger="click" size="small">
- <span class="el-dropdown-link">
- <span>选择排序方式</span> <i class="el-icon-bottom"></i> <i class="el-icon-caret-bottom"></i>
- </span>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(正序)</el-dropdown-item>
- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(到序)</el-dropdown-item>
- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>
- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>
- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按网站A-Z排序</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
+
+
+<!-- <div class="filter">-->
+<!-- <div class="filter-sort">-->
+<!-- <el-dropdown trigger="click" size="small">-->
+<!-- <span class="el-dropdown-link">-->
+<!-- <span>选择排序方式</span> <i class="el-icon-bottom"></i> <i class="el-icon-caret-bottom"></i>-->
+<!-- </span>-->
+<!-- <el-dropdown-menu slot="dropdown">-->
+<!-- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(正序)</el-dropdown-item>-->
+<!-- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(到序)</el-dropdown-item>-->
+<!-- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>-->
+<!-- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>-->
+<!-- <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按网站A-Z排序</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </el-dropdown>-->
- </div>
- <el-divider direction="vertical" style="margin-top: 3px;"></el-divider>
-
- <div class="main-label">
- <span><i class="el-icon-star-on"></i></span>
- <span>稍后再读</span>
- </div>
- <div class="main-label">
- <span><i class="el-icon-star-on"></i></span>
- <span>稍后再读</span>
- </div>
- <div class="main-label">
- <span><i class="el-icon-star-on"></i></span>
- <span>稍后再读</span>
- </div>
- <div class="main-label">
- <span><i class="el-icon-star-on"></i></span>
- <span>稍后再读</span>
- </div>
- <div class="main-label">
- <span><i class="el-icon-star-on"></i></span>
- <span>稍后再读</span>
- </div>
+<!-- </div>-->
+<!-- <div >-->
+<!-- <el-divider direction="vertical" ></el-divider>-->
+<!-- </div>-->
+<!-- <div class="main-label">-->
+<!-- <span><i class="el-icon-star-on"></i></span>-->
+<!-- <span>稍后再读</span>-->
+<!-- </div>-->
+<!-- <div class="main-label">-->
+<!-- <span><i class="el-icon-star-on"></i></span>-->
+<!-- <span>稍后再读</span>-->
+<!-- </div>-->
+<!-- <div class="main-label">-->
+<!-- <span><i class="el-icon-star-on"></i></span>-->
+<!-- <span>稍后再读</span>-->
+<!-- </div>-->
+<!-- <div class="main-label">-->
+<!-- <span><i class="el-icon-star-on"></i></span>-->
+<!-- <span>稍后再读</span>-->
+<!-- </div>-->
+<!-- <div class="main-label">-->
+<!-- <span><i class="el-icon-star-on"></i></span>-->
+<!-- <span>稍后再读</span>-->
+<!-- </div>-->
- </div>
- <div class="bookmarklist">
+<!-- </div>-->
+<!-- <div class="bookmarklist">-->
- <el-row>
+<!-- <el-row>-->
-<hr>
- <el-col :span="24" v-for="bm in bookmark">
+<!--<hr>-->
+<!-- <el-col :span="24" v-for="bm in bookmark">-->
- <div class="bookmark">
- <p class="bookmark-title">{{bm.title}}</p>
- <div class="">
- <p class="description">{{bm.description}}</p>
- </div>
- <div class="info-wrap">
- <div class="info">
- <div class="bookmark-icon">
- <img :err-src='bm.icon' :ng-src="bm.icon" :src="bm.icon" />
- </div>
- <div class="bookmark-official">{{bm.official}} · </div><div class="bookmark-time">{{bm.time}}</div>
- </div>
- </div>
- </div>
- <el-divider class="bookmark-hr"></el-divider>
- </el-col>
+<!-- <div class="bookmark">-->
+<!-- <p class="bookmark-title">{{bm.title}}</p>-->
+<!-- <div class="">-->
+<!-- <p class="description">{{bm.description}}</p>-->
+<!-- </div>-->
+<!-- <div class="info-wrap">-->
+<!-- <div class="info">-->
+<!-- <div class="bookmark-icon">-->
+<!-- <img :err-src='bm.icon' :ng-src="bm.icon" :src="bm.icon" />-->
+<!-- </div>-->
+<!-- <div class="bookmark-official">{{bm.official}} · </div><div class="bookmark-time">{{bm.time}}</div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <el-divider class="bookmark-hr"></el-divider>-->
+<!-- </el-col>-->
- </el-row>
+<!-- </el-row>-->
- </div>
+<!-- </div>-->
+ <router-view></router-view>
-
-<!-- <div class="announcement"></div>-->
+<!--<!– <div class="announcement"></div>–>-->
</el-main>
<el-footer>Footer</el-footer>
@@ -256,8 +259,9 @@
},
callback: {
beforeClick: this.beforeClick,
- onClick: this.zTreeOnClick,
- onCheck: this.zTreeOnCheck,
+ onClick: this.OnClickzTree,
+ // onCheck: this.zTreeOnCheck,
+
}
},
zNodes:[
@@ -340,7 +344,7 @@
if (confCount>0) return;
//if (treeNode.parentNode && treeNode.parentNode.id!=1) return;
var switchObjspan = $("#" + treeNode.tId + "_span");
- var editStr = "<span class="+treeNode.tId+"_sz onclick='alert(2222);return false;' style='color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:8px' onfocus='this.blur();'>删</span>";
+ var editStr = "<span class="+treeNode.tId+"_sz onclick='alert(2222);return false;' style='color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:8px' onfocus='this.blur();'><i class='el-icon-edit'></i></span>";
switchObjspan.after(editStr);
$("." + treeNode.tId + "_count").unbind().remove();
@@ -367,10 +371,24 @@
//if (treeNode.level != 19990 ) {
var zTree = $.fn.zTree.getZTreeObj("treeDemo");
zTree.expandNode(treeNode);
+
// return false;
// }
//return true;
},
+ //节点点击
+ OnClickzTree:function(event,treeId, treeNode){
+ // alert("11"+treeNode.tId );
+
+ // $("." + treeNode.tId + "_sz").unbind().remove();
+ // var switchObjspan = $("#" + treeNode.tId + "_span");
+ //
+ // var confCount = $("#" + treeNode.tId + "_count").length;
+ // if (confCount>0) return;
+ // var editStr = "<span class="+treeNode.tId+"_count onclick='alert(1111111);return false;' style='color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:8px' onfocus='this.blur();'>12</span>";
+ // switchObjspan.after(editStr);
+ return false;
+ },
//显示隐藏 ztree菜单
zreaZtree:function () {
var that=this;
@@ -472,6 +490,12 @@
margin-bottom: 0;
/*background:url('https://ftp.bmp.ovh/imgs/2020/08/4ac1d6b4f41049ef.jpg') no-repeat;*/
background-color: #f6f6f6;
+ /*background: url(http://csssecrets.io/images/tiger.jpg) no-repeat;*/
+ /*background-size: cover;*/
+ /*z-index: -1;!*-1 可以当背景*!*/
+ /*-webkit-filter: blur(3px);*/
+ /*filter: blur(3px);*/
+
}
@@ -565,8 +589,16 @@
margin-top: 8px;
border: 0px;
background-color: #f2f2f2;
+ border-radius: 0!important;
+
}
+ .header-sousou input:focus{
+ background-color: #FFFFFF!important;
+ border: 1px solid #f2f2f2;
+ }
+
+
.header-sousou i{
font-size: 1px;
margin-top: 6px;
@@ -580,7 +612,7 @@
.sousou-input{
float: left;
- width: 100%;
+ width: 100%;
}
@@ -599,18 +631,7 @@
- .main-label{
- color: #7e868d;
- border-radius: 2px;
- height: 22px;
- float: left;
- font-size: 12px;
- margin-left: 5px;
- }
- .main-label:hover{
- background-color: #E8F3FC;
- color: #1988E0;
- }
+
.main-label span i{
margin-left: 5px;
}
@@ -687,7 +708,7 @@
margin-bottom: 7px!important;
}
.sousouleft-switch{
- float: left;
+
width: 30px;
height: 30px;
line-height: 50px;
@@ -701,11 +722,15 @@
opacity: 0.8;
}
+ .sousou-left{
+ display: flex;
+ }
+
.sousou-leftico{
- float: left;
+
width: 30px;
height: 30px;
- border: #a4a4a4 solid 1px;
+ border: #d1e9ff solid 1px;
border-radius: 5px;
opacity:0.7;
text-align: center;