合并

dist/static/css/chunk-17f908e3.301f70d5.css

@@ -0,0 +1 @@
+.titleCell[data-v-3f96f0e4]{display:inline-block}.tableWrap[data-v-3f96f0e4]{margin-top:20px}.qrcode[data-v-3f96f0e4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.qrcode img[data-v-3f96f0e4]{width:200px;height:200px;margin:0 auto}.code-url[data-v-3f96f0e4]{font-size:18px;text-align:center;padding:15px 15px 0 15px}

src/assets/icon/iconfont.json

@@ -462,7 +462,7 @@
     },
     {
       "icon_id": "27122007",
-      "name": "作业管理",
+      "name": "练习管理",
       "font_class": "zuoyeguanli",
       "unicode": "e65d",
       "unicode_decimal": 58973

src/views/afterSchoolManager/components/textConment.vue

@@ -20,7 +20,7 @@
       <el-alert :title="'练习组' + (index + 1)" :closable="false">
         {{ item.subjectName }}
       </el-alert>
-
+      <div style="padding: 8px 16px 8px;">练习说明：{{ item.memo }}</div>
       <el-table
         :data="item.trainingDetailList"
         :show-header="true"

src/views/attendanceManager/attendanceList/api.js

@@ -19,7 +19,7 @@ export function getHomePageList (data) {
 // }
 
 
-// 获取作业详情
+// 获取练习详情
 export function findCourseHomeworkDetail (data) {
   return request({
     url: api + '/teacher/findCourseHomeworkDetail',

src/views/attendanceManager/attendanceList/components/textConment.vue

@@ -20,7 +20,7 @@
       <el-alert :title="'练习组' + (index + 1)" :closable="false">
         {{ item.subjectName }}
       </el-alert>
-
+      <div style="padding: 8px 16px 8px;">练习说明：{{ item.memo }}</div>
       <el-table
         :data="item.trainingDetailList"
         :show-header="true"

src/views/band-guidance-training/detail.vue

@@ -305,15 +305,8 @@ export default {
       });
     },
     async onExport() {
-      
-      this.$confirm(`您确定导出${this.name}?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(async () => {
-        try {
-          const { citys, ...more } = this.searchForm
-          const obj = {
+      const { citys, ...more } = this.searchForm
+      const obj = {
             tempDirectorTrainingCampId: this.$route.query.id,
             ...more
           }
@@ -322,20 +315,13 @@ export default {
             obj.cityCode = citys[1]
             obj.regionCode = citys[2]
           }
-          const { data } = await api_tempDirectorTrainingDetailCampExport(obj)
-          let link = document.createElement("a");
-          let fname = data.fileName || "导出文件.xls"; //下载文件的名字
-          link.href = data.downloadPath;
-          link.setAttribute("download", fname);
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link)
-        } catch {
-          // 
-        }
-      }).catch(error => {
-        that.$message.error('下载失败，请联系管理员');
-      });
+      Export(this, {
+        url: '/api-web/tempDirectorTrainingDetailCamp/export',
+        fileName: '乐队指导特训营.xls',
+        method: 'post',
+        params: obj
+      }, `您确定导出${this.name}?`)
+      
     },
     onCancel() {
       this.$store.dispatch("delVisitedViews", this.$route);

src/views/categroyManager/generalSettings/overallManager.vue

@@ -392,7 +392,7 @@
               }
             ]"
           >
-            作业练习组内最多添加:
+            练习练习组内最多添加:
             <el-input
               style="width: 180px;margin: 0 5px;"
               v-model="form['279']"

src/views/categroyManager/insideSetting/staffManager.vue

@@ -368,7 +368,7 @@
                       <p>分部经理：分部事务审批，为乐团主管分配日程安排</p>
                       <p>乐团主管：具体乐团、VIP、网管课课程组负责人，管理日常教务</p>
                       <p>维修技师：管理端APP乐器维修人员</p>
-                      <p>衔接老师：合作单位老师，可在管理端APP查看所关联乐团课程、作业</p>
+                      <p>衔接老师：合作单位老师，可在管理端APP查看所关联乐团课程、练习</p>
                       <p>HRBP：人力资源表可选择HR归属</p>
                     </div>
                     <i

src/views/musicInspection/modals/lookDetail.vue

@@ -137,7 +137,7 @@
           prop="18"
           width="160px"
           align="center"
-          label="老师是否点评上周作业/练习情况？"
+          label="老师是否点评上周练习/练习情况？"
         >
           <template slot-scope="scope">
             <i
@@ -247,7 +247,7 @@
           prop="19"
           width="160px"
           align="center"
-          label="老师是否布置课后作业？"
+          label="老师是否布置课后练习？"
         >
           <template slot-scope="scope">
             <i

src/views/operateManager/serverIndexList.vue

@@ -251,8 +251,8 @@
         <p>2、学员在【进行中】乐团在读</p>
         <p>3、乐团截止本周日前，有声部课（含集训）或合奏课（含集训）</p>
         <p  style="margin-top: 20px;font-weight:600">特殊情况：</p>
-        <p>1、学员在多个乐团时，可能存在多次作业</p>
-        <p>2、老师<span>已布置训练后</span>，由于班级、学员、课程变动<span>更新</span>训练布置路径时，可能存在多次作业，但<span>服务指标相关数据统计仅按最新的训练布置路径统计</span></p>
+        <p>1、学员在多个乐团时，可能存在多次练习</p>
+        <p>2、老师<span>已布置训练后</span>，由于班级、学员、课程变动<span>更新</span>训练布置路径时，可能存在多次练习，但<span>服务指标相关数据统计仅按最新的训练布置路径统计</span></p>
         <p>3、学员不在【课外训练布置班级】所设置的班级类型中时，不会生成课外训练</p>
         <div class="imgWrap">
               <el-image

src/views/teamBuild/components/teamBaseInfo.vue

@@ -555,10 +555,10 @@
         >
           <template #label>
             <p style="position: relative; display: inline-block">
-              开课后作业同步群消息
+              开课后练习同步群消息
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">
-                  学员提交乐团课后作业时，群聊中是否发送作业提交消息
+                  学员提交乐团课后练习时，群聊中是否发送练习提交消息
                 </div>
                 <i
                   class="el-icon-question"

src/views/teamDetail/componentCourse/studentWork.vue

@@ -8,7 +8,7 @@
     <div class="workTitle" v-if="title || content">
       {{ title }}:<span>{{ content }}</span>
     </div>
-    <div v-else class="workTitle">暂未布置作业</div>
+    <div v-else class="workTitle">暂未布置练习</div>
 
     <el-form :inline="true" class="workForm" style="padding: 0 25px">
       <el-form-item label="应交学生数">

src/views/teamDetail/components/courseList.vue

@@ -67,7 +67,7 @@
       <el-form-item prop="homeworkFlag">
         <el-select
           v-model.trim="searchForm.homeworkFlag"
-          placeholder="是否布置作业"
+          placeholder="是否布置练习"
           filterable
           clearable
         >
@@ -134,7 +134,7 @@
         style="color: #f85043; font-weight: 600"
         >{{ detail.standardRate }}</span
       >
-      &nbsp;&nbsp;&nbsp;&nbsp; 总作业提交率：<span
+      &nbsp;&nbsp;&nbsp;&nbsp; 总练习提交率：<span
         style="color: #f85043; font-weight: 600"
         >{{ detail.homeworkCommitRate }}</span
       >
@@ -269,7 +269,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否布置课后作业">
+        <el-table-column align="center" prop="remark" label="是否布置课后练习">
           <template slot-scope="scope">
             <div>
               {{
@@ -280,7 +280,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="作业提交率">
+        <el-table-column align="center" prop="remark" label="练习提交率">
           <template slot-scope="scope">
             <div>
               {{