kuaifan 5 anni fa
parent
commit
75ffc25596

+ 12 - 0
resources/assets/js/main/components/project/my/favor.vue

@@ -47,6 +47,18 @@
                 "title": "项目名称",
                 "key": 'title',
                 "minWidth": 100,
+                render: (h, params) => {
+                    return h('a', {
+                        attrs: {
+                            href: 'javascript:void(0)',
+                        },
+                        on: {
+                            click: () => {
+                                this.openProject(params.row.id);
+                            }
+                        }
+                    }, params.row.title);
+                },
             }, {
                 "title": "收藏时间",
                 "minWidth": 160,

+ 12 - 0
resources/assets/js/main/components/project/my/join.vue

@@ -47,6 +47,18 @@
                 "title": "项目名称",
                 "key": 'title',
                 "minWidth": 100,
+                render: (h, params) => {
+                    return h('a', {
+                        attrs: {
+                            href: 'javascript:void(0)',
+                        },
+                        on: {
+                            click: () => {
+                                this.openProject(params.row.id);
+                            }
+                        }
+                    }, params.row.title);
+                },
             }, {
                 "title": "加入时间",
                 "minWidth": 160,

+ 12 - 0
resources/assets/js/main/components/project/my/manage.vue

@@ -47,6 +47,18 @@
                 "title": "项目名称",
                 "key": 'title',
                 "minWidth": 100,
+                render: (h, params) => {
+                    return h('a', {
+                        attrs: {
+                            href: 'javascript:void(0)',
+                        },
+                        on: {
+                            click: () => {
+                                this.openProject(params.row.id);
+                            }
+                        }
+                    }, params.row.title);
+                },
             }, {
                 "title": "创建时间",
                 "minWidth": 160,

+ 4 - 0
resources/assets/js/main/mixins/project.js

@@ -1,5 +1,9 @@
 export default {
     methods: {
+        openProject(projectid) {
+            this.goForward({path: '/project/panel/' + projectid});
+        },
+
         outProject(projectid, successCallback) {
             this.$Modal.confirm({
                 title: '退出项目',

+ 2 - 5
resources/assets/js/main/pages/index.vue

@@ -345,11 +345,8 @@
         mounted() {
 
         },
-        computed: {
-
-        },
-        watch: {
-
+        deactivated() {
+            this.loginShow = false;
         },
         methods: {
             onLogin() {

+ 49 - 0
resources/assets/js/main/pages/project-panel.vue

@@ -0,0 +1,49 @@
+<template>
+    <div class="w-main doc">
+
+        <v-title>{{$L('知识库')}}-{{$L('轻量级的团队在线协作')}}</v-title>
+
+        <w-header value="doc"></w-header>
+
+        <div class="w-nav">
+            <div class="nav-row">
+                <div class="w-nav-left">
+                    <span class="new ft hover"><i class="ft icon"></i> {{$L('新建知识库')}}</span>
+                </div>
+                <div class="w-nav-flex"></div>
+            </div>
+        </div>
+
+        <w-content></w-content>
+
+    </div>
+</template>
+
+<style lang="scss" scoped>
+    .doc {
+    }
+</style>
+<script>
+    import WHeader from "../components/WHeader";
+    import WContent from "../components/WContent";
+    export default {
+        components: {WContent, WHeader},
+        data () {
+            return {
+
+            }
+        },
+        mounted() {
+
+        },
+        computed: {
+
+        },
+        watch: {
+
+        },
+        methods: {
+
+        },
+    }
+</script>

+ 7 - 7
resources/assets/js/main/pages/project.vue

@@ -102,7 +102,7 @@
         </Modal>
 
         <Drawer v-model="projectDrawerShow" width="75%">
-            <Tabs v-model="projectDrawerTab">
+            <Tabs v-if="projectDrawerShow" v-model="projectDrawerTab">
                 <TabPane :label="$L('已完成任务')" name="complete">
                     <project-complete :canload="projectDrawerShow && projectDrawerTab == 'complete'" :projectid="handleProjectId"></project-complete>
                 </TabPane>
@@ -116,7 +116,7 @@
         </Drawer>
 
         <Drawer v-model="projectListDrawerShow" width="50%">
-            <Tabs v-model="projectListDrawerTab">
+            <Tabs v-if="projectListDrawerShow" v-model="projectListDrawerTab">
                 <TabPane :label="$L('参与的项目')" name="myjoin">
                     <project-my-join :canload="projectListDrawerShow && projectListDrawerTab == 'myjoin'"></project-my-join>
                 </TabPane>
@@ -324,11 +324,10 @@
         mounted() {
             this.getLists(true);
         },
-        computed: {
-
-        },
-        watch: {
-
+        deactivated() {
+            this.addShow = false;
+            this.projectDrawerShow = false;
+            this.projectListDrawerShow = false;
         },
         methods: {
             setPage(page) {
@@ -466,6 +465,7 @@
                     }
 
                     case 'open': {
+                        this.openProject(item.id);
                         break;
                     }
                     case 'complete':

+ 2 - 5
resources/assets/js/main/pages/team.vue

@@ -235,11 +235,8 @@
         mounted() {
             this.getLists(true);
         },
-        computed: {
-
-        },
-        watch: {
-
+        deactivated() {
+            this.addShow = false;
         },
         methods: {
             setPage(page) {

+ 5 - 0
resources/assets/js/main/routes.js

@@ -14,6 +14,11 @@ export default [
         meta: { slide: false },
         component: resolve => require(['./pages/project.vue'], resolve)
     }, {
+        path: '/project/panel/:id',
+        name: 'project-panel',
+        meta: { slide: false },
+        component: resolve => require(['./pages/project-panel.vue'], resolve)
+    }, {
         path: '/doc',
         name: 'doc',
         meta: { slide: false },