Bladeren bron

Merge branch '11/24SAAS' into iteration-20241022-member

lex-xin 9 maanden geleden
bovenliggende
commit
0ab6a073e0

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-21c16b9e.c12539fb.css

@@ -0,0 +1 @@
+.btns[data-v-c2f97868]{text-align:right}.files[data-v-c2f97868]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-c2f97868]{position:absolute;right:20px;bottom:10px}.gradual-item[data-v-c2f97868]{background-color:#f8f8f8;margin-bottom:10px;padding:10px;border-radius:6px}.dialog-footer[data-v-f189da54]{text-align:right}.numberInput[data-v-f189da54]{width:100%}[data-v-f189da54] .el-input-number .el-input__inner{text-align:left!important}.dialog-footer[data-v-66e7d516]{text-align:right}[data-v-66e7d516] .el-input-number .el-input__inner{text-align:left!important}.myCascader .el-radio[data-v-a1238cba]{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input[data-v-a1238cba]{visibility:hidden}.myCascader .el-cascader-node__postfix[data-v-a1238cba]{top:10px}[data-v-a1238cba] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-a1238cba]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-a1238cba] .el-dialog__body{padding:0;font-size:0}.iframe_back[data-v-a1238cba]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-a1238cba]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-a1238cba]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

+ 0 - 1
dist/static/css/chunk-286ebdea.e641d59f.css

@@ -1 +0,0 @@
-.btns[data-v-c2f97868]{text-align:right}.files[data-v-c2f97868]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-c2f97868]{position:absolute;right:20px;bottom:10px}.gradual-item[data-v-c2f97868]{background-color:#f8f8f8;margin-bottom:10px;padding:10px;border-radius:6px}.dialog-footer[data-v-f189da54]{text-align:right}.numberInput[data-v-f189da54]{width:100%}[data-v-f189da54] .el-input-number .el-input__inner{text-align:left!important}.dialog-footer[data-v-66e7d516]{text-align:right}[data-v-66e7d516] .el-input-number .el-input__inner{text-align:left!important}.myCascader .el-radio[data-v-f7723102]{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input[data-v-f7723102]{visibility:hidden}.myCascader .el-cascader-node__postfix[data-v-f7723102]{top:10px}[data-v-f7723102] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-f7723102]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-f7723102] .el-dialog__body{padding:0}.iframe_back[data-v-f7723102]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-f7723102]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-f7723102]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.82c90285.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-21c16b9e.7c56582d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-286ebdea.a1de4e43.js


+ 6 - 53
src/views/accompaniment/index.vue

@@ -301,31 +301,18 @@
 
     <el-dialog
       v-if="lookVisible"
-      width="667px"
+      width="1030px"
       class="lookForm"
       :visible.sync="lookVisible"
       title="预览"
     >
       <template slot="title">
         <span style="color: #fff;">预览</span>
-        <el-select
-          v-model="selectPart"
-          placeholder="请选择分谱"
-          @change="onPartChange"
-        >
-          <el-option
-            v-for="(item, index) in parts"
-            :key="item"
-            :label="item"
-            :value="index"
-          >
-          </el-option>
-        </el-select>
       </template>
       <iframe
         id="iframe"
         v-if="lookVisible"
-        style="width: 667px; height: 386px"
+        style="width: 1030px; height: 630px; border: none;"
         ref="iframe"
         :src="accompanyUrl"
       />
@@ -383,7 +370,6 @@ export default {
       lookNum: 0,
       lookRow: {},
       accompanyUrl: null, // 预览地址
-      accompanyUrl2: null, // 预览地址
       tableList: [],
       searchForm: {
         search: "",
@@ -546,29 +532,12 @@ export default {
       );
     },
     async looker(row, num) {
-      try {
-        this.selectPart = 0;
-        const res = await fetch(row.xmlUrl);
-        const text = await res.text();
-        this.parts = this.getPartListNames(text);
-      } catch (error) {
-        this.parts = [];
-        this.selectPart = 0;
-      }
-      let url = location.origin + "/accompany-web/";
-      if (/dayaedu.com/.test(location.origin)) {
-        url = location.origin + "/accompany/";
-      }
-
       this.accompanyUrl =
-        url +
+        location.origin + '/gym-music-score/' +
         "?Authorization=" +
         getToken() +
-        "&platform=web" +
-        "#/detail/" +
-        row.id +
-        "?part-index=" +
-        this.selectPart;
+        "&systemType=web&isHideBack=1&isHideMusicList=1&id=" +
+        row.id;
       this.lookVisible = true;
       this.lookNum = num;
       this.lookRow = row;
@@ -582,23 +551,6 @@ export default {
       //   }
       // })
     },
-    onPartChange(val) {
-      let url = location.origin + "/accompany-web/";
-      if (/dayaedu.com/.test(location.origin)) {
-        url = location.origin + "/accompany/";
-      }
-      //         url +
-      this.accompanyUrl =
-        url +
-        "?Authorization=" +
-        getToken() +
-        "&platform=web&t=" +
-        new Date().getTime() +
-        "#/detail/" +
-        this.lookRow.id +
-        "?part-index=" +
-        val;
-    },
     async changeStatus(row) {
       try {
         let status = row.clientShowFlag ? "停用" : "启用";
@@ -705,6 +657,7 @@ export default {
 .lookForm {
   ::v-deep .el-dialog__body {
     padding: 0;
+    font-size: 0
   }
 }
 .iframe_back {

Some files were not shown because too many files changed in this diff