diff --git a/hxy-web/html/dataStatistics/header.html b/hxy-web/html/dataStatistics/header.html
index 92901bb..5d9e397 100644
--- a/hxy-web/html/dataStatistics/header.html
+++ b/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>
diff --git a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js b/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js
index 69ff8f4..ddf6b55 100644
--- a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js
+++ b/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;
 }
\ No newline at end of file
diff --git a/hxy-web/js/public/public.js b/hxy-web/js/public/public.js
index d239ff2..1e4a7a8 100644
--- a/hxy-web/js/public/public.js
+++ b/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"
diff --git a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
index 15ba806..f2a015c 100644
--- a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
+++ b/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){
diff --git a/hxy-web/js/wireManager/viewResult/viewResult.js b/hxy-web/js/wireManager/viewResult/viewResult.js
index 05283af..a523d8c 100644
--- a/hxy-web/js/wireManager/viewResult/viewResult.js
+++ b/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;
 }
\ No newline at end of file
diff --git a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
index 2a33a48..492deb1 100644
--- a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
+++ b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
@@ -1,234 +1,265 @@
-var table,form,layer,laydate,element;
+var table, form, layer, laydate, element;
 var currentDate = new Date();
-var tabList=[];
-var month = currentDate.getMonth() + 1;//当前第几月
+var tabList = [];
+var month = currentDate.getMonth() + 1; //当前第几月
 var year = currentDate.getFullYear();
+var resultMonth = localStorage.getItem("resultMakeMonth");
 var resultUserId;
 var resultProId;
-var resultMonth;
-layui.use(['form','layer','table','laydate','element'], function () {
-    table = layui.table;
-    form = layui.form;
-    layer = layui.layer;
-    laydate = layui.laydate;
-    element = layui.element;
-	
-    // 渲染时间选择器
-    laydate.render({
-        elem:'#month', //指定元素  元素选择器
-        type:'month',  //选择时间类型 可选值:year(年) month(年月)  date(年月日)  time(时分秒)  datetime(年月日时分秒)
-        trigger:'click',
-		min:firstDayStr(),
-		max:lastDayStr(),
-        format: 'yyyy-MM',
-        btns:['now','confirm'], //选择框右下角显示的按钮 清除-现在-确定
-        value: formatCurrentMonth(), // 如果你想预设当前日期为选中状态
-        done: function (value, date) {//时间回调
-            console.log("date:", date);
-			localStorage.setItem("resultMakeMonth",value);
-			resultMonth=value;
-            init(date.year,date.month);
-        }
-    });
-    $("#month").val(localStorage.getItem("resultMakeMonth"));
-	resultMonth=localStorage.getItem("resultMakeMonth")
+
+layui.use(['form', 'layer', 'table', 'laydate', 'element'], function() {
+	table = layui.table;
+	form = layui.form;
+	layer = layui.layer;
+	laydate = layui.laydate;
+	element = layui.element;
+
+	// 渲染时间选择器
+	laydate.render({
+		elem: '#month', //指定元素  元素选择器
+		type: 'month', //选择时间类型 可选值:year(年) month(年月)  date(年月日)  time(时分秒)  datetime(年月日时分秒)
+		trigger: 'click',
+		min: firstDayStr(),
+		max: lastDayStr(),
+		format: 'yyyy-MM',
+		btns: ['now', 'confirm'], //选择框右下角显示的按钮 清除-现在-确定
+		value: formatCurrentMonth(), // 如果你想预设当前日期为选中状态
+		done: function(value, date) { //时间回调
+			console.log("date:", date);
+			resultMonth = value;
+			init(date.year, date.month);
+		}
+	});
+	$("#month").val(resultMonth);
 	setData()
-	init(year,month)
+	let result = getYearMonth(resultMonth);
+	init(result.oldYear, result.oldMonth);
 });
-function firstDayStr(){
-	var today = new Date();
-    var thisMonth = today.getMonth(); // 获取当前月份（从0开始）
-    var year = today.getFullYear(); // 获取当前年份
- 
-    // 当月的第一天
-    var firstDay = new Date(year, thisMonth-1, 2);
-    var firstDayString = firstDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
- 
-    // 当月的最后一天
-    var lastDay = new Date(year, thisMonth + 1, 1);
-    var lastDayString = lastDay.toISOString().slice(0, 7); // 转换为YYYY-MM-DD格式
-	 console.log("First day of this month: " + firstDayString);
-	 return firstDayString;
-}
-function lastDayStr(){
+
+function firstDayStr() {
+	var today = new Date();
+	var thisMonth = today.getMonth(); // 获取当前月份（从0开始）
+	var year = today.getFullYear(); // 获取当前年份
+
+	// 当月的第一天
+	var firstDay = new Date(year, thisMonth - 1, 2);
+	var firstDayString = firstDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
+
+	// 当月的最后一天
+	var lastDay = new Date(year, thisMonth + 1, 1);
+	var lastDayString = lastDay.toISOString().slice(0, 7); // 转换为YYYY-MM-DD格式
+	console.log("First day of this month: " + firstDayString);
+	return firstDayString;
+}
+
+function lastDayStr() {
 	var today = new Date();
 	var thisMonth = today.getMonth(); // 获取当前月份（从0开始）
 	var year = today.getFullYear(); // 获取当前年份
-	 
 	// 当月的第一天
 	var firstDay = new Date(year, thisMonth, 1);
 	var firstDayString = firstDay.toISOString().slice(0, 7); // 转换为YYYY-MM-DD格式
-	 
 	// 当月的最后一天
 	var lastDay = new Date();
 	var lastDayString = lastDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
-	 console.log("Last day of this month: " + lastDayString);
-	 return lastDayString;
+	return lastDayString;
 }
-function currMonth(){
+
+function currMonth() {
 	var lastDay = new Date();
-	var lastDayString = lastDay.toISOString().slice(0, 7); // 转换为YYYY-MM-DD格式
-	 console.log("Last day of this month: " + lastDayString);
-	 return lastDayString;
+	var lastDayString = lastDay.toISOString().slice(0, 7); // 转换为YYYY-MM格式
+	return lastDayString;
 }
+
+function currUpdateMonth(update) {
+	var lastDay = new Date();
+	lastDay.setMonth(lastDay.getMonth() + update);
+	var lastDayString = lastDay.toISOString().slice(0, 7); // 转换为YYYY-MM格式
+	return lastDayString;
+}
+
 //工程切换
-function projectTab(event,proId){
-	 resultProId=proId;
-	 localStorage.setItem("resultProId",resultProId);
-	 console.log(resultProId,'resultProId')
-	 //修改所点工程样式
-	 $("#projects>div").removeClass("projectsStyle");
-	 $(event).addClass("projectsStyle")
-	 getView();
-	 getSpecial(localStorage.getItem("resultMakeMonth").substring(0,4),localStorage.getItem("resultMakeMonth").substring(5,7)<10?localStorage.getItem("resultMakeMonth").substring(5,7).replace("0",""):localStorage.getItem("resultMakeMonth").substring(5,7));
- }
- 
+function projectTab(event, proId) {
+	resultProId = proId;
+	localStorage.setItem("resultProId", resultProId);
+	console.log(resultProId, 'resultProId')
+	//修改所点工程样式
+	$("#projects>div").removeClass("projectsStyle");
+	$(event).addClass("projectsStyle")
+	getView();
+	let result = getYearMonth(resultMonth);
+	// init(result.oldYear,result.oldMonth);
+	getSpecial(result.oldYear, result.oldMonth);
+}
+
 function formatCurrentMonth() {
-        var date = new Date();
-        var month = date.getMonth() + 1; // 注意月份是从0开始的，所以加1
-        return date.getFullYear() + '-' + (month < 10 ? '0' + month : month);
-    }
+	var date = new Date();
+	var month = date.getMonth() + 1; // 注意月份是从0开始的，所以加1
+	return date.getFullYear() + '-' + (month < 10 ? '0' + month : month);
+}
 /**
  * 初始化数据
  */
-function init(chosenYear,chosenMonth){
-    layui.use(['table'], function () {
+function init(chosenYear, chosenMonth) {
+	layui.use(['table'], function() {
 		getTab(chosenMonth)
-		if(localStorage.getItem("resultMakeMonth")!=currMonth()){
-			$("#normalInspectionUpload").css("display","none")
+		if (resultMonth != currMonth() && resultMonth != currUpdateMonth(-1) ) {
+			$("#normalInspectionUpload").css("display", "none")
 			getViewc();
-		}else{
-			$("#normalInspectionUpload").css("display","")
+		} else {
+			$("#normalInspectionUpload").css("display", "")
 			getView();
 		}
-		getSpecial(chosenYear,chosenMonth)
-    })
+		getSpecial(chosenYear, chosenMonth)
+	})
 }
-function getSpecial(chosenYear,chosenMonth){
+
+function getSpecial(chosenYear, chosenMonth) {
 	let table = layui.table;
 	let daysInMonth = new Date(chosenYear, chosenMonth, 0).getDate();
 	console.log(daysInMonth)
 	let tableData = []
-	$.ajax({//id获取详情打开弹窗传值子页面
-	    type: 'post',
-	    url: PATH_URL + "/makeInfo/getSpecialData",
-	    dataType: 'json',
-		async:false,
-	    data: {
-	        userId: localStorage.getItem("resultUserId"),proId:localStorage.getItem("resultProId"),makeMonth:localStorage.getItem("resultMakeMonth")
-	    },
-	    success: function (data) {
-			console.log(data,"resultSpecial");
-			var isWorkData=[];
-			$.each(data.data,function(index,item){
+	$.ajax({ //id获取详情打开弹窗传值子页面
+		type: 'post',
+		url: PATH_URL + "/makeInfo/getSpecialData",
+		dataType: 'json',
+		async: false,
+		data: {
+			userId: localStorage.getItem("resultUserId"),
+			proId: localStorage.getItem("resultProId"),
+			makeMonth: resultMonth
+		},
+		success: function(data) {
+			console.log(data, "resultSpecial");
+			var isWorkData = [];
+			$.each(data.data, function(index, item) {
 				isWorkData.push(item.makeTime)
 			})
-			var isWork={};
-			isWork.isWork=isWorkData;
+			var isWork = {};
+			isWork.isWork = isWorkData;
 			tableData.push(isWork);
-	    },
-		error:function(e){
-			
+		},
+		error: function(e) {
+
 		}
 	})
 	let cols = []
 	for (let k = 1; k <= daysInMonth; k++) {
-	    let str = chosenMonth+'.'+k;
-	    let obj = {field:'isWork', title: str,align: 'center',width:70,
-	        templet: function(d){
-	            if(d.isWork.includes(d.LAY_COL.title)){
-	                return `<i class="layui-icon" style="color: red;">&#xe605;</i> `
-	            }else{
-	                return `<apan></apan>`
-	            }
-	        }}
-	    cols.push(obj)
+		let str = chosenMonth + '.' + k;
+		let obj = {
+			field: 'isWork',
+			title: str,
+			align: 'center',
+			width: 70,
+			templet: function(d) {
+				if (d.isWork.includes(d.LAY_COL.title)) {
+					return `<i class="layui-icon" style="color: red;">&#xe605;</i> `
+				} else {
+					return `<apan></apan>`
+				}
+			}
+		}
+		cols.push(obj)
 	}
-	console.log(tableData,"tableData");
+	console.log(tableData, "tableData");
 	table.render({
-	    elem: '#isWorkList',
-	    // url: "/sys/achievement",
-	    // where: obj,
-	    //skin: 'line', // 横向边框线
-	    cols: [cols],
-	    data: tableData
+		elem: '#isWorkList',
+		// url: "/sys/achievement",
+		// where: obj,
+		//skin: 'line', // 横向边框线
+		cols: [cols],
+		data: tableData
 	});
 }
 
-function getTab(chosenMonth){
-    tabList = [{id:'1',projectName:'xxx工程1'},{id:'2',projectName:'xxx工程2'},{id:'3',projectName:'xxx工程3'},{id:'4',projectName:'xxx工程4'}]
-	$.ajax({//id获取详情打开弹窗传值子页面
-	    type: 'post',
-	    url: PATH_URL + "/makeInfo/getProByUser",
-	    dataType: 'json',
-		async:false,
-	    data: {
-	        id: localStorage.getItem("resultUserId")
-	    },
-	    success: function (data) {
-			tabList=data.data;
-	    },
-		error:function(e){
-			
+function getTab(chosenMonth) {
+	tabList = [{
+		id: '1',
+		projectName: 'xxx工程1'
+	}, {
+		id: '2',
+		projectName: 'xxx工程2'
+	}, {
+		id: '3',
+		projectName: 'xxx工程3'
+	}, {
+		id: '4',
+		projectName: 'xxx工程4'
+	}]
+	$.ajax({ //id获取详情打开弹窗传值子页面
+		type: 'post',
+		url: PATH_URL + "/makeInfo/getProByUser",
+		dataType: 'json',
+		async: false,
+		data: {
+			id: localStorage.getItem("resultUserId")
+		},
+		success: function(data) {
+			tabList = data.data;
+		},
+		error: function(e) {
+
 		}
 	})
-    // projectList
-    $("#projects").empty()
-    let html = ``
-    for (let i = 0; i < tabList.length; i++) {
+	// projectList
+	$("#projects").empty()
+	let html = ``
+	for (let i = 0; i < tabList.length; i++) {
 		var className = ""
-		if(i == 0){
+		if (i == 0) {
 			className = "projectsStyle";
-			localStorage.setItem("resultProId",tabList[i].id);
+			localStorage.setItem("resultProId", tabList[i].id);
 		}
 		html += `<div class="${className}" onclick="projectTab(this,${tabList[i].id})">
 					<span id="${tabList[i].id}">${tabList[i].proName}</span>
 				</div>`
-    }
-    $("#projects").append(html);
+	}
+	$("#projects").append(html);
 }
 
-function getView(){
+function getView() {
 	// ①已上传：展示修改、删除图标，上传日期不可选择，照片信息，杆塔号；颜色为“#52C1F5”；
 	// ②未上传：展示上传图标，上传日期可选择，杆塔号，颜色为“#F56C6C”；
 	// ③巡护段外：展示修改、删除图标，上传日期不可选择，照片信息，工程名称，杆塔号；颜色为“#FF9900”；
 	// ④特巡/值守：展示修改、删除图标，上传日期不可选择，照片信息，备注；颜色为“#73A0FA”；
 	// ⑤正在编辑：修改图标绿色背景，可重新上传照片、重新选择日期，编辑即边框闪烁；
-	$.ajax({//id获取详情打开弹窗传值子页面
-	    type: 'post',
-	    url: PATH_URL + "/makeInfo/getById",
-	    dataType: 'json',
-		async:false,
-	    data: {
-	        userId: localStorage.getItem("resultUserId"),makeMonth:localStorage.getItem("resultMakeMonth"),proId:localStorage.getItem("resultProId")
-	    },
-	    success: function (data) {
-			console.log(data,"result");
-			viewList1=data.mgtListone;
-			photoList1=data.vgtListone;
-			viewList2=data.mgtListtwo;
-			photoList2=data.vgtListtwo;
-			viewList3=data.mgtListspe;
-			photoList3=data.mgtListspe;
-			
-	    },
-		error:function(e){
-			
+	$.ajax({ //id获取详情打开弹窗传值子页面
+		type: 'post',
+		url: PATH_URL + "/makeInfo/getById",
+		dataType: 'json',
+		async: false,
+		data: {
+			userId: localStorage.getItem("resultUserId"),
+			makeMonth: resultMonth,
+			proId: localStorage.getItem("resultProId")
+		},
+		success: function(data) {
+			console.log(data, "result");
+			viewList1 = data.mgtListone;
+			photoList1 = data.vgtListone;
+			viewList2 = data.mgtListtwo;
+			photoList2 = data.vgtListtwo;
+			viewList3 = data.mgtListspe;
+			photoList3 = data.mgtListspe;
+		},
+		error: function(e) {
+
 		}
 	})
-	
+
 	$("#inspectionTourContent").empty();
 	//杆塔集合
- //    viewList1 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+	//    viewList1 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
 	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
 	// //照片集合
-	var filePath = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/c0a62f0b51924a4584ec0c8f011fc2af0074P3wTgy1h3gtizuzvfj30zk0zg7ad.jpg';
-	var sFilePath='../../../image/viewImg.jpg';
+	var filePath =
+		'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/c0a62f0b51924a4584ec0c8f011fc2af0074P3wTgy1h3gtizuzvfj30zk0zg7ad.jpg';
+	var sFilePath = '../../../image/viewImg.jpg';
 	// photoList1 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#6', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'}]
-	
-    let html = ``;
+
+	let html = ``;
 	html += `<div style="width: 90%;height: 30px;font-weight: bold;">
 				<span style="border: 3px solid #409EFF;width: 20px;height: 10px;margin-left: 2%;margin-right: 1%;"></span>
 				<span style="color:#666666">正常巡视-第一次巡视</span>
@@ -237,56 +268,59 @@ function getView(){
 				<span style="color:#0000FF;cursor: pointer;" onclick="patrolOutsideAdd()">巡护段外上传>></span>
 			</div>
 			<div id="firstViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
-    for (let i = 0;i < viewList1.length;i++) {	
-		var gtName = viewList1[i].gtName.length>4?viewList1[i].gtName.substring(0,4) + '...': viewList1[i].gtName;
+	for (let i = 0; i < viewList1.length; i++) {
+		var gtName = viewList1[i].gtName.length > 4 ? viewList1[i].gtName.substring(0, 4) + '...' : viewList1[i].gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">`
-						var ystate=0;
-						for (var j = 0; j < photoList1.length; j++) {
-							if(viewList1[i].gtId == photoList1[j].gtId){
-								//照片存在，直接显示
-								ystate=1;
-								break;
-							}
-						}
-						if("1"==viewList1[i].makeType){
-							html +=`<div class="viewHeader" style="background-color: #FF9900;">`
-						}else if(ystate==0){
-							html +=`<div class="viewHeader" style="background-color: #F56C6C;">`
-						}else{
-							html +=`<div class="viewHeader" style="background-color: #52C1F5;">`
-						}
-							html += `<img src="../../../image/tower_white.png" alt="">
+		var ystate = 0;
+		for (var j = 0; j < photoList1.length; j++) {
+			if (viewList1[i].gtId == photoList1[j].gtId) {
+				//照片存在，直接显示
+				ystate = 1;
+				break;
+			}
+		}
+		if ("1" == viewList1[i].makeType) {
+			html += `<div class="viewHeader" style="background-color: #FF9900;">`
+		} else if (ystate == 0) {
+			html += `<div class="viewHeader" style="background-color: #F56C6C;">`
+		} else {
+			html += `<div class="viewHeader" style="background-color: #52C1F5;">`
+		}
+		html += `<img src="../../../image/tower_white.png" alt="">
 							<span style="width: 33%;" title="${viewList1[i].gtName}">${gtName}</span> `
-							if("1"==viewList1[i].state||"1"==viewList1[i].makeType){
-								html +=`
+		if ("1" == viewList1[i].state || "1" == viewList1[i].makeType) {
+			html += `
 								<img src="../../../image/edit_white.png" onclick="towerEdit(this,${viewList1[i].gtId},1)" style="cursor: pointer;width: 14px;height:16px"  alt="">
 								<img src="../../../image/del_white.png" onclick="towerDel(this,${viewList1[i].gtId},1)" style="cursor: pointer;width: 14px;height:16px" alt="">
 								 `
-							}
-						 html +=`</div>
+		}
+		html += `</div>
 						<div class="viewContent">`
-							var flag = false;
-							for (var j = 0; j < photoList1.length; j++) {
-								if(viewList1[i].gtId == photoList1[j].gtId){
-									//照片存在，直接显示
-									html += `<img src="${IMG_URL+photoList1[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList1[j].filePath}')">`
-									flag = true;
-									break;
-								}
-							}
-							var usernamed=$("#username").text();
-							if(!flag){
-								//照片不存在，显示上传照片按钮
-								if("1"==viewList1[i].state){
-									html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList1[i].gtId},1,${viewList1[i].makeType})">`
-									html += `<div style="color:#cccccc">上传图片</div>`
-								}else{
-									html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" >`
-									html += `<div style="color:#cccccc">该杆塔不属于${usernamed}管辖</div>`
-								}
-							}
-							html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
+		var flag = false;
+		for (var j = 0; j < photoList1.length; j++) {
+			if (viewList1[i].gtId == photoList1[j].gtId) {
+				//照片存在，直接显示
+				html +=
+					`<img src="${IMG_URL+photoList1[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList1[j].filePath}')">`
+				flag = true;
+				break;
+			}
+		}
+		var usernamed = $("#username").text();
+		if (!flag) {
+			//照片不存在，显示上传照片按钮
+			if ("1" == viewList1[i].state) {
+				html +=
+					`<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList1[i].gtId},1,${viewList1[i].makeType})">`
+				html += `<div style="color:#cccccc">上传图片</div>`
+			} else {
+				html +=
+					`<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" >`
+				html += `<div style="color:#cccccc">该杆塔不属于${usernamed}管辖</div>`
+			}
+		}
+		html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn" onclick="uploadPhoto(${viewList1[i].gtId},1,${viewList1[i].makeType})">
 									<i class="layui-icon layui-icon-refresh-3"></i>
 									重新上传
@@ -295,21 +329,21 @@ function getView(){
 						</div>
 						<div class="viewFooter">
 							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;`
-							for (var j = 0; j < photoList1.length; j++) {
-								if(viewList1[i].gtId == photoList1[j].gtId){
-									//照片存在，直接显示
-									html += `${photoList1[j].makeTime}`
-									break;
-								}
-							}
-						html +=`</div>
+		for (var j = 0; j < photoList1.length; j++) {
+			if (viewList1[i].gtId == photoList1[j].gtId) {
+				//照片存在，直接显示
+				html += `${photoList1[j].makeTime}`
+				break;
+			}
+		}
+		html += `</div>
 					</div>
 					
 				</div>`
-    }
+	}
 	html += `</div>`;
-	
- //    viewList2 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+
+	//    viewList2 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
 	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
 	// photoList2 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
@@ -320,59 +354,62 @@ function getView(){
 				<span style="color:#F56C6C">(负责的巡护区段杆塔)</span>
 			</div>
 			<div id="secondViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
-    for (let i = 0;i < viewList2.length;i++) {
-		var gtName = viewList2[i].gtName.length>4?viewList2[i].gtName.substring(0,4) + '...': viewList2[i].gtName;
+	for (let i = 0; i < viewList2.length; i++) {
+		var gtName = viewList2[i].gtName.length > 4 ? viewList2[i].gtName.substring(0, 4) + '...' : viewList2[i].gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">
 						`
-							var ystate=0;
-							for (var j = 0; j < photoList2.length; j++) {
-								if(viewList2[i].gtId == photoList2[j].gtId){
-									//照片存在，直接显示
-									ystate=1;
-									break;
-								}
-							}
-							if("1"==viewList2[i].makeType){
-								html +=`<div class="viewHeader" style="background-color: #FF9900;">`
-							}else if(ystate==0){
-								html +=`<div class="viewHeader" style="background-color: #F56C6C;">`
-							}else{
-								html +=`<div class="viewHeader" style="background-color: #52C1F5;">`
-							}
-								html += `
+		var ystate = 0;
+		for (var j = 0; j < photoList2.length; j++) {
+			if (viewList2[i].gtId == photoList2[j].gtId) {
+				//照片存在，直接显示
+				ystate = 1;
+				break;
+			}
+		}
+		if ("1" == viewList2[i].makeType) {
+			html += `<div class="viewHeader" style="background-color: #FF9900;">`
+		} else if (ystate == 0) {
+			html += `<div class="viewHeader" style="background-color: #F56C6C;">`
+		} else {
+			html += `<div class="viewHeader" style="background-color: #52C1F5;">`
+		}
+		html += `
 							<img src="../../../image/tower_white.png" alt="">
 							<span style="width: 33%;" title="${viewList2[i].gtName}">${gtName}</span>
 							`
-							if("1"==viewList2[i].state||"1"==viewList2[i].makeType){
-								html +=`
+		if ("1" == viewList2[i].state || "1" == viewList2[i].makeType) {
+			html += `
 								<img src="../../../image/edit_white.png" onclick="towerEdit(this,${viewList1[i].gtId},1)" style="cursor: pointer;width: 14px;height:16px"  alt="">
 								<img src="../../../image/del_white.png" onclick="towerDel(this,${viewList1[i].gtId},1)" style="cursor: pointer;width: 14px;height:16px" alt="">
 								 `
-							}
-							html +=`</div>
+		}
+		html += `</div>
 						<div class="viewContent">`
-							var flag = false;
-							for (var j = 0; j < photoList2.length; j++) {
-								if(viewList2[i].gtId == photoList2[j].gtId){
-									//照片存在，直接显示
-									html += `<img src="${IMG_URL+photoList2[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList2[j].filePath}')">`
-									flag = true;
-									break;
-								}
-							}
-							var usernamed=$("#username").text();
-							if(!flag){
-								//照片不存在，显示上传照片按钮
-								if("1"==viewList2[i].state){
-									html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList2[i].gtId},2,${viewList2[i].makeType})">`
-									html += `<div style="color:#cccccc">上传图片</div>`
-								}else{
-									html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" >`
-									html += `<div style="color:#cccccc">该杆塔不属于${usernamed}管辖</div>`
-								}
-							}
-							html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
+		var flag = false;
+		for (var j = 0; j < photoList2.length; j++) {
+			if (viewList2[i].gtId == photoList2[j].gtId) {
+				//照片存在，直接显示
+				html +=
+					`<img src="${IMG_URL+photoList2[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList2[j].filePath}')">`
+				flag = true;
+				break;
+			}
+		}
+		var usernamed = $("#username").text();
+		if (!flag) {
+			//照片不存在，显示上传照片按钮
+			if ("1" == viewList2[i].state) {
+				html +=
+					`<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList2[i].gtId},2,${viewList2[i].makeType})">`
+				html += `<div style="color:#cccccc">上传图片</div>`
+			} else {
+				html +=
+					`<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" >`
+				html += `<div style="color:#cccccc">该杆塔不属于${usernamed}管辖</div>`
+			}
+		}
+		html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn"  onclick="uploadPhoto(${viewList2[i].gtId},2,${viewList2[i].makeType})">
 									<i class="layui-icon layui-icon-refresh-3"></i>
 									重新上传
@@ -381,23 +418,23 @@ function getView(){
 						</div>
 						<div class="viewFooter">
 							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;`
-							for (var j = 0; j < photoList2.length; j++) {
-								if(viewList2[i].gtId == photoList2[j].gtId){
-									//照片存在，直接显示
-									html += `${photoList2[j].makeTime}`
-									break;
-								}
-							}
-						html +=`
+		for (var j = 0; j < photoList2.length; j++) {
+			if (viewList2[i].gtId == photoList2[j].gtId) {
+				//照片存在，直接显示
+				html += `${photoList2[j].makeTime}`
+				break;
+			}
+		}
+		html += `
 						</div>
 					</div>
 				</div>`
-    }
+	}
 	html += `</div>`;
-	
-	
-	
- //    viewList3 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+
+
+
+	//    viewList3 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
 	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
 	// photoList3 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
@@ -409,8 +446,9 @@ function getView(){
 				<table id="isWorkList" class="layui-table" lay-skin="row" style="width:100%;"></table>
 			</div>
 			<div id="specialViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
-    for (let i = 0;i < viewList3.length;i++) {
-		var gtName = viewList3[i].gtName.length>11?viewList3[i].gtName.substring(0,11) + '...': viewList3[i].gtName;
+	for (let i = 0; i < viewList3.length; i++) {
+		var gtName = viewList3[i].gtName.length > 11 ? viewList3[i].gtName.substring(0, 11) + '...' : viewList3[i]
+			.gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">
 						<div class="viewHeader" style="font-size:12px;background-color: #73A0FA;">
@@ -421,21 +459,22 @@ function getView(){
 						</div>
 						<div class="viewContent">
 							`
-								var flag = false;
-								for (var j = 0; j < photoList3.length; j++) {
-									if(viewList3[i].gtId == photoList3[j].gtId){
-										//照片存在，直接显示
-										html += `<img src="${IMG_URL+photoList3[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList3[j].filePath}')">`
-										flag = true;
-										break;
-									}
-								}
-								if(!flag){
-									//照片不存在，显示上传照片按钮
-									html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" ">
+		var flag = false;
+		for (var j = 0; j < photoList3.length; j++) {
+			if (viewList3[i].gtId == photoList3[j].gtId) {
+				//照片存在，直接显示
+				html +=
+					`<img src="${IMG_URL+photoList3[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList3[j].filePath}')">`
+				flag = true;
+				break;
+			}
+		}
+		if (!flag) {
+			//照片不存在，显示上传照片按钮
+			html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" ">
 											<div style="color:#cccccc">上传图片</div>`
-								}
-								html += `
+		}
+		html += `
 							<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn" onclick="uploadSpecialPhoto(${viewList3[i].gtId})">>
 									<i class="layui-icon layui-icon-refresh-3"></i>
@@ -446,64 +485,66 @@ function getView(){
 						<div class="viewFooter">
 							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;
 							`
-								for (var j = 0; j < photoList3.length; j++) {
-									if(viewList3[i].gtId == photoList3[j].gtId){
-										//照片存在，直接显示
-										html += `${photoList3[j].makeTime}`
-										break;
-									}
-								}
-							html +=`
+		for (var j = 0; j < photoList3.length; j++) {
+			if (viewList3[i].gtId == photoList3[j].gtId) {
+				//照片存在，直接显示
+				html += `${photoList3[j].makeTime}`
+				break;
+			}
+		}
+		html += `
 						</div>
 					</div>
 					
 				</div>`
-    }
+	}
 	html += `</div>`;
-    $("#inspectionTourContent").append(html);
+	$("#inspectionTourContent").append(html);
 }
 
-function getViewc(){
+function getViewc() {
 	// ①已上传：展示修改、删除图标，上传日期不可选择，照片信息，杆塔号；颜色为“#52C1F5”；
 	// ②未上传：展示上传图标，上传日期可选择，杆塔号，颜色为“#F56C6C”；
 	// ③巡护段外：展示修改、删除图标，上传日期不可选择，照片信息，工程名称，杆塔号；颜色为“#FF9900”；
 	// ④特巡/值守：展示修改、删除图标，上传日期不可选择，照片信息，备注；颜色为“#73A0FA”；
 	// ⑤正在编辑：修改图标绿色背景，可重新上传照片、重新选择日期，编辑即边框闪烁；
-	$.ajax({//id获取详情打开弹窗传值子页面
-	    type: 'post',
-	    url: PATH_URL + "/makeInfo/getById",
-	    dataType: 'json',
-		async:false,
-	    data: {
-	        userId: localStorage.getItem("resultUserId"),makeMonth:localStorage.getItem("resultMakeMonth"),proId:localStorage.getItem("resultProId")
-	    },
-	    success: function (data) {
-			console.log(data,"result");
-			viewList1=data.mgtListone;
-			photoList1=data.vgtListone;
-			viewList2=data.mgtListtwo;
-			photoList2=data.vgtListtwo;
-			viewList3=data.mgtListspe;
-			photoList3=data.mgtListspe;
-			
-	    },
-		error:function(e){
-			
+	$.ajax({ //id获取详情打开弹窗传值子页面
+		type: 'post',
+		url: PATH_URL + "/makeInfo/getById",
+		dataType: 'json',
+		async: false,
+		data: {
+			userId: localStorage.getItem("resultUserId"),
+			makeMonth: resultMonth,
+			proId: localStorage.getItem("resultProId")
+		},
+		success: function(data) {
+			console.log(data, "result");
+			viewList1 = data.mgtListone;
+			photoList1 = data.vgtListone;
+			viewList2 = data.mgtListtwo;
+			photoList2 = data.vgtListtwo;
+			viewList3 = data.mgtListspe;
+			photoList3 = data.mgtListspe;
+		},
+		error: function(e) {
+
 		}
 	})
-	
+
 	$("#inspectionTourContent").empty();
 	//杆塔集合
- //    viewList1 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+	//    viewList1 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
 	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
 	// //照片集合
-	var filePath = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/c0a62f0b51924a4584ec0c8f011fc2af0074P3wTgy1h3gtizuzvfj30zk0zg7ad.jpg';
-	var sFilePath='../../../image/viewImg.jpg';
+	var filePath =
+		'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/c0a62f0b51924a4584ec0c8f011fc2af0074P3wTgy1h3gtizuzvfj30zk0zg7ad.jpg';
+	var sFilePath = '../../../image/viewImg.jpg';
 	// photoList1 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#6', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'}]
-	
-    let html = ``;
+
+	let html = ``;
 	html += `<div style="width: 90%;height: 30px;font-weight: bold;">
 				<span style="border: 3px solid #409EFF;width: 20px;height: 10px;margin-left: 2%;margin-right: 1%;"></span>
 				<span style="color:#666666">正常巡视-第一次巡视</span>
@@ -512,44 +553,45 @@ function getViewc(){
 				<span style="color:#0000FF;cursor: pointer;" onclick="patrolOutsideAdd()">巡护段外上传>></span>
 			</div>
 			<div id="firstViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
-    for (let i = 0;i < viewList1.length;i++) {	
-		var gtName = viewList1[i].gtName.length>4?viewList1[i].gtName.substring(0,4) + '...': viewList1[i].gtName;
+	for (let i = 0; i < viewList1.length; i++) {
+		var gtName = viewList1[i].gtName.length > 4 ? viewList1[i].gtName.substring(0, 4) + '...' : viewList1[i].gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">`
-						var ystate=0;
-						for (var j = 0; j < photoList1.length; j++) {
-							if(viewList1[i].gtId == photoList1[j].gtId){
-								//照片存在，直接显示
-								ystate=1;
-								break;
-							}
-						}
-						if("1"==viewList1[i].makeType){
-							html +=`<div class="viewHeader" style="background-color: #FF9900;">`
-						}else if(ystate==0){
-							html +=`<div class="viewHeader" style="background-color: #F56C6C;">`
-						}else{
-							html +=`<div class="viewHeader" style="background-color: #52C1F5;">`
-						}
-							html += `<img src="../../../image/tower_white.png" alt="">
+		var ystate = 0;
+		for (var j = 0; j < photoList1.length; j++) {
+			if (viewList1[i].gtId == photoList1[j].gtId) {
+				//照片存在，直接显示
+				ystate = 1;
+				break;
+			}
+		}
+		if ("1" == viewList1[i].makeType) {
+			html += `<div class="viewHeader" style="background-color: #FF9900;">`
+		} else if (ystate == 0) {
+			html += `<div class="viewHeader" style="background-color: #F56C6C;">`
+		} else {
+			html += `<div class="viewHeader" style="background-color: #52C1F5;">`
+		}
+		html += `<img src="../../../image/tower_white.png" alt="">
 							<span style="width: 33%;" title="${viewList1[i].gtName}">${gtName}</span>
 						</div>
 						<div class="viewContent">`
-							var flag = false;
-							for (var j = 0; j < photoList1.length; j++) {
-								if(viewList1[i].gtId == photoList1[j].gtId){
-									//照片存在，直接显示
-									html += `<img src="${IMG_URL+photoList1[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList1[j].filePath}')">`
-									flag = true;
-									break;
-								}
-							}
-							if(!flag){
-								//照片不存在，显示上传照片按钮
-								html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList1[i].gtId},1,${viewList1[i].makeType})">
+		var flag = false;
+		for (var j = 0; j < photoList1.length; j++) {
+			if (viewList1[i].gtId == photoList1[j].gtId) {
+				//照片存在，直接显示
+				html +=
+					`<img src="${IMG_URL+photoList1[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList1[j].filePath}')">`
+				flag = true;
+				break;
+			}
+		}
+		if (!flag) {
+			//照片不存在，显示上传照片按钮
+			html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList1[i].gtId},1,${viewList1[i].makeType})">
 										<div style="color:#cccccc">上传图片</div>`
-							}
-							html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
+		}
+		html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn" onclick="uploadPhoto(${viewList1[i].gtId},1,${viewList1[i].makeType})">
 									<i class="layui-icon layui-icon-refresh-3"></i>
 									重新上传
@@ -558,21 +600,21 @@ function getViewc(){
 						</div>
 						<div class="viewFooter">
 							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;`
-							for (var j = 0; j < photoList1.length; j++) {
-								if(viewList1[i].gtId == photoList1[j].gtId){
-									//照片存在，直接显示
-									html += `${photoList1[j].makeTime}`
-									break;
-								}
-							}
-						html +=`</div>
+		for (var j = 0; j < photoList1.length; j++) {
+			if (viewList1[i].gtId == photoList1[j].gtId) {
+				//照片存在，直接显示
+				html += `${photoList1[j].makeTime}`
+				break;
+			}
+		}
+		html += `</div>
 					</div>
 					
 				</div>`
-    }
+	}
 	html += `</div>`;
-	
- //    viewList2 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+
+	//    viewList2 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
 	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
 	// photoList2 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
@@ -583,46 +625,47 @@ function getViewc(){
 				<span style="color:#F56C6C">(负责的巡护区段杆塔)</span>
 			</div>
 			<div id="secondViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
-    for (let i = 0;i < viewList2.length;i++) {
-		var gtName = viewList2[i].gtName.length>4?viewList2[i].gtName.substring(0,4) + '...': viewList2[i].gtName;
+	for (let i = 0; i < viewList2.length; i++) {
+		var gtName = viewList2[i].gtName.length > 4 ? viewList2[i].gtName.substring(0, 4) + '...' : viewList2[i].gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">
 						`
-							var ystate=0;
-							for (var j = 0; j < photoList2.length; j++) {
-								if(viewList2[i].gtId == photoList2[j].gtId){
-									//照片存在，直接显示
-									ystate=1;
-									break;
-								}
-							}
-							if("1"==viewList2[i].makeType){
-								html +=`<div class="viewHeader" style="background-color: #FF9900;">`
-							}else if(ystate==0){
-								html +=`<div class="viewHeader" style="background-color: #F56C6C;">`
-							}else{
-								html +=`<div class="viewHeader" style="background-color: #52C1F5;">`
-							}
-								html += `
+		var ystate = 0;
+		for (var j = 0; j < photoList2.length; j++) {
+			if (viewList2[i].gtId == photoList2[j].gtId) {
+				//照片存在，直接显示
+				ystate = 1;
+				break;
+			}
+		}
+		if ("1" == viewList2[i].makeType) {
+			html += `<div class="viewHeader" style="background-color: #FF9900;">`
+		} else if (ystate == 0) {
+			html += `<div class="viewHeader" style="background-color: #F56C6C;">`
+		} else {
+			html += `<div class="viewHeader" style="background-color: #52C1F5;">`
+		}
+		html += `
 							<img src="../../../image/tower_white.png" alt="">
 							<span style="width: 33%;" title="${viewList2[i].gtName}">${gtName}</span>
 						</div>
 						<div class="viewContent">`
-							var flag = false;
-							for (var j = 0; j < photoList2.length; j++) {
-								if(viewList2[i].gtId == photoList2[j].gtId){
-									//照片存在，直接显示
-									html += `<img src="${IMG_URL+photoList2[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList2[j].filePath}')">`
-									flag = true;
-									break;
-								}
-							}
-							if(!flag){
-								//照片不存在，显示上传照片按钮
-								html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList2[i].gtId},2,${viewList2[i].makeType})">
+		var flag = false;
+		for (var j = 0; j < photoList2.length; j++) {
+			if (viewList2[i].gtId == photoList2[j].gtId) {
+				//照片存在，直接显示
+				html +=
+					`<img src="${IMG_URL+photoList2[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList2[j].filePath}')">`
+				flag = true;
+				break;
+			}
+		}
+		if (!flag) {
+			//照片不存在，显示上传照片按钮
+			html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList2[i].gtId},2,${viewList2[i].makeType})">
 										<div style="color:#cccccc">上传图片</div>`
-							}
-							html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
+		}
+		html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn"  onclick="uploadPhoto(${viewList2[i].gtId},2,${viewList2[i].makeType})">
 									<i class="layui-icon layui-icon-refresh-3"></i>
 									重新上传
@@ -631,23 +674,23 @@ function getViewc(){
 						</div>
 						<div class="viewFooter">
 							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;`
-							for (var j = 0; j < photoList2.length; j++) {
-								if(viewList2[i].gtId == photoList2[j].gtId){
-									//照片存在，直接显示
-									html += `${photoList2[j].makeTime}`
-									break;
-								}
-							}
-						html +=`
+		for (var j = 0; j < photoList2.length; j++) {
+			if (viewList2[i].gtId == photoList2[j].gtId) {
+				//照片存在，直接显示
+				html += `${photoList2[j].makeTime}`
+				break;
+			}
+		}
+		html += `
 						</div>
 					</div>
 				</div>`
-    }
+	}
 	html += `</div>`;
-	
-	
-	
- //    viewList3 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+
+
+
+	//    viewList3 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
 	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
 	// photoList3 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
 	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
@@ -659,8 +702,9 @@ function getViewc(){
 				<table id="isWorkList" class="layui-table" lay-skin="row" style="width:100%;"></table>
 			</div>
 			<div id="specialViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
-    for (let i = 0;i < viewList3.length;i++) {
-		var gtName = viewList3[i].gtName.length>11?viewList3[i].gtName.substring(0,11) + '...': viewList3[i].gtName;
+	for (let i = 0; i < viewList3.length; i++) {
+		var gtName = viewList3[i].gtName.length > 11 ? viewList3[i].gtName.substring(0, 11) + '...' : viewList3[i]
+			.gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">
 						<div class="viewHeader" style="font-size:12px;background-color: #73A0FA;">
@@ -671,21 +715,22 @@ function getViewc(){
 						</div>
 						<div class="viewContent">
 							`
-								var flag = false;
-								for (var j = 0; j < photoList3.length; j++) {
-									if(viewList3[i].gtId == photoList3[j].gtId){
-										//照片存在，直接显示
-										html += `<img src="${IMG_URL+photoList3[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList3[j].filePath}')">`
-										flag = true;
-										break;
-									}
-								}
-								if(!flag){
-									//照片不存在，显示上传照片按钮
-									html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" ">
+		var flag = false;
+		for (var j = 0; j < photoList3.length; j++) {
+			if (viewList3[i].gtId == photoList3[j].gtId) {
+				//照片存在，直接显示
+				html +=
+					`<img src="${IMG_URL+photoList3[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList3[j].filePath}')">`
+				flag = true;
+				break;
+			}
+		}
+		if (!flag) {
+			//照片不存在，显示上传照片按钮
+			html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" ">
 											<div style="color:#cccccc">上传图片</div>`
-								}
-								html += `
+		}
+		html += `
 							<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn" onclick="uploadSpecialPhoto(${viewList3[i].gtId})">>
 									<i class="layui-icon layui-icon-refresh-3"></i>
@@ -696,276 +741,302 @@ function getViewc(){
 						<div class="viewFooter">
 							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;
 							`
-								for (var j = 0; j < photoList3.length; j++) {
-									if(viewList3[i].gtId == photoList3[j].gtId){
-										//照片存在，直接显示
-										html += `${photoList3[j].makeTime}`
-										break;
-									}
-								}
-							html +=`
+		for (var j = 0; j < photoList3.length; j++) {
+			if (viewList3[i].gtId == photoList3[j].gtId) {
+				//照片存在，直接显示
+				html += `${photoList3[j].makeTime}`
+				break;
+			}
+		}
+		html += `
 						</div>
 					</div>
 					
 				</div>`
-    }
+	}
 	html += `</div>`;
-    $("#inspectionTourContent").append(html);
+	$("#inspectionTourContent").append(html);
 }
 
 
-function towerSpeciaEdit(event,id,numTimes){
+function towerSpeciaEdit(event, id, numTimes) {
 	var color = $(event).css("background-color");
 	//通过按钮样式判断按钮状态  
-	if(color == "rgb(22, 186, 170)"){
+	if (color == "rgb(22, 186, 170)") {
 		//此为编辑状态
 		//呼吸灯效果
 		$(event).parent().parent().removeClass("arrow_box");
 		//修改按钮背景颜色
 		$(event).css("background-color", "");
 		//展示编辑按钮
-		$(event).parent().next().children("div").css("display","none")
-	}else{
+		$(event).parent().next().children("div").css("display", "none")
+	} else {
 		//常规状态
 		//呼吸灯效果
 		$(event).parent().parent().addClass("arrow_box");
 		//修改按钮背景颜色
 		$(event).css("background-color", "#16BAAA");
 		//展示编辑按钮
-		$(event).parent().next().children("div").css("display","flex")
+		$(event).parent().next().children("div").css("display", "flex")
 	}
 }
-function uploadSpecialPhoto(id){
+
+function uploadSpecialPhoto(id) {
 	let height = '70%';
 	let width = '60%';
 	var index = parent.layer.open({
-	    title: ['上传特巡', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-	    type: 2,
-	    content: './uploadSpecialPhoto.html',
-	    area: [width, height],
-	    maxmin: false,
-	    success: function (layero, index) {
-	        var myIframe = parent.window[layero.find('iframe')[0]['name']];
-	        myIframe.setGtId(id,localStorage.getItem("resultMakeMonth"),3,localStorage.getItem("resultUserId"),3,localStorage.getItem("resultProId"));
-	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-	
-	    },
+		title: ['上传特巡', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+		type: 2,
+		content: './uploadSpecialPhoto.html',
+		area: [width, height],
+		maxmin: false,
+		success: function(layero, index) {
+			var myIframe = parent.window[layero.find('iframe')[0]['name']];
+			myIframe.setGtId(id, resultMonth, 3, localStorage.getItem("resultUserId"), 3, localStorage
+				.getItem("resultProId"));
+			// var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
+
+		},
 	});
 }
 //文件查看
 //查看附件详情
 function filePreView(url) {
-    if(url != "" && url != null){
-        var suffix = url.split(".")[1];
-        if(url.includes("mp4")){
-            localStorage.setItem("filePath", url);
-            var height = '99%';
-            var width = '70%';
-            var index = parent.layer.open({
-                title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-                type: 2,
-                content: '../../videoPlay.html',
-                area: [width, height],
-                maxmin: false
-            });
-        }else{
-            localStorage.setItem("filePath", url);
-            // localStorage.setItem("fileName", fileName);
-            // localStorage.setItem("fileTime", time);
-            var height = '99%';
-            var width = '70%';
-            var index = parent.layer.open({
-                title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-                type: 2,
-                content: '../../photoView.html',
-                area: [width, height],
-                maxmin: false
-            });
-        }
-    }
+	if (url != "" && url != null) {
+		var suffix = url.split(".")[1];
+		if (url.includes("mp4")) {
+			localStorage.setItem("filePath", url);
+			var height = '99%';
+			var width = '70%';
+			var index = parent.layer.open({
+				title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+				type: 2,
+				content: '../../videoPlay.html',
+				area: [width, height],
+				maxmin: false
+			});
+		} else {
+			localStorage.setItem("filePath", url);
+			// localStorage.setItem("fileName", fileName);
+			// localStorage.setItem("fileTime", time);
+			var height = '99%';
+			var width = '70%';
+			var index = parent.layer.open({
+				title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+				type: 2,
+				content: '../../photoView.html',
+				area: [width, height],
+				maxmin: false
+			});
+		}
+	}
 }
 
 //杆塔信息编辑
-function towerEdit(event,id,numTimes){
+function towerEdit(event, id, numTimes) {
 	var color = $(event).css("background-color");
 	//通过按钮样式判断按钮状态  
-	if(color == "rgb(22, 186, 170)"){
+	if (color == "rgb(22, 186, 170)") {
 		//此为编辑状态
 		//呼吸灯效果
 		$(event).parent().parent().removeClass("arrow_box");
 		//修改按钮背景颜色
 		$(event).css("background-color", "");
 		//展示编辑按钮
-		$(event).parent().next().children("div").css("display","none")
-	}else{
+		$(event).parent().next().children("div").css("display", "none")
+	} else {
 		//常规状态
 		//呼吸灯效果
 		$(event).parent().parent().addClass("arrow_box");
 		//修改按钮背景颜色
 		$(event).css("background-color", "#16BAAA");
 		//展示编辑按钮
-		$(event).parent().next().children("div").css("display","flex")
+		$(event).parent().next().children("div").css("display", "flex")
 	}
-	
+
 }
 //杆塔信息删除
-function towerDel(event,id,numTimes){
-	layer.confirm("确定删除吗？", function (index) {
-		$.ajax({//id获取详情打开弹窗传值子页面
-		    type: 'post',
-		    url: PATH_URL + "/makeInfo/delGtId",
-		    dataType: 'json',
-			async:false,
-		    data: {
-		        gtId:id,makeMonth:localStorage.getItem("resultMakeMonth"),numTimes:numTimes,userId:localStorage.getItem("resultUserId")
-		    },
-		    success: function (data) {
-				console.log(data,"确定删除");
-				if(data.code==500){
+function towerDel(event, id, numTimes) {
+	layer.confirm("确定删除吗？", function(index) {
+		$.ajax({ //id获取详情打开弹窗传值子页面
+			type: 'post',
+			url: PATH_URL + "/makeInfo/delGtId",
+			dataType: 'json',
+			async: false,
+			data: {
+				gtId: id,
+				makeMonth: resultMonth,
+				numTimes: numTimes,
+				userId: localStorage.getItem("resultUserId")
+			},
+			success: function(data) {
+				console.log(data, "确定删除");
+				if (data.code == 500) {
 					layer.msg(data.msg)
-				}else{
+				} else {
 					setData()
 					getView()
-					getSpecial(localStorage.getItem("resultMakeMonth").substring(0,4),localStorage.getItem("resultMakeMonth").substring(5,7)<10?localStorage.getItem("resultMakeMonth").substring(5,7).replace("0",""):localStorage.getItem("resultMakeMonth").substring(5,7));
+					getSpecial(resultMonth.substring(0, 4), resultMonth.substring(5, 7) < 10 ?
+						resultMonth.substring(5, 7).replace("0", "") : resultMonth.substring(5,
+							7));
 					layer.close(index);
 				}
-		    },
-			error:function(e){
-				
+			},
+			error: function(e) {
+
 			}
 		})
 	})
 }
-function towerSpecialDel(event,id,numTimes){
-	layer.confirm("确定删除吗？", function (index) {
-		$.ajax({//id获取详情打开弹窗传值子页面
-		    type: 'post',
-		    url: PATH_URL + "/makeInfo/delGtId",
-		    dataType: 'json',
-			async:false,
-		    data: {
-		        id:id,numTimes:numTimes
-		    },
-		    success: function (data) {
-				console.log(data,"确定删除");
-				if(data.code==500){
+
+function towerSpecialDel(event, id, numTimes) {
+	layer.confirm("确定删除吗？", function(index) {
+		$.ajax({ //id获取详情打开弹窗传值子页面
+			type: 'post',
+			url: PATH_URL + "/makeInfo/delGtId",
+			dataType: 'json',
+			async: false,
+			data: {
+				id: id,
+				numTimes: numTimes
+			},
+			success: function(data) {
+				console.log(data, "确定删除");
+				if (data.code == 500) {
 					layer.msg(data.msg)
-				}else{
+				} else {
 					setData()
 					getView()
-					getSpecial(localStorage.getItem("resultMakeMonth").substring(0,4),localStorage.getItem("resultMakeMonth").substring(5,7)<10?localStorage.getItem("resultMakeMonth").substring(5,7).replace("0",""):localStorage.getItem("resultMakeMonth").substring(5,7));
+					getSpecial(resultMonth.substring(0, 4), resultMonth.substring(5, 7) < 10 ?
+						resultMonth.substring(5, 7).replace("0", "") : resultMonth.substring(5,
+							7));
 					layer.close(index);
 				}
-		    },
-			error:function(e){
-				
+			},
+			error: function(e) {
+
 			}
 		})
 	})
 }
-function reloadData(){
+
+function reloadData() {
 	setData();
 	getView();
-	getSpecial(localStorage.getItem("resultMakeMonth").substring(0,4),localStorage.getItem("resultMakeMonth").substring(5,7)<10?localStorage.getItem("resultMakeMonth").substring(5,7).replace("0",""):localStorage.getItem("resultMakeMonth").substring(5,7));
+	getSpecial(resultMonth.substring(0, 4), resultMonth.substring(5, 7) < 10 ? resultMonth.substring(5, 7).replace("0",
+		"") : resultMonth.substring(5, 7));
 }
 //正常巡视照片导入
-function normalInspectionUpload(){
+function normalInspectionUpload() {
 	let height = '99%';
 	let width = '70%';
 	var index = parent.layer.open({
-	    title: ['正常巡视照片导入', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-	    type: 2,
-	    content: './normalInspectionUpload.html',
-	    area: [width, height],
-	    maxmin: false,
-	    success: function (layero, index) {
-	        // var myIframe = window[layero.find('iframe')[0]['name']];
-	        // myIframe.hideSubmit();
-	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-	
-	    },
+		title: ['正常巡视照片导入', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+		type: 2,
+		content: './normalInspectionUpload.html',
+		area: [width, height],
+		maxmin: false,
+		success: function(layero, index) {
+			// var myIframe = window[layero.find('iframe')[0]['name']];
+			// myIframe.hideSubmit();
+			// var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
+
+		},
 	});
 }
 
 //新增特巡结果
-function specialPatrolAdd(){
+function specialPatrolAdd() {
 	let height = '99%';
 	let width = '60%';
 	var index = parent.layer.open({
-	    title: ['特巡结果上传', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-	    type: 2,
-	    content: './specialPatrolAdd.html',
-	    area: [width, height],
-	    maxmin: false,
-	    success: function (layero, index) {
-	        // var myIframe = window[layero.find('iframe')[0]['name']];
-	        // myIframe.hideSubmit();
-	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-	
-	    },
+		title: ['特巡结果上传', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+		type: 2,
+		content: './specialPatrolAdd.html',
+		area: [width, height],
+		maxmin: false,
+		success: function(layero, index) {
+			// var myIframe = window[layero.find('iframe')[0]['name']];
+			// myIframe.hideSubmit();
+			// var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
+
+		},
 	});
 }
 
 //巡护段外上传
-function patrolOutsideAdd(){
-	localStorage.setItem("resultUserId",localStorage.getItem("resultUserId"));
+function patrolOutsideAdd() {
+	localStorage.setItem("resultUserId", localStorage.getItem("resultUserId"));
 	let height = '99%';
 	let width = '60%';
 	var index = parent.layer.open({
-	    title: ['巡视结果上传-巡护范围之外的杆塔', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-	    type: 2,
-	    content: './patrolOutsideAdd.html',
-	    area: [width, height],
-	    maxmin: false,
-	    success: function (layero, index) {
-	        // var myIframe = window[layero.find('iframe')[0]['name']];
-	        // myIframe.hideSubmit();
-	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-	
-	    },
+		title: ['巡视结果上传-巡护范围之外的杆塔', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+		type: 2,
+		content: './patrolOutsideAdd.html',
+		area: [width, height],
+		maxmin: false,
+		success: function(layero, index) {
+			// var myIframe = window[layero.find('iframe')[0]['name']];
+			// myIframe.hideSubmit();
+			// var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
+
+		},
 	});
 }
 
 //上传单张巡视图片
-function uploadPhoto(id,numTimes,makeType){
+function uploadPhoto(id, numTimes, makeType) {
 	let height = '70%';
 	let width = '60%';
 	var index = parent.layer.open({
-	    title: ['上传巡视图片', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-	    type: 2,
-	    content: './uploadPhoto.html',
-	    area: [width, height],
-	    maxmin: false,
-	    success: function (layero, index) {
-	        var myIframe = parent.window[layero.find('iframe')[0]['name']];
-	        myIframe.setGtId(id,localStorage.getItem("resultMakeMonth"),numTimes,localStorage.getItem("resultUserId"),makeType,localStorage.getItem("resultProId"));
-	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-	
-	    },
+		title: ['上传巡视图片', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+		type: 2,
+		content: './uploadPhoto.html',
+		area: [width, height],
+		maxmin: false,
+		success: function(layero, index) {
+			var myIframe = parent.window[layero.find('iframe')[0]['name']];
+			myIframe.setGtId(id, resultMonth, numTimes, localStorage.getItem("resultUserId"), makeType,
+				localStorage.getItem("resultProId"));
+			// var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
+
+		},
 	});
 }
 //页面赋值
-function setData(){
-	var id=localStorage.getItem("resultUserId");
-	var makeMonth=localStorage.getItem("resultMakeMonth");
-	$.ajax({//id获取详情打开弹窗传值子页面
-	    type: 'post',
-	    url: PATH_URL + "/makeInfo/getUserDetail",
-	    dataType: 'json',
-		async:false,
-	    data: {
-	        id: id,makeMonth:makeMonth
-	    },
-	    success: function (data) {
-	        $("#username").text(data.data.userName);
-	        $("#phone").text(data.data.tel);
-	        $("#num").text(data.data.powerNum);
-	        $("#oneNum").text(data.data.oneMake);
-	        $("#twoNum").text(data.data.twoMake);
-	        $("#otherNum").text(data.data.special);
-	    },
-		error:function(e){
-			
+function setData() {
+	var id = localStorage.getItem("resultUserId");
+	var makeMonth = resultMonth;
+	$.ajax({ //id获取详情打开弹窗传值子页面
+		type: 'post',
+		url: PATH_URL + "/makeInfo/getUserDetail",
+		dataType: 'json',
+		async: false,
+		data: {
+			id: id,
+			makeMonth: makeMonth
+		},
+		success: function(data) {
+			$("#username").text(data.data.userName);
+			$("#phone").text(data.data.tel);
+			$("#num").text(data.data.powerNum);
+			$("#oneNum").text(data.data.oneMake);
+			$("#twoNum").text(data.data.twoMake);
+			$("#otherNum").text(data.data.special);
+		},
+		error: function(e) {
+
 		}
 	})
-}
\ No newline at end of file
+}
+
+
+function getYearMonth(yearMonth) {
+	let date = new Date(yearMonth);
+	let oldYear = date.getFullYear();
+	let oldMonth = date.getMonth() + 1;
+	return {
+		oldYear,
+		oldMonth
+	};
+}