Merge branch 'master' into 11/24SAAS

dist/static/css/chunk-05fbcff2.a81ce832.css

@@ -0,0 +1 @@
+.btns[data-v-562ab4b5]{text-align:right}.files[data-v-562ab4b5]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-562ab4b5]{position:absolute;right:20px;bottom:10px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-3e496900] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-3e496900]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-3e496900] .el-dialog__body{padding:0}.iframe_back[data-v-3e496900]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-3e496900]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-3e496900]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

src/views/accompaniment/index.vue

@@ -246,7 +246,7 @@
           fixed="right"
         >
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               type="text"
               @click="looker(scope.row)"
               :disabled="
@@ -256,7 +256,19 @@
                 scope.row.clientType != 'SMART_PRACTICE'
               "
               >预览</el-button
-            >
+            > -->
+            <el-dropdown :disabled="(scope.row.isOpenMetronome ? !scope.row.url : !scope.row.metronomeUrl) || scope.row.clientType != 'SMART_PRACTICE'">
+                <span class="el-dropdown-link">
+                  预览<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item>
+                    <el-button type="text" @click="looker(scope.row, 1)" >系统自带节拍器</el-button></el-dropdown-item>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-button type="text" @click="looker(scope.row, 0)" >原音自带节拍器</el-button></el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
             <el-button
               type="text"
               @click="player(scope.row)"
@@ -352,11 +364,13 @@ export default {
   },
   data() {
     return {
+      tabName: 'first',
       type: "",
       activeUrl: "",
       songUseType,
       lookVisible: false,
       accompanyUrl: null, // 预览地址
+      accompanyUrl2: null, // 预览地址
       audioVisible: false,
       tableList: [],
       searchForm: {
@@ -463,14 +477,16 @@ export default {
       this.$refs.searchForm.resetFields();
       this.FetchList();
     },
-    looker(row) {
+    looker(row, num) {
       this.accompanyUrl =
         vaildTeachingUrl() +
         "/accompany?Authorization=" +
         getToken() +
-        "&platform=web#/detail/" +
+        "&platform=web&isOpenMetronome="+ num +"#/detail/" +
         row.id;
       this.lookVisible = true;
+
+
       // this.$nextTick(() => {
       //   console.log(this.$refs.iframe)
       //   let iframe = this.$refs.iframe
@@ -542,6 +558,10 @@ export default {
 }
 </style>
 <style lang="less" scoped>
+/deep/.el-dropdown {
+  margin-right: 10px;
+  color: #14928A;
+}
 .remark {
   display: inline;
   overflow: hidden;
@@ -552,7 +572,6 @@ export default {
     padding: 0;
   }
 }
-
 .iframe_back {
   width: 195px;
   height: 45px;

src/views/accompaniment/modals/form.vue

@@ -56,11 +56,24 @@
         label="节拍器"
         :rules="[{required: true, message: '请选择节拍器'}]"
       >
+        <template slot="label">
+          <span>
+            节拍器
+            <el-tooltip placement="top" popper-class="mTooltip">
+              <div slot="content">
+                是否播放系统自带节拍器
+              </div>
+              <i
+                class="el-icon-question"
+                style="font-size: 18px; color: #f56c6c"
+              ></i>
+            </el-tooltip>
+          </span>
+        </template>
         <el-select
           style="width: 100% !important"
           v-model="form.sysMusicScore.isOpenMetronome"
           placeholder="请选择节拍器"
-          @change="rankChange"
         >
           <!-- <el-option
             :value="item.id"
@@ -159,7 +172,7 @@
           v-model="form.sysMusicScore.metronomeUrl"
         />
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="MID原音"
         prop="sysMusicScore.midiUrl"
       >
@@ -168,7 +181,7 @@
           accept=".mid"
           v-model="form.sysMusicScore.midiUrl"
         />
-      </el-form-item>
+      </el-form-item> -->
       <div
         class="files"
         v-for="(song, index) in form.sysMusicScoreAccompaniments"