完善路由

src/store/modules/permission.js

@@ -322,6 +322,20 @@ function setDetailRoute(accessedRoutes) {
         },
         // 相册详情
         {
+          name: '全部证书',
+          path: 'performance',
+          component: () => import('@/views/photo-detail'),
+          hidden: true,
+          meta: {
+            noCache: '1',
+            title: '全部证书',
+            belongTopMenu: "/business",
+            activeMenu: '/teamList',
+            id:'xxx28'
+          }
+        },
+        // 全部证书
+        {
           name: '新建vip',
           path: 'buildVip',
           component: () => import('@/views/buildVip/index'),

src/views/photo-detail/index.vue

@@ -1,18 +1,18 @@
 <template>
-  <div :class="{'m-container': type === 'DEFAULT'}">
-    <h2 v-if="type === 'DEFAULT'">
+  <div class="m-container">
+    <h2>
       <el-page-header @back="onCancel" :content="detailName"></el-page-header>
     </h2>
     <div class="m-core">
       <div class="buttons">
         <auth :auths="['photo/add']">
-          <el-button type="primary" @click="openUpload()">{{type === 'DEFAULT' ? '上传照片' : '上传证书'}}</el-button>
+          <el-button type="primary" @click="openUpload()">{{mergeType === 'DEFAULT' ? '上传照片' : '上传证书'}}</el-button>
         </auth>
         <auth :auths="['photo/batchUpdate']">
-          <el-button type="primary" :disabled="list.length == 0" v-if="!editing" @click="changeMode()">{{type === 'DEFAULT' ? '编辑照片' : '编辑证书'}}</el-button>
+          <el-button type="primary" :disabled="list.length == 0" v-if="!editing" @click="changeMode()">{{mergeType === 'DEFAULT' ? '编辑照片' : '编辑证书'}}</el-button>
         </auth>
         <auth :auths="['photo/del']">
-          <el-button type="danger" v-if="editing" @click="remove()">{{type === 'DEFAULT' ? '删除照片' : '删除证书'}}</el-button>
+          <el-button type="danger" v-if="editing" @click="remove()">{{mergeType === 'DEFAULT' ? '删除照片' : '删除证书'}}</el-button>
         </auth>
         <el-button type="primary" v-if="editing" @click="confirm()">确定</el-button>
         <el-button type="primary" v-if="editing" @click="cancel()">取消</el-button>
@@ -42,7 +42,7 @@
               </div>
               <div v-else class="ctrl-bar-view">
                 <el-tooltip effect="dark" content="设为封面" placement="top" :open-delay=".5">
-                  <i class="el-icon-picture-outline-round" @click="setCover(item)" v-if="type === 'DEFAULT'"></i>
+                  <i class="el-icon-picture-outline-round" @click="setCover(item)" v-if="mergeType === 'DEFAULT'"></i>
                   <i v-else></i>
                 </el-tooltip>
                 <el-tooltip effect="dark" :content="views.includes(item.id) ? '设为不可见' : '设为可见'" placement="top" :open-delay=".5">
@@ -59,14 +59,14 @@
             <el-tooltip v-if="!editing" class="item" effect="dark" :content="item.name" placement="top" :open-delay=".5">
               <div class="name">{{item.name}}</div>
             </el-tooltip>
-            <el-input class="nameinput" v-else v-model="item.name" size="mini" :placeholder="'请输入' + (type === 'DEFAULT' ? '照片' : '证书') + '名称'" clearable/>
+            <el-input class="nameinput" v-else v-model="item.name" size="mini" :placeholder="'请输入' + (mergeType === 'DEFAULT' ? '照片' : '证书') + '名称'" clearable/>
           </div>
         </draggable>
       </el-checkbox-group>
       <empty v-if="list.length == 0"/>
     </div>
     <el-dialog
-      :title="type === 'DEFAULT' ? '上传照片' : '上传证书'"
+      :title="mergeType === 'DEFAULT' ? '上传照片' : '上传证书'"
       :visible.sync="uploadVisible"
       v-if="uploadVisible"
     >
@@ -95,20 +95,23 @@ export default {
     draggable,
   },
   computed: {
+    mergeType() {
+      return this.$route.query.phototype || this.type
+    },
     detailName() {
-      return this.$route.query.name || '相册详情'
+      return this.$route.query.name || this.mergeType === 'DEFAULT' ?'相册详情' : '全部证书'
     },
     queryIdOrType() {
       const id = this.$route.query.pid
-      if (this.type === 'DEFAULT') {
+      if (this.mergeType === 'DEFAULT') {
         return {
           id,
-          type: this.type,
+          type: this.mergeType,
           photoAlbumId: id,
         }
       }
       return {
-        type: this.type,
+        type: this.mergeType,
         musicGroupId: this.$route.query.id,
       }
     },

src/views/resetTeaming/components/archicesComponents/performance.vue

@@ -83,6 +83,7 @@
           </div>
           <auth auths="musicGroupQuestionnaire/add">
             <el-button type="text"
+              @click="toPerformance"
               >全部证书 ></el-button
             >
           </auth>
@@ -148,6 +149,15 @@ export default {
     this.FetchPhoto()
   },
   methods: {
+    toPerformance() {
+      this.$router.push({
+        path: '/business/performance',
+        query: {
+          returnUrl: this.$route.fullPath,
+          phototype: 'SHOW'
+        }
+      })
+    },
     openForm(detail) {
       this.detail = detail
       this.formVisible = true