From c70e3556f45b9d746f9cc104ad26ef9112f1cbc1 Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Fri, 21 Aug 2020 23:34:25 +0800
Subject: [PATCH] =?UTF-8?q?vue=E8=B7=AF=E7=94=B1=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/router/index.js                  | 11 +++++-
 ruoyi-ui/src/views/bookmark/content/index.vue | 24 ++++++++-----
 ruoyi-ui/src/views/bookmark/index/index.vue   | 34 +++++++++++++------
 ruoyi-ui/src/views/bookmark/menu/index.vue    |  2 ++
 4 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 5e587b5e7..340a6f459 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -11,6 +11,7 @@ import Layout from '@/layout'
 import bookmarkmenu from '@/views/bookmark/menu';
 
 import index3 from '@/views/bookmark/index';
+ // import content from '../views/bookmark/content/index';
 
 
 
@@ -150,9 +151,17 @@ export const constantRoutes = [
     children: [
       {
         path: '/content',
+        name: 'content',
         component: resolve => require(['../views/bookmark/content/index.vue'], resolve),
+        query:{
+          t:Date.now(),
+        },
+        meta:{
+          requireAuth: false,//加该字段,表示进入这个路由是需要登录的true
+        },
       }
-    ],redirect:'/content'
+    ],
+
   },
 ]
 
diff --git a/ruoyi-ui/src/views/bookmark/content/index.vue b/ruoyi-ui/src/views/bookmark/content/index.vue
index 206ff2c90..8423986f0 100644
--- a/ruoyi-ui/src/views/bookmark/content/index.vue
+++ b/ruoyi-ui/src/views/bookmark/content/index.vue
@@ -1,10 +1,10 @@
 
 
-<template>
-    <div>
+<template >
+    <div >
 
       <div class="filter" >
-        <div class="filter-sort">
+        <div class="filter-sort" >
           <el-dropdown trigger="click" size="small">
               <span class="el-dropdown-link">
             <span>按时间排序(正)</span> <i class="el-icon-caret-bottom"></i>
@@ -51,7 +51,7 @@
 
 
       </div>
-      <div  class="bookmarklist">
+      <div  class="bookmarklist" v-loading="loading">
 
         <el-row >
 
@@ -108,7 +108,7 @@
 
         data: function () {
             return {
-              loading:true,
+              loading:false,
               queryParams: {
                 pageNum: 1,
                 pageSize: 15,
@@ -136,10 +136,18 @@
       }
     },
       created() {
-         this.queryParams.menuId=1;
-         this.getList();
+        var that=this;
+        if (that.$route.query.menuId==undefined){
+          that.queryParams.menuId=1;
+        }else {
+          that.queryParams.menuId=that.$route.query.menuId;
+        }
+        this.getList();
       },
-        methods: {
+    mounted(){
+
+    },
+    methods: {
           /** 查询书签管理列表 */
           getList() {
             this.loading = true;
diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue
index 4bd7a1f61..afc2fe1eb 100644
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@@ -22,7 +22,7 @@
         <ul id="treeDemo" class="ztree" ></ul>
       </div>
       <div class="reminder">工具箱</div>
-      <div class="aside-title"><i class="el-icon-s-tools"></i><span>所有书签</span></div>
+      <div class="aside-title"><i class="el-icon-s-tools"></i><span>收藏同步</span></div>
       <div class="aside-title"><i class="el-icon-help"></i><span>发现书签</span></div>
       <div class="aside-title"><i class="el-icon-s-platform"></i><span>任意门</span></div>
       <div class="aside-title"><i class="el-icon-message-solid"></i><span>收件箱</span></div>
@@ -100,7 +100,7 @@
       </el-header>
       <el-main class="bookmarkmain" >
 
-        <router-view></router-view>
+        <router-view :key="$route.query.menuId"></router-view>
 
 
       </el-main>
@@ -142,15 +142,15 @@
 
 
 
-  <!-- 添加链接-->
-    <el-dialog  title="添加链接"  :visible.sync="addurlopen" width="500px"  append-to-body class="addbookmarkurl">
+<!--  &lt;!&ndash; 添加链接&ndash;&gt;-->
+<!--    <el-dialog  title="添加链接"  :visible.sync="addurlopen" width="500px"  append-to-body class="addbookmarkurl">-->
 
 
-      <el-input  v-model="bookamkrurl" placeholder="输入链接地址 例：https://withpinbox.com" class="addbookmarkurl-input"  />
+<!--      <el-input  v-model="bookamkrurl" placeholder="输入链接地址 例：https://withpinbox.com" class="addbookmarkurl-input"  />-->
 
-      <el-button  plain  class="addbookmarkurl-button"  round  @click="submitForm">确定</el-button>
+<!--      <el-button  plain  class="addbookmarkurl-button"  round  @click="submitForm">确定</el-button>-->
 
-    </el-dialog>
+<!--    </el-dialog>-->
 
 
 
@@ -362,6 +362,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='editBookmark()' 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);
 
@@ -388,8 +389,8 @@
    beforeClick:function(treeId, treeNode) {
 
     //if (treeNode.level != 19990 ) {
-       var zTree = $.fn.zTree.getZTreeObj("treeDemo");
-       zTree.expandNode(treeNode);
+    //    var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+    //    zTree.expandNode(treeNode);
 
     //  return false;
     // }
@@ -397,7 +398,14 @@
   },
       //节点点击
       OnClickzTree:function(event,treeId, treeNode){
-      // alert("11"+treeNode.tId );
+        var that=this;
+        that.$router.push({
+          path: "/content",
+          query: {
+            menuId: treeNode.menuId
+          }
+        })
+
 
         // $("." + treeNode.tId + "_sz").unbind().remove();
         // var switchObjspan = $("#" + treeNode.tId + "_span");
@@ -406,7 +414,7 @@
         // 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;
+      // return false;
       },
       //显示隐藏 ztree菜单
       zreaZtree:function () {
@@ -419,6 +427,10 @@
 
       editBookmark:function(e){
         var that=this;
+
+        //console.log("menuid:"+e.srcElement.dataset.menuId)
+
+
         that.handleAdd();//新增
         if ( e && e.stopPropagation )
         //因此它支持W3C的stopPropagation()方法
diff --git a/ruoyi-ui/src/views/bookmark/menu/index.vue b/ruoyi-ui/src/views/bookmark/menu/index.vue
index e6dc773a5..aaf8df822 100644
--- a/ruoyi-ui/src/views/bookmark/menu/index.vue
+++ b/ruoyi-ui/src/views/bookmark/menu/index.vue
@@ -152,6 +152,8 @@
       var that=this;
       //光标自动选中
       that.$refs.sousouref.focus()
+
+
     },