mo 3 年之前
父節點
當前提交
eb6f858060
共有 100 個文件被更改,包括 499 次插入204 次删除
  1. 0 0
      dist/html/data/document.js
  2. 3 3
      dist/html/files/作业列表/data.js
  3. 0 0
      dist/html/files/作业情况/data.js
  4. 6 6
      dist/html/作业情况.html
  5. 3 3
      dist/html/学员管理.html
  6. 1 1
      dist/html/异常处理.html
  7. 1 1
      dist/html/新增学员.html
  8. 4 4
      dist/html/服务指标明细.html
  9. 1 1
      dist/html/课表列表.html
  10. 0 0
      dist/static/js/app.d6717207.js
  11. 0 0
      dist/static/js/chunk-11146df6.c880e3ad.js
  12. 0 0
      dist/static/js/chunk-12c6ad92.8990afb2.js
  13. 0 0
      dist/static/js/chunk-18b37c00.2719a0c9.js
  14. 0 0
      dist/static/js/chunk-21be1105.4511da87.js
  15. 0 0
      dist/static/js/chunk-259e1df6.f212ea5a.js
  16. 0 0
      dist/static/js/chunk-28c38e1c.ef3c97df.js
  17. 0 0
      dist/static/js/chunk-2e95ee29.618382d6.js
  18. 0 0
      dist/static/js/chunk-2ee51586.928bccdc.js
  19. 0 0
      dist/static/js/chunk-34d9c888.0e7b5b9b.js
  20. 0 0
      dist/static/js/chunk-3c8b2a9c.d6648133.js
  21. 0 0
      dist/static/js/chunk-3d44bd43.939f3cb7.js
  22. 0 0
      dist/static/js/chunk-3f7c6ea7.32b3953f.js
  23. 0 0
      dist/static/js/chunk-430d43c6.975034c8.js
  24. 0 0
      dist/static/js/chunk-43e033dc.1561a9b6.js
  25. 0 0
      dist/static/js/chunk-48f2714c.eef1bd0f.js
  26. 0 0
      dist/static/js/chunk-495439dc.dba9b4db.js
  27. 0 0
      dist/static/js/chunk-496c88c2.5173ebb2.js
  28. 0 0
      dist/static/js/chunk-4a5767e5.ba5bcd18.js
  29. 0 0
      dist/static/js/chunk-584f76a2.6bce1520.js
  30. 0 0
      dist/static/js/chunk-59c1227c.12607351.js
  31. 0 0
      dist/static/js/chunk-5a425c8a.a650582e.js
  32. 0 0
      dist/static/js/chunk-5bcfc712.c37a5970.js
  33. 0 0
      dist/static/js/chunk-5e5a3aa0.b6100d2b.js
  34. 0 0
      dist/static/js/chunk-5f5ffb00.de3f9082.js
  35. 0 0
      dist/static/js/chunk-6d4a0a0a.6b31a302.js
  36. 0 0
      dist/static/js/chunk-709d6afe.71344587.js
  37. 0 0
      dist/static/js/chunk-736f8818.dd8320bc.js
  38. 0 0
      dist/static/js/chunk-739fed81.806f6850.js
  39. 0 0
      dist/static/js/chunk-7b7bb8fa.8c47f45d.js
  40. 0 0
      dist/static/js/chunk-7f91ee0d.8e56d732.js
  41. 0 0
      dist/static/js/chunk-93b49e4a.2a284cf3.js
  42. 0 0
      dist/static/js/chunk-9cf825a4.44026cee.js
  43. 0 0
      dist/static/js/chunk-a23e2ba4.481d9a61.js
  44. 0 0
      dist/static/js/chunk-b2c32afa.f6ee4235.js
  45. 0 0
      dist/static/js/chunk-b5446cf6.76b09491.js
  46. 0 0
      dist/static/js/chunk-b95689ac.ab52ecf4.js
  47. 0 0
      dist/static/js/chunk-c0b0701c.08ac5272.js
  48. 0 0
      dist/static/js/chunk-c23a63d0.3095954e.js
  49. 0 0
      dist/static/js/chunk-c68f3e9e.302cbcdf.js
  50. 0 0
      dist/static/js/chunk-c7f5974e.ae4d6a9c.js
  51. 0 0
      dist/static/js/chunk-ce48cac0.7f203473.js
  52. 0 0
      dist/static/js/chunk-d00fd9e4.151e975a.js
  53. 0 0
      dist/static/js/chunk-d4a89ac0.2e8eeb8d.js
  54. 0 0
      dist/static/js/chunk-d9fbd972.050ceccd.js
  55. 0 0
      dist/static/js/chunk-da63f3ae.54836ee7.js
  56. 0 0
      dist/static/js/chunk-ebb0bb00.2f212a8d.js
  57. 0 0
      dist/static/js/chunk-fae5b3fa.cd41de16.js
  58. 1 0
      dist/static/js/chunk-fb5bfd66.a448ad3a.js
  59. 0 0
      public/html/data/document.js
  60. 3 3
      public/html/files/作业列表/data.js
  61. 0 0
      public/html/files/作业情况/data.js
  62. 6 6
      public/html/作业情况.html
  63. 3 3
      public/html/学员管理.html
  64. 1 1
      public/html/异常处理.html
  65. 1 1
      public/html/新增学员.html
  66. 4 4
      public/html/服务指标明细.html
  67. 1 1
      public/html/课表列表.html
  68. 3 3
      src/api/afterSchool.js
  69. 2 2
      src/api/buildTeam.js
  70. 4 4
      src/api/specialSetting.js
  71. 1 0
      src/constant/index.js
  72. 1 1
      src/constant/instructionList.js
  73. 3 3
      src/router/index.js
  74. 4 3
      src/utils/searchArray.js
  75. 1 1
      src/views/accompanyManager/accompanyBuys.vue
  76. 3 3
      src/views/afterSchoolManager/afterWorkList.vue
  77. 201 0
      src/views/app/clouldSuggestion.vue
  78. 114 74
      src/views/app/suggestion.vue
  79. 51 0
      src/views/app/suggestionIndex.vue
  80. 2 2
      src/views/attendanceManager/attendanceList/index.vue
  81. 1 1
      src/views/auditList/index.vue
  82. 2 2
      src/views/businessManager/shopManager/shopCategory.vue
  83. 1 1
      src/views/categroyManager/generalSettings/errorManager.vue
  84. 1 1
      src/views/categroyManager/globalMusicGroup.vue
  85. 1 1
      src/views/categroyManager/specialSetup/cloudTeacherFee.vue
  86. 1 1
      src/views/categroyManager/specialSetup/discountManage.vue
  87. 12 12
      src/views/categroyManager/specialSetup/jobTemplateSetting.vue
  88. 1 1
      src/views/categroyManager/specialSetup/typesManager.vue
  89. 1 1
      src/views/childrensDay/resetDays.vue
  90. 3 3
      src/views/evaluateManager/networkList.vue
  91. 3 3
      src/views/evaluateManager/vipEvaluateList.vue
  92. 3 3
      src/views/helpCenter/helpCategory.vue
  93. 4 4
      src/views/main/constant.js
  94. 1 1
      src/views/musicInspection/modals/lookDetail.vue
  95. 1 1
      src/views/musicalManager/index.vue
  96. 4 4
      src/views/operateManager/modals/infoList.js
  97. 6 6
      src/views/operateManager/serverIndexDetail.vue
  98. 22 22
      src/views/operateManager/serverIndexList.vue
  99. 1 1
      src/views/repairManager/repairList.vue
  100. 1 1
      src/views/resetTeaming/components/archicesComponents/api.js

文件差異過大導致無法顯示
+ 0 - 0
dist/html/data/document.js


+ 3 - 3
dist/html/files/作业列表/data.js

@@ -1,7 +1,7 @@
 $axure.loadCurrentPage(
 (function() {
     var _ = function() { var r={},a=arguments; for(var i=0; i<a.length; i+=2) r[a[i]]=a[i+1]; return r; }
-    var _creator = function() { return _(b,c,d,e,f,g,h,g,i,_(j,k),l,[m],n,_(o,p,q,r,s,t,u,_(),v,_(w,x,y,z,A,_(B,C,D,E),F,null,G,z,H,z,I,J,K,null,L,M,N,O,P,Q,R,M),S,_(),T,_(),U,_(V,[])),W,_(),X,_());}; 
-var b="url",c="作业列表.html",d="generationDate",e=new Date(1621393508956.38),f="isCanvasEnabled",g=false,h="isAdaptiveEnabled",i="sketchKeys",j="",k="s0",l="variables",m="OnLoadVariable",n="page",o="packageId",p="9562fa63e1da4688a86a3b2656f21a66",q="type",r="Axure:Page",s="name",t="作业列表",u="notes",v="style",w="baseStyle",x="627587b6038d43cca051c114ac41ad32",y="pageAlignment",z="near",A="fill",B="fillType",C="solid",D="color",E=0xFFFFFFFF,F="image",G="imageHorizontalAlignment",H="imageVerticalAlignment",I="imageRepeat",J="auto",K="favicon",L="sketchFactor",M="0",N="colorStyle",O="appliedColor",P="fontName",Q="Applied Font",R="borderWidth",S="adaptiveStyles",T="interactionMap",U="diagram",V="objects",W="masters",X="objectPaths";
+    var _creator = function() { return _(b,c,d,e,f,g,h,g,i,_(j,k),l,[m],n,_(o,p,q,r,s,t,u,_(),v,_(w,x,y,z,A,_(B,C,D,E),F,null,G,z,H,z,I,J,K,null,L,M,N,O,P,Q,R,M),S,_(),T,_(),U,_(V,[])),W,_(),X,_());};
+var b="url",c="训练列表.html",d="generationDate",e=new Date(1621393508956.38),f="isCanvasEnabled",g=false,h="isAdaptiveEnabled",i="sketchKeys",j="",k="s0",l="variables",m="OnLoadVariable",n="page",o="packageId",p="9562fa63e1da4688a86a3b2656f21a66",q="type",r="Axure:Page",s="name",t="训练列表",u="notes",v="style",w="baseStyle",x="627587b6038d43cca051c114ac41ad32",y="pageAlignment",z="near",A="fill",B="fillType",C="solid",D="color",E=0xFFFFFFFF,F="image",G="imageHorizontalAlignment",H="imageVerticalAlignment",I="imageRepeat",J="auto",K="favicon",L="sketchFactor",M="0",N="colorStyle",O="appliedColor",P="fontName",Q="Applied Font",R="borderWidth",S="adaptiveStyles",T="interactionMap",U="diagram",V="objects",W="masters",X="objectPaths";
 return _creator();
-})());
+})());

文件差異過大導致無法顯示
+ 0 - 0
dist/html/files/作业情况/data.js


+ 6 - 6
dist/html/作业情况.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>作业情况</title>
+    <title>训练情况</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <link href="resources/css/axure_rp_page.css" type="text/css" rel="stylesheet"/>
     <link href="data/styles.css" type="text/css" rel="stylesheet"/>
-    <link href="files/作业情况/styles.css" type="text/css" rel="stylesheet"/>
+    <link href="files/训练情况/styles.css" type="text/css" rel="stylesheet"/>
     <script src="resources/scripts/jquery-3.2.1.min.js"></script>
     <script src="resources/scripts/axure/axQuery.js"></script>
     <script src="resources/scripts/axure/globals.js"></script>
@@ -38,7 +38,7 @@
     <script src="resources/scripts/axure/math.js"></script>
     <script src="resources/scripts/axure/jquery.nicescroll.min.js"></script>
     <script src="data/document.js"></script>
-    <script src="files/作业情况/data.js"></script>
+    <script src="files/训练情况/data.js"></script>
     <script type="text/javascript">
       $axure.utils.getTransparentGifPath = function() { return 'resources/images/transparent.gif'; };
       $axure.utils.getOtherPath = function() { return 'resources/Other.html'; };
@@ -50,7 +50,7 @@
 
       <!-- Unnamed (图片 ) -->
       <div id="u912" class="ax_default _图片">
-        <img id="u912_img" class="img " src="images/作业情况/u912.svg"/>
+        <img id="u912_img" class="img " src="images/训练情况/u912.svg"/>
         <div id="u912_text" class="text " style="display:none; visibility: hidden">
           <p></p>
         </div>
@@ -151,7 +151,7 @@
         <div id="u926" class="ax_default label">
           <div id="u926_div" class=""></div>
           <div id="u926_text" class="text ">
-            <p><span>作业情况</span></p>
+            <p><span>训练情况</span></p>
           </div>
         </div>
 
@@ -159,7 +159,7 @@
         <div id="u927" class="ax_default _文本段落">
           <div id="u927_div" class=""></div>
           <div id="u927_text" class="text ">
-            <p><span>可以选择时间段查询该乐团作业布置、提交、点评率</span></p><p><span>默认查询最近8周数据</span></p>
+            <p><span>可以选择时间段查询该乐团训练布置、提交、点评率</span></p><p><span>默认查询最近8周数据</span></p>
           </div>
         </div>
 

+ 3 - 3
dist/html/学员管理.html

@@ -203,7 +203,7 @@
         <div id="u2507" class="ax_default _文本段落">
           <div id="u2507_div" class=""></div>
           <div id="u2507_text" class="text ">
-            <p><span>点击【查看】按钮,可查询老师本周应布置的课后作业的具体课程及需要布置课外训练的学员名单</span></p>
+            <p><span>点击【查看】按钮,可查询老师本周应布置的课后训练的具体课程及需要布置课外训练的学员名单</span></p>
           </div>
         </div>
 
@@ -231,7 +231,7 @@
         <div id="u2511" class="ax_default _文本段落">
           <div id="u2511_div" class=""></div>
           <div id="u2511_text" class="text ">
-            <p><span>老师未布置本周作业时,可操作该按钮向老师发送布置作业的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
+            <p><span>老师未布置本周训练时,可操作该按钮向老师发送布置训练的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
           </div>
         </div>
 
@@ -267,7 +267,7 @@
         <div id="u2516" class="ax_default _文本段落">
           <div id="u2516_div" class=""></div>
           <div id="u2516_text" class="text ">
-            <p><span>该功能用于批量向老师发送布置作业提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
+            <p><span>该功能用于批量向老师发送布置训练提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
           </div>
         </div>
 

+ 1 - 1
dist/html/异常处理.html

@@ -771,7 +771,7 @@
         <div id="u110" class="ax_default _文本段落">
           <div id="u110_div" class=""></div>
           <div id="u110_text" class="text ">
-            <p style="line-height:22px;"><span>1、老师未按照服务指标布置作业时提醒该异常</span></p><p style="line-height:24px;"><span>2、点击【立即处理】跳转【服务指标明细】界面,可查看哪些老师有多少次作业未布置</span></p><p style="line-height:24px;"><span>3、</span><span style="color:#FF0006;">在【服务指标明细】页面提醒老师或老师将作业布置完成后,该异常取消</span></p>
+            <p style="line-height:22px;"><span>1、老师未按照服务指标布置训练时提醒该异常</span></p><p style="line-height:24px;"><span>2、点击【立即处理】跳转【服务指标明细】界面,可查看哪些老师有多少次训练未布置</span></p><p style="line-height:24px;"><span>3、</span><span style="color:#FF0006;">在【服务指标明细】页面提醒老师或老师将训练布置完成后,该异常取消</span></p>
           </div>
         </div>
 

+ 1 - 1
dist/html/新增学员.html

@@ -183,7 +183,7 @@
         <div id="u2547" class="ax_default _文本段落">
           <div id="u2547_div" class=""></div>
           <div id="u2547_text" class="text ">
-            <p><span>该功能用于开启或关闭学员服务指标,若开启,则系统会按照学员的排课情况按周生成服务指标(周期内学员由哪位老师布置作业,作业分为课后作业、课外训练)</span></p>
+            <p><span>该功能用于开启或关闭学员服务指标,若开启,则系统会按照学员的排课情况按周生成服务指标(周期内学员由哪位老师布置训练,训练分为课后训练、课外训练)</span></p>
           </div>
         </div>
 

+ 4 - 4
dist/html/服务指标明细.html

@@ -104,7 +104,7 @@
       <div id="u2653" class="ax_default _文本段落">
         <div id="u2653_div" class=""></div>
         <div id="u2653_text" class="text ">
-          <p><span>1、该页面是以老师的维度按周期统计老师需要服务的学员及具体服务方式(课后作业、课外训练)</span></p><p><span>2、学员开启服务指标</span></p><p><span>3、系统在每周期一凌晨跟根据排课情况生成本周的服务指标</span></p><p><span>4、</span><span style="color:#FF0006;">服务指标生成规则 &gt;&gt;</span></p>
+          <p><span>1、该页面是以老师的维度按周期统计老师需要服务的学员及具体服务方式(课后训练、课外训练)</span></p><p><span>2、学员开启服务指标</span></p><p><span>3、系统在每周期一凌晨跟根据排课情况生成本周的服务指标</span></p><p><span>4、</span><span style="color:#FF0006;">服务指标生成规则 &gt;&gt;</span></p>
         </div>
       </div>
 
@@ -155,7 +155,7 @@
         <div id="u2660" class="ax_default _文本段落">
           <div id="u2660_div" class=""></div>
           <div id="u2660_text" class="text ">
-            <p><span>点击【查看】按钮,可查询老师本周应布置的课后作业的具体课程及需要布置课外训练的学员名单</span></p>
+            <p><span>点击【查看】按钮,可查询老师本周应布置的课后训练的具体课程及需要布置课外训练的学员名单</span></p>
           </div>
         </div>
 
@@ -183,7 +183,7 @@
         <div id="u2664" class="ax_default _文本段落">
           <div id="u2664_div" class=""></div>
           <div id="u2664_text" class="text ">
-            <p><span>老师未布置本周作业时,可操作该按钮向老师发送布置作业的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
+            <p><span>老师未布置本周训练时,可操作该按钮向老师发送布置训练的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
           </div>
         </div>
 
@@ -219,7 +219,7 @@
         <div id="u2669" class="ax_default _文本段落">
           <div id="u2669_div" class=""></div>
           <div id="u2669_text" class="text ">
-            <p><span>该功能用于批量向老师发送布置作业提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
+            <p><span>该功能用于批量向老师发送布置训练提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
           </div>
         </div>
 

+ 1 - 1
dist/html/课表列表.html

@@ -316,7 +316,7 @@
       <div id="u2424" class="ax_default _文本段落">
         <div id="u2424_div" class=""></div>
         <div id="u2424_text" class="text ">
-          <p><span>该功能用于查看该课程具体信息,包括学员列表、学员考勤、老师列表、老师考勤、学员作业、学员评论、课程调整记录</span></p>
+          <p><span>该功能用于查看该课程具体信息,包括学员列表、学员考勤、老师列表、老师考勤、学员训练、学员评论、课程调整记录</span></p>
         </div>
       </div>
 

文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.d6717207.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-11146df6.c880e3ad.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-12c6ad92.8990afb2.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-18b37c00.2719a0c9.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-21be1105.4511da87.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-259e1df6.f212ea5a.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-28c38e1c.ef3c97df.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-2e95ee29.618382d6.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-2ee51586.928bccdc.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-34d9c888.0e7b5b9b.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-3c8b2a9c.d6648133.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-3d44bd43.939f3cb7.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-3f7c6ea7.32b3953f.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-430d43c6.975034c8.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-43e033dc.1561a9b6.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-48f2714c.eef1bd0f.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-495439dc.dba9b4db.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-496c88c2.5173ebb2.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-4a5767e5.ba5bcd18.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-584f76a2.6bce1520.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-59c1227c.12607351.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-5a425c8a.a650582e.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-5bcfc712.c37a5970.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-5e5a3aa0.b6100d2b.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-5f5ffb00.de3f9082.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-6d4a0a0a.6b31a302.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-709d6afe.71344587.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-736f8818.dd8320bc.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-739fed81.806f6850.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-7b7bb8fa.8c47f45d.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-7f91ee0d.8e56d732.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-93b49e4a.2a284cf3.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-9cf825a4.44026cee.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-a23e2ba4.481d9a61.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-b2c32afa.f6ee4235.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-b5446cf6.76b09491.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-b95689ac.ab52ecf4.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-c0b0701c.08ac5272.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-c23a63d0.3095954e.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-c68f3e9e.302cbcdf.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-c7f5974e.ae4d6a9c.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-ce48cac0.7f203473.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-d00fd9e4.151e975a.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-d4a89ac0.2e8eeb8d.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-d9fbd972.050ceccd.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-da63f3ae.54836ee7.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-ebb0bb00.2f212a8d.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-fae5b3fa.cd41de16.js


文件差異過大導致無法顯示
+ 1 - 0
dist/static/js/chunk-fb5bfd66.a448ad3a.js


文件差異過大導致無法顯示
+ 0 - 0
public/html/data/document.js


+ 3 - 3
public/html/files/作业列表/data.js

@@ -1,7 +1,7 @@
 $axure.loadCurrentPage(
 (function() {
     var _ = function() { var r={},a=arguments; for(var i=0; i<a.length; i+=2) r[a[i]]=a[i+1]; return r; }
-    var _creator = function() { return _(b,c,d,e,f,g,h,g,i,_(j,k),l,[m],n,_(o,p,q,r,s,t,u,_(),v,_(w,x,y,z,A,_(B,C,D,E),F,null,G,z,H,z,I,J,K,null,L,M,N,O,P,Q,R,M),S,_(),T,_(),U,_(V,[])),W,_(),X,_());}; 
-var b="url",c="作业列表.html",d="generationDate",e=new Date(1621393508956.38),f="isCanvasEnabled",g=false,h="isAdaptiveEnabled",i="sketchKeys",j="",k="s0",l="variables",m="OnLoadVariable",n="page",o="packageId",p="9562fa63e1da4688a86a3b2656f21a66",q="type",r="Axure:Page",s="name",t="作业列表",u="notes",v="style",w="baseStyle",x="627587b6038d43cca051c114ac41ad32",y="pageAlignment",z="near",A="fill",B="fillType",C="solid",D="color",E=0xFFFFFFFF,F="image",G="imageHorizontalAlignment",H="imageVerticalAlignment",I="imageRepeat",J="auto",K="favicon",L="sketchFactor",M="0",N="colorStyle",O="appliedColor",P="fontName",Q="Applied Font",R="borderWidth",S="adaptiveStyles",T="interactionMap",U="diagram",V="objects",W="masters",X="objectPaths";
+    var _creator = function() { return _(b,c,d,e,f,g,h,g,i,_(j,k),l,[m],n,_(o,p,q,r,s,t,u,_(),v,_(w,x,y,z,A,_(B,C,D,E),F,null,G,z,H,z,I,J,K,null,L,M,N,O,P,Q,R,M),S,_(),T,_(),U,_(V,[])),W,_(),X,_());};
+var b="url",c="训练列表.html",d="generationDate",e=new Date(1621393508956.38),f="isCanvasEnabled",g=false,h="isAdaptiveEnabled",i="sketchKeys",j="",k="s0",l="variables",m="OnLoadVariable",n="page",o="packageId",p="9562fa63e1da4688a86a3b2656f21a66",q="type",r="Axure:Page",s="name",t="训练列表",u="notes",v="style",w="baseStyle",x="627587b6038d43cca051c114ac41ad32",y="pageAlignment",z="near",A="fill",B="fillType",C="solid",D="color",E=0xFFFFFFFF,F="image",G="imageHorizontalAlignment",H="imageVerticalAlignment",I="imageRepeat",J="auto",K="favicon",L="sketchFactor",M="0",N="colorStyle",O="appliedColor",P="fontName",Q="Applied Font",R="borderWidth",S="adaptiveStyles",T="interactionMap",U="diagram",V="objects",W="masters",X="objectPaths";
 return _creator();
-})());
+})());

文件差異過大導致無法顯示
+ 0 - 0
public/html/files/作业情况/data.js


+ 6 - 6
public/html/作业情况.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>作业情况</title>
+    <title>训练情况</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <link href="resources/css/axure_rp_page.css" type="text/css" rel="stylesheet"/>
     <link href="data/styles.css" type="text/css" rel="stylesheet"/>
-    <link href="files/作业情况/styles.css" type="text/css" rel="stylesheet"/>
+    <link href="files/训练情况/styles.css" type="text/css" rel="stylesheet"/>
     <script src="resources/scripts/jquery-3.2.1.min.js"></script>
     <script src="resources/scripts/axure/axQuery.js"></script>
     <script src="resources/scripts/axure/globals.js"></script>
@@ -38,7 +38,7 @@
     <script src="resources/scripts/axure/math.js"></script>
     <script src="resources/scripts/axure/jquery.nicescroll.min.js"></script>
     <script src="data/document.js"></script>
-    <script src="files/作业情况/data.js"></script>
+    <script src="files/训练情况/data.js"></script>
     <script type="text/javascript">
       $axure.utils.getTransparentGifPath = function() { return 'resources/images/transparent.gif'; };
       $axure.utils.getOtherPath = function() { return 'resources/Other.html'; };
@@ -50,7 +50,7 @@
 
       <!-- Unnamed (图片 ) -->
       <div id="u912" class="ax_default _图片">
-        <img id="u912_img" class="img " src="images/作业情况/u912.svg"/>
+        <img id="u912_img" class="img " src="images/训练情况/u912.svg"/>
         <div id="u912_text" class="text " style="display:none; visibility: hidden">
           <p></p>
         </div>
@@ -151,7 +151,7 @@
         <div id="u926" class="ax_default label">
           <div id="u926_div" class=""></div>
           <div id="u926_text" class="text ">
-            <p><span>作业情况</span></p>
+            <p><span>训练情况</span></p>
           </div>
         </div>
 
@@ -159,7 +159,7 @@
         <div id="u927" class="ax_default _文本段落">
           <div id="u927_div" class=""></div>
           <div id="u927_text" class="text ">
-            <p><span>可以选择时间段查询该乐团作业布置、提交、点评率</span></p><p><span>默认查询最近8周数据</span></p>
+            <p><span>可以选择时间段查询该乐团训练布置、提交、点评率</span></p><p><span>默认查询最近8周数据</span></p>
           </div>
         </div>
 

+ 3 - 3
public/html/学员管理.html

@@ -203,7 +203,7 @@
         <div id="u2507" class="ax_default _文本段落">
           <div id="u2507_div" class=""></div>
           <div id="u2507_text" class="text ">
-            <p><span>点击【查看】按钮,可查询老师本周应布置的课后作业的具体课程及需要布置课外训练的学员名单</span></p>
+            <p><span>点击【查看】按钮,可查询老师本周应布置的课后训练的具体课程及需要布置课外训练的学员名单</span></p>
           </div>
         </div>
 
@@ -231,7 +231,7 @@
         <div id="u2511" class="ax_default _文本段落">
           <div id="u2511_div" class=""></div>
           <div id="u2511_text" class="text ">
-            <p><span>老师未布置本周作业时,可操作该按钮向老师发送布置作业的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
+            <p><span>老师未布置本周训练时,可操作该按钮向老师发送布置训练的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
           </div>
         </div>
 
@@ -267,7 +267,7 @@
         <div id="u2516" class="ax_default _文本段落">
           <div id="u2516_div" class=""></div>
           <div id="u2516_text" class="text ">
-            <p><span>该功能用于批量向老师发送布置作业提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
+            <p><span>该功能用于批量向老师发送布置训练提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
           </div>
         </div>
 

+ 1 - 1
public/html/异常处理.html

@@ -771,7 +771,7 @@
         <div id="u110" class="ax_default _文本段落">
           <div id="u110_div" class=""></div>
           <div id="u110_text" class="text ">
-            <p style="line-height:22px;"><span>1、老师未按照服务指标布置作业时提醒该异常</span></p><p style="line-height:24px;"><span>2、点击【立即处理】跳转【服务指标明细】界面,可查看哪些老师有多少次作业未布置</span></p><p style="line-height:24px;"><span>3、</span><span style="color:#FF0006;">在【服务指标明细】页面提醒老师或老师将作业布置完成后,该异常取消</span></p>
+            <p style="line-height:22px;"><span>1、老师未按照服务指标布置训练时提醒该异常</span></p><p style="line-height:24px;"><span>2、点击【立即处理】跳转【服务指标明细】界面,可查看哪些老师有多少次训练未布置</span></p><p style="line-height:24px;"><span>3、</span><span style="color:#FF0006;">在【服务指标明细】页面提醒老师或老师将训练布置完成后,该异常取消</span></p>
           </div>
         </div>
 

+ 1 - 1
public/html/新增学员.html

@@ -183,7 +183,7 @@
         <div id="u2547" class="ax_default _文本段落">
           <div id="u2547_div" class=""></div>
           <div id="u2547_text" class="text ">
-            <p><span>该功能用于开启或关闭学员服务指标,若开启,则系统会按照学员的排课情况按周生成服务指标(周期内学员由哪位老师布置作业,作业分为课后作业、课外训练)</span></p>
+            <p><span>该功能用于开启或关闭学员服务指标,若开启,则系统会按照学员的排课情况按周生成服务指标(周期内学员由哪位老师布置训练,训练分为课后训练、课外训练)</span></p>
           </div>
         </div>
 

+ 4 - 4
public/html/服务指标明细.html

@@ -104,7 +104,7 @@
       <div id="u2653" class="ax_default _文本段落">
         <div id="u2653_div" class=""></div>
         <div id="u2653_text" class="text ">
-          <p><span>1、该页面是以老师的维度按周期统计老师需要服务的学员及具体服务方式(课后作业、课外训练)</span></p><p><span>2、学员开启服务指标</span></p><p><span>3、系统在每周期一凌晨跟根据排课情况生成本周的服务指标</span></p><p><span>4、</span><span style="color:#FF0006;">服务指标生成规则 &gt;&gt;</span></p>
+          <p><span>1、该页面是以老师的维度按周期统计老师需要服务的学员及具体服务方式(课后训练、课外训练)</span></p><p><span>2、学员开启服务指标</span></p><p><span>3、系统在每周期一凌晨跟根据排课情况生成本周的服务指标</span></p><p><span>4、</span><span style="color:#FF0006;">服务指标生成规则 &gt;&gt;</span></p>
         </div>
       </div>
 
@@ -155,7 +155,7 @@
         <div id="u2660" class="ax_default _文本段落">
           <div id="u2660_div" class=""></div>
           <div id="u2660_text" class="text ">
-            <p><span>点击【查看】按钮,可查询老师本周应布置的课后作业的具体课程及需要布置课外训练的学员名单</span></p>
+            <p><span>点击【查看】按钮,可查询老师本周应布置的课后训练的具体课程及需要布置课外训练的学员名单</span></p>
           </div>
         </div>
 
@@ -183,7 +183,7 @@
         <div id="u2664" class="ax_default _文本段落">
           <div id="u2664_div" class=""></div>
           <div id="u2664_text" class="text ">
-            <p><span>老师未布置本周作业时,可操作该按钮向老师发送布置作业的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
+            <p><span>老师未布置本周训练时,可操作该按钮向老师发送布置训练的提醒,提醒后首页-异常提醒-服务指标异常会取消该异常</span></p>
           </div>
         </div>
 
@@ -219,7 +219,7 @@
         <div id="u2669" class="ax_default _文本段落">
           <div id="u2669_div" class=""></div>
           <div id="u2669_text" class="text ">
-            <p><span>该功能用于批量向老师发送布置作业提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
+            <p><span>该功能用于批量向老师发送布置训练提醒</span></p><p><span>1、在列表中勾选需要的发送提醒的老师</span></p><p><span>2、点击【批量提醒】按钮</span></p>
           </div>
         </div>
 

+ 1 - 1
public/html/课表列表.html

@@ -316,7 +316,7 @@
       <div id="u2424" class="ax_default _文本段落">
         <div id="u2424_div" class=""></div>
         <div id="u2424_text" class="text ">
-          <p><span>该功能用于查看该课程具体信息,包括学员列表、学员考勤、老师列表、老师考勤、学员作业、学员评论、课程调整记录</span></p>
+          <p><span>该功能用于查看该课程具体信息,包括学员列表、学员考勤、老师列表、老师考勤、学员训练、学员评论、课程调整记录</span></p>
         </div>
       </div>
 

+ 3 - 3
src/api/afterSchool.js

@@ -11,7 +11,7 @@ export function queryPageList(data) {
     })
 }
 
-// 课外作业
+// 课外训练
 export function extracurricularExercisesReply(data) {
     return request({
       url: api + '/extracurricularExercisesReply/queryPageList',
@@ -19,7 +19,7 @@ export function extracurricularExercisesReply(data) {
       params: data
     })
 }
-// 作业详情
+// 训练详情
 export function findStudentExtraExerciseDetail(data) {
     return request({
       url: api + '/extracurricularExercises/findStudentExtraExerciseDetail',
@@ -34,4 +34,4 @@ export function findStudentExtracurricularExercisesSituations(data) {
     method: 'get',
     params: data
   })
-}
+}

+ 2 - 2
src/api/buildTeam.js

@@ -914,7 +914,7 @@ export function getTeacherPersonalAttendance (data) {
   })
 }
 
-// 获取作业列表
+// 获取训练列表
 export function findStudentCourseHomeworks (data) {
   return request({
     url: api + '/studentManage/findStudentCourseHomeworks',
@@ -932,7 +932,7 @@ export function teacherCourseStatistics (data) {
   })
 }
 
-// 老师布置的作业
+// 老师布置的训练
 export function getCourseScheduleHomework (data) {
   return request({
     url: api + '/teacher/getCourseScheduleHomework',

+ 4 - 4
src/api/specialSetting.js

@@ -92,7 +92,7 @@ export function chargeTypeDel (data) {
   })
 }
 
-// 分页查询作业模板列表
+// 分页查询训练模板列表
 export function courseHomeworkTemplateList (data) {
   return request({
     url: api + '/courseHomeworkTemplate/queryPage',
@@ -101,7 +101,7 @@ export function courseHomeworkTemplateList (data) {
   })
 }
 
-// 修改作业模板
+// 修改训练模板
 export function homeWorkUpdate (data) {
   return request({
     url: api + '/courseHomeworkTemplate/update',
@@ -110,7 +110,7 @@ export function homeWorkUpdate (data) {
   })
 }
 
-// 修改作业模板
+// 修改训练模板
 export function homeWorkAdd (data) {
   return request({
     url: api + '/courseHomeworkTemplate/add',
@@ -120,7 +120,7 @@ export function homeWorkAdd (data) {
 }
 
 
-// 修改作业模板
+// 修改训练模板
 export function homeWorkDel (id) {
   return request({
     url: api + `/courseHomeworkTemplate/del/${id}`,

+ 1 - 0
src/constant/index.js

@@ -256,6 +256,7 @@ export const ProbationPeriodStatus = {
 export const clientType = {
   STUDENT:'学生端',
   TEACHER:'老师端',
+  EDUCATION:'教务端'
 
 }
 // export const musicScoreCategoriesId = [

+ 1 - 1
src/constant/instructionList.js

@@ -19,7 +19,7 @@ export const instructionList = {
     2:'学员_师资',
     3:'训练规划',
     4:'训练时长',
-    5:'作业情况',
+    5:'训练情况',
     6:'训练照片',
     9:'展演_证书',
     7:'乐团资讯',

+ 3 - 3
src/router/index.js

@@ -297,7 +297,7 @@ export const asyncRoutes = {
   // 添加或修改
   entryOperation: () => import('@/views/app/entryOperation'),
   // 意见反馈
-  suggestion: () => import('@/views/app/suggestion'),
+  suggestion: () => import('@/views/app/suggestionIndex'),
   // 帮助分类
   helpCategory: () => import('@/views/helpCenter/helpCategory'),
   // 帮助内容
@@ -306,7 +306,7 @@ export const asyncRoutes = {
   incomeOut: () => import('@/views/businessManager/orderManager/incomeOut'),
   // // 课外训练
   // afterSchoolList:()=>import('@/views/afterSchoolManager/afterSchoolList'),
-  // // 课外作业
+  // // 课外训练
   // afterWorkList:()=>import('@/views/afterSchoolManager/afterWorkList'),
   // 课外管理
   afterSchoolManager: () => import('@/views/afterSchoolManager'),
@@ -384,7 +384,7 @@ export const asyncRoutes = {
   classManager: () => import('@/views/courseListManager'),
   // 课程管理
   courseManager: () => import('@/views/courseListManager'),
-  // 作业管理
+  // 训练管理
   workManager: () => import('@/views/courseListManager'),
   // 老师管理
  teacherManager: () => import('@/views/courseListManager'),

+ 4 - 3
src/utils/searchArray.js

@@ -1,5 +1,5 @@
 // 搜索用的下拉数据列表
-import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,downListType,musicGroupType,conclusion,vipResetType,courseViewType } from '../constant'
+import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,downListType,musicGroupType,conclusion,vipResetType,courseViewType,clientType } from '../constant'
 // 课程类型
 export const courseType = [
   { label: "声部课", value: "SINGLE" },
@@ -150,12 +150,12 @@ export const practiceGroupType = [
 ]
 export const visitChiose = [
   { value: '课程推荐', label: '课程推荐', children: [{ value: '新课推荐', label: '新课推荐' }, { value: '续费提醒', label: '续费提醒' }] },
-  { value: '常规回访', label: '常规回访', children: [{ value: '课后及作业回访', label: '课后及作业回访' }, { value: '练习及乐团表现', label: '练习及乐团表现' }] },
+  { value: '常规回访', label: '常规回访', children: [{ value: '课后及训练回访', label: '课后及训练回访' }, { value: '练习及乐团表现', label: '练习及乐团表现' }] },
   { value: '其它', label: '其它', children: [{ value: '其它', label: '其它' }] }
 ]
 export const visitChiose1 = [
   { value: '课程推荐', label: '课程推荐', children: [{ value: '新课推荐', label: '新课推荐' }, { value: '续费提醒', label: '续费提醒' }] },
-  { value: '常规回访', label: '常规回访', children: [{ value: '课后及作业回访', label: '课后及作业回访' }, { value: '练习及乐团表现', label: '练习及乐团表现' },{ label:'考勤申诉',  value:'考勤申诉' }, { value: "异常请假回访", label: "异常请假回访" }] },
+  { value: '常规回访', label: '常规回访', children: [{ value: '课后及训练回访', label: '课后及训练回访' }, { value: '练习及乐团表现', label: '练习及乐团表现' },{ label:'考勤申诉',  value:'考勤申诉' }, { value: "异常请假回访", label: "异常请假回访" }] },
   { value: '其它', label: '其它', children: [{ value: '其它', label: '其它' },{ value: '会员续费', label: '会员续费' }] }
 ]
 
@@ -230,6 +230,7 @@ export const musicClassTypeList =  getValueForKey(musicClassType)
 export const ProbationPeriodList = getValueForKey(ProbationPeriodStatus)
 export const downTypeList = getValueForKey(downListType)
 export const conclusionList = getValueForKey(conclusion)
+export const clientList = getValueForKey(clientType)
 //downListType
 function getValueForKey (obj) {
   let arr = []

+ 1 - 1
src/views/accompanyManager/accompanyBuys.vue

@@ -14,7 +14,7 @@
         <el-input
           v-model.trim="searchForm.search"
           clearable
-          placeholder="学员编号 学员名称"
+          placeholder="学员编号学员名称"
         ></el-input>
       </el-form-item>
       <el-form-item>

+ 3 - 3
src/views/afterSchoolManager/afterWorkList.vue

@@ -2,7 +2,7 @@
 <template>
   <div class>
     <!-- <h2>
-      <div class="squrt"></div>课外作业
+      <div class="squrt"></div>课外训练
     </h2>-->
     <div class="m-core">
       <save-form :inline="true"
@@ -148,7 +148,7 @@
                            prop="userId"
                            label="学生编号"></el-table-column>
           <el-table-column align="center"
-                           label="提交作业">
+                           label="提交训练">
             <template slot-scope="scope">
               <div>{{scope.row.status?'是':'否'}}</div>
             </template>
@@ -240,7 +240,7 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <el-dialog title="查看作业"
+    <el-dialog title="查看训练"
                width="680px"
                append-to-body
                :visible.sync="workVisible">

+ 201 - 0
src/views/app/clouldSuggestion.vue

@@ -0,0 +1,201 @@
+<template>
+  <!-- <div class='m-container'> -->
+  <!-- <h2>
+      <div class="squrt"></div>意见反馈
+    </h2> -->
+  <div class="m-core">
+    <save-form
+      :inline="true"
+      class="searchForm"
+      save-key="clouldSuggestion"
+      @submit="search"
+      @reset="onReSet"
+      :model.sync="searchForm"
+      ref="searchForm"
+    >
+      <!-- 状态 指导老师 活动方案-->
+      <el-form-item prop="search">
+        <el-input
+          v-model.trim="searchForm.search"
+          clearable
+          placeholder="姓名、编号、手机号"
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item  prop="clientType">
+        <el-select clearable v-model="searchForm.clientType">
+          <el-option
+            v-for="(item, index) in clientList"
+            :key="index"
+            :value="item.value"
+            :label="item.label"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- statusList -->
+      <el-form-item prop="timer">
+        <el-date-picker
+          v-model.trim="searchForm.timer"
+          style="width: 400px"
+          type="daterange"
+          :picker-options="{
+            firstDayOfWeek: 1,
+          }"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button native-type="submit" type="danger">搜索</el-button>
+        <el-button native-type="reset" type="primary">重置</el-button>
+      </el-form-item>
+    </save-form>
+    <div class="tableWrap">
+      <el-table
+        :data="dataList"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      >
+        <el-table-column align="center" label="反馈时间" prop="createTime">
+          <template slot-scope="scope">
+            {{ scope.row.createTime | dateForMinFormat }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column align="center" prop="name" label="标题"> -->
+        <!-- </el-table-column> -->
+        <el-table-column align="center" label="内容" prop="content">
+          <template slot-scope="scope">
+            <tooltip :content="scope.row.content" />
+            <!-- <el-popover placement="top-start"
+                          width="300"
+                          trigger="hover"
+                          :content="scope.row.content">
+                <span slot="reference">{{ scope.row.content }}</span>
+              </el-popover> -->
+            <!-- <div :title="scope.row.content">{{ scope.row.content }}</div> -->
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="用户"
+          prop="username"
+        ></el-table-column>
+        <el-table-column align="center" prop="mobileNo" label="邮箱或手机号">
+        </el-table-column>
+        <el-table-column align="center" label="客户端" prop="clientType">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.clientType | clientTypeFilter }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="createTime" label="反馈时间">
+        </el-table-column>
+      </el-table>
+      <pagination
+        sync
+        :total.sync="pageInfo.total"
+        save-key="clouldSuggestion"
+        :page.sync="pageInfo.page"
+        :limit.sync="pageInfo.limit"
+        :page-sizes="pageInfo.page_size"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+  <!-- </div> -->
+</template>
+<script>
+import pagination from "@/components/Pagination/index";
+import { sysSuggestionList } from "@/api/appTenant";
+import Tooltip from "@/components/Tooltip/index";
+import { clientList } from "@/utils/searchArray";
+import { getTimes } from "@/utils";
+export default {
+  components: { pagination, Tooltip },
+  name: "chargesList",
+  data() {
+    return {
+      id: null,
+      dataList: [],
+      clientList,
+      searchForm: {
+        search: "",
+        timer: [],
+        clientType: "",
+      },
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+    };
+  },
+  activated() {
+    this.getList();
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      let { timer, ...rest } = this.searchForm;
+      let params = {
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page,
+        type: "SMART_PRACTICE",
+        ...getTimes(timer, ["startTime", "endTime"]),
+        ...rest,
+      };
+      sysSuggestionList(params).then((res) => {
+        if (res.code == 200) {
+          this.dataList = res.data.rows;
+          this.pageInfo.total = res.data.total;
+        }
+      });
+    },
+    onReSet() {
+      this.$refs["searchForm"].resetFields();
+      this.search();
+    },
+    search() {
+      this.pageInfo.page = 1;
+      this.getList();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover,
+  &:active,
+  &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #fff;
+  }
+}
+/deep/.el-table .cell {
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
+/deep/.el-date-editor.el-input {
+  width: 100% !important;
+}
+/deep/.el-select {
+  width: 98% !important;
+}
+
+/deep/.el-table {
+  display: inline-block;
+}
+</style>

+ 114 - 74
src/views/app/suggestion.vue

@@ -1,80 +1,106 @@
 <template>
-  <div class='m-container'>
-    <h2>
+  <!-- <div class='m-container'> -->
+  <!-- <h2>
       <div class="squrt"></div>意见反馈
-    </h2>
-    <div class="m-core">
-      <div class="tableWrap">
-        <el-table :data="dataList"
-                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-
-          <el-table-column align="center"
-                           label="反馈时间"
-                           prop="createTime">
-            <template slot-scope="scope">
-              {{scope.row.createTime | dateForMinFormat}}
-            </template>
-          </el-table-column>
-          <!-- <el-table-column align="center" prop="name" label="标题"> -->
-          <!-- </el-table-column> -->
-          <el-table-column align="center"
-                           label="内容"
-                           prop="content">
-            <template slot-scope="scope">
-              <tooltip :content="scope.row.content" />
-              <!-- <el-popover placement="top-start"
+    </h2> -->
+  <div class="m-core">
+    <save-form
+      :inline="true"
+      class="searchForm"
+      save-key="Suggestion"
+      @submit="search"
+      @reset="onReSet"
+      :model.sync="searchForm"
+      ref="searchForm"
+    >
+      <el-form-item prop="timer">
+        <el-date-picker
+          v-model.trim="searchForm.timer"
+          style="width: 400px"
+          type="daterange"
+          :picker-options="{
+            firstDayOfWeek: 1,
+          }"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button native-type="submit" type="danger">搜索</el-button>
+        <el-button native-type="reset" type="primary">重置</el-button>
+      </el-form-item>
+    </save-form>
+    <div class="tableWrap">
+      <el-table
+        :data="dataList"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      >
+        <el-table-column align="center" label="反馈时间" prop="createTime">
+          <template slot-scope="scope">
+            {{ scope.row.createTime | dateForMinFormat }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column align="center" prop="name" label="标题"> -->
+        <!-- </el-table-column> -->
+        <el-table-column align="center" label="内容" prop="content">
+          <template slot-scope="scope">
+            <tooltip :content="scope.row.content" />
+            <!-- <el-popover placement="top-start"
                           width="300"
                           trigger="hover"
                           :content="scope.row.content">
                 <span slot="reference">{{ scope.row.content }}</span>
               </el-popover> -->
-              <!-- <div :title="scope.row.content">{{ scope.row.content }}</div> -->
-            </template>
-          </el-table-column>
-          <el-table-column align="center"
-                           label="用户"
-                           prop="username"></el-table-column>
-          <el-table-column align="center"
-                           prop="mobileNo"
-                           label="邮箱或手机号">
-          </el-table-column>
-          <el-table-column align="center"
-                           label="客户端"
-                           prop="clientType">
-                           <template slot-scope="scope">
-                             <div>
-                               {{scope.row.clientType|clientTypeFilter}}
-                             </div>
-                           </template>
-
-                           </el-table-column>
-          <!-- <el-table-column align="center"
+            <!-- <div :title="scope.row.content">{{ scope.row.content }}</div> -->
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="用户"
+          prop="username"
+        ></el-table-column>
+        <el-table-column align="center" prop="mobileNo" label="邮箱或手机号">
+        </el-table-column>
+        <el-table-column align="center" label="客户端" prop="clientType">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.clientType | clientTypeFilter }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="createTime" label="反馈时间">
+        </el-table-column>
+        <!-- <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">
               <el-button type="text" v-permission="'/entryOperationLook'" @click="onChargeOperation('look', scope.row)">查看</el-button>
             </template>
           </el-table-column> -->
-        </el-table>
-        <pagination
+      </el-table>
+      <pagination
         sync
         :total.sync="pageInfo.total"
-                    :page.sync="pageInfo.page"
-                    :limit.sync="pageInfo.limit"
-                    :page-sizes="pageInfo.page_size"
-                    @pagination="getList" />
-      </div>
-
+        :page.sync="pageInfo.page"
+        :limit.sync="pageInfo.limit"
+        :page-sizes="pageInfo.page_size"
+        @pagination="getList"
+        save-key="Suggestion"
+      />
     </div>
   </div>
+  <!-- </div> -->
 </template>
 <script>
-import pagination from '@/components/Pagination/index'
-import { sysSuggestionList } from '@/api/appTenant'
-import Tooltip from '@/components/Tooltip/index'
+import pagination from "@/components/Pagination/index";
+import { sysSuggestionList } from "@/api/appTenant";
+import { getTimes } from "@/utils";
+import Tooltip from "@/components/Tooltip/index";
 export default {
   components: { pagination, Tooltip },
-  name: 'chargesList',
-  data () {
+  name: "chargesList",
+  data() {
     return {
       id: null,
       dataList: [],
@@ -83,31 +109,45 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
-    }
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      searchForm: {
+        timer: [],
+      },
+    };
   },
-  activated () {
-    this.getList()
+  activated() {
+    this.getList();
   },
-  mounted () {
-    this.getList()
+  mounted() {
+    this.getList();
   },
   methods: {
-    getList () {
+    getList() {
+      let { timer, ...rest } = this.searchForm;
       let params = {
         rows: this.pageInfo.limit,
-        page: this.pageInfo.page
-      }
-      sysSuggestionList(params).then(res => {
+        page: this.pageInfo.page,
+        type: "APP",
+        ...getTimes(timer, ["startTime", "endTime"]),
+      };
+      sysSuggestionList(params).then((res) => {
         if (res.code == 200) {
-          this.dataList = res.data.rows
-          this.pageInfo.total = res.data.total
+          this.dataList = res.data.rows;
+          this.pageInfo.total = res.data.total;
         }
-      })
-    }
-  }
-}
+      });
+    },
+    onReSet() {
+      this.$refs["searchForm"].resetFields();
+      this.search();
+    },
+    search() {
+      this.pageInfo.page = 1;
+      this.getList();
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 /deep/.el-button--primary {

+ 51 - 0
src/views/app/suggestionIndex.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      意见反馈
+    </h2>
+    <div class="m-core">
+      <tab-router
+        v-model.trim="activeIndex"
+        type="card"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane label="APP反馈" lazy name="1" v-if="permissionList.suggestion">
+          <suggestion v-if="activeIndex === '1'" />
+        </el-tab-pane>
+        <el-tab-pane label="云教练反馈" lazy name="2" v-if="permissionList.clouldSuggestion">
+          <clouldSuggestion v-if="activeIndex === '2'"  />
+        </el-tab-pane>
+      </tab-router>
+    </div>
+  </div>
+</template>
+<script>
+import suggestion from "./suggestion";
+import clouldSuggestion from "./clouldSuggestion";
+import { permission } from "@/utils/directivePage";
+// /suggestion /clouldSuggestion
+export default {
+  components: { suggestion, clouldSuggestion },
+  data() {
+    return {
+      activeIndex: "1",
+      permissionList: {
+        suggestion: permission("/suggestion"),
+        clouldSuggestion: permission("/clouldSuggestion"),
+      },
+    };
+  },
+  //生命周期 - 创建完成(可以访问当前this实例)
+  created() {},
+  //生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {},
+  methods: {
+    handleClick(evt) {
+      // this.changeHash(evt.name);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

+ 2 - 2
src/views/attendanceManager/attendanceList/index.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      作业列表
+      训练列表
     </h2>
     <div class="m-core">
       <save-form
@@ -148,7 +148,7 @@
           :page-sizes="rules.page_size"
           @pagination="getList"
         />
-        <el-dialog title="作业详情" :visible.sync="classVisible" width="1000px" v-if="classVisible">
+        <el-dialog title="训练详情" :visible.sync="classVisible" width="1000px" v-if="classVisible">
           <studentWork
             v-if="activeRow"
             :courseScheduleId="activeRow.courseScheduleId"

+ 1 - 1
src/views/auditList/index.vue

@@ -18,7 +18,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="search"
-            placeholder="乐团名称/编号"
+            placeholder="乐团名称编号"
           ></el-input>
         </el-form-item>
         <el-form-item>

+ 2 - 2
src/views/businessManager/shopManager/shopCategory.vue

@@ -133,7 +133,7 @@ export default {
       typeStatus: false, // 添加教学点
       formLabelWidth: "120px",
       form: {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         subjectIds: [],
       },
       rules: {
@@ -237,7 +237,7 @@ export default {
     onFormClose(formName) {
       // 关闭弹窗重置验证
       this.form = {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         subjectIds: [],
       };
       this.$refs[formName].resetFields();

+ 1 - 1
src/views/categroyManager/generalSettings/errorManager.vue

@@ -163,7 +163,7 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         subjectIds: []
       }
       this.$refs[formName].resetFields()

+ 1 - 1
src/views/categroyManager/globalMusicGroup.vue

@@ -59,7 +59,7 @@
             <musicCourseFee v-if="activeIndex == 10" />
           </el-tab-pane>
           <el-tab-pane
-            label="乐团作业模板"
+            label="乐团训练模板"
             lazy
             name="4"
             v-if="permissionList.jobTemplateSetting"

+ 1 - 1
src/views/categroyManager/specialSetup/cloudTeacherFee.vue

@@ -225,7 +225,7 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
-        organId: null, // 作业模块名称
+        organId: null, // 训练模块名称
         price: null,
         plusPrice: null
       }

+ 1 - 1
src/views/categroyManager/specialSetup/discountManage.vue

@@ -318,7 +318,7 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         subjectId: null,
         goodsDiscountRate: null,
       }

+ 12 - 12
src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <!-- <h2>作业模板管理</h2> -->
+    <!-- <h2>训练模板管理</h2> -->
     <div class="m-core">
       <div class='newBand' v-permission="'courseHomeworkTemplate/add'"
            @click="openJob('create')">添加</div>
@@ -10,7 +10,7 @@
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
                            prop="name"
-                           label="作业模板名称">
+                           label="训练模板名称">
           </el-table-column>
           <el-table-column align='center'
                            prop="classGroupTypeName"
@@ -55,7 +55,7 @@
         <el-form :model="form"
                  :rules="rules"
                  ref="ruleForm">
-          <el-form-item label="作业模板名称"
+          <el-form-item label="训练模板名称"
                         prop="name"
                         :label-width="formLabelWidth">
             <el-input v-model.trim="form.name"
@@ -84,7 +84,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="作业内容"
+          <el-form-item label="训练内容"
                         prop="content"
                         :label-width="formLabelWidth">
             <el-input type="textarea"
@@ -115,22 +115,22 @@ export default {
       tableList: [],
       formActionTitle: 'create',
       formTitle: {
-        create: '添加作业模板',
-        update: '修改作业模板'
+        create: '添加训练模板',
+        update: '修改训练模板'
       },
       jobStatus: false, // 添加教学点
       formLabelWidth: '120px',
       form: {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         classGroupType: null,
         subjectId: null,
         content: null
       },
       rules: {
-        name: [{ required: true, message: '请输入作业模板名称', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入训练模板名称', trigger: 'blur' }],
         classGroupType: [{ required: true, message: '请选择对应课程类型', trigger: 'change' }],
         subjectId: [{ required: true, message: '请选择声部', trigger: 'change' }],
-        content: [{ required: true, message: '请输入作业内容', trigger: 'blur' }]
+        content: [{ required: true, message: '请输入训练内容', trigger: 'blur' }]
       },
       pageInfo: {
         // 分页规则
@@ -177,7 +177,7 @@ export default {
       if (type == 'update') {
         this.form = {
           id: row.id,
-          name: row.name, // 作业模块名称
+          name: row.name, // 训练模块名称
           classGroupType: row.classGroupType,
           subjectId: row.subjectId,
           content: row.content
@@ -185,7 +185,7 @@ export default {
       }
     },
     onJobDel (row) {
-      this.$confirm("是否确认删除作业模板", "提示", {
+      this.$confirm("是否确认删除训练模板", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -219,7 +219,7 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         classGroupType: null,
         subjectId: null,
         content: null

+ 1 - 1
src/views/categroyManager/specialSetup/typesManager.vue

@@ -175,7 +175,7 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         description: null
       }
       this.$refs[formName].resetFields()

+ 1 - 1
src/views/childrensDay/resetDays.vue

@@ -12,7 +12,7 @@
           v-model.trim="searchForm.search"
           clearable
           @keyup.enter.native="search"
-          placeholder="姓名/编号/手机号"
+          placeholder="姓名、编号、手机号"
         ></el-input>
       </el-form-item>
       <el-form-item prop="organId">

+ 3 - 3
src/views/evaluateManager/networkList.vue

@@ -105,7 +105,7 @@
       <!-- homeWorkReplied -->
       <el-form-item>
         <el-select
-          placeholder="布置作业"
+          placeholder="布置训练"
           v-model="searchForm.assignHomework"
           clearable
         >
@@ -225,7 +225,7 @@
             <div>{{ scope.row.reviewId > 0 ? "是" : "否" }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="布置作业">
+        <el-table-column align="center" label="布置训练">
           <template slot-scope="scope">
             <div>{{ scope.row.assignHomework ? "是" : "否" }}</div>
           </template>
@@ -308,7 +308,7 @@
             <p>{{ courseScheduleReview.hasLiaison ? "是" : "否" }}</p>
           </div>
           <div class="leftCell" v-if="courseScheduleReview">
-            <p>是否提交作业</p>
+            <p>是否提交训练</p>
             <p>{{ courseScheduleReview.handHomework ? "是" : "否" }}</p>
           </div>
           <div class="leftCell" v-if="courseScheduleReview">

+ 3 - 3
src/views/evaluateManager/vipEvaluateList.vue

@@ -84,7 +84,7 @@
       </el-form-item>
       <el-form-item>
         <el-select
-          placeholder="布置作业"
+          placeholder="布置训练"
           v-model="searchForm.assignHomework"
           clearable
         >
@@ -176,7 +176,7 @@
             <div>{{ scope.row.reviewId > 0 ? "评价" : "未评价" }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="布置作业">
+        <el-table-column align="center" label="布置训练">
           <template slot-scope="scope">
             <div>{{ scope.row.assignHomework ? "是" : "否" }}</div>
           </template>
@@ -252,7 +252,7 @@
             <p>{{courseScheduleReview.hasLiaison?'是':'否'}}</p>
           </div> -->
           <div class="leftCell" v-if="courseScheduleReview">
-            <p>是否提交作业</p>
+            <p>是否提交训练</p>
             <p>{{ courseScheduleReview.handHomework ? "是" : "否" }}</p>
           </div>
           <div class="leftCell" v-if="courseScheduleReview">

+ 3 - 3
src/views/helpCenter/helpCategory.vue

@@ -94,7 +94,7 @@ export default {
       typeStatus: false, // 添加教学点
       formLabelWidth: "120px",
       form: {
-        text: null, // 作业模块名称
+        text: null, // 训练模块名称
         parentId: 0
       },
       rules: {
@@ -200,7 +200,7 @@ export default {
         // 修改的时候赋值
         this.form = {
           id: row.id,
-          text: row.text, // 作业模块名称
+          text: row.text, // 训练模块名称
           parentId: 0
         };
       } else if (type == 'add') {
@@ -216,7 +216,7 @@ export default {
     onFormClose (formName) {
       // 关闭弹窗重置验证
       this.form = {
-        name: null, // 作业模块名称
+        name: null, // 训练模块名称
         subjectIds: []
       };
       this.$refs[formName].resetFields();

+ 4 - 4
src/views/main/constant.js

@@ -20,9 +20,9 @@ export const descs = {
   FINANCE_PAY: '筛选时间段内支出金额总和',
   FINANCE_BALANCE_AMOUNT: '筛选时间段内余额消耗总和',
   FINANCE_AMOUNT: '筛选时间段内现金收入总和',
-  HOMEWORK_CREATE_RATE: '筛选时间段内,服务指标作业总布置率',
-  HOMEWORK_SUBMIT_RATE: '筛选时间段内,已布置的作业学员总提交率(包括服务指标外的作业)',
-  HOMEWORK_COMMENT_RATE: '筛选时间段内,学员已提交的作业老师总点评率',
+  HOMEWORK_CREATE_RATE: '筛选时间段内,服务指标训练总布置率',
+  HOMEWORK_SUBMIT_RATE: '筛选时间段内,已布置的训练学员总提交率(包括服务指标外的训练)',
+  HOMEWORK_COMMENT_RATE: '筛选时间段内,学员已提交的训练老师总点评率',
   MUSIC_GROUP_COURSE: '筛选时间段内,乐团课程总数',
   VIP_GROUP_COURSE: '筛选时间段内,VIP课程总数',
   PRACTICE_GROUP_COURSE: '筛选时间段内,网管课程总数',
@@ -42,7 +42,7 @@ export const descs = {
   STUDENT_VISIT:'乐团主管未完成回访任务',
   TEACHER_EXCEPTION_ATTENDANCE:'课程上有老师或学员考勤异常',
   TEACHER_NOT_A_CLASS:'课程无老师考勤',
-  TEACHER_SERVE_ERROR:'服务指标生成的作业未布置',
+  TEACHER_SERVE_ERROR:'服务指标生成的训练未布置',
   WAIT_CREATE_PAYMENT_CALENDER:'缴费项目有效期结束前7天',
   NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒',
   COURSE_TIME_ERROR: '上课时间在21:00~06:00时间段内为时间安排异常',

+ 1 - 1
src/views/musicInspection/modals/lookDetail.vue

@@ -38,7 +38,7 @@
         <el-table-column
           width="200px"
           align="center"
-          label="老师是否提前准备板书(本课内容、作业)"
+          label="老师是否提前准备板书(本课内容、训练)"
         >
           <template slot-scope="scope">
             <i :class="scope.row[1] == 1 ? 'el-icon-check' : 'el-icon-close'"></i>

+ 1 - 1
src/views/musicalManager/index.vue

@@ -17,7 +17,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="search"
-            placeholder="学生姓名/编号/电话"
+            placeholder="学生姓名、编号、电话"
           ></el-input>
         </el-form-item>
         <el-form-item prop="organId">

+ 4 - 4
src/views/operateManager/modals/infoList.js

@@ -1,11 +1,11 @@
 export const infoList =[
-{ row1:'学员有声部课、VIP课、合奏课、网管课',row2:'本周有声部课',row3:'声部课老师课后布置作业',row4:'声部课老师统计服务指标'},
-{ row1:'学员有声部课、VIP课、合奏课、网管课',row2:'本周无声部课',row3:'声部课老师在课外训练布置作业',row4:'声部课老师统计服务指标'},
-{ row1:'学员有VIP课、合奏课、网管课',row2:'本周有VIP课',row3:'VIP课老师课后布置作业',row4:'VIP课老师统计服务指标'},
+{ row1:'学员有声部课、VIP课、合奏课、网管课',row2:'本周有声部课',row3:'声部课老师课后布置训练',row4:'声部课老师统计服务指标'},
+{ row1:'学员有声部课、VIP课、合奏课、网管课',row2:'本周无声部课',row3:'声部课老师在课外训练布置训练',row4:'声部课老师统计服务指标'},
+{ row1:'学员有VIP课、合奏课、网管课',row2:'本周有VIP课',row3:'VIP课老师课后布置训练',row4:'VIP课老师统计服务指标'},
 { row1:'学员有VIP课、合奏课、网管课',row2:'本周无VIP课',row3:'VIP课老师布置课外训练',row4:'VIP课老师统计服务指标'},
 { row1:'学员有合奏课、网管课',row2:'无论本周是否有合奏课',row3:'该乐团声部班老师布置课外训练',row4:'声部班老师统计服务指标'},
 { row1:'学员有合奏课、网管课',row2:'无论本周是否有合奏课',row3:'该乐团没有声部班则指导老师布置课外训练',row4:'指导老师统计服务指标'},
-{ row1:'学员有网管课',row2:'本周有网管课',row3:'网管课老师课后布置作业',row4:'网管课老师统计服务指标'},
+{ row1:'学员有网管课',row2:'本周有网管课',row3:'网管课老师课后布置训练',row4:'网管课老师统计服务指标'},
 { row1:'学员有网管课',row2:'本周无网管课',row3:'网管课老师布置课外训练',row4:'网管课老师统计服务指标'},
 { row1:'学员没有任何课程但在进行中乐团在读',row2:'无课程',row3:'该乐团声部班老师布置课外训练',row4:'声部班老师统计服务指标'},
 { row1:'学员没有任何课程但在进行中乐团在读',row2:'无课程',row3:'该乐团没有声部班则指导老师布置课外训练',row4:'指导老师统计服务指标'}]

+ 6 - 6
src/views/operateManager/serverIndexDetail.vue

@@ -21,7 +21,7 @@
           <div class="textWrap">
             <p class="title">类型 :</p>
             <p class="contant">
-              {{ item.homeworkType == "HOMEWORK" ? "课堂作业" : "课外训练" }}
+              {{ item.homeworkType == "HOMEWORK" ? "课堂训练" : "课外训练" }}
             </p>
           </div>
           <div class="textWrap">
@@ -85,21 +85,21 @@
             <div v-show="item.up">
               <div class="transition-box">
                 <div class="cell">
-                  <p style="width: 80px; padding-top: 4px">作业内容:</p>
+                  <p style="width: 80px; padding-top: 4px">训练内容:</p>
                   <el-input
                     type="textarea"
                     :disabled="true"
                     :rows="3"
                     :value="item.content"
                     style="font-size: 16px"
-                    placeholder="老师布置的作业"
+                    placeholder="老师布置的训练"
                   ></el-input>
                 </div>
                 <div class="cell">
-                  <p style="width: 80px">查看作业:</p>
+                  <p style="width: 80px">查看训练:</p>
                   <div v-for="(some, index) in item.homeWork" :key="index">
                     <p class="homeWork" v-if="some" @click="openVideo(some)">
-                      作业{{ index + 1 }}
+                      训练{{ index + 1 }}
                     </p>
                   </div>
                 </div>
@@ -144,7 +144,7 @@
       </div>
     </el-card>
     <el-dialog
-      title="查看作业"
+      title="查看训练"
       width="360px"
       append-to-body
       :visible.sync="workVisible"

+ 22 - 22
src/views/operateManager/serverIndexList.vue

@@ -130,7 +130,7 @@
               <copy-text>{{ scope.row.courseIds || "课外训练" }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="预期作业布置">
+          <el-table-column align="center" label="预期训练布置">
             <template slot-scope="scope">
               <div>{{ scope.row.expectExercisesNum + "次" }}</div>
             </template>
@@ -138,10 +138,10 @@
           <el-table-column align="center" width="120" prop>
             <template slot="header" slot-scope="scope">
               <p style="position: relative">
-                实际作业布置
+                实际训练布置
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    以周为单位,每周服务指标指定的课程布置作业记一次实际作业布置
+                    以周为单位,每周服务指标指定的课程布置训练记一次实际训练布置
                   </div>
                   <!-- <img :src="imageIcon"
                        class="micon el-tooltip"
@@ -199,7 +199,7 @@
               <div>{{ scope.row.existPracticeCourse + "节" }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="作业提交时间">
+          <el-table-column align="center" label="训练提交时间">
             <template slot-scope="scope">
               <div>{{ scope.row.lastSubmitTime }}</div>
             </template>
@@ -233,14 +233,14 @@
     </div>
     <el-dialog title="服务指标规则说明" :visible.sync="lookServer">
       <div class="serverInfo">
-        <p>作业布置&服务指标优先级:<span>声部课>VIP课>合奏课>网管课</span></p>
+        <p>训练布置&服务指标优先级:<span>声部课>VIP课>合奏课>网管课</span></p>
         <p>
-          <span>周一凌晨</span> 系统根据学员的排课情况生成布置作业路径及服务指标
+          <span>周一凌晨</span> 系统根据学员的排课情况生成布置训练路径及服务指标
         </p>
         <p>
           <span>多次课程</span>
-          只布置一次作业、统计一次服务指标(多乐团、多组VIP网管课除外)
+          只布置一次训练、统计一次服务指标(多乐团、多组VIP网管课除外)
         </p>
         <el-table
           border
@@ -262,7 +262,7 @@
           <el-table-column
             align="center"
             prop="row3"
-            label="作业布置路径"
+            label="训练布置路径"
           ></el-table-column>
           <el-table-column
             align="center"
@@ -274,18 +274,18 @@
           <h4>其他情况:</h4>
           <p>
             1.学员在 <span>多个乐团时</span> ,剩余课程中
-            <span>本周有声部课</span> 的乐团布置作业
+            <span>本周有声部课</span> 的乐团布置训练
             <span>都有</span> 则都布置,
             <span>都没有</span> 则根据表格中的逻辑布置
           </p>
           <p>
             2.学员存在 <span>多组VIP课</span> 时,若课程组
-            <span>老师相同</span> ,则仅布置一次作业(网管课同理)
+            <span>老师相同</span> ,则仅布置一次训练(网管课同理)
           </p>
           <p>
             3.学员存在 <span>多组VIP课</span> 时,若课程组
             <span>老师不同,本周有课</span>
-            的VIP课程组布置作业,多个课程组本周都有课则布置多次(网管课同理)
+            的VIP课程组布置训练,多个课程组本周都有课则布置多次(网管课同理)
           </p>
           <p>
             4.学员存在 <span>多组VIP课</span> 时,若课程组
@@ -297,7 +297,7 @@
           <h4>课程调整:</h4>
           <p>
             本周 <span>课程调整时</span> ,重新根据该学员的
-            <span>本周课程情况更新</span> 作业布置路径及服务指标
+            <span>本周课程情况更新</span> 训练布置路径及服务指标
             则根据表格中的逻辑布置
           </p>
         </div>
@@ -307,7 +307,7 @@
           <p>
             <span>周六周日</span> 的服务指标
             <span>延迟到下周二更新</span>
-            实际安排数据(即周日的作业课程,在周二23:59:59时前布置作业都算一次实际安排)
+            实际安排数据(即周日的训练课程,在周二23:59:59时前布置训练都算一次实际安排)
           </p>
         </div>
         <div class="infoWrap">
@@ -322,17 +322,17 @@
           <h4>服务指标解释:</h4>
           <p><span>若本周学员有多次服务指标则生成多条数据</span></p>
           <p>
-            预期作业布置:本周内服务指标次数(即本周应该给该学员布置的作业次数)
+            预期训练布置:本周内服务指标次数(即本周应该给该学员布置的训练次数)
           </p>
           <p>
-            实际作业布置:本周通过服务指标作业布置路径给该学员布置作业的次数
+            实际训练布置:本周通过服务指标训练布置路径给该学员布置训练的次数
           </p>
-          <p>提交次数:本周学员按照作业布置路径提交作业的次数</p>
-          <p>评价次数:本周老师评价通过作业布置路径提交的作业的次数</p>
-          <p>及时评价次数:学员提交作业后24小时内进行评价的次数</p>
+          <p>提交次数:本周学员按照训练布置路径提交训练的次数</p>
+          <p>评价次数:本周老师评价通过训练布置路径提交的训练的次数</p>
+          <p>及时评价次数:学员提交训练后24小时内进行评价的次数</p>
           <p>VIP课:本周VIP课程课时数</p>
           <p>付费网管课:本周付费网管课课时数</p>
-          <p>作业提交时间:学员提交作业的时间</p>
+          <p>训练提交时间:学员提交训练的时间</p>
           <p>服务周期:本服务周期时间段</p>
         </div>
       </div>
@@ -368,9 +368,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="实际作业布置">
+        <el-form-item label="实际训练布置">
           <el-select
-            placeholder="实际作业布置"
+            placeholder="实际训练布置"
             v-model="searchForm.actualExercisesNumIsAchieve"
             clearable
           >
@@ -437,7 +437,7 @@
             <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="作业提交时间">
+        <el-form-item label="训练提交时间">
           <el-date-picker
             v-model.trim="searchForm.workTimer"
             style="width: 400px"

+ 1 - 1
src/views/repairManager/repairList.vue

@@ -17,7 +17,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="search"
-            placeholder="维修单号/姓名"
+            placeholder="维修单号姓名"
           ></el-input>
         </el-form-item>
         <el-form-item>

+ 1 - 1
src/views/resetTeaming/components/archicesComponents/api.js

@@ -97,7 +97,7 @@ export const getStudentList = data => request2({
 
 })
 
-// 获取作业情况
+// 获取训练情况
 export const getHomeworkStat = data => request2({
   url: '/api-web/exercisesSituation/musicGroupHomeworkStat',
   data ,

部分文件因文件數量過多而無法顯示