no message

src/pages/home.vue

@@ -4,7 +4,7 @@
       <el-aside :style="defaultLeftMenu">
         <div class="leftBox">
           <div class="logoBox">
-            <img src="../assets/login/logo.png" @click="clickNotebook" width="118px" height="44px" class="logoImg" />
+            <img src="../assets/login/logo.png" width="118px" height="44px" class="logoImg" />
           </div>
           <div class="menuBox">
            <letfmenu></letfmenu>
@@ -67,9 +67,6 @@ export default {
       let windowHeight = window.innerHeight;
       this.defaultMainHeight.height = windowHeight - 60 +"px";
       this.defaultLeftMenu.height = windowHeight +"px";
-    },
-    clickNotebook() {
-      this.$router.push({path: '/home/notebook'});
     }
   },
   created: async function () {

src/pages/project/projectList.vue

@@ -40,7 +40,6 @@
 </template>
 
 <script>
-// import pageNameModel from "./../publicModel/pageName.vue"
 import projectInfo from "./projectInfo.vue"
 export default {
     data() {

src/pages/self/pscChart.vue → src/pages/project/pscChart.vue

@@ -7,7 +7,6 @@
 <script>
 import * as echarts from 'echarts';
 export default {
-    // 笔记本
     data() {
         return {
             notebookList:[

src/pages/project/task.vue

+<template>
+    <div class="selfTask">
+        <div class="myTaskBaseBox">
+        <el-card shadow="always">
+            <div class="pscChartBox">
+                <pscChart></pscChart>
+            </div>
+            <div class="calendarChartBox">
+                <div id="calendarChart" style="width:400px;height:400px"></div>
+            </div>
+        </el-card>
+    </div>
+    </div>
+</template>
+<script>
+import pscChart from "./pscChart.vue"
+export default {
+    // 任务
+    data() {
+        return {
+        }
+    },
+    components: { pscChart },
+    mounted:function(){
+        this.initPscChart();
+        this.initDayChart();
+    },
+    methods:{
+        checkNotebookItem:function() {
+
+        },
+        addNotebook:function() {
+
+        },
+        initPscChart:function() {
+            
+
+        }
+    }    
+}
+</script>
+
+<style>
+
+.selfTask .myTaskBaseBox {
+    width: 100%;
+    height: 700px;
+}
+
+.selfTask .myTaskBaseBox .el-card  {
+    box-shadow: 0 2px 12px 0 rgba(252, 252, 252, 0.144);
+    background-color: rgb(255 255 255 / 15%);
+    border-radius: 6px;
+    background-color: rgb(255 255 255 / 25%);
+    height:  810px;
+}
+
+.myTaskBaseBox .pscChartBox {
+    width: 100%;
+    height: 400px;
+}
+
+
+.myTaskBaseBox .calendarChartBox {
+    width: 100%;
+    height: 300px;
+    /* background: rgb(231, 131, 131); */
+}
+</style>
\ No newline at end of file

src/pages/self/addNotebook.vue

+<template>
+    <div>
+        添加笔记
+    </div>
+</template>
+
+<script>
+export default {
+    //添加笔记
+    data() {
+        return {
+        }
+    },
+    components: {  },
+    mounted:function(){
+    },
+    methods:{
+    }    
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/pages/self/files.vue

+<template>
+    <div>建设中</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/pages/self/notebook.vue

 <template>
     <div class="notebookBox">
-        <el-row :gutter="24">
-            <el-col :span="10">
-                 <div class="notebookBaseBox">
-                    <el-card shadow="always">
-                        <div class="pscChartBox">
-                            <pscChart></pscChart>
+        <div class="notebookMainBox">
+            <el-row :gutter="24">
+                <el-col :span="24">
+                    <div class="selectNotebookBox">
+                        <div class="addNotebookBox">
+                            <el-button type="primary" @click="addNotebookEvent"><font style="font-size:22px" class="el-icon-plus"></font></el-button>
                         </div>
-                        <div class="calendarChartBox">
-                           <div id="calendarChart" style="width:400px;height:400px"></div>
-                        </div>
-                    </el-card>
-                </div>
-            </el-col>
-            <el-col :span="14">
-                <div class="selectNotebookBox">
-                    <div class="addNotebookBox">
-                        <el-button type="primary" @click="addNotebook"><font style="font-size:22px" class="el-icon-plus"></font></el-button>
                     </div>
-                </div>
-                <div class="notebookTable">
-                    <el-table :data="notebookList" height="740"  >
-                        <el-table-column align="left" width="80" label="查看">
-                            <template slot-scope="scope">
-                                    <i @click="checkNotebookItem(scope.row)" style="color:aliceblue;font-size:18px" class="el-icon-s-management"></i>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="projectName" align="left" label="项目名称">
-                        </el-table-column>
-                        <el-table-column prop="count" align="center" label="笔记数量">
-                        </el-table-column>
-                    </el-table>
-                </div>
-               
-            </el-col>
-        </el-row>
+                    <div class="notebookTable">
+                        <el-table :data="notebookList" height="740"  >
+                            <el-table-column align="left" width="80" label="查看">
+                                <template slot-scope="scope">
+                                        <i @click="checkNotebookItem(scope.row)" style="color:aliceblue;font-size:18px" class="el-icon-s-management"></i>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="projectName" align="left" label="项目名称">
+                            </el-table-column>
+                            <el-table-column prop="count" align="center" label="笔记数量">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                
+                </el-col>
+            </el-row>
+        </div>
+        
+        <div class="notebookDialogBox">
+            <div class="addNotebookInfoDialog">
+                <el-dialog width="80%" top="2vh" :visible.sync="addNotebookInfoDialogVisible">
+                    <addNotebook></addNotebook>
+                </el-dialog>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
-import pscChart from "./pscChart.vue"
+import addNotebook from "./addNotebook.vue"
 export default {
     // 笔记本
     data() {
@@ -51,10 +49,11 @@ export default {
                 {projectName:"徐汇二期", count:3},
                 {projectName:"深圳艺校三期", count:6},
                 {projectName:"深圳艺校四期", count:0},
-            ]
+            ],
+            addNotebookInfoDialogVisible:false,
         }
     },
-    components: { pscChart },
+    components: { addNotebook },
     mounted:function(){
         this.initPscChart();
         this.initDayChart();
@@ -63,8 +62,8 @@ export default {
         checkNotebookItem:function() {
 
         },
-        addNotebook:function() {
-
+        addNotebookEvent:function() {
+            this.addNotebookInfoDialogVisible = true;
         },
         initPscChart:function() {
             
@@ -121,28 +120,15 @@ export default {
     border-color: rgb(255 255 255 / 35%);
 }
 
-.notebookBox .notebookBaseBox {
-    width: 100%;
-    height: 700px;
-}
-
-.notebookBox .notebookBaseBox .el-card  {
-    box-shadow: 0 2px 12px 0 rgba(252, 252, 252, 0.144);
-    background-color: rgb(255 255 255 / 15%);
-    border-radius: 6px;
-    background-color: rgb(255 255 255 / 25%);
-    height:  810px;
+/* 弹出框 */
+.notebookDialogBox .el-dialog, .el-pager li {
+    /* background-color: rgba(206, 206, 206, 0.486); */
+    border-radius: 40px;
+    box-shadow: 0 2px 50px 0 rgba(255, 255, 255, 0.699);
+    background: url('../../assets/login/logbackground.png') no-repeat;
 }
-
-.notebookBaseBox .pscChartBox {
-    width: 100%;
-    height: 400px;
+.notebookDialogBox .el-dialog__header {
+    padding:0 0 0 0;
 }
 
-
-.notebookBaseBox .calendarChartBox {
-    width: 100%;
-    height: 300px;
-    /* background: rgb(231, 131, 131); */
-}
 </style>
\ No newline at end of file

src/pages/self/notebookInfo.vue

+<template>
+    <div></div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/router/index.js

@@ -15,7 +15,6 @@ export default new Router({
       name: 'new',
       component: () => import('../pages/new/menu.vue'),
       children: [
-        {path: 'test', name: 'test', component: () => import('../pages/task/taskList.vue')},
         {path: 'test2', name: 'test2', component: () => import('../pages/new/test.vue')}
       ]
     },
@@ -30,7 +29,15 @@ export default new Router({
       name: 'home',
       component: () => import('../pages/home.vue'),
       children: [
-        {path: 'notebook', name: 'notebook', component: () => import('../pages/self/notebook.vue')}
+      ]
+    },
+    {
+      path: '/desk', 
+      name: 'desk',
+      component: () => import('../pages/home.vue'),
+      children: [
+        {path: 'notebook', name: 'notebook', component: () => import('../pages/self/notebook.vue')},
+        {path: 'files', name: 'files', component: () => import('../pages/self/files.vue')}
       ]
     },
     {
@@ -39,8 +46,16 @@ export default new Router({
       component: () => import('../pages/home.vue'),
       children: [
         {path: 'projectList', name: 'projectList', component: () => import('../pages/project/projectList.vue')},
-        {path: 'taskList', name: 'taskList', component: () => import('../pages/task/taskList.vue')},
-        {path: 'initiate', name: 'initiate', component: () => import('../pages/task/initiate.vue')},
+        {path: 'task', name: 'task', component: () => import('../pages/project/task.vue')},
+      ]
+    },
+    {
+      path: '/feedback',
+      name: 'feedback',
+      component: () => import('../pages/home.vue'),
+      children: [
+        {path: 'taskList', name: 'taskList', component: () => import('../pages/feedback/taskList.vue')},
+        {path: 'initiate', name: 'initiate', component: () => import('../pages/feedback/initiate.vue')},
       ]
     },
     {

src/server/menu.js

@@ -2,17 +2,16 @@
 let picList = [
     {
         index:1,
-        name:"PROJECT",
-        icon:"el-icon-collection",
+        name:" 反 馈",
+        icon:"el-icon-s-opportunity",
         subList:[
-            {subName:"项目列表", path:"/project/projectList"},
-            {subName:"我的任务", path:"/project/taskList"},
-            {subName:"我发起的", path:"/project/initiate"}
+            {subName:"指派给我的", path:"/feedback/taskList"},
+            {subName:"我发起的", path:"/feedback/initiate"}
         ]
     },
     {
         index:2,
-        name:"SYSTEM",
+        name:" 系 统 设 置",
         icon:"el-icon-s-tools",
         subList:[
             {subName:"修改密码", path:"/set/pwd"},
@@ -35,6 +34,17 @@ let picList = [
             {subName:"项目维护", path:"/pm/replenish"},
             {subName:"统计", path:"/pm/stats"},
         ]
+    },
+    {
+        index:5,
+        name:" 工 作 台",
+        icon:"el-icon-s-platform",
+        subList:[
+            {subName:"笔记", path:"/desk/notebook"},
+            {subName:"文件仓库", path:"/desk/files"},
+            {subName:"项目列表", path:"/project/projectList"},
+            {subName:"我的任务", path:"/project/task"},
+        ]
     }
 ]