更新显示

src/views/rules/components/offLine.vue

@@ -33,19 +33,18 @@
             </tr>
             <!--  -->
             <!-- <tr>
-                <td rowspan="6">异常签到</td>
+                <td rowspan="3">异常签到</td>
                 <td>课程<span class="r">开始前</span>{{ list.offline_error_sign_in_cut_salary }}分钟至课程<span class="r">开始前</span>20分钟签到，GPS定位点在教学点{{ list.attendance_range }}米<span class="r">外</span></td>
-            </tr>
-            <tr>
-                <td>时间段：--</td>
             </tr> -->
             <!-- <tr>
+                <td>时间段：--</td>
+            </tr>
+            <tr>
                 <td>扣费规则: -{{ list.offline_error_sign_in_cut_salary }}{{ list.offline_error_sign_in_cut_salary_unit | formatUnit }}</td>
             </tr> -->
-            <!-- 140 -->
-            <tr style="width: 100%"><td>课程<span class="r">开始前</span>{{ list.offline_error_sign_in_cut_salary }}分钟后至课程<span class="r">开始前</span>签到，GPS定位点在教学点{{ list.attendance_range }}米<span class="r">外</span></td></tr>
+            <tr style="width: 100%"><td rowspan="3">异常签到</td><td>课程<span class="r">开始前</span>{{ list.offline_advance_sign_in_minutes }}分钟后至课程<span class="r">开始前</span>签到，GPS定位点在教学点{{ list.attendance_range }}米<span class="r">外</span></td></tr>
             <tr style="width: 100%">
-                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_error_sign_in_cut_salary) }}-12:00:00</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_advance_sign_in_minutes) }}-12:00:00</td>
             </tr>
             <tr style="width: 100%">
                 <td>扣费规则: -{{ list.offline_error_sign_in_cut_salary }}{{ list.offline_error_sign_in_cut_salary_unit | formatUnit }}</td>
@@ -90,7 +89,7 @@
                     <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range }}米外</span></td>
             </tr>
             <tr>
-                <td>扣费规则: -{{ list.offline_sign_in_gps_error_cut_salary }}{{ offline_sign_in_gps_error_cut_salary_unit | formatUnit }}</td>
+                <td>扣费规则: -{{ list.offline_sign_in_gps_error_cut_salary }}{{ list.offline_sign_in_gps_error_cut_salary_unit | formatUnit }}</td>
             </tr>
         </table>
 
@@ -217,7 +216,7 @@
                     <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range }}米外</span></td>
             </tr>
             <tr>
-                <td>扣费规则: -{{ list.offline_sign_out_gps_error_cut_salary }}{{ offline_sign_out_gps_error_cut_salary_unit | formatUnit }}</td>
+                <td>扣费规则: -{{ list.offline_sign_out_gps_error_cut_salary }}{{ list.offline_sign_out_gps_error_cut_salary_unit | formatUnit }}</td>
             </tr>
         </table>
     </div>

src/views/rules/components/vipOffLine.vue

@@ -23,7 +23,7 @@
             <!--  -->
             <tr>
                 <td rowspan="3">正常签到签退</td>
-                <td>操作了【点名】，GPS定位在教学点{{ list.attendance_range_vip }}米<span class="r">内</span></td>
+                <td>操作了【点名】，GPS定位在教学点{{ list.attendance_range }}米<span class="r">内</span></td>
             </tr>
             <tr>
                 <td>时间段：--</td>
@@ -34,7 +34,7 @@
             <!--  -->
             <tr>
                 <td rowspan="3">异常签到签退</td>
-                <td>操作了【点名】，GPS定位在教学点{{ list.attendance_range_vip }}米<span class="r">外</span></td>
+                <td>操作了【点名】，GPS定位在教学点{{ list.attendance_range }}米<span class="r">外</span></td>
             </tr>
             <tr>
                 <td>时间段：--</td>
@@ -57,7 +57,7 @@
             <!-- <tr>
                 <td rowspan="2"></td>
                 <td>
-                    <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range_vip }}米外</span></td>
+                    <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range }}米外</span></td>
             </tr>
             <tr>
                 <td>扣费规则: -100%</td>

src/views/rules/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="rules">
+    <div class="rules" v-if="showData">
         <on-line v-if="type == 'onLine' || !type" :dataList="dataList" />
         <off-line v-if="type == 'offLine' || !type" :dataList="dataList" />
         <vip-off-line v-if="type == 'vipOffLine' || !type" :dataList="dataList" />
@@ -18,7 +18,8 @@ export default {
         let query = this.$route.query
         return {
             type: query.type || null,
-            dataList: {}
+            dataList: {},
+            showData: false,
         }
     },
     mounted() {
@@ -33,6 +34,7 @@ export default {
     methods: {
         async __init() {
             try {
+                this.showData = false
                 let offRes = await await sysTenantConfig({ group: "OFFLINE" })
                 const offData = offRes.data || []
                 offData.forEach(off => {
@@ -49,7 +51,7 @@ export default {
                 forwardData.forEach(forward => {
                     this.dataList[forward.paramName] = forward.paranValue
                 })
-                
+                this.showData = true
             } catch(e) {}
         }
     }