瀏覽代碼

Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

Li 2 年之前
父節點
當前提交
b2d96fb8bd

文件差異過大導致無法顯示
+ 5 - 5
TEAMModelOS.SDK/Models/Cosmos/Student/ErrorItems.cs


+ 13 - 4
TEAMModelOS/ClientApp/src/view/artexam/SelectMusic.vue

@@ -3,10 +3,11 @@
     <!-- <Button type="info" @click="websiteModal = true">选择演唱题目</Button> -->
     <!-- <Button type="info" @click="websiteModal = true">选择演唱题目</Button> -->
     <iframe :src="openUrl" frameborder="0" width="100%" height="800" v-show="!isFinish"></iframe>
     <iframe :src="openUrl" frameborder="0" width="100%" height="800" v-show="!isFinish"></iframe>
     <div class="select-wrap" v-if="isFinish">
     <div class="select-wrap" v-if="isFinish">
-      <p v-if="message.mustSong.length">必唱曲目</p>
-      <div class="song-item" v-for="(item,index) in message.mustSong" :key="index">{{ index + 1}} . {{ item.songName }}</div>
-      <p v-if="message.optionSong.length">选唱曲目</p>
-      <div class="song-item" v-for="(item,index) in message.optionSong" :key="index">{{ index + 1}} . {{ item.songName }}</div>
+      <p class="btn-re-choose" @click="isFinish = false">重新选择</p>
+      <!-- <p v-if="message.mustSong.length">必唱曲目</p> -->
+      <div class="song-item" v-for="(item,index) in message.mustSong" :key="index">【必唱】{{ index + 1}} . {{ item.songName }}</div>
+      <!-- <p v-if="message.optionSong.length">选唱曲目</p> -->
+      <div class="song-item" v-for="(item,index) in message.optionSong" :key="index">【选唱】{{ index + 1}} . {{ item.songName }}</div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -53,6 +54,14 @@ export default {
     margin: 10px;
     margin: 10px;
     color: rgb(52, 143, 204);
     color: rgb(52, 143, 204);
     font-weight: bold;
     font-weight: bold;
+    background: rgb(252, 252, 252);
+    padding: 10px;
+  }
+
+  .btn-re-choose {
+    display: inline-block;
+    text-decoration: underline;
+    margin: 10px;
   }
   }
 }
 }
 </style>
 </style>