Merge branch 'tmp_meeting_needs' into online

src/views/rules/components/offLine.vue

@@ -104,10 +104,10 @@
             </tr>
             <tr>
                 <td rowspan="3">可点名时间范围</td>
-                <td>课程<span class="r">开始前</span>1小时至课程<span class="r">结束后</span>6小时(当天24点前)（需先进行【签到】操作）</td>
+                <td>课程<span class="r">开始前</span>1小时至课程<span class="r">当天24点前</span></td>
             </tr>
             <tr>
-                <td>11:00:00-18:59:59</td>
+                <td>11:00:00-23:59:59</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
@@ -115,7 +115,7 @@
             <!--  -->
             <tr>
                 <td rowspan="3">正常点名</td>
-                <td>进行了【点名】操作</td>
+                <td>进行了【点名】操作，完成<span class="r">【点名】后才可签退</span></td>
             </tr>
             <tr>
                 <td>--</td>
@@ -155,59 +155,66 @@
             </tr>
             <tr>
                 <td rowspan="3">可签退时间范围</td>
-                <td colspan="2">课程<span class="r">结束后</span>到课程当天24点前</td>
+                <td>课程<span class="r">结束后</span>到课程<span class="r">当天24点前</span></td>
             </tr>
             <tr>
-                <td colspan="2">13:00:00-23:59:59</td>
+                <td>13:00:00-23:59:59</td>
             </tr>
             <tr>
-                <td colspan="2">扣费规则: --</td>
+                <td>扣费规则: --</td>
             </tr>
             <!--  -->
             <tr>
                 <td rowspan="3">正常签退</td>
-                <td colspan="2">课程<span class="r">结束后</span>至课程<span class="r">结束后</span>6小时，且GPS定位在教学点{{ list.attendance_range }}米<span class="r">外</span></td>
+                <td>课程<span class="r">结束后</span>至课程<span class="r">结束后</span>6小时，且GPS定位在教学点{{ list.attendance_range }}米<span class="r">内</span></td>
             </tr>
             <tr>
-                <td colspan="2">13:00:00-18:59:59</td>
+                <td>13:00:00-18:59:59</td>
             </tr>
             <tr>
-                <td colspan="2">扣费规则: --</td>
+                <td>扣费规则: --</td>
             </tr>
             <!--  -->
             <tr>
                 <td rowspan="3">早退</td>
-                <td colspan="2">课程<span class="r">结束前</span>3分钟签退至课程<span class="r">结束前</span>签退</td>
+                <td>课程<span class="r">结束前</span>3分钟签退至课程<span class="r">结束前</span>签退</td>
             </tr>
             <tr>
-                <td colspan="2">12:56:59-12:59:59</td>
+                <td>12:56:59-12:59:59</td>
             </tr>
             <tr>
-                <td colspan="2">扣费规则: -100%</td>
+                <td>扣费规则: -100%</td>
             </tr>
             <!--  -->
             <tr>
-                <td rowspan="4">异常签退</td>
-                <td>课程<span class="r">结束6小时后</span>至课程<span class="r">当天</span>24点前</td>
-                <td rowspan="4">扣费规则: <br />正常点名-50 <br />未点名-50%</td>
+                <td rowspan="3">异常签退</td>
+                <td>课程<span class="r">结束6小时后</span>至课程<span class="r">当天</span>24点前 或 GPS定位点在教学点范围之外</td>
             </tr>
             <tr>
                 <td>19:00:00-23:59:59</td>
             </tr>
-            <tr >
-                <td>GPS定位点在教学点范围之外</td>
+            <tr>
+                <td>扣费规则: -50</td>
+            </tr>
+            <!--  -->
+            <tr>
+                <td rowspan="3">未签退</td>
+                <td>未进行【签退】操作</td>
             </tr>
             <tr>
                 <td>--</td>
             </tr>
+            <tr>
+                <td>扣费规则: -100%</td>
+            </tr>
             <!--  -->
             <tr>
                 <td rowspan="2"></td>
-                <td colspan="2">
+                <td>
                     <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range }}米外</span></td>
             </tr>
             <tr>
-                <td colspan="2">扣费规则: -100%</td>
+                <td>扣费规则: -100%</td>
             </tr>
         </table>
     </div>

src/views/rules/index.vue

@@ -58,7 +58,6 @@ export default {
                                 break;
                         }
                     });
-                    // console.log(dataList)
                     this.dataList = dataList
                 }
             })