From 2df906a447195f9786dd468512ea895d6cc18532 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 15 五月 2025 14:53:54 +0800
Subject: [PATCH] APP3.5开发

---
 igds-app/js/admin/warn-list.js |  104 ++++++++++++++++++++++++----------------------------
 1 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/igds-app/js/admin/warn-list.js b/igds-app/js/admin/warn-list.js
index 399937f..ec009c8 100644
--- a/igds-app/js/admin/warn-list.js
+++ b/igds-app/js/admin/warn-list.js
@@ -19,7 +19,8 @@
 	"data": {
 		"id": "",
 		"status": "",
-		"remark": ""
+		"remark": "",
+		"completeUser":""
 	}
 };
 
@@ -31,7 +32,8 @@
 	data.tokenAuth = user.tokenAuth;
 	dataPop.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
-	url = user.url + "/api-phone/v35/gateway";
+	dataPop.data.completeUser = user.cname
+	url = user.url + "/api/phone/v35/gateway";
 
 	dateTime = getDate(new Date())
 	document.getElementById("date").value = dateTime
@@ -57,7 +59,6 @@
 		success: function(result) {
 			if (result.code == "0000") {
 				warnList = result.data;
-				console.log(warnList)
 				renderWarn();
 			} else {
 				renderWarn();
@@ -69,47 +70,7 @@
 			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
 		}
 	})
-	// warnList = [{
-	// 		"id": "88",
-	// 		"name": "鎷夌洰浜涜皟",
-	// 		"type": "nostrud",
-	// 		"eventType": "cillumreprehenderitest",
-	// 		"level": "1",
-	// 		"status": "40",
-	// 		"time": "2006-11-01 14:01:36",
-	// 		"info": "dolor",
-	// 		"depotId": "6",
-	// 		"depotName": "",
-	// 		"remark": "00000"
-	// 	},
-	// 	{
-	// 		"id": "56",
-	// 		"name": "娉曢兘璞″彨涓庡眬",
-	// 		"type": "cillumreprehenderitUt",
-	// 		"eventType": "in",
-	// 		"level": "2",
-	// 		"status": "20",
-	// 		"time": "1981-02-18 22:28:23",
-	// 		"info": "deserunt Excepteur aliqua veniam commodo",
-	// 		"depotId": "28",
-	// 		"depotName": "榫欑敤鏀圭礌",
-	// 		"remark": "1111"
-	// 	}, {
-	// 		"id": "72",
-	// 		"name": "鍗庢灄涔濆埆",
-	// 		"type": "exdeseruntcillumeu",
-	// 		"eventType": "aliqua sint dolor aute",
-	// 		"level": "1",
-	// 		"status": "10",
-	// 		"time": "1978-07-23 12:17:27",
-	// 		"info": "deserunt nostrud id tempor",
-	// 		"depotId": "70",
-	// 		"depotName": "鍘垮織閫夊彧",
-	// 		"remark": ""
-	// 	}
-	// ]
 
-	renderWarn();
 }
 
 
@@ -176,8 +137,7 @@
 	var html = '';
 	if (warnList && warnList.length > 0) {
 		$.each(warnList, function(index, item) {
-			html += '<li><div class="con myfancy" onclick="openPop(\'' + item.id + '\',\'' + (item.remark ==
-				null ? "" : item.remark) + '\',\'' + item.status + '\')">';
+			html += '<li><div class="con myfancy" id="'+item.id+'" remark="'+(item.remark == null ? "" : item.remark) +'" status="'+item.status+'" >';
 			if (item.status == '10') {
 				html += '<span class="type">鏈鐞�</span>';
 			}else if (item.status == '20') {
@@ -194,29 +154,46 @@
 			html += '<div class="box"><div class="group c1"><div class="desc">' + (item.depotName == null ||
 					item.depotName == "" ? "--" : item.depotName) +
 				'</div><div class="ort">浠撳簱鍚嶇О</div></div></div>';
-			if (item.level == '1') {
+			if (item.level == '01') {
 				html +=
-					'<div class="box"><div class="group level-2"><div class="desc">楂樼骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
-			}
-			if (item.level == '2') {
+					'<div class="box"><div class="group level-2"><div class="desc">涓�绾ч璀�</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
+			}else if (item.level == '02') {
 				html +=
-					'<div class="box"><div class="group level-1"><div class="desc">涓骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
+					'<div class="box"><div class="group level-1"><div class="desc">浜岀骇棰勮</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
+			}else if(item.level == '03'){
+				html +=
+					'<div class="box"><div class="group level-1"><div class="desc">涓夌骇棰勮</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
+			}else {
+				html +=
+					'<div class="box"><div class="group level-1"><div class="desc">--</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
 			}
 
-			html += '<div class="tit coation">璀﹀憡鍐呭: <span>' + item.info + '</span></div>';
+			html += '<div class="tit coation">璀﹀憡鍐呭: <span>' + (item.info == null ||
+					item.info == "" ? "......" : item.info)+ '</span></div>';
 			html += '<div class="time">' + item.time + '</div></div></li>';
 		})
 	} else {
-		html +=
-			'<li><div class="con myfancy" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤璀﹀憡淇℃伅</div></li>';
+		html += '<li><div class="con myfancy" id="0" remark="鏆傛棤璀﹀憡淇℃伅" status="30">';
+		html += '<span class="type k">宸插鐞�</span>';
+		html += '<div class="tit">璀﹀憡鍚嶇О: <span>鏆傛棤璀﹀憡淇℃伅</span></div>';
+		html += '<div class="txt">';
+		html += '<div class="box"><div class="group c"><div class="desc">--</div><div class="ort">璀﹀憡绫诲瀷</div></div></div>';
+		html += '<div class="box"><div class="group c1"><div class="desc">--</div><div class="ort">浠撳簱鍚嶇О</div></div></div>';
+		html += '<div class="box"><div class="group level-1"><div class="desc">鏃�</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
+		html += '<div class="tit coation">璀﹀憡鍐呭: <span>鏃犺鍛婂唴瀹�</span></div>';
+		html += '<div class="time">'+dateTime+'</div></div></li>';
+		// html +=
+		// 	'<li><div class="con myfancy" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤璀﹀憡淇℃伅</div></li>';
 	}
 	$("#recordList").html(html);
 }
 
 
-
 //鎵撳紑寮圭獥
-function openPop(warnId, remark, status) {
+mui(".mui-scroll-wrapper").on("tap", ".m-caution-mana ul li .myfancy", function() {
+	var warnId = this.getAttribute("id");
+	var status = this.getAttribute("status");
+	var remark = this.getAttribute("remark");
 	dataPop.data.id = warnId;
 	var html = ''
 	if (status == '10') {
@@ -226,7 +203,20 @@
 	$("#handleWarn").html(html);
 	document.getElementById("textareaPop").value = remark;
 	$('#m-pop').css('display', 'flex');
-}
+})
+
+// //鎵撳紑寮圭獥
+// function openPop(warnId, remark, status) {
+// 	dataPop.data.id = warnId;
+// 	var html = ''
+// 	if (status == '10') {
+// 		html += '<div type="button" class="mui-btn cancel"  onclick="handleWarn(\'' + 1 + '\')">蹇界暐</div>'
+// 		html += '<div type="button" class="mui-btn confirm" onclick="handleWarn(\'' + 2 + '\')">澶勭悊</div>'
+// 	}
+// 	$("#handleWarn").html(html);
+// 	document.getElementById("textareaPop").value = remark;
+// 	$('#m-pop').css('display', 'flex');
+// }
 //璀﹀憡澶勭悊
 function handleWarn(tag) {
 	if (tag == "1") {
@@ -249,9 +239,11 @@
 		success: function(result) {
 			if (result.code == "0000") {
 				mui.toast(result.msg);
+				getWarnList();
 				// console.log(JSON.stringify(result))
 			} else {
 				mui.toast(result.msg);
+				getWarnList();
 				// console.log(JSON.stringify(result))
 			}
 		},

--
Gitblit v1.9.3