Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml

@@ -10,19 +10,13 @@
                     <div class="lr-layout-tool-item">
                         <div id="datesearch" style="min-width:150px"></div>
                     </div>
-                    <div class="lr-layout-tool-item">
-                        <div id="weeks" style="min-width:150px"></div>
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <div id="DeptNo" style="min-width:200px"></div>
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <div id="status" style="min-width:150px"></div>
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div class=" btn-group btn-group-sm">
+                            <script src="~/Content/vue/vue.js"></script>
+                            <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+                            <script src="https://unpkg.com/element-ui/lib/index.js"></script>
                             <div id="app">
-                                <a class="btn btn-default" v-on:click="nocludesVisible = true">时间段排除</a>
+                                <a id="timeNoCludes" class="btn btn-default" v-on:click="nocludesVisible = true">时间段排除</a>
                                 <el-dialog title="时间段排除"
                                            :visible.sync="nocludesVisible"
                                            width="500px"
@@ -39,8 +33,7 @@
                                                         end-placeholder="结束日期"
                                                         align="right">
                                         </el-date-picker>
-                                        <el-button
-                                                   size="small"
+                                        <el-button size="small"
                                                    type="warning"
                                                    plain
                                                    class="el-icon-delete"
@@ -48,65 +41,73 @@
                                         </el-button>
                                     </div>
                                     <div>
-                                        <el-button size="small" type="primary" plain v-on:click="addNoCludes">新增</el-button>
+                                        <el-button size="small" type="primary" plain v-on:click="addNoCludes">新 增</el-button>
                                     </div>
                                     <span slot="footer" class="dialog-footer">
-                                        <el-button size="small" type="primary" v-on:click="nocludesVisible = false">确 定</el-button>
+                                        <el-button size="small" type="primary" v-on:click="handleClose">确 定</el-button>
                                     </span>
                                 </el-dialog>
                             </div>
-                            <script src="~/Content/vue/vue.js"></script>
-                            <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
-                            <script src="https://unpkg.com/element-ui/lib/index.js"></script>
                             <script>
                                 new Vue({
                                     el: "#app",
                                     data: {
-                                        searchNoIncludes: [{value:null}],
+                                        searchNoIncludes: [{ value: null }],
                                         nocludesVisible: false,
-                                        pickerOptions: {
-                                            shortcuts: [{
-                                                text: '最近一周',
-                                                onClick(picker) {
-                                                    const end = new Date();
-                                                    const start = new Date();
-                                                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                                                    picker.$emit('pick', [start, end]);
-                                                }
-                                            }, {
-                                                text: '最近一个月',
-                                                onClick(picker) {
-                                                    const end = new Date();
-                                                    const start = new Date();
-                                                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                                                    picker.$emit('pick', [start, end]);
-                                                }
-                                            }, {
-                                                text: '最近三个月',
-                                                onClick(picker) {
-                                                    const end = new Date();
-                                                    const start = new Date();
-                                                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                                                    picker.$emit('pick', [start, end]);
-                                                }
-                                            }]
-                                        },
+                                        pickerOptions: {},
+                                        begin: '',
+                                        end: '',
+                                    },
+                                    mounted() {
+                                        window.datesearchChange = this.datesearchChange
                                     },
                                     methods: {
+                                        datesearchChange() {
+                                            this.begin = $('#datesearch').attr('starttime')
+                                            this.end = $('#datesearch').attr('endtime')
+                                            this.pickerOptions = {
+                                                disabledDate: (e)=> {
+                                                    let datetime = e.valueOf()
+                                                    if (datetime >= new Date(this.begin).valueOf() && datetime < new Date(this.end).valueOf()+1000) {
+                                                        return false
+                                                    }
+                                                    return true
+                                                }
+                                            }
+                                            this.searchNoIncludes = [{ value: null }]
+                                            this.setDataNoIncludes()
+                                        },
                                         handleClose() {
+                                            this.setDataNoIncludes()
                                             this.nocludesVisible = false
                                         },
                                         addNoCludes() {
                                             this.searchNoIncludes.push({ value: null })
                                         },
                                         delNoIcludes(index) {
-                                            this.searchNoIncludes.splice(index,1)
+                                            this.searchNoIncludes.splice(index, 1)
+                                        },
+                                        setDataNoIncludes() {
+                                            let arr = this.searchNoIncludes.filter(e => {
+                                                return e.value && e.value.length
+                                            })
+                                            let data = arr.map(e => e.value.toString())
+                                            $('#timeNoCludes').attr("timeNoCludes", data.join("&"))
                                         }
                                     }
                                 })
                             </script>
                         </div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="weeks" style="min-width:150px"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="DeptNo" style="min-width:200px"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="status" style="min-width:150px"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
                     </div>

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) });
         }
     };

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);

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue

@@ -31,7 +31,7 @@
 					<view style="color: #666;">
 						{{postData.ClockPlace}}
 					</view>
-					<view class="wifiCard" v-if="info.AttendanceType != 5">
+					<view class="wifiCard" v-if="info.AttendanceType != 5&isInternalNet">
 						定位不精准？<span @click="isInternalNetwork">WIFI信息打卡</span>
 					</view>
 				</view>
@@ -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,22 @@
 				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]
+					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:'已连接校园网'}
-						this.NAV_TO(`./single_zc`,postData,true)
+						TOAST&&this.NAV_TO(`./single_zc`,postData,true)
 					}else{
-						this.TOAST('未检测到校园网连接')
+						TOAST&&this.TOAST('未检测到校园网连接')
 					}
 				})
 			},

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue

@@ -40,7 +40,7 @@
 						<view>
 							{{postData.ClockPlace}}
 						</view>
-						<view class="wifiCard" v-if="info.AttendanceType != 5">
+						<view class="wifiCard" v-if="info.AttendanceType != 5&isInternalNet">
 							定位不精准？<span @click="isInternalNetwork">WIFI信息打卡</span>
 						</view>
 					</view>
@@ -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,22 @@
 				});
 			},
 			// 判断是否学校网络
-			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]
+					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:'已连接校园网'}
-						this.NAV_TO(`./single_zc`,postData,true)
+						TOAST&&this.NAV_TO(`./single_zc`,postData,true)
 					}else{
-						this.TOAST('未检测到校园网连接')
+						TOAST&&this.TOAST('未检测到校园网连接')
 					}
 				})
 			},

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`
 		},
 	}