状态更新BUG修复

js/util.js

@@ -412,20 +412,18 @@ mui.plusReady(function() {
 				let taskName = this.dataset.taskName;
 				if (myTaskListStateFalse[taskId]) {
 					let myTaskListStateFalseItem = myTaskListStateFalse[taskId];
-					let content = {
-						"id": myTaskListStateFalseItem.id,
-						"title": myTaskListStateFalseItem.title,
-						"content": myTaskListStateFalseItem.content
-					};
 					let columnId = Number(myTaskListStateFalseItem.column_id);
 					let modelId = Number(myTaskListStateFalseItem.model_id);
 					let paramData2 = new FormData();
+					paramData2.append("content", JSON.stringify(myTaskListStateFalseItem.content));
 					paramData2.append("columnId", columnId);
+					paramData2.append("modelId", modelId);
 					paramData2.append("id", myTaskListStateFalseItem.id);
 					paramData2.append("state", 1);
-					updateAuditState({
+					updateContentData({
 						data: paramData2
 					}, function(res) {
+						console.log(JSON.stringify(res))
 						let resData = res;
 						if (resData.code == 200) {
 							// 我的任务详情页面跳转
@@ -577,10 +575,10 @@ mui.plusReady(function() {
 				paramData.append("modelId", modelId);
 				paramData.append("id", myMarkerData.id);
 				paramData.append("state", 1);
-				let paramData2 = new FormData();
-				paramData2.append("columnId", columnId);
-				paramData2.append("id", myMarkerData.id);
-				paramData2.append("state", 1);
+				// let paramData2 = new FormData();
+				// paramData2.append("columnId", columnId);
+				// paramData2.append("id", myMarkerData.id);
+				// paramData2.append("state", 1);
 				updateContentData({
 					data: paramData
 				}, function(res) {
@@ -589,16 +587,17 @@ mui.plusReady(function() {
 						document.getElementById('mapBottomBox').style.bottom = "-100%";
 						mui.toast('提交成功');
 						sessionStorage.clear();
-						updateAuditState({
-							data: paramData2
-						}, function(res) {
-							let resData = res;
-							if (resData.code == 200) {
-								window.history.back();
-							}
-						}, function(e) {
-							console.log(e)
-						})
+						window.history.back();
+						// updateAuditState({
+						// 	data: paramData2
+						// }, function(res) {
+						// 	let resData = res;
+						// 	if (resData.code == 200) {
+						// 		window.history.back();
+						// 	}
+						// }, function(e) {
+						// 	console.log(e)
+						// })
 					}
 				}, function(e) {
 					console.log(e)
@@ -842,7 +841,7 @@ mui.plusReady(function() {
 		}
 		// dms状态更新
 		function updateAuditState(setting, funSuccess, funError) {
-			newPostRequest(updateAudit, setting, funSuccess, funError);
+			newPostRequest(updateContent, setting, funSuccess, funError);
 			// requestSettins.success = funSuccess;
 			// requestSettins.error = funError;
 			// let newSetting = Object.assign(requestSettins, setting);
@@ -995,7 +994,7 @@ mui.plusReady(function() {
 					data: paramData,
 					dataType: "json"
 				}, function success(res, textStatus, xhr) {
-					console.log(res, textStatus, xhr)
+					console.log(JSON.stringify(res), textStatus, xhr)
 					if (res.code == 200) {
 						// 如果用户选中了记住密码，则保存账户信息
 						if (isActive) {
@@ -1118,6 +1117,17 @@ mui.plusReady(function() {
 				};
 				searchParam.push(paramItem);
 			}
+			// if(pageParam[pageName].userIdColumnName){
+			// 	let param = {
+			// 	  field: pageParam[pageName].userIdColumnName,
+			// 	  searchType: "1",
+			// 	  content: {
+			// 	    value: localStorage.getItem("USER_ID")
+			// 	  }
+			// 	};
+			// 	searchParam.push(param);
+			// }
+
 			if (pageParam[pageName].searchStateColumnName && searchStateValue !== 0) {
 				let paramItem = {
 					field: pageParam[pageName].searchStateColumnName,
@@ -1149,6 +1159,7 @@ mui.plusReady(function() {
 					} else {
 						resJson = res;
 					}
+					console.log(JSON.stringify(resJson))
 					if (resJson.code == 200 && resJson.content != null && resJson.content.data &&
 						resJson.content.data
 						.length > 0) {
@@ -1163,6 +1174,7 @@ mui.plusReady(function() {
 							let createTime = new Date(resJson.content.data[i].create_time);
 							let updateTime = new Date(resJson.content.data[i].update_time);
 							if (pageName === 'myTask') {
+								console.log(JSON.stringify(resJson.content.data[i]))
 								if (resJson.content.data[i].state == 0) {
 									myTaskListStateFalse[resJson.content.data[i].c_task_id] = resJson
 										.content.data[i];
@@ -1185,7 +1197,6 @@ mui.plusReady(function() {
 									.name :
 									cDoubtfulPoints.id;
 								cDoubtfulPoints.id = resJson.content.data[i].id;
-								cDoubtfulPoints.filePath = resJson.content.data[i].uploadFileUrls;
 								serverDataMap[cDoubtfulPoints.id] = resJson.content.data[i];
 								geometrys.push(cDoubtfulPoints);
 								localStorage.setItem("geometrys", JSON.stringify(geometrys));

pages/map.html

@@ -441,7 +441,7 @@
 						<p class="detailedInformation" data-marker-data='${markerDataPropertiesStr}'>详细信息</p>
 						<div class="arrowdown" data-state="${state}"><span class="mui-icon mui-icon-arrowdown"></span></div>
 						<p>疑点图斑：</p>
-						<div><img class="patternSpot" src="https://117.131.26.69:10081/proxy_dms${markerData.filePath}"/></div>
+						${markerData.uploadFileUrls ? `<div><img class="patternSpot" src="https://117.131.26.69:10081/proxy_dms${markerData.uploadFileUrls}"/></div>` : `<p>暂无</p>`}
 						<p>位置：${markerData.properties && markerData.properties['镇域名称'] ? markerData.properties['镇域名称'] : '未知'}</p>
 						<div id="mapImageList">
 							`;