Merge branch 'iteration-20241016' into jenkins

src/router/auditionRouter.js

@@ -60,7 +60,7 @@ let auditionRouter = [
         name: 'arrangeWork',
         component: () => import(/* webpackChunkName:'ArrangeWork'*/'@/views/audition/ArrangeWork.vue'),
         meta: {
-            descrition: '布置训练',
+            descrition: '布置练习',
             weight: 4 // 页面权重
         },
         

src/router/teacherRouter.js

@@ -256,7 +256,7 @@ let teacherRouter = [
     name: "trainStatistics",
     component: () => import(/* webpackChunkName:'trainStatistics'*/ "@/views/trainStatistics/index.vue"),
     meta: {
-      descrition: "训练统计",
+      descrition: "练习统计",
       weight: 3, // 页面权重
     },
   },

src/views/afterClassEvaluate/detail.vue

@@ -25,7 +25,7 @@
       >
         <template #title>
           <van-icon :name="icon_class" size="22" style="padding-right: .06rem;" />
-          课后训练
+          课后练习
         </template>
       </van-cell>
     </van-cell-group>
@@ -177,7 +177,7 @@ export default {
     async submitReview() {
       // 不是大雅机构则练习非必填
       if(!this.isAssignHomework && this.enableAssignHomework && this.tenantId == 1) {
-        this.$toast('请布置课后训练')
+        this.$toast('请布置课后练习')
         return
       }
 

src/views/audition/ArrangeWork.vue

@@ -3,7 +3,7 @@
     <m-header v-if="headerStatus" />
     <van-cell :title="classGroupName" title-style="font-size: .18rem; color: #333333;">
       <template #extra>
-        <van-tag type="primary" plain style="background-color: #f1fcf9">课后训练</van-tag>
+        <van-tag type="primary" plain style="background-color: #f1fcf9">课后练习</van-tag>
       </template>
     </van-cell>
     <van-cell class="endTime" readonly is-link title-style="font-size: .16rem; color: #333333;" @click="studentStatus = true">
@@ -21,19 +21,19 @@
     <div class="container">
       <div class="formGroup">
         <div class="dot"></div>
-        <div class="formTitle">训练标题</div>
-        <van-field v-model="title" type="text" maxlength="25" show-word-limit placeholder="请输入训练标题" />
+        <div class="formTitle">练习标题</div>
+        <van-field v-model="title" type="text" maxlength="25" show-word-limit placeholder="请输入练习标题" />
       </div>
       <div class="formGroup">
         <div class="dot"></div>
-        <div class="formTitle">训练内容</div>
-        <van-field rows="4" v-model="content" maxlength="600" show-word-limit type="textarea" placeholder="请输入训练内容" />
+        <div class="formTitle">练习内容</div>
+        <van-field rows="4" v-model="content" maxlength="600" show-word-limit type="textarea" placeholder="请输入练习内容" />
       </div>
     </div>
     <!-- <van-cell
       class="endTime"
       style="padding: 0.12rem 0.21rem;"
-      title="训练提交截止时间"
+      title="练习提交截止时间"
       @click="onEndTime"
       is-link
       readonly
@@ -41,7 +41,7 @@
     >
       <template #title>
         <div class="dot"></div>
-        训练提交截止时间
+        练习提交截止时间
       </template>
       <template #default>
         {{ dateSection.showStartDate }}
@@ -51,10 +51,10 @@
     <div class="accompanyHeader">云练习曲目选择<span>(若练习内容非云练习曲目则无需选择)</span></div>
     <van-tabs v-model="tabActive" color="#01C1B5">
       <van-tab v-for="(item, i) in params.subjectList" :title="item.subjectName" :name="item.id" :key="i" class="van-hairline--bottom">
-        <van-cell class="endTime" v-for="(music, index) in item.musicScoreIdList" :key="index" style="margin-top: 0; padding: 0.12rem 0.21rem" title="训练曲目" @click="onSelectAccompany(item, index)" readonly is-link placeholder="请选择训练曲目">
+        <van-cell class="endTime" v-for="(music, index) in item.musicScoreIdList" :key="index" style="margin-top: 0; padding: 0.12rem 0.21rem" title="练习曲目" @click="onSelectAccompany(item, index)" readonly is-link placeholder="请选择练习曲目">
           <template #title>
             <div class="dot"></div>
-            训练曲目
+            练习曲目
           </template>
           <template #default>
             <template v-if="music.name">
@@ -70,7 +70,7 @@
             <span style="height: 24px; font-size: 16px; line-height: 24px; color: #dadada !important"><van-icon name="arrow" /></span>
           </template>
         </van-cell>
-        <div class="addAccompaniment" v-if="item.musicScoreIdList.length < 3" @click="addCloud(item)"><van-icon name="plus" size="16px" />增加云练习训练曲目</div>
+        <div class="addAccompaniment" v-if="item.musicScoreIdList.length < 3" @click="addCloud(item)"><van-icon name="plus" size="16px" />增加云练习练习曲目</div>
       </van-tab>
     </van-tabs>
 
@@ -172,7 +172,7 @@ export default {
       localStorage.setItem("Authorization", decodeURI(params.Authorization));
       localStorage.setItem("userInfo", decodeURI(params.Authorization));
     }
-    document.title = "布置训练";
+    document.title = "布置练习";
     if (browser().android || browser().iPhone) {
       this.headerStatus = false;
     }
@@ -302,16 +302,16 @@ export default {
     },
     onSubmit: _throttle(function (type) {
       if (!this.title) {
-        this.$toast("请输入训练标题");
+        this.$toast("请输入练习标题");
         return;
       }
       if (!this.content) {
-        this.$toast("请输入训练内容");
+        this.$toast("请输入练习内容");
         return;
       }
       let tempSubjectList = this.params.subjectList;
       let musicScoreSubjectDto = [];
-      let notAccompanySong = []; // 用于判断没有设置训练曲目的数据
+      let notAccompanySong = []; // 用于判断没有设置练习曲目的数据
       let subjectLength = this.params.subjectIdList.length;
       tempSubjectList.forEach((subject) => {
         let scoreIdList = [];
@@ -338,7 +338,7 @@ export default {
         // console.log('选择曲目')
         this.$dialog
           .confirm({
-            message: notAccompanySong.join(",") + "声部未选择云练习训练曲目，是否继续布置练习？",
+            message: notAccompanySong.join(",") + "声部未选择云练习练习曲目，是否继续布置练习？",
             confirmButtonColor: "#01C1B5",
           })
           .then(() => {

src/views/audition/CourseEvaluation.vue

@@ -17,7 +17,7 @@
     <van-cell-group v-if="enableAssignHomework || tenantId != 1">
       <div class="dot"></div>
        <!-- v-if="enableAssignHomework" -->
-      <van-cell class="input" :is-link="!isAssignHomework ? true : false" title="课后训练" :value='isAssignHomework ? "已布置" : "未布置"' @click="onWork()"></van-cell>
+      <van-cell class="input" :is-link="!isAssignHomework ? true : false" title="课后练习" :value='isAssignHomework ? "已布置" : "未布置"' @click="onWork()"></van-cell>
     </van-cell-group>
     <van-cell-group>
        <div class="dot"></div>
@@ -285,7 +285,7 @@ export default {
     submitReview() {
       // 不是大雅机构则练习非必填
       if(!this.isAssignHomework && this.enableAssignHomework && this.tenantId == 1) {
-        this.$toast('请布置课后训练')
+        this.$toast('请布置课后练习')
         return
       }
       if (!this.teachingMaterial) {

src/views/audition/modal/workModel.vue

@@ -2,7 +2,7 @@
   <div class="workModel" style="margin-bottom: .72rem">
     <!-- <van-sticky>
       <van-nav-bar
-        title="训练曲目"
+        title="练习曲目"
         left-arrow
         @click-left="close"
       />

src/views/trainStatistics/api.js

@@ -1,5 +1,5 @@
 import request from "@/helpers/request";
-// 训练统计
+// 练习统计
 export const countStudentTrain = (data) => {
   return request({
     url: "/cloudStudy/countStudentTrain",

src/views/trainStatistics/index.vue

@@ -28,15 +28,15 @@
         <van-cell is-link :clickable="false" center style="padding: 12px 12px 16px">
           <template #title>
             <van-grid :border="false" column-num="4" :clickable="true">
-              <van-grid-item text="训练时长">
+              <van-grid-item text="练习时长">
                 <template #icon>{{ item.totalPlayTime }}分钟</template>
               </van-grid-item>
-              <van-grid-item text="训练次数">
+              <van-grid-item text="练习次数">
                 <template #icon
                   ><span style="color: #01c1b5">{{ item.trainNum }}次</span></template
                 >
               </van-grid-item>
-              <van-grid-item text="训练天数">
+              <van-grid-item text="练习天数">
                 <template #icon
                   ><span style="color: #ff802c">{{ item.trainDay }}天</span></template
                 >
@@ -51,7 +51,7 @@
         </van-cell>
       </van-cell-group>
     </van-list>
-    <m-empty v-else msg="暂无训练统计" />
+    <m-empty v-else msg="暂无练习统计" />
   </div>
 </template>
 <script>
@@ -110,7 +110,7 @@ export default {
     if (browser().android || browser().iPhone) {
       this.headerStatus = false;
     }
-    document.title = "训练统计";
+    document.title = "练习统计";
     try {
       let res = await sysTenantConfig({ group: "DAYA_BASIC" });
       const { data } = res;

src/views/trainStatistics/trainDetail.vue

@@ -89,7 +89,7 @@
           </van-cell>
         </van-cell-group>
       </van-list>
-      <m-empty v-else key="trainDetail" msg="暂无训练详情" />
+      <m-empty v-else key="trainDetail" msg="暂无练习详情" />
 
       <!-- 是否需要回访 -->
       <div class="button-group" v-if="visitFlag">

src/views/trainStatistics/trainModel.vue

@@ -2,7 +2,7 @@
   <div class="trainModel">
     <div class="visit-tips" v-show="activeType == 'visited'">
       <span
-        >上周训练时长不足{{ playTime }}分钟或训练次数小于{{ trainNum }}次的学员<br />
+        >上周练习时长不足{{ playTime }}分钟或练习次数小于{{ trainNum }}次的学员<br />
         需在每周三24:00前完成回访</span
       >
     </div>
@@ -65,21 +65,21 @@
     </search>
     <van-row class="searchArray">
       <van-col span="6" class="title-style" @click="onSort(0)">
-        训练时长
+        练习时长
         <div>
           <i class="box box-up" :class="{ active: searchArray[0] == 'ASC' }" style="margin-bottom: 0.03rem"></i>
           <i class="box box-down" :class="{ active: searchArray[0] == 'DESC' }"></i>
         </div>
       </van-col>
       <van-col span="6" class="title-style" @click="onSort(1)">
-        训练次数
+        练习次数
         <div>
           <i class="box box-up" :class="{ active: searchArray[1] == 'ASC' }" style="margin-bottom: 0.03rem"></i>
           <i class="box box-down" :class="{ active: searchArray[1] == 'DESC' }"></i>
         </div>
       </van-col>
       <van-col span="6" class="title-style" @click="onSort(2)">
-        训练天数
+        练习天数
         <div>
           <i class="box box-up" :class="{ active: searchArray[2] == 'ASC' }" style="margin-bottom: 0.03rem"></i>
           <i class="box box-down" :class="{ active: searchArray[2] == 'DESC' }"></i>