bug修改

hxy-web/html/dataStatistics/header.html

@@ -90,7 +90,7 @@
 					</li>
 					<li>
 						<div><img src="../../image/tabIcon6.png" alt=""></div>
-						<div>特勤考勤台账</div>
+						<div>特巡考勤台账</div>
 					</li>
 					<li>
 						<div><img src="../../image/tabIcon7.png" alt=""></div>

hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js

@@ -9,9 +9,12 @@ layui.use(['form','layer','table','laydate'], function () {
 
 	//初始化日期选择框
 	laydate.render({
-	    elem: '#dataTime',
+	    elem: '#makeMonth',
 	    type: 'month',
+		value: getCurrentMonth() // 初始加载当前月
 	});
+	
+	
     // 触发submit提交 按钮点击或者表单被执行提交时触发
     form.on('submit(query)', function (data) {
         console.log("搜索")
@@ -170,6 +173,7 @@ var col = [
  */
 function init(){
 	var subComId = $(window.parent.document).find("select[id='subComId']").val(); 
+	let makeMonth = $('#makeMonth').val();
       // 渲染表格
   table.render({
     elem: '#table',
@@ -177,7 +181,8 @@ function init(){
     page: true,
 	where:{
 		yjId:localStorage.getItem("selectyj"),
-		subId:localStorage.getItem("selectSubCom")
+		subId:localStorage.getItem("selectSubCom"),
+		makeMonth:makeMonth
 	},
 	method:'post',
 	border: true,
@@ -271,4 +276,12 @@ function exportData() {
 		+ "&makeMonth=" + makeMonth
 		+ "&subId=" + subId
 		+ "&yjId=" + yjId
+}
+
+// 获取当前月份，格式为 YYYY-MM
+function getCurrentMonth() {
+    var currentDate = new Date();
+    var year = currentDate.getFullYear();
+    var month = (currentDate.getMonth() + 1).toString().padStart(2, '0'); // 月份补0
+    return year + '-' + month;
 }

hxy-web/js/public/public.js

@@ -1,5 +1,5 @@
 //系统请求路径
-let PATH_URL="http://127.0.0.1:1917/line" 
+let PATH_URL="http://127.0.0.1:2024/line" 
 // let PATH_URL="http://192.168.0.14:2024/line" 
 
 let FILE_URL="http://127.0.0.1:1909/file"

hxy-web/js/wireManager/viewResult/specialPatrolAdd.js

@@ -172,15 +172,22 @@ function insertSpecial(obj){
 	$.each(ysUrls,function(index,item){
 		ysurld=ysurld+item+",";
 	})
+	
+	//上传月份总是与日期不对应，从选择的提起获取月份
+	let makeTime = $("#dataTime").val();
+	let formatYearMonth = makeTime.substring(0, 7);
+	
 	$.ajax({
 	     type:"post",
 	     url : PATH_URL + "/makeInfo/insertSpecial", 
 		 async:false,
 	     data:{
-				userId: localStorage.getItem("resultUserId"),proId:localStorage.getItem("resultProId"),makeMonth:localStorage.getItem("resultMakeMonth"),
+				userId: localStorage.getItem("resultUserId"),
+				proId:localStorage.getItem("resultProId"),
+				makeMonth:formatYearMonth,
 				ysUrl:ysurld,url:urld,
 				remarks:$("#remark").val(),
-				makeTime:$("#dataTime").val()
+				makeTime:makeTime
 	     },
 	     dataType:"json",
 	     success:function(res){

hxy-web/js/wireManager/viewResult/viewResult.js

@@ -12,6 +12,7 @@ layui.use(['form','layer','table','laydate'], function () {
 	laydate.render({
 	    elem: '#makeMonth',
 	    type: 'month',
+		value: getCurrentMonth() // 初始加载当前月
 	});
     // 触发submit提交 按钮点击或者表单被执行提交时触发
     form.on('submit(query)', function (data) {
@@ -36,7 +37,8 @@ layui.use(['form','layer','table','laydate'], function () {
 		    userName:'',
 		    yjName:'',
 			proName:'',
-			makeMonth:'',yjId:yjId
+			makeMonth:'',
+			yjId:yjId
 		}
 		 // 对表格进行重载。id 即 table表格的id
 		table.reload('table', {
@@ -70,11 +72,13 @@ layui.use(['form','layer','table','laydate'], function () {
  */
 function init(){
 	yjId=localStorage.getItem("oneselectyj");
+	let makeMonth = $('#makeMonth').val();
 	let obj = {
 	    userName:'',
 	    yjName:'',
 		proName:'',
-		makeMonth:'',yjId:yjId
+		makeMonth:makeMonth,
+		yjId:yjId
 	}
       // 渲染表格
   table.render({
@@ -219,4 +223,12 @@ function exportData() {
 		+ "&yjName=" + yjName
 		+ "&makeMonth=" + makeMonth
 		+ "&yjId=" + yjId
+}
+
+// 获取当前月份，格式为 YYYY-MM
+function getCurrentMonth() {
+    var currentDate = new Date();
+    var year = currentDate.getFullYear();
+    var month = (currentDate.getMonth() + 1).toString().padStart(2, '0'); // 月份补0
+    return year + '-' + month;
 }