更新内容

src/App.vue

@@ -13,12 +13,18 @@
 
 
 <script>
+import { queryUserInfo } from '@/api/app'
 export default {
     name: 'app',
-    mounted() {
+    async mounted() {
       if(document.querySelector('#m_loading')) {
         document.querySelector('#m_loading').remove()
       }
+      await queryUserInfo().then(res => {
+        const result = res.data || null
+        const tenantId = result.tenantId || 0
+        sessionStorage.setItem('tenantId', tenantId)
+      })
     }
 }
 </script>

src/common/axios.js

@@ -43,6 +43,11 @@ _axios.interceptors.request.use(
         config.headers['Authorization'] = auth
       }
     }
+    const tenantId = sessionStorage.getItem('tenantId')
+    if(tenantId && tenantId != 'undefined') {
+      config.headers['tenantId'] = tenantId
+    }
+
     // config.headers['Authorization'] = 'bearer 5848d682-f5a3-4ce1-b86d-5b5f466ae665'
     return config;
   },

src/common/vueFilters.js

@@ -105,4 +105,13 @@ Vue.filter('formatTimer', (value) => {
     } else {
       return value
     }
-  })
+  })
+
+// 格式化单位
+Vue.filter('formatUnit', value => {
+    const template = {
+        1: '元',
+        2: '%'
+    }
+    return template[value]
+})

src/helpers/request.js

@@ -25,6 +25,10 @@ instance.interceptors.request.use(config => {
       Authorization,
     }
   }
+  const tenantId = sessionStorage.getItem('tenantId')
+  if(tenantId && tenantId != 'undefined') {
+    config.headers['tenantId'] = tenantId
+  }
   return config
 })
 

src/utils/date.js

@@ -0,0 +1,29 @@
+import dayjs from 'dayjs'
+
+export function addFormMinute(timerStr, time = 0) {
+  let timer = dayjs('2021-12-17' + ' ' + timerStr).add(time, 'minute')
+  return timer.format('HH:mm:ss')
+}
+export function addFormMinuteAddS(timerStr, time = 0) {
+  let timer = dayjs('2021-12-17' + ' ' + timerStr).add(time, 'minute').add(1,'second')
+  return timer.format('HH:mm:ss')
+
+}
+export function addFormMinuteMS(timerStr, time = 0) {
+  let timer = dayjs('2021-12-17' + ' ' + timerStr).add(time, 'minute').subtract(1,'second')
+  return timer.format('HH:mm:ss')
+
+}
+export function reduceFormMinute(timerStr, time = 0) {
+  let timer = dayjs('2021-12-17' + ' ' + timerStr).subtract(time, 'minute')
+  return timer.format('HH:mm:ss')
+
+}
+export function reduceFormMinuteAddS(timerStr, time = 0) {
+  let timer = dayjs('2021-12-17' + ' ' + timerStr).subtract(time, 'minute').add(1,'second')
+  return timer.format('HH:mm:ss')
+}
+export function reduceFormMinuteMS(timerStr, time = 0) {
+  let timer = dayjs('2021-12-17' + ' ' + timerStr).subtract(time, 'minute').subtract(1,'second')
+  return timer.format('HH:mm:ss')
+}

src/views/activeProgram/program.vue

@@ -549,12 +549,12 @@ export default {
                     return;
                 }
             }
-            let onlineNums = form.onlineClassesNums
-            if(form.onlineClassesNums.length > 0) {
+            let onlineNums = form.onlineClassesNums || 0
+            if(form.onlineClassesNums > 0) {
                 onlineNums = Number(form.onlineClassesNums)
             }
-            let offlineNums = form.offlineClassesNums
-            if(form.offlineClassesNums.length > 0) {
+            let offlineNums = form.offlineClassesNums || 0
+            if(form.offlineClassesNums > 0) {
                 offlineNums = Number(form.offlineClassesNums)
             }
             let onlineClassesStatus = onlineNums === "" ? true : false;
@@ -602,8 +602,8 @@ export default {
             form.studentIdList = this.checkboxSelectIds.join(",");
 
             form.firstStudentId = this.studentList.length > 0 ? this.studentList[0].userId : null;
-            form.onlineClassesNum = Number(form.onlineClassesNums);
-            form.offlineClassesNum = Number(form.offlineClassesNums);
+            form.onlineClassesNum = Number(form.onlineClassesNums || 0);
+            form.offlineClassesNum = Number(form.offlineClassesNums || 0);
             let params = {
                 courseSchedules: this.timeTable
             }

src/views/audition/CourseEvaluation.vue

@@ -173,18 +173,21 @@ export default {
       subjectNames: null,
       // isReset: false,
       isInside: false,
+      tenantId: null, // 当前机构编号
       isAssignHomework: 0, // 是否有布置作业,0 => 否 1 => 是
       enableAssignHomework: 0, // 是否要布置作业  0 否  1 是
       memberStatus: 0, // 是否有学生或者乐团是会员
     };
   },
+  created() {
+		this.tenantId = sessionStorage.getItem('tenantId') || null
+	},
   async mounted() {
     let params = this.$route.query;
     if (params.Authorization) {
       localStorage.setItem("Authorization", decodeURI(params.Authorization));
       localStorage.setItem("userInfo", decodeURI(params.Authorization));
     }
-    console.log(params)
     this.courseId = params.id;
     this.reviewId = parseInt(params.reviewId);
     this.isInside = params.isInside;
@@ -280,7 +283,8 @@ export default {
   },
   methods: {
     submitReview() {
-      if(!this.isAssignHomework && this.enableAssignHomework) {
+      // 不是大雅机构则作业非必填
+      if(!this.isAssignHomework && this.enableAssignHomework && this.tenantId == 1) {
         this.$toast('请布置课后训练')
         return
       }
@@ -316,7 +320,8 @@ export default {
         updateReviewInfo(obj).then((res) => {
           this.$toast("修改成功");
           setTimeout((res) => {
-            if (this.isInside) {
+            // 硬编码，判断是否是大雅机构，其它机构则可以不用布置作业
+            if (this.isInside && this.tenantId == 1) {
               this.$router.replace({ path: "/manageEvaluation" });
             } else {
               this.onAppBack();
@@ -328,7 +333,7 @@ export default {
           if (res.data.code == 200) {
             this.$toast("提交成功");
             setTimeout((res) => {
-              if (this.isInside) {
+              if (this.isInside && this.tenantId == 1) {
                 this.$router.push({ path: "/manageEvaluation" });
               } else {
                 this.onAppBack();
@@ -403,7 +408,7 @@ export default {
     },
     onClose() {
       // 关闭弹窗
-      if (this.isInside) {
+      if (this.isInside && this.tenantId == 1) {
         this.$router.replace({ path: "/manageEvaluation" });
       } else {
         this.onAppBack();

src/views/rules/api.js

@@ -1,4 +1,5 @@
 const axios = require('@/common/axios').default
+import request from '@/helpers/request'
 
 export const sysConfigList = (data) => {
   return axios({
@@ -9,8 +10,8 @@ export const sysConfigList = (data) => {
 }
 
 export const sysTenantConfig = (data) => {
-  return axios({
-    url: '/api-teacher/sysTenantConfig/queryAll',
+  return request({
+    url: '/sysTenantConfig/queryAll',
     method: 'get',
     params: data
   })

src/views/rules/components/offLine.vue

@@ -12,10 +12,10 @@
             </tr>
             <tr>
                 <td rowspan="3">可签到时间范围</td>
-                <td>课程<span class="r">开始前</span>1小时至课程<span class="r">结束前</span></td>
+                <td>课程<span class="r">开始前</span>{{ list.offline_sign_in_early_forward_time }}分钟至课程<span class="r">结束前</span></td>
             </tr>
             <tr>
-                <td>时间段：11:00:00-13:00:00</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_sign_in_early_forward_time) }}-13:00:00</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
@@ -23,53 +23,54 @@
             <!--  -->
             <tr>
                 <td rowspan="3">正常签到</td>
-                <td>课程<span class="r">开始前</span>1小时至课程<span class="r">开始前</span>20分钟签到，GPS定位点在教学点{{ list.attendance_range }}米<span class="r">内</span></td>
+                <td>课程<span class="r">开始前</span>{{ list.offline_sign_in_early_forward_time }}分钟至课程<span class="r">开始前</span>{{ list.offline_advance_sign_in_minutes }}分钟签到，GPS定位点在教学点{{ list.attendance_range }}米<span class="r">内</span></td>
             </tr>
             <tr>
-                <td>时间段：10:00:00-11:39:59</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_sign_in_early_forward_time) }}-{{ reduceFormMinute('12:00:00', list.offline_advance_sign_in_minutes) }}</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
             </tr>
             <!--  -->
-            <tr>
+            <!-- <tr>
                 <td rowspan="6">异常签到</td>
-                <td>课程<span class="r">开始前</span>1小时至课程<span class="r">开始前</span>20分钟签到，GPS定位点在教学点{{ list.attendance_range }}米<span class="r">外</span></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>扣费规则: -50</td>
-            </tr>
-            <tr style="width: 100%"><td>课程<span class="r">开始前</span>20分钟后至课程<span class="r">开始前</span>签到</td></tr>
+            </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>时间段：11:40:00-11:59:59</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_error_sign_in_cut_salary) }}-12:00:00</td>
             </tr>
             <tr style="width: 100%">
-                <td>扣费规则: -50</td>
+                <td>扣费规则: -{{ list.offline_error_sign_in_cut_salary }}{{ list.offline_error_sign_in_cut_salary_unit | formatUnit }}</td>
             </tr>
             <!--  -->
             <tr>
                 <td rowspan="3">迟到</td>
-                <td>课程<span class="r">开始后</span>30分钟内签到</td>
+                <td>课程<span class="r">开始后</span>{{ list.offline_advance_sign_in_late_minutes }}分钟内签到</td>
             </tr>
             <tr>
-                <td>时间段：12:00:00-12:29:59</td>
+                <td>时间段：12:00:00-{{ addFormMinute('12:00:00', list.offline_advance_sign_in_late_minutes) }}</td>
             </tr>
             <tr>
-                <td>扣费规则: -50%</td>
+                <td>扣费规则: -{{ list.offline_late_cut_salary }}{{ list.offline_late_cut_salary_unit | formatUnit }}</td>
             </tr>
              <!--  -->
             <tr>
                 <td rowspan="3">旷课</td>
-                <td>课程<span class="r">开始后</span>30分钟至课程<span class="r">结束前</span>签到</td>
+                <td>课程<span class="r">开始后</span>{{ list.offline_advance_sign_in_late_minutes }}分钟至课程<span class="r">结束前</span>签到</td>
             </tr>
             <tr>
-                <td>时间段：12:30:00后签到（包括12:30:00）</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_advance_sign_in_late_minutes) }}后签到（包括{{ reduceFormMinute('12:00:00', list.offline_advance_sign_in_late_minutes) }}）</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.offline_level_sign_in_cut_salary }}{{ list.offline_level_sign_in_cut_salary_unit | formatUnit }}</td>
             </tr>
              <!--  -->
             <tr>
@@ -80,7 +81,7 @@
                 <td>时间段：12:30:00-12:59:59</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.offline_no_sign_in_cut_salary }}{{ list.offline_no_sign_in_cut_salary_unit | formatUnit }}</td>
             </tr>
 
             <tr>
@@ -89,7 +90,7 @@
                     <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range }}米外</span></td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.offline_sign_in_gps_error_cut_salary }}{{ offline_sign_in_gps_error_cut_salary_unit | formatUnit }}</td>
             </tr>
         </table>
 
@@ -104,10 +105,10 @@
             </tr>
             <tr>
                 <td rowspan="3">可点名时间范围</td>
-                <td>课程<span class="r">开始前</span>1小时至课程<span class="r">当天24点前</span></td>
+                <td>课程<span class="r">开始前</span>{{ list.offline_sign_in_early_forward_time }}分钟至课程<span class="r">结束后</span>{{ list.advance_sign_out_minutes }}</td>
             </tr>
             <tr>
-                <td>时间段：11:00:00-23:59:59</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_sign_in_early_forward_time) }}-{{ addFormMinute("13:00:00", list.advance_sign_out_minutes) }}</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
@@ -135,14 +136,14 @@
                 <td>扣费规则: --</td>
             </tr>
             <!--  -->
-            <tr>
+            <!-- <tr>
                 <td rowspan="2"></td>
                 <td>
                     <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range }}米外</span></td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
-            </tr>
+                <td>扣费规则: -{{ list.offline_sign_out_gps_error_cut_salary }}{{ offline_sign_out_gps_error_cut_salary_unit | formatUnit }}</td>
+            </tr> -->
         </table>
 
         <table border="1" style="width: 100%">
@@ -166,10 +167,10 @@
             <!--  -->
             <tr>
                 <td rowspan="3">正常签退</td>
-                <td>课程<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>{{ list.advance_sign_out_minutes }}分钟，且GPS定位在教学点{{ list.attendance_range }}米<span class="r">内</span></td>
             </tr>
             <tr>
-                <td>时间段：13:00:00-18:59:59</td>
+                <td>时间段：13:00:00-{{ addFormMinute('13:00:00', list.advance_sign_out_minutes) }}</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
@@ -177,27 +178,26 @@
             <!--  -->
             <tr>
                 <td rowspan="3">早退</td>
-                <td>课程<span class="r">结束前</span>3分钟签退至课程<span class="r">结束前</span>签退</td>
+                <td>课程<span class="r">结束前</span>{{ list.offline_advance_sign_out_minutes }}分钟签退至课程<span class="r">结束前</span>签退</td>
             </tr>
             <tr>
-                <td>时间段：12:56:59前签退（包括12:56:59）</td>
+                <td>时间段：{{ reduceFormMinute('13:00:00', list.offline_advance_sign_out_minutes) }}前签退（包括{{ reduceFormMinute('13:00:00', list.offline_advance_sign_out_minutes) }}）</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.offline_early_sign_out_cut_salary }}{{ list.offline_early_sign_out_cut_salary_unit | formatUnit }}</td>
             </tr>
             <!--  -->
             <tr>
                 <td rowspan="3">异常签退</td>
                 <td>
-                    课程<span class="r">结束前3分钟</span>至<span class="r">课程结束前</span><br/>
-                    或<span class="r">结束6小时后</span>至课程<span class="r">当天</span>24点前<br/>
+                    课程<span class="r">结束前{{ list.offline_advance_sign_out_minutes }}分钟</span>至<span class="r">课程结束前</span><br/>
                     或GPS定位点在教学点范围之外</td>
             </tr>
             <tr>
-                <td>时间段：12:56:59-12:59:59 &nbsp;&nbsp; 19:00:00-23:59:59</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.offline_advance_sign_out_minutes) }}-12:59:59</td>
             </tr>
             <tr>
-                <td>扣费规则: -50</td>
+                <td>扣费规则: -{{ list.offline_error_sign_out_cut_salary }}{{ list.offline_error_sign_out_cut_salary_unit | formatUnit }}</td>
             </tr>
             <!--  -->
             <tr>
@@ -208,7 +208,7 @@
                 <td>时间段：--</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.offline_no_sign_out_cut_salary }}{{ list.offline_no_sign_out_cut_salary_unit | formatUnit }}</td>
             </tr>
             <!--  -->
             <tr>
@@ -217,13 +217,21 @@
                     <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range }}米外</span></td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.offline_sign_out_gps_error_cut_salary }}{{ offline_sign_out_gps_error_cut_salary_unit | formatUnit }}</td>
             </tr>
         </table>
     </div>
 </template>
 
 <script>
+import {
+  addFormMinute,
+  addFormMinuteAddS,
+  reduceFormMinute,
+  reduceFormMinuteAddS,
+  addFormMinuteMS,
+  reduceFormMinuteMS,
+} from "@/utils/date";
 export default {
     props: {
         dataList: {
@@ -241,6 +249,26 @@ export default {
     mounted() {
         this.list = this.dataList
     },
+    methods: {
+        addFormMinute(timerStr, time) {
+            return addFormMinute(timerStr, time);
+        },
+        addFormMinuteAddS(timerStr, time) {
+            return addFormMinuteAddS(timerStr, time);
+        },
+        reduceFormMinute(timerStr, time) {
+            return reduceFormMinute(timerStr, time);
+        },
+        reduceFormMinuteAddS(timerStr, time) {
+            return reduceFormMinuteAddS(timerStr, time);
+        },
+        addFormMinuteMS(timerStr, time) {
+            return addFormMinuteMS(timerStr, time);
+        },
+        reduceFormMinuteMS(timerStr, time) {
+            return reduceFormMinuteMS(timerStr, time);
+        },
+    },
     watch: {
         dataList(newValue) {
             this.list = newValue

src/views/rules/components/onLine.vue

@@ -12,17 +12,17 @@
             </tr>
             <tr>
                 <td rowspan="3">可签到时间范围</td>
-                <td>课程<span class="r">开始前</span>{{ list.advance_sign_in_minutes }}分钟至课程<span class="r">结束前</span>进入教室</td>
+                <td>课程<span class="r">开始前</span>{{ list.course_before_buffer_time }}分钟至课程<span class="r">结束前</span>进入教室</td>
             </tr>
-            <tr><td>时间段：11:40:00-12:59:59</td></tr>
+            <tr><td>时间段：{{ reduceFormMinute('12:00:00', list.course_before_buffer_time) }}-12:59:59</td></tr>
             <tr><td>扣费规则: --</td></tr>
             <!--  -->
             <tr>
                 <td rowspan="3">正常签到</td>
-                <td>课程<span class="r">开始前</span>{{ list.advance_sign_in_minutes }}分钟至课程<span class="r">开始前</span>1分钟进入教室</td>
+                <td>课程<span class="r">开始前</span>{{ list.course_before_buffer_time }}分钟至课程<span class="r">开始前</span>{{ list.course_before_buffer_time - list.online_advance_sign_in_minutes }}分钟进入教室</td>
             </tr>
             <tr>
-                <td>时间段：11:40:00-11:58:59</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.course_before_buffer_time) }}-{{ reduceFormMinute('12:00:00', (list.course_before_buffer_time - list.online_advance_sign_in_minutes)) }}</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
@@ -30,24 +30,24 @@
             <!--  -->
             <tr>
                 <td rowspan="3">迟到</td>
-                <td>课程<span class="r">开始前</span>1分钟至课程<span class="r">开始后</span>3分钟进入教室</td>
+                <td>课程<span class="r">开始前</span>{{ list.online_advance_sign_in_minutes }}分钟至课程<span class="r">开始后</span>{{ list.online_advance_sign_in_late_minutes }}分钟进入教室</td>
             </tr>
             <tr>
-                <td>时间段：11:59:00-12:02:59</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.online_advance_sign_in_minutes) }}-{{ addFormMinute('12:00:00', list.online_advance_sign_in_late_minutes) }}</td>
             </tr>
             <tr>
-                <td>扣费规则: -50%</td>
+                <td>扣费规则: -{{ list.online_late_cut_salary }}{{ list.online_late_cut_salary_unit | formatUnit }}</td>
             </tr>
             <!--  -->
             <tr>
                 <td rowspan="3">旷课</td>
-                <td>课程<span class="r">开始后</span>3分钟至课程<span class="r">结束前</span>进入教室</td>
+                <td>课程<span class="r">开始后</span>{{ list.online_advance_sign_in_late_minutes }}分钟至课程<span class="r">结束前</span>进入教室</td>
             </tr>
             <tr>
-                <td>时间段：12:03:00后签到（包括12:03:00）</td>
+                <td>时间段：{{ addFormMinuteAddS('12:00:00', list.online_advance_sign_in_late_minutes) }}后签到（包括{{ addFormMinuteAddS('12:00:00', list.online_advance_sign_in_late_minutes) }}）</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.online_level_sign_in_cut_salary }}{{ list.online_level_sign_in_cut_salary_unit | formatUnit }}</td>
             </tr>
             <!--  -->
             <tr>
@@ -58,7 +58,7 @@
                 <td>时间段：--</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.online_no_sign_in_cut_salary }}{{ list.online_no_sign_in_cut_salary_unit | formatUnit }}</td>
             </tr>
         </table>
 
@@ -72,9 +72,9 @@
             </tr>
             <tr>
                 <td rowspan="3">可签退时间范围</td>
-                <td>课程<span class="r">开始前</span>{{ list.advance_sign_in_minutes }}分钟至课程<span class="r">结束后</span>15分钟（课程结束后15分钟网络教室自动关闭）</td>
+                <td>课程<span class="r">开始前</span>{{ list.course_before_buffer_time }}分钟至课程<span class="r">结束后</span>{{ list.course_after_buffer_time }}分钟（课程结束后{{ list.course_after_buffer_time }}分钟网络教室自动关闭）</td>
             </tr>
-            <tr><td>时间段：11:40:00-13:15:00</td></tr>
+            <tr><td>时间段：{{ reduceFormMinute('12:00:00', list.course_before_buffer_time) }}-{{ addFormMinute('12:00:00', list.course_after_buffer_time) }}</td></tr>
             <tr><td>扣费规则: --</td></tr>
             <!--  -->
             <tr>
@@ -82,7 +82,7 @@
                 <td>课程<span class="r">结束后</span>退出教室</td>
             </tr>
             <tr>
-                <td>时间段：13:00:00-13:15:00</td>
+                <td>时间段：13:00:00-{{ addFormMinute('12:00:00', list.course_after_buffer_time) }}</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
@@ -90,30 +90,38 @@
             <!--  -->
             <tr>
                 <td rowspan="3">早退</td>
-                <td>课程<span class="r">开始前</span>{{ list.advance_sign_in_minutes }}分钟至课程<span class="r">结束前</span>3分钟退出教室</td>
+                <td>早于课程<span class="r">结束前</span>{{ list.online_early_sign_out_minutes }}分钟前退出云教室</td>
             </tr>
             <tr>
-                <td>时间段：11:40:00-12:56:59</td>
+                <td>时间段：12:00:00-{{ reduceFormMinuteMS("13:00:00", list.online_early_sign_out_minutes) }}</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.online_early_sign_out_cut_salary }}{{ list.online_early_sign_out_cut_salary_unit | formatUnit }}</td>
             </tr>
             <!--  -->
             <tr>
                 <td rowspan="3">异常签退</td>
-                <td>课程<span class="r">结束前</span>3分钟至课程<span class="r">结束前</span>退出教室</td>
+                <td>课程<span class="r">结束前</span>{{ list.online_early_sign_out_minutes }}分钟至课程<span class="r">结束前</span>退出教室</td>
             </tr>
             <tr>
-                <td>时间段：12:57:00-12:59:59</td>
+                <td>时间段：{{ reduceFormMinute("13:00:00", list.online_early_sign_out_minutes) }}-12:59:59</td>
             </tr>
             <tr>
-                <td>扣费规则: -50%</td>
+                <td>扣费规则: -{{ list.online_error_sign_out_cut_salary }}{{ list.online_error_sign_out_cut_salary_unit | formatUnit }}</td>
             </tr>
         </table>
     </div>
 </template>
 
 <script>
+import {
+  addFormMinute,
+  addFormMinuteAddS,
+  reduceFormMinute,
+  reduceFormMinuteAddS,
+  addFormMinuteMS,
+  reduceFormMinuteMS,
+} from "@/utils/date";
 export default {
     name: 'onLine',
     props: {
@@ -131,6 +139,27 @@ export default {
     },
     mounted() {
         this.list = this.dataList
+        console.log(this.list)
+    },
+    methods: {
+        addFormMinute(timerStr, time) {
+            return addFormMinute(timerStr, time);
+        },
+        addFormMinuteAddS(timerStr, time) {
+            return addFormMinuteAddS(timerStr, time);
+        },
+        reduceFormMinute(timerStr, time) {
+            return reduceFormMinute(timerStr, time);
+        },
+        reduceFormMinuteAddS(timerStr, time) {
+            return reduceFormMinuteAddS(timerStr, time);
+        },
+        addFormMinuteMS(timerStr, time) {
+            return addFormMinuteMS(timerStr, time);
+        },
+        reduceFormMinuteMS(timerStr, time) {
+            return reduceFormMinuteMS(timerStr, time);
+        },
     },
     watch: {
         dataList(newValue) {

src/views/rules/components/vipOffLine.vue

@@ -12,10 +12,10 @@
             </tr>
             <tr>
                 <td rowspan="3">可签到时间范围</td>
-                <td>课程开始前{{ list.enable_student_attendance_befor_course_start_time_range_vip }}分钟至课程结束后{{ list.enable_student_attendance_time_range_vip }}分钟</td>
+                <td>课程开始前{{ list.enable_student_attendance_time_range_vip }}分钟至课程结束后{{ list.enable_student_attendance_time_range_vip }}分钟</td>
             </tr>
             <tr>
-                <td>时间段：11:40:00-13:19:59</td>
+                <td>时间段：{{ reduceFormMinute('12:00:00', list.enable_student_attendance_time_range_vip) }}-{{ addFormMinute('13:00:00', list.enable_student_attendance_time_range_vip) }}</td>
             </tr>
             <tr>
                 <td>扣费规则: --</td>
@@ -40,7 +40,7 @@
                 <td>时间段：--</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.vip_offline_gps_error_cut_salary }}{{ list.vip_offline_gps_error_cut_salary_unit | formatUnit }}</td>
             </tr>
              <!--  -->
             <tr>
@@ -51,23 +51,31 @@
                 <td>时间段：--</td>
             </tr>
             <tr>
-                <td>扣费规则: -100%</td>
+                <td>扣费规则: -{{ list.vip_offline_no_gps_error_cut_salary }}{{ list.vip_offline_no_gps_error_cut_salary_unit | formatUnit }}</td>
             </tr>
              <!--  -->
-            <tr>
+            <!-- <tr>
                 <td rowspan="2"></td>
                 <td>
                     <span class="r">签到签退时间都在正常范围内，但同时GPS定位在教学点{{ list.attendance_range_vip }}米外</span></td>
             </tr>
             <tr>
                 <td>扣费规则: -100%</td>
-            </tr>
+            </tr> -->
         </table>
     </div>
 </template>
 
 
 <script>
+import {
+  addFormMinute,
+  addFormMinuteAddS,
+  reduceFormMinute,
+  reduceFormMinuteAddS,
+  addFormMinuteMS,
+  reduceFormMinuteMS,
+} from "@/utils/date";
 export default {
     props: {
         dataList: {
@@ -85,6 +93,26 @@ export default {
     mounted() {
         this.list = this.dataList
     },
+    methods: {
+        addFormMinute(timerStr, time) {
+            return addFormMinute(timerStr, time);
+        },
+        addFormMinuteAddS(timerStr, time) {
+            return addFormMinuteAddS(timerStr, time);
+        },
+        reduceFormMinute(timerStr, time) {
+            return reduceFormMinute(timerStr, time);
+        },
+        reduceFormMinuteAddS(timerStr, time) {
+            return reduceFormMinuteAddS(timerStr, time);
+        },
+        addFormMinuteMS(timerStr, time) {
+            return addFormMinuteMS(timerStr, time);
+        },
+        reduceFormMinuteMS(timerStr, time) {
+            return reduceFormMinuteMS(timerStr, time);
+        },
+    },
     watch: {
         dataList(newValue) {
             this.list = newValue

src/views/rules/index.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { sysConfigList } from './api'
+import { sysTenantConfig } from './api'
 import setLoading from '@/utils/loading'
 import OnLine from './components/onLine'
 import OffLine from './components/offLine'
@@ -32,36 +32,25 @@ export default {
     },
     methods: {
         async __init() {
-            setLoading(true)
-            await sysConfigList().then(res => {
-                const result = res.data
-                if(result.code == 200) {
-                    const { data } = result
-                    const dataList = {}
-                    data.forEach(item => {
-                        switch(item.paramName) {
-                            case 'advance_sign_in_minutes':
-                                // 老师正常打卡时间，为课程当天，距离开课时间前{}分钟
-                                dataList.advance_sign_in_minutes = item.paranValue
-                                break;
-                            case 'attendance_range':
-                                dataList.attendance_range = item.paranValue
-                                break;
-                            case 'enable_student_attendance_time_range_vip':
-                                dataList.enable_student_attendance_time_range_vip = item.paranValue
-                                break;
-                            case 'enable_student_attendance_befor_course_start_time_range_vip':
-                                dataList.enable_student_attendance_befor_course_start_time_range_vip = item.paranValue
-                                break;
-                            case 'attendance_range_vip':
-                                dataList.attendance_range_vip = item.paranValue
-                                break;
-                        }
-                    });
-                    this.dataList = dataList
-                }
-            })
-            setLoading(false)
+            try {
+                let offRes = await await sysTenantConfig({ group: "OFFLINE" })
+                const offData = offRes.data || []
+                offData.forEach(off => {
+                    this.dataList[off.paramName] = off.paranValue
+                });
+
+                let onRes = await await sysTenantConfig({ group: "ONLINE" })
+                const forwardRes = await sysTenantConfig({ group: "DAYA_BASIC" });
+                const onData = onRes.data || []
+                onData.forEach(on => {
+                    this.dataList[on.paramName] = on.paranValue
+                })
+                const forwardData = forwardRes.data || []
+                forwardData.forEach(forward => {
+                    this.dataList[forward.paramName] = forward.paranValue
+                })
+                
+            } catch(e) {}
         }
     }
 }

src/views/teacher/VIP00Apply.vue

@@ -524,7 +524,7 @@ export default {
   },
   watch: {
     'statusList.hasOffline'() {
-      console.log(this.statusList.hasOffline)
+      // console.log(this.statusList.hasOffline)
     }
   },
   data() {

src/views/teacher/VIPApply.vue

@@ -1,19 +1,24 @@
 <template>
-	 <van-tabs v-model="active" swipe-threshold="3" sticky class="vanTabs" @change="onChange" color="#01C1B5"> 
-		<van-tab title="VIP申请" :name="1">
-			<vip-00-apply v-if="active === 1" />
-		</van-tab>
-		<van-tab title="双十一排课" :name="2">
-			<vip-11-apply v-if="active === 2" />
-		</van-tab>
-		<van-tab title="考级VIP排课" :name="3">
-			<vip-course v-if="active === 3" />
-		</van-tab>
-		<van-tab title="考级乐理排课" :name="4">
-			<theory-course v-if="active === 4" />
-		</van-tab>
-	</van-tabs> 
-	<!-- <vip-00-apply /> -->
+	<!-- 判断是否是大雅机构 -->
+	<div v-if="tenantId == 1">
+		<van-tabs v-model="active" swipe-threshold="3" sticky class="vanTabs" @change="onChange" color="#01C1B5"> 
+			<van-tab title="VIP申请" :name="1">
+				<vip-00-apply v-if="active === 1" />
+			</van-tab>
+			<van-tab title="双十一排课" :name="2">
+				<vip-11-apply v-if="active === 2" />
+			</van-tab>
+			<van-tab title="考级VIP排课" :name="3">
+				<vip-course v-if="active === 3" />
+			</van-tab>
+			<van-tab title="考级乐理排课" :name="4">
+				<theory-course v-if="active === 4" />
+			</van-tab>
+		</van-tabs>
+	</div>
+	<div v-else>
+		<vip-00-apply />
+	</div>
 </template>
 
 <script>
@@ -30,9 +35,14 @@ export default {
 	},
 	data() {
 		return {
-			active: 1
+			active: 1,
+			tenantId: null,
 		}
 	},
+	created() {
+		this.tenantId = sessionStorage.getItem('tenantId') || null
+		console.log(this.tenantId)
+	},
 	mounted() {
 		let params = this.$route.query;
     if (params.Authorization) {

src/views/trainStatistics/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="visitList">
-        <van-sticky>
+        <van-sticky v-if="tenantId == 1">
             <m-header v-if="headerStatus" :isFixed="false" />
             <van-tabs v-model="active" @change="tabChange" title-active-color="#000000" title-inactive-color="#808080" color="#01C1B5" class="van-hairline--bottom">
                 <van-tab title="全部学员" name="all">
@@ -86,6 +86,9 @@ export default {
             playTime: 0,
         };
     },
+    created() {
+		this.tenantId = sessionStorage.getItem('tenantId') || null
+	},
     async mounted() {
         let params = this.$route.query;
         if (params.Authorization) {
@@ -98,7 +101,7 @@ export default {
         document.title = '训练统计'
         try {
             let res = await sysTenantConfig({ group: 'DAYA_BASIC' })
-            const { data } = res.data
+            const { data } = res
             data.forEach(item => {
                 if(item.paramName == 'student_cloud_teacher_train_num') {
                     this.trainNum = item.paranValue

src/views/trainStatistics/trainModel.vue

@@ -74,11 +74,11 @@ export default {
             default: 0
         },
         trainNum: {
-            type: String || Number,
+            type: [Number, String],
             default: 0
         },
         playTime: {
-            type: String || Number,
+            type: [Number, String],
             default: 0
         },
     },
@@ -99,8 +99,7 @@ export default {
                 trainNum: null,
                 trainDay: null,
                 recordNum: null,
-            },
-            
+            }
         }
     },
     async mounted() {