From 741cc2dc35597ff89ed18e21908c9de510b88c4d Mon Sep 17 00:00:00 2001 From: yxq Date: Thu, 6 Jun 2024 15:22:41 +0800 Subject: [PATCH 1/6] =?UTF-8?q?web=20=E6=95=99=E5=8A=A1=EF=BC=8C=E8=AF=BE?= =?UTF-8?q?=E6=97=B6=E8=B4=B9=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/coursestatictis.cshtml | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) 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..3f14612e8 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 @@ -19,6 +19,94 @@
+
+
+
+ 时间段排除 + +
+ + + + +
+
+ 新增 +
+ + 确 定 + + +
+ + + + +
+
 查询
From 9187a89ea2158d99642bb0545f1531ac85518267 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 13:38:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=89=93=E5=8D=A1=E5=A2=9E=E5=8A=A0wifi=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E6=A3=80=E6=B5=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/App.vue | 7 +++++ .../pages/AttendanceCard/list.vue | 25 +++++++++++++++++ .../pages/AttendanceCardTeacher/list.vue | 27 ++++++++++++++++++- .../LearunApp-2.2.0/vue.config.js | 2 +- 4 files changed, 59 insertions(+), 2 deletions(-) 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..a249f49e7 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.1'; + 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..0d036038d 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信息打卡 + @@ -314,6 +317,19 @@ toAttendanceCardTeacher() { this.JUMP_TO('/pages/AttendanceCardTeacher/list', {},true) }, + // 判断是否学校网络 + isInternalNetwork(){ + this.LOADING() + this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ + this.HIDE_LOADING() + if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let postData = {AIsOut:0,ClockPlace:'已连接校园网'} + this.NAV_TO(`./single_zc`,postData,true) + }else{ + this.TOAST('未检测到校园网连接') + } + }) + }, }, destroyed() { // let scirpt = document.getElementById('baiduScript') @@ -431,4 +447,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..af586e192 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信息打卡 + @@ -312,7 +315,20 @@ }) }); - } + }, + // 判断是否学校网络 + isInternalNetwork(){ + this.LOADING() + this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ + this.HIDE_LOADING() + if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let postData = {AIsOut:0,ClockPlace:'已连接校园网'} + this.NAV_TO(`./single_zc`,postData,true) + }else{ + this.TOAST('未检测到校园网连接') + } + }) + }, }, destroyed() { let scirpt = document.getElementById('baiduScript') @@ -430,4 +446,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..0f155ed26 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.1`, chunkFilename: `${filePath}[name]${Timestamp}.js` }, } From 34f4b1254ad0807fa4e700a963bb52a26b87740b Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 15:23:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?web=20=E8=AF=BE=E6=97=B6=E8=B4=B9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E9=97=B4=E6=AE=B5=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/coursestatictis.cshtml | 93 ++++++++++--------- .../ArrangeLessonTerm/coursestatictis.js | 4 + 2 files changed, 51 insertions(+), 46 deletions(-) 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 3f14612e8..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,19 +10,13 @@
-
-
-
-
-
-
-
-
-
+ + +
- 新增 + 新 增
- 确 定 + 确 定
- - -
+
+
+
+
+
+
+
+
+
 查询
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) }); } }; From 545990c78557c56dd9f49ddaf8e5141fc9bde50c Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 15:25:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/AttendanceCard/list.vue | 15 ++++++++++----- .../pages/AttendanceCardTeacher/list.vue | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) 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 0d036038d..9ee1afd5c 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,7 +31,7 @@ {{postData.ClockPlace}} - + 定位不精准？WIFI信息打卡 @@ -96,6 +96,8 @@ postData: {}, isGetingLocal:false, // modal:false, + + isInternalNet:false, } }, @@ -106,6 +108,7 @@ methods: { // 页面初始化 async init() { + this.isInternalNetwork(false) this.LOADING('加载数据中...') this.now = this.getCurrentTime() @@ -318,15 +321,17 @@ this.JUMP_TO('/pages/AttendanceCardTeacher/list', {},true) }, // 判断是否学校网络 - isInternalNetwork(){ + isInternalNetwork(TOAST=true){ this.LOADING() this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() - if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let res_ = res[1] + if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + this.isInternalNet = true let postData = {AIsOut:0,ClockPlace:'已连接校园网'} - this.NAV_TO(`./single_zc`,postData,true) + TOAST&&this.NAV_TO(`./single_zc`,postData,true) }else{ - this.TOAST('未检测到校园网连接') + TOAST&&this.TOAST('未检测到校园网连接') } }) }, 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 af586e192..5cfa13e06 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,7 +40,7 @@ {{postData.ClockPlace}} - + 定位不精准？WIFI信息打卡 @@ -100,6 +100,8 @@ map: null, postData: {}, isGetingLocal:false, + + isInternalNet:false, } }, @@ -110,6 +112,7 @@ methods: { // 页面初始化 async init() { + this.isInternalNetwork(false) this.LOADING('加载数据中...') this.now = this.getCurrentTime() @@ -317,15 +320,17 @@ }); }, // 判断是否学校网络 - isInternalNetwork(){ + isInternalNetwork(TOAST=true){ this.LOADING() this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() - if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let res_ = res[1] + if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + this.isInternalNet = true let postData = {AIsOut:0,ClockPlace:'已连接校园网'} - this.NAV_TO(`./single_zc`,postData,true) + TOAST&&this.NAV_TO(`./single_zc`,postData,true) }else{ - this.TOAST('未检测到校园网连接') + TOAST&&this.TOAST('未检测到校园网连接') } }) }, From 843d793803025454556e83a138ab79f9579493fc Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 16:29:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/AttendanceCard/list.vue | 7 ++++++- .../LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) 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 9ee1afd5c..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 @@ -326,7 +326,12 @@ this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() let res_ = res[1] - if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + 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) 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 5cfa13e06..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 @@ -325,7 +325,12 @@ this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() let res_ = res[1] - if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + 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) From a9ebdeeba872e0f26ba1502dd6388f21e8448649 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 16:30:21 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue | 2 +- Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a249f49e7..f5834595c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue @@ -6,7 +6,7 @@ async onLaunch(param) { // 版本更新 - var newVer = '1.0.1'; + var newVer = '1.0.2'; var oldVer = localStorage.getItem('version');     if (newVer != oldVer) { localStorage.setItem('version', newVer); 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 0f155ed26..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?v=1.0.1`, + filename: `${filePath}[name]${Timestamp}.js?v=1.0.2`, chunkFilename: `${filePath}[name]${Timestamp}.js` }, }