diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml index ec5af8777..65b914a5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml @@ -10,6 +10,95 @@
+
+
+ + + +
+ 时间段排除 + +
+ + + + +
+
+ 新 增 +
+ + 确 定 + + +
+ +
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js index 8009affaa..13a05ad8f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js @@ -53,8 +53,11 @@ var bootstrap = function ($, learun) { // 默认 dfvalue: '0', selectfn: function (begin, end) { + $('#datesearch').attr('starttime', begin) + $('#datesearch').attr('endtime', end) startTime = begin; endTime = end; + window.datesearchChange() } }); // 查询 @@ -166,6 +169,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = startTime; param.EndTime = endTime; + param.noTime = $('#timeNoCludes').attr("timeNoCludes") $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue index f238cd635..f5834595c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue @@ -5,6 +5,13 @@ // 考虑到用户刷新网页时会丢失全局数据、页面栈、页面数据等，因此直接跳回首页即可 async onLaunch(param) { + // 版本更新 + var newVer = '1.0.2'; + var oldVer = localStorage.getItem('version'); +     if (newVer != oldVer) { + localStorage.setItem('version', newVer); + this.JUMP_TO("/") + } // 加载百度地图资源 let ak = this.GET_AK() var script = document.createElement('script'); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue index beb459b69..d793e5d1b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue @@ -31,6 +31,9 @@ {{postData.ClockPlace}} + + 定位不精准？WIFI信息打卡 + @@ -93,6 +96,8 @@ postData: {}, isGetingLocal:false, // modal:false, + + isInternalNet:false, } }, @@ -103,6 +108,7 @@ methods: { // 页面初始化 async init() { + this.isInternalNetwork(false) this.LOADING('加载数据中...') this.now = this.getCurrentTime() @@ -314,6 +320,26 @@ toAttendanceCardTeacher() { this.JUMP_TO('/pages/AttendanceCardTeacher/list', {},true) }, + // 判断是否学校网络 + isInternalNetwork(TOAST=true){ + this.LOADING() + this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ + this.HIDE_LOADING() + let res_ = res[1] + let client_ip_start = '1.190.222.' + let arr = [] + for(let i=34;i<47;i++){ + arr.push(client_ip_start+i) + } + if(res_.data&&arr.includes(res_.data.client_ip)){ + this.isInternalNet = true + let postData = {AIsOut:0,ClockPlace:'已连接校园网'} + TOAST&&this.NAV_TO(`./single_zc`,postData,true) + }else{ + TOAST&&this.TOAST('未检测到校园网连接') + } + }) + }, }, destroyed() { // let scirpt = document.getElementById('baiduScript') @@ -431,4 +457,13 @@ filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); filter: gray; } + + .wifiCard{ + margin-top: 6px; + font-size: 14px; + text-align: center; + span{ + color: #0c86d8; + } + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue index ec63c89dd..8c3419e9b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue @@ -40,6 +40,9 @@ {{postData.ClockPlace}} + + 定位不精准？WIFI信息打卡 + @@ -97,6 +100,8 @@ map: null, postData: {}, isGetingLocal:false, + + isInternalNet:false, } }, @@ -107,6 +112,7 @@ methods: { // 页面初始化 async init() { + this.isInternalNetwork(false) this.LOADING('加载数据中...') this.now = this.getCurrentTime() @@ -312,7 +318,27 @@ }) }); - } + }, + // 判断是否学校网络 + isInternalNetwork(TOAST=true){ + this.LOADING() + this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ + this.HIDE_LOADING() + let res_ = res[1] + let client_ip_start = '1.190.222.' + let arr = [] + for(let i=34;i<47;i++){ + arr.push(client_ip_start+i) + } + if(res_.data&&arr.includes(res_.data.client_ip)){ + this.isInternalNet = true + let postData = {AIsOut:0,ClockPlace:'已连接校园网'} + TOAST&&this.NAV_TO(`./single_zc`,postData,true) + }else{ + TOAST&&this.TOAST('未检测到校园网连接') + } + }) + }, }, destroyed() { let scirpt = document.getElementById('baiduScript') @@ -430,4 +456,13 @@ filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); filter: gray; } + + .wifiCard{ + margin-top: 6px; + font-size: 14px; + text-align: center; + span{ + color: #0c86d8; + } + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js index aec61525d..5e1d367f9 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js @@ -14,7 +14,7 @@ module.exports = { disableHostCheck: true }, output: { // 输出重构 打包编译后的 文件目录 文件名称 【模块名称.时间戳】 - filename: `${filePath}[name]${Timestamp}.js`, + filename: `${filePath}[name]${Timestamp}.js?v=1.0.2`, chunkFilename: `${filePath}[name]${Timestamp}.js` }, }