From c7ba1ce89a2a552eee9b5edadc9a302d8aafb05b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 13 六月 2023 15:15:16 +0800
Subject: [PATCH] 细节修改
---
igds-app/js/admin/warn-list.js | 151 ++++++++++++++++++++++++++++---------------------
1 files changed, 86 insertions(+), 65 deletions(-)
diff --git a/igds-app/js/admin/warn-list.js b/igds-app/js/admin/warn-list.js
index 8c7519c..7ebf6e3 100644
--- a/igds-app/js/admin/warn-list.js
+++ b/igds-app/js/admin/warn-list.js
@@ -69,51 +69,46 @@
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
- // warnData ={
- // "data": [
- // {
- // "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":""
- // }
- // ]
- // }
+ // 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();
}
@@ -163,11 +158,15 @@
type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
+ value: dateTime
})
+ var time = dateTime
dtpicker.show(function(e) {
dateTime = e.value;
document.getElementById("date").value = e.value
- getWarnList();
+ if(time != dateTime){
+ getWarnList();
+ }
})
}
@@ -176,18 +175,14 @@
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>';
- }
- if (item.status == '20') {
+ }else if (item.status == '20') {
html += '<span class="type k">澶勭悊寤惰繜</span>';
- }
- if (item.status == '30') {
+ }else if (item.status == '30') {
html += '<span class="type k">宸插鐞�</span>';
- }
- if (item.status == '40') {
+ }else if (item.status == '40') {
html += '<span class="type k">蹇界暐</span>';
}
html += '<div class="tit">璀﹀憡鍚嶇О: <span>' + item.name + '</span></div>';
@@ -210,26 +205,50 @@
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') {
- html += '<button type="button" class="mui-btn cancel" onclick="handleWarn("1")">蹇界暐</button>'
- html += '<button type="button" class="mui-btn confirm" onclick="handleWarn("2")">澶勭悊</button>'
+ 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);
- $("#textareaPop").val(remark)
+ 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") {
@@ -240,7 +259,8 @@
dataPop.data.status = '30'
// mui.toast("璀﹀憡澶勭悊");
}
- dataPop.data.remark = mui("#textareaPop")[0].value;
+ dataPop.data.remark = document.getElementById("textareaPop").value;
+ console.log(JSON.stringify(dataPop.data),"warn-list")
//璇锋眰
mui.ajax(url, {
type: "POST",
@@ -250,10 +270,11 @@
data: JSON.stringify(dataPop),
success: function(result) {
if (result.code == "0000") {
- console.log(JSON.stringify(result))
+ mui.toast(result.msg);
+ // console.log(JSON.stringify(result))
} else {
mui.toast(result.msg);
- console.log(JSON.stringify(result))
+ // console.log(JSON.stringify(result))
}
},
error: function() {
@@ -274,7 +295,7 @@
//婊戝姩
mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
--
Gitblit v1.9.3