Merge branch '07/06musicArchives' into test

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

@@ -71,7 +71,6 @@
             <i
               class="el-icon-question micon el-tooltip"
               style="font-size: 18px; color: #f56c6c"
-              v-permission="'export/teacherSalary'"
             ></i>
           </el-tooltip>
         </div>

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

@@ -12,7 +12,6 @@
             <i
               class="el-icon-question micon el-tooltip"
               style="font-size: 18px; color: #f56c6c"
-              v-permission="'export/teacherSalary'"
             ></i>
           </el-tooltip>
         </div>

src/views/resetTeaming/index.vue

@@ -1,10 +1,22 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" :content="teamName"></el-page-header>
-      <auth :auths="'/musicArchices'" >
-        <img :src="archices" alt="" @click="gotoArchices" class="archices" v-if="team_status=='PROGRESS' || team_status=='CLOSE'" />
-      </auth>
+      <el-page-header @back="onCancel">
+        <template slot="content">
+          <div class="hearConcat" @click="gotoArchices">
+            <p>{{ teamName }}</p>
+
+            <auth :auths="'/musicArchices'">
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">
+                  乐团档案
+                </div>
+                <img :src="archices" alt="" class="archices" />
+              </el-tooltip>
+            </auth>
+          </div>
+        </template>
+      </el-page-header>
     </h2>
     <div class="m-core">
       <el-popover
@@ -444,4 +456,19 @@ export default {
   margin-left: 10px;
   cursor: pointer;
 }
+.hearConcat {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  img {
+    width: 36px;
+    height: 36px;
+    position: relative;
+    top: 0px;
+    margin-right: 8px;
+  }
+}
+/deep/.el-page-header__left{
+  align-items: center;
+}
 </style>