Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

zhangyanpeng

2020-01-22 a7c8080195f6b936b75a6a4129805e0a6766968f

 src/router/index.ts

@@ -5,7 +5,9 @@
import Mine from "../views/Mine.vue";
import Project from "../views/Project.vue";
import Overview from "../views/Overview.vue";
import list from "../views/list.vue";
import calendarTask from "../views/calendarTask.vue";
import square from "../components/square.vue";

Vue.use(VueRouter);

@@ -43,6 +45,12 @@
           components:{
               home: Overview
            }
         },{
           path: "list",
           name: "list",
           components:{
               home: list
            }
         },
         {
           path: "calendarTask",
@@ -52,10 +60,10 @@
            }
         },
         {
           path: "project2",
           name: "project2",
           path: "square",
           name: "square",
           components:{
              home: Project
              home: square
           }
         },
         {