Merge branch 'dev' of http://94.191.59.107:3000/wukai/lzga-doc into dev

src/router/index.js

@@ -314,7 +314,7 @@ export const dynamicRoutes = [{
   path: '/doc/oo-edit',
   component: Layout,
   hidden: true,
-  permissions: ['doc:info:edit'],
+  permissions: ['doc:info'],
   children: [{
     path: 'index/:docId(\\d+)',
     component: () => import('@/views/doc/oo/edit'),
@@ -356,7 +356,7 @@ export const dynamicRoutes = [{
   path: '/doc/group-doc/',
   component: Layout,
   hidden: true,
-  permissions: ['doc:groupDoc'],
+  permissions: ['doc:info'],
   children: [{
     path: 'doc/:groupId(\\d+)',
     component: () => import('@/views/doc/info/groupDoc'),

src/views/doc/dir/groupSpaceSelect.vue

@@ -82,6 +82,10 @@
         this.loading = true;
         selectGroup(this.queryParams).then(response => {
           this.groupList = response.rows;
+          if (this.groupList.length == 1) {
+            const groupId = this.groupList[0].groupId;
+            this.$router.push("/doc/group-space/space/" + groupId);
+          }
           this.total = response.total;
           this.loading = false;
         });

src/views/doc/info/groupDoc.vue

@@ -51,8 +51,8 @@
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreview(scope.row)">预览</el-button>
               <el-button size="mini" type="text" icon="el-icon-download" @click="handleDownload(scope.row)"
-                v-if="checkLevel(scope.row,'download')">下载</el-button>
-              <el-button size="mini" type="text" icon="el-icon-view" @click="handleEdit(scope.row) v-hasRole="
+  >下载</el-button>
+              <el-button size="mini" type="text" icon="el-icon-view" @click="handleEdit(scope.row)" v-hasRole="
                 ['group.manager']">在线编辑</el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                 v-hasRole="['group.manager']">修改</el-button>
@@ -338,6 +338,11 @@
       submitForm() {
         this.$refs["form"].validate(valid => {
           if (valid) {
+            //这句是要删掉的
+            this.form.tagList = [{
+              tagId: 1,
+              tagName: '十四大'
+            }];
             if (this.form.docId != null) {
               updateInfo(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
@@ -403,4 +408,4 @@
       }
     }
   };
-</script>
+</script>