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/security-patrol.js | 18 +++++---
igds-app/es-real-electric.html | 3 +
igds-app/js/admin/es-read-meter.js | 2
igds-app/js/admin/basic-depot.js | 3 +
igds-app/js/admin/device-temp.js | 10 +++-
igds-app/index.html | 38 +++++++++++++------
igds-app/js/admin/grain-history.js | 2
igds-app/grain-history.html | 6 +-
igds-app/js/admin/es-real-electric.js | 21 ++++++++++
igds-app/js/admin/my.js | 6 +--
10 files changed, 75 insertions(+), 34 deletions(-)
diff --git a/igds-app/es-real-electric.html b/igds-app/es-real-electric.html
index 1253af4..96012cb 100644
--- a/igds-app/es-real-electric.html
+++ b/igds-app/es-real-electric.html
@@ -23,7 +23,7 @@
<div class="g-in-sl">
<div class="m-pow-dist">
<ul class="ul-listpd1" id="recordList">
- <li>
+ <!-- <li>
<div class="con">
<div class="tit">
<div class="t1">
@@ -143,6 +143,7 @@
</div>
</div>
</li>
+ -->
</ul>
</div>
</div>
diff --git a/igds-app/grain-history.html b/igds-app/grain-history.html
index 301edce..88036da 100644
--- a/igds-app/grain-history.html
+++ b/igds-app/grain-history.html
@@ -31,7 +31,7 @@
<div class="wp">
<div class="m-search-ene">
<div class="mui-input-row mui-search" onclick="chooseDepot();">
- <input id="depot" type="search" value="0" readonly class="mui-input-clear" placeholder="璇烽�夋嫨浠撳簱">
+ <input id="depot" type="search" value="0" readonly placeholder="璇烽�夋嫨浠撳簱">
</div>
<button type="button" class="mui-btn" onclick="getHistoryList()">鏌ヨ</button>
</div>
@@ -41,7 +41,7 @@
<div class="m-hist">
<div class="m-pow-dist m-sslq">
<ul class="ul-listpd1 ul-listslq" id="hisList">
- <li>
+ <!-- <li>
<div class="con">
<div class="tit">妫�娴嬫椂闂�: 鏆傛棤妫�娴嬫暟鎹�
<a href="" class="more"></a>
@@ -90,7 +90,7 @@
</div>
</div>
</li>
- <!-- <li>
+ <li>
<div class="con">
<div class="tit">妫�娴嬫椂闂�: 2022-04-15 12:00
<a href="" class="more"></a>
diff --git a/igds-app/index.html b/igds-app/index.html
index 59a9cca..b88e4f4 100644
--- a/igds-app/index.html
+++ b/igds-app/index.html
@@ -6,11 +6,11 @@
content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<title>棣栭〉</title>
<!-- MUI鏍峰紡 -->
- <link rel="stylesheet" href="./css/mui.min.css"/>
+ <link rel="stylesheet" href="./css/mui.min.css" />
<!-- 鍏叡css -->
- <link rel="stylesheet" href="./css/admin/public.css"/>
+ <link rel="stylesheet" href="./css/admin/public.css" />
<!-- 椤甸潰css -->
- <link rel="stylesheet" href="./css/admin/index.css"/>
+ <link rel="stylesheet" href="./css/admin/index.css" />
</head>
<body>
<!-- 渚ф粦瀵艰埅鏍瑰鍣� -->
@@ -49,7 +49,7 @@
</div>
</div>
<div class="right" id="deptButton">
- <button type="button" class="mui-btn choose-btn" >閫夋嫨搴撳尯</button>
+ <button type="button" class="mui-btn choose-btn">閫夋嫨搴撳尯</button>
</div>
</div>
<div class="mui-scroll-wrapper index-box">
@@ -61,13 +61,22 @@
</div>
<div class="right">
<div class="mui-slider">
- <div class="mui-slider-group">
- <!--绗竴涓唴瀹瑰尯瀹瑰櫒-->
+ <div class="mui-slider-group mui-slider-loop">
+ <!--鏀寔寰幆锛岄渶瑕侀噸澶嶇殑鑺傜偣-->
+ <div class="mui-slider-item mui-slider-item-duplicate">
+ <div class="txt">姝ゅ鏄竴鏉￠�氱煡鍏憡鏍规嵁鍓嶅悗宸埆...</div>
+ </div>
+ <div class="mui-slider-item">
+ <div class="txt">1姝ゅ鏄竴鏉￠�氱煡鍏憡鏍规嵁鍓嶅悗宸埆...</div>
+ </div>
+ <div class="mui-slider-item">
+ <div class="txt">2姝ゅ鏄竴鏉￠�氱煡鍏憡鏍规嵁鍓嶅悗宸埆...</div>
+ </div>
<div class="mui-slider-item">
<div class="txt">姝ゅ鏄竴鏉￠�氱煡鍏憡鏍规嵁鍓嶅悗宸埆...</div>
</div>
- <!--绗簩涓唴瀹瑰尯-->
- <div class="mui-slider-item">
+ <!--鏀寔寰幆锛岄渶瑕侀噸澶嶇殑鑺傜偣-->
+ <div class="mui-slider-item mui-slider-item-duplicate">
<div class="txt">1姝ゅ鏄竴鏉￠�氱煡鍏憡鏍规嵁鍓嶅悗宸埆...</div>
</div>
</div>
@@ -186,21 +195,26 @@
<script type="text/javascript" charset="utf-8">
//mui鍒濆鍖�
mui.init();
-
+
mui.plusReady(function() {
var user = JSON.parse(localStorage.getItem('user'));
data.tokenAuth = user.tokenAuth;
url = user.url + "/api-phone/gateway";
-
+
$("#cname").html(user.cname);
- if(user.companyId == user.deptId){
+ if (user.companyId == user.deptId) {
data.data.companyId = user.companyId;
getListDept();
- }else{
+ } else {
$("#deptName").html("鎵�鍦ㄥ簱鍖猴細" + user.deptName);
$("#deptButton").css('display', 'none');
localStorage.setItem('selectDeptId', JSON.stringify(user.deptId));
}
+ //鑾峰緱slider鎻掍欢瀵硅薄
+ var gallery = mui('.mui-slider');
+ gallery.slider({
+ interval: 2600, //鑷姩杞挱鍛ㄦ湡锛岃嫢涓�0鍒欎笉鑷姩鎾斁锛岄粯璁や负0锛�
+ });
})
</script>
</html>
\ No newline at end of file
diff --git a/igds-app/js/admin/basic-depot.js b/igds-app/js/admin/basic-depot.js
index 1ca5396..374078d 100644
--- a/igds-app/js/admin/basic-depot.js
+++ b/igds-app/js/admin/basic-depot.js
@@ -33,6 +33,7 @@
success: function(result) {
if (result.code == "0000") {
depotList = result.data;
+ console.log(JSON.stringify(depotList))
renderDepotList();
} else {
mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
@@ -50,7 +51,7 @@
if(depotList && depotList.length > 0){
$.each(depotList, function(index, item) {
html += '<li><div class="con">';
- html += '<div class="tit">浠撳簱鍚嶇О锛�<span>' + (item.depotName == null?"--":item.depotName) + '</span></div>';
+ html += '<div class="tit">浠撳簱鍚嶇О锛�<span>' + (item.name == null?"--":item.name) + '</span></div>';
html += '<div class="txt">';
html += '<div class="box"><div class="group type"><div class="desc">';
html += (item.depotTypeName == null?"--":item.depotTypeName) + '</div><div class="ort">浠撳簱绫诲瀷</div></div></div>';
diff --git a/igds-app/js/admin/device-temp.js b/igds-app/js/admin/device-temp.js
index a8c837a..2afbb76 100644
--- a/igds-app/js/admin/device-temp.js
+++ b/igds-app/js/admin/device-temp.js
@@ -234,14 +234,14 @@
var html = '';
if (targetStatus == 'OPEN') {
document.getElementById("vibrationSwitch").classList.add('mui-active');
- $('.mui-switch-handle').css("-webkit-transform" , "translate3d(16px, 0, 0)");
+ $('.mui-switch-handle').css("-webkit-transform", "translate3d(16px, 0, 0)");
console.log("寮�")
} else if (targetStatus == 'CLOSE') {
document.getElementById("vibrationSwitch").classList.remove('mui-active');
- $('.mui-switch-handle').css("-webkit-transform" , "translate3d(0, 0, 0)");
+ $('.mui-switch-handle').css("-webkit-transform", "translate3d(0, 0, 0)");
console.log("鍏�")
}
-
+
var passCode = this.getAttribute("passCode");
var serId = this.getAttribute("serId");
var name = this.getAttribute("name");
@@ -281,6 +281,10 @@
data.data.targetTemp = targetTemp
setTemp();
closePop();
+ document.getElementById("range").value = 17
+ $('.subbar').css({
+ width: ((17 - 9) / 16) * 100 + '%'
+ })
});
//鍏抽棴寮圭獥
function closePop() {
diff --git a/igds-app/js/admin/es-read-meter.js b/igds-app/js/admin/es-read-meter.js
index c18a400..df41b38 100644
--- a/igds-app/js/admin/es-read-meter.js
+++ b/igds-app/js/admin/es-read-meter.js
@@ -150,7 +150,7 @@
html += '</ul></div></div>';
})
} else {
- html += '<div class="m-ck-cont"><div class="g-titck1">鏆傛棤淇℃伅 <span class="right">鏇存柊鏃堕棿: 2023-01-01 00:00:00</span></div>';
+ html += '<div class="m-ck-cont"><div class="g-titck1">鏆傛棤淇℃伅 <span class="right">鏇存柊鏃堕棿: ' + dateTime + '</span></div>';
html += '<div class="m-energy2"><ul class="ul-txtliste1"><li><div class="con">';
html += '<div class="num">0<span> KWh</span></div><div class="desc">鏈夊姛鐢佃兘</div></div></li>';
html += '<li><div class="con"><div class="num">0<span> KWh</span></div>'
diff --git a/igds-app/js/admin/es-real-electric.js b/igds-app/js/admin/es-real-electric.js
index 41098cb..07cdfc3 100644
--- a/igds-app/js/admin/es-real-electric.js
+++ b/igds-app/js/admin/es-real-electric.js
@@ -1,5 +1,6 @@
var url;
var electricList;
+var dateTime;
var data = {
"interfaceId": "5501",
"outId": "10501",
@@ -16,7 +17,25 @@
url = user.url + "/api-phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
+ dateTime = getDate(new Date());
getElectric();
+}
+
+//鏃ユ湡鏍煎紡鍖杫yyy-MM-dd
+function getDate(date) {
+ var year = date.getFullYear();
+ var month, day,hour,minute;
+ month = date.getMonth() + 1;
+ if (month > 0 && month <= 9) {
+ month = "0" + month;
+ }
+ day = date.getDate()
+ if (day > 0 && day <= 9) {
+ day = "0" + day
+ }
+ hour = date.getHours();
+ minute = date.getMinutes();
+ return year + "-" + month + "-" + day + " "+ hour + ":" + minute
}
function getElectric() {
@@ -138,7 +157,7 @@
html += '<li><div class="con"><div class="tit"><div class="t1">';
html += '<span class="bg" style="background-image: url(images/d1.png);"></span>';
html += '<span>鏆傛棤閰嶇數鏁版嵁</span></div></div>';
- html += '<div class="inner"><div class="info">鏇存柊鏃堕棿: <span style="font-size:15px"></span></div>';
+ html += '<div class="inner"><div class="info">鏇存柊鏃堕棿: <span style="font-size:15px">' + dateTime + '</span></div>';
html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">A鐩哥數鍘�</div></div>';
html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>';
html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>';
diff --git a/igds-app/js/admin/grain-history.js b/igds-app/js/admin/grain-history.js
index a0866d0..2fb09c5 100644
--- a/igds-app/js/admin/grain-history.js
+++ b/igds-app/js/admin/grain-history.js
@@ -202,7 +202,7 @@
depotName = items[0].text;
$("#depot").val(depotName);
- mui.toast(depotId + "-" + dateTime);
+ // mui.toast(depotId + "-" + dateTime);
});
}
diff --git a/igds-app/js/admin/my.js b/igds-app/js/admin/my.js
index c791812..ee438d1 100644
--- a/igds-app/js/admin/my.js
+++ b/igds-app/js/admin/my.js
@@ -31,6 +31,7 @@
localStorage.removeItem("user");
localStorage.removeItem("selectDeptId");
mui.toast("缂撳瓨娓呴櫎鎴愬姛!");
+ loginOut();
}
//閫�鍑虹櫥褰�
@@ -39,10 +40,7 @@
}
//淇敼淇℃伅
function update() {
- mui.openWindow({
- url: "edit.html",
- id: "edit"
- })
+ mui.alert("鎵嬫満绔笉鍏佽淇敼淇℃伅锛岃鐧诲綍PC绔慨鏀�","鎻愮ず",["纭畾"], function() {}, "div")
}
//鍏充簬
diff --git a/igds-app/js/admin/security-patrol.js b/igds-app/js/admin/security-patrol.js
index 92b80bd..ebe1fac 100644
--- a/igds-app/js/admin/security-patrol.js
+++ b/igds-app/js/admin/security-patrol.js
@@ -95,7 +95,7 @@
dtpicker.show(function(e) {
dateTime = e.value;
document.getElementById("date").value = e.value
- if(time != dateTime){
+ if (time != dateTime) {
getPatrolList();
}
})
@@ -104,7 +104,7 @@
function getPatrolList() {
//璧嬪�煎弬鏁扮殑鏃ユ湡
data.data.dataTime = dateTime;
- console.log(JSON.stringify(data.data),"鐢靛瓙宸℃洿璁板綍","security-patrol")
+ console.log(JSON.stringify(data.data), "鐢靛瓙宸℃洿璁板綍", "security-patrol")
mui.ajax(url, {
type: "POST",
dataType: "json",
@@ -160,12 +160,15 @@
html += '<div class="cards"><div class="cd"><div class="con user">'
html += '<div class="tit">鎵撳崱浜�</div><div class="txt">' + item.userName + '</div></div></div>';
html += '<div class="cd"><div class="con loc"><div class="tit">鍧愭爣</div>'
- html += '<div class="txt">' + item.longitude + ', ' + item.latitude +
- '</div></div></div></div></div></li>'
+ html += '<div class="txt">' + item.longitude + ', ' + item.latitude + '</div></div></div></div></div></li>'
})
} else {
- html +=
- '<li><div class="item" style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">鏆傛棤宸℃洿淇℃伅</div></li>';
+ html += '<li><div class="item"><div class="top">'
+ html += '<div class="date">鏆傛棤宸℃洿璁板綍</div><div class="r-btn" id = "0">鏌ョ湅鐓х墖</div></div>';
+ html += '<div class="cards"><div class="cd"><div class="con user">'
+ html += '<div class="tit">鎵撳崱浜�</div><div class="txt">--</div></div></div>';
+ html += '<div class="cd"><div class="con loc"><div class="tit">鍧愭爣</div>'
+ html += '<div class="txt">0, 0</div></div></div></div></div></li>'
}
$("#recordList").html(html)
}
@@ -282,7 +285,8 @@
data: JSON.stringify(data1),
success: function(result) {
if (result.code == "0000") {
- mui.toast(result.msg);
+ // mui.toast(result.msg);
+ setInterval(getPatrolList(), 500)
} else {
mui.toast(result.msg);
}
--
Gitblit v1.9.3