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/inout-real.js | 2
igds-app/js/admin/device-verb.js | 650 +++++++++++++++++++------------------
igds-app/js/admin/inout-in-register.js | 2
igds-app/device-modeN2.html | 125 +++++++
igds-app/js/admin/grain-detail.js | 3
igds-app/js/admin/work-record.js | 2
igds-app/js/admin/device-temp.js | 42 +-
igds-app/js/admin/grain-pest.js | 2
igds-app/js/admin/grain-gas.js | 2
igds-app/js/admin/es-read-meter.js | 2
igds-app/js/admin/security-video.js | 32 +
igds-app/js/admin/inout-out-handle.js | 4
igds-app/js/admin/basic-depot.js | 4
igds-app/js/admin/es-detail.js | 2
igds-app/js/admin/basic-dept.js | 2
igds-app/js/admin/security-patrol.js | 4
igds-app/js/admin/depot-list.js | 12
igds-app/js/admin/inout-in-handle.js | 4
igds-app/js/admin/work-apply.js | 2
igds-app/js/admin/warn-list.js | 18
igds-app/js/admin/inout-out-handle-list.js | 2
igds-app/js/admin/login.js | 7
igds-app/js/admin/inout-in-handle-list.js | 2
igds-app/js/admin/index.js | 11
igds-app/security-video.html | 7
igds-app/js/admin/device-n2.js | 57 ++-
igds-app/js/admin/inout-in-record.js | 2
igds-app/js/admin/inout-out-record.js | 2
igds-app/index.html | 5
igds-app/js/admin/grain-history.js | 2
igds-app/js/admin/work-audit.js | 2
igds-app/js/admin/es-real-electric.js | 2
igds-app/js/admin/inout-out-register.js | 2
33 files changed, 601 insertions(+), 418 deletions(-)
diff --git a/igds-app/device-modeN2.html b/igds-app/device-modeN2.html
new file mode 100644
index 0000000..2768ba3
--- /dev/null
+++ b/igds-app/device-modeN2.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" 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" />
+ <!-- 鍏叡css -->
+ <link rel="stylesheet" href="./css/admin/public.css" />
+ <!-- 椤甸潰css -->
+ <link rel="stylesheet" href="./css/admin/device-n2.css">
+ </head>
+ <body class="g-bg" style="background-image: url(images/a8.png);">
+ <header id="header" class="mui-bar mui-bar-nav m-pagetit">
+ <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+ <h1 class="mui-title">姘旇皟绠＄悊</h1>
+ </header>
+ <div class="mui-content">
+ <div class="mui-scroll-wrapper g-src_box">
+ <div class="m-mana" id="recordList">
+ <div class="m-tf" >
+ <div class="g-tittf1">姘旇皟妯″紡</div>
+ <ul class="ul-listmana1 ullisttf1">
+ <li>
+ <div class="con myfancy" modeTag="30" data-win="#win_fm">
+ <div class="pic pic3">
+ <img src="images/e2.png">
+ </div>
+ <div class="info full" style="background-image: url(images/e7.png);">
+ 姘斿瘑鎬ф娴�
+ </div>
+ </div>
+ </li>
+ <li>
+ <div class="con myfancy" modeTag="01" data-win="#win_fm">
+ <div class="pic pic3">
+ <img src="images/e2.png">
+ </div>
+ <div class="info full" style="background-image: url(images/e6.png);">
+ 鎶借礋鍘�
+ </div>
+ </div>
+ </li>
+ <li>
+ <div class="con myfancy" modeTag="03" data-win="#win_fm">
+ <div class="pic pic3">
+ <img src="images/e2.png">
+ </div>
+ <div class="info full" style="background-image: url(images/e5.png);">
+ 鍏呮爱
+ </div>
+ </div>
+ </li>
+ <li>
+ <div class="con myfancy" modeTag="04" data-win="#win_fm">
+ <div class="pic pic3">
+ <img src="images/e2.png">
+ </div>
+ <div class="info full" style="background-image: url(images/e7.png);">
+ 鍧囨爱
+ </div>
+ </div>
+ </li>
+ <li>
+ <div class="con myfancy" modeTag="02" data-win="#win_fm">
+ <div class="pic pic3">
+ <img src="images/e2.png">
+ </div>
+ <div class="info full" style="background-image: url(images/e6.png);">
+ 鎺掓皵
+ </div>
+ </div>
+ </li>
+ <!-- <li>
+ <div class="con myfancy" modeTag="011" data-win="#win_fm">
+ <div class="pic pic3">
+ <img src="images/e2.png">
+ </div>
+ <div class="info full" style="background-image: url(images/e5.png);">
+ 鍒舵爱鏈烘帶鍒�
+ </div>
+ </div>
+ </li> -->
+ </ul>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <!-- 闃�闂� 寮圭獥 -->
+ <div class="m-pop" id="win_fm">
+ <div class="pop-bg"></div>
+ <div class="inner">
+ <div class="m-opts">
+ <div class="name">闃�闂�</div>
+ <div class="btns">
+ <a id="1" class="btn" style="background: linear-gradient(90deg,#2aaad9,#72c6f1);">鎵撳紑</a>
+ <a id="2" href="" class="btn" style="background: linear-gradient(90deg,#f36968,#fb9475);">鍏抽棴</a>
+ </div>
+ <div class="btns">
+ <a id="3" href="" class="btn" style="background: linear-gradient(90deg,#ec8c42,#ffb453);">鍏ㄥ紑</a>
+ <a id="4" href="" class="btn" style="background: linear-gradient(90deg,#188255,#379a71);">鍏ㄥ叧</a>
+ </div>
+ <div class="btns">
+ <a id="5" href="" class="btn" style="background: linear-gradient(90deg,#9768dc,#c170e3);">鍏呮爱</a>
+ <a id="6" href="" class="btn" style="background: linear-gradient(90deg,#188255,#379a71);">鍧囨爱</a>
+ </div>
+ </div>
+ <div class="close"><span class="mui-icon mui-icon-close"></span></div>
+ </div>
+ </div>
+ </body>
+ <script src="./js/mui.min.js"></script>
+ <script src="./js/jquery.js"></script>
+ <script src="js/lib.js"></script>
+ <script src="./js/admin/device-modeN2.js"></script>
+ <script type="text/javascript" charset="utf-8">
+ mui.init();
+
+ mui.plusReady(function() {
+ init();
+ })
+ </script>
+</html>
\ No newline at end of file
diff --git a/igds-app/index.html b/igds-app/index.html
index eeb7cf3..3e48efc 100644
--- a/igds-app/index.html
+++ b/igds-app/index.html
@@ -199,11 +199,12 @@
mui.plusReady(function() {
var user = JSON.parse(localStorage.getItem('user'));
data.tokenAuth = user.tokenAuth;
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
$("#cname").html(user.cname);
- if (user.companyId == user.deptId) {
+ if (user.deptType == "00"||user.deptType == "10") {
data.data.companyId = user.companyId;
+ data.data.deptId = user.deptId
getListDept();
} else {
$("#deptName").html("鎵�鍦ㄥ簱鍖猴細" + user.deptName);
diff --git a/igds-app/js/admin/basic-depot.js b/igds-app/js/admin/basic-depot.js
index 989f47c..f39528a 100644
--- a/igds-app/js/admin/basic-depot.js
+++ b/igds-app/js/admin/basic-depot.js
@@ -15,7 +15,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
getData();
@@ -51,7 +51,7 @@
if(depotList && depotList.length > 0){
$.each(depotList, function(index, item) {
html += '<li><div class="con">';
- html += '<div class="tit">浠撳簱鍚嶇О锛�<span>' + (item.name == null?"--":item.name) + '</span></div>';
+ html += '<div class="tit">浠撳簱鍚嶇О锛�<span>' + (item.depotName == null?"--":item.depotName) + '</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/basic-dept.js b/igds-app/js/admin/basic-dept.js
index d5bfb18..1c27d48 100644
--- a/igds-app/js/admin/basic-dept.js
+++ b/igds-app/js/admin/basic-dept.js
@@ -20,7 +20,7 @@
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
getData();
diff --git a/igds-app/js/admin/depot-list.js b/igds-app/js/admin/depot-list.js
index 4fdc9fa..1891c19 100644
--- a/igds-app/js/admin/depot-list.js
+++ b/igds-app/js/admin/depot-list.js
@@ -23,7 +23,7 @@
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
getData();
@@ -41,7 +41,6 @@
success: function(result) {
if (result.code == "0000") {
depotList = result.data;
- // console.log(JSON.stringify(depotList))
renderDepotList();
} else {
mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
@@ -55,6 +54,7 @@
//娓叉煋
function renderDepotList() {
+
if (depotList && depotList.length > 0) {
var html = '';
$.each(depotList, function(index, item) {
@@ -73,7 +73,7 @@
html += '<img src="images/a9.png">';
}
- html += '</div><div class="txt">' + item.name + '</div>';
+ html += '</div><div class="txt">' + item.depotName + '</div>';
//鏍规嵁浠撳簱鐘舵�佹樉绀轰笉鍚岄鑹�
if(item.depotStatus == "01"){
@@ -116,9 +116,9 @@
//鍔熻兘妯″潡璺宠浆
mui(".mui-content").on("tap", ".mui-scroll-wrapper ul li a", function() {
var index = this.getAttribute("id");
- var depotId = depotList[index].id;
+ var depotId = depotList[index].depotId;
var depotType = depotList[index].depotType;
- var depotName = depotList[index].name;
+ var depotName = depotList[index].depotName;
var html = null;
//绮儏璇︾粏
if (tag == "grain") {
@@ -134,7 +134,7 @@
}
//姘旇皟鎿嶄綔
if (tag == "n2") {
- html = "device-n2";
+ html = "device-modeN2";
}
//娓╂帶鎿嶄綔
if (tag == "temp") {
diff --git a/igds-app/js/admin/device-n2.js b/igds-app/js/admin/device-n2.js
index 4f84b24..139aa6c 100644
--- a/igds-app/js/admin/device-n2.js
+++ b/igds-app/js/admin/device-n2.js
@@ -1,4 +1,5 @@
var deviceData;
+var targetStatus;
//闃�闂ㄦ帶鍒�
var data = {
"interfaceId": "5402",
@@ -11,7 +12,8 @@
"type": "09",
"passCode": "",
"serId": "",
- "targetStatus":""
+ "targetStatus":"",
+ "batchTag":""
}
};
//璁惧鍒楄〃 - 鐢电闃�
@@ -31,7 +33,7 @@
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = user.deptId;
data1.tokenAuth = user.tokenAuth;
@@ -95,7 +97,6 @@
//娓叉煋椤甸潰
function renderDevice() {
- console.log(JSON.stringify(deviceData))
var html = '';
if (deviceData) {
var deviceList = deviceData.listDevice
@@ -118,18 +119,19 @@
if (frontList && frontList.length > 0) {
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱姝ｉ潰</div><ul class="ul-listmana1 ullisttf1">';
$.each(frontList, function(index, item) {
+ targetStatus = item.status
if (item.location == '01') {
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" targetStatus="' + item.status +'" serId="' +
item.serId +
'" data-win="#win_kt"><div class="pic pic2"><img src="images/e2.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info out" style="background-image: url(images/e5.png);">' +
item.name + '</div>'
- } else {
+ } else if(targetStatus == 'CLOSE'){
html += '<div class="info out" style="background-image: url(images/e9.png);">' +
item.name + '</div>'
}
- html += '</div></div></li>'
+ html += '</div></li>'
}
})
html += '</ul></div>'
@@ -138,17 +140,18 @@
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙嶉潰</div><ul class="ul-listmana1 ullisttf1">';
$.each(backList, function(index, item) {
if (item.location == '02') {
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ targetStatus = item.status
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" targetStatus="' + item.status +'" serId="' +
item.serId +
'" data-win="#win_fm"><div class="pic pic2"><img src="images/e2.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info full" style="background-image: url(images/e5.png);">' +
item.name + '</div>'
- } else {
+ } else if(targetStatus == 'CLOSE'){
html += '<div class="info full" style="background-image: url(images/e9.png);">' +
item.name + '</div>'
}
- html += '</div></div></li>'
+ html += '</div></li>'
}
})
html += '</ul></div>'
@@ -156,18 +159,19 @@
if (leftList && leftList.length > 0) {
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱宸︿晶闈�</div><ul class="ul-listmana1 ullisttf1">';
$.each(leftList, function(index, item) {
+ targetStatus = item.status
if (item.location == '03') {
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" targetStatus="' + item.status +'" serId="' +
item.serId +
'" data-win="#win_fm"><div class="pic pic2"><img src="images/e2.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info full" style="background-image: url(images/e5.png);">' +
item.name + '</div>'
- } else {
+ } else if(targetStatus == 'CLOSE'){
html += '<div class="info full" style="background-image: url(images/e9.png);">' +
item.name + '</div>'
}
- html += '</div></div></li>'
+ html += '</div></li>'
}
})
html += '</ul></div>'
@@ -175,18 +179,19 @@
if (rightList && rightList.length > 0) {
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙充晶闈�</div><ul class="ul-listmana1 ullisttf1">';
$.each(rightList, function(index, item) {
+ targetStatus = item.status
if (item.location == '04') {
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" targetStatus="' + item.status +'" serId="' +
item.serId +
'" data-win="#win_fm"><div class="pic pic2"><img src="images/e2.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info full" style="background-image: url(images/e5.png);">' +
item.name + '</div>'
- } else {
+ } else if(targetStatus == 'CLOSE'){
html += '<div class="info full" style="background-image: url(images/e9.png);">' +
item.name + '</div>'
}
- html += '</div></div></li>'
+ html += '</div></li>'
}
})
html += '</ul></div>'
@@ -198,7 +203,6 @@
html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
// html += '<div>1111</div>'
}
- console.log(html)
$("#recordList").html(html);
}
@@ -206,13 +210,32 @@
mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .con", function() {
var passCode = this.getAttribute("passCode");
var serId = this.getAttribute("serId");
+ targetStatus = this.getAttribute("targetStatus");
+ data.data.targetStatus = targetStatus;
data.data.passCode = passCode;
data.data.serId = serId;
$('.m-pop').css('display', 'flex');
});
mui(".m-pop").on("tap", ".inner a", function() {
var id = this.getAttribute("id");
- mui.toast(id);
+ console.log(JSON.stringify(data.data))
+ if(id==1){
+ data.data.targetStatus="OPEN"
+ batchTag = false;
+ }
+ if(id==2){
+ data.data.targetStatus="CLOSE"
+ batchTag = false;
+ }
+ if(id==3){
+ data.data.targetStatus="OPEN"
+ batchTag = true;
+ }
+ if(id==4){
+ data.data.targetStatus="CLOSE"
+ batchTag = true;
+ }
+ setTemp();
closePop();
});
//鍏抽棴寮圭獥
diff --git a/igds-app/js/admin/device-temp.js b/igds-app/js/admin/device-temp.js
index de8011a..e5c1b10 100644
--- a/igds-app/js/admin/device-temp.js
+++ b/igds-app/js/admin/device-temp.js
@@ -9,6 +9,7 @@
"reqDateTime": new Date(),
"tokenAuth": "",
"data": {
+ "deviceId":"",
"deptId": "",
"depotId": "",
"type": "05",
@@ -37,7 +38,7 @@
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = user.deptId;
data1.tokenAuth = user.tokenAuth;
@@ -122,37 +123,34 @@
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱姝ｉ潰</div><ul class="ul-listmana1 ullisttf1">';
$.each(frontList, function(index, item) {
targetStatus = item.status
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ html += '<li><div class="con myfancy" deviceId="'+item.id+'" passCode="' + item.passCode + '" serId="' +
item.serId + '" targetStatus="' + item.status + '" name="' + item.name +
'" data-win="#win_kt"><div class="pic pic2"><img src="images/e1.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info out" style="background-image: url(images/e8.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
} else {
html += '<div class="info out" style="background-image: url(images/e9.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
}
- html += '</div></div></li>'
-
})
html += '</ul></div>'
}
if (backList && backList.length > 0) {
+ console.log("backList")
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙嶉潰</div><ul class="ul-listmana1 ullisttf1">';
$.each(backList, function(index, item) {
targetStatus = item.status
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ html += '<li><div class="con myfancy" deviceId="'+item.id+'" passCode="' + item.passCode + '" serId="' +
item.serId + '" targetStatus="' + item.status + '" name="' + item.name +
'" data-win="#win_kt"><div class="pic pic2"><img src="images/e1.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info out" style="background-image: url(images/e8.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
} else {
html += '<div class="info out" style="background-image: url(images/e9.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
}
- html += '</div></div></li>'
-
})
html += '</ul></div>'
}
@@ -160,37 +158,34 @@
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱宸︿晶闈�</div><ul class="ul-listmana1 ullisttf1">';
$.each(leftList, function(index, item) {
targetStatus = item.status
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ html += '<li><div class="con myfancy" deviceId="'+item.id+'" passCode="' + item.passCode + '" serId="' +
item.serId + '" targetStatus="' + item.status + '" name="' + item.name +
'" data-win="#win_kt"><div class="pic pic2"><img src="images/e1.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info out" style="background-image: url(images/e8.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
} else {
html += '<div class="info out" style="background-image: url(images/e9.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
}
- html += '</div></div></li>'
-
})
html += '</ul></div>'
}
if (rightList && rightList.length > 0) {
+ console.log("rightList")
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙充晶闈�</div><ul class="ul-listmana1 ullisttf1">';
$.each(rightList, function(index, item) {
targetStatus = item.status
- html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ html += '<li><div class="con myfancy" deviceId="'+item.id+'" passCode="' + item.passCode + '" serId="' +
item.serId + '" targetStatus="' + item.status + '" name="' + item.name +
'" data-win="#win_kt"><div class="pic pic2"><img src="images/e1.png"></div>';
if (targetStatus == 'OPEN') {
html += '<div class="info out" style="background-image: url(images/e8.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
} else {
html += '<div class="info out" style="background-image: url(images/e9.png);">' +
- item.name + '</div>'
+ item.name + '</div></div></li>'
}
- html += '</div></div></li>'
-
})
html += '</ul></div>'
}
@@ -231,7 +226,8 @@
mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .con", function() {
targetStatus = this.getAttribute("targetStatus")
- data.data.targetStatus = targetStatus
+ data.data.targetStatus = targetStatus;
+ console.log(targetStatus)
var html = '';
if (targetStatus == 'OPEN') {
document.getElementById("vibrationSwitch").classList.add('mui-active');
@@ -243,9 +239,11 @@
console.log("鍏�")
}
+ var deviceId = this.getAttribute("deviceId");
var passCode = this.getAttribute("passCode");
var serId = this.getAttribute("serId");
var name = this.getAttribute("name");
+ data.data.deviceId = deviceId
data.data.passCode = passCode;
data.data.serId = serId;
data.data.name = name;
diff --git a/igds-app/js/admin/device-verb.js b/igds-app/js/admin/device-verb.js
index 093e821..66ed039 100644
--- a/igds-app/js/admin/device-verb.js
+++ b/igds-app/js/admin/device-verb.js
@@ -18,15 +18,15 @@
"outId": "10402",
"reqDateTime": new Date(),
"tokenAuth": "",
- "data": [],
- // {
- // "deptId": "",
- // "depotId": "",
- // "type": "",
- // "passCode": "",
- // "serId": "",
- // "targetStatus": ""
- // }
+ "data": {
+ "deptId": "",
+ "depotId": "",
+ "type": "",
+ "passCode": "",
+ "serId": "",
+ "targetStatus": "",
+ "batchTag":""
+ }
};
//璁惧鍒楄〃
var data1 = {
@@ -50,15 +50,18 @@
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = user.deptId;
+ data1.data.deptId = user.deptId;
data1.tokenAuth = user.tokenAuth;
deptId = user.deptId;
//鑾峰彇浠庝笂涓�涓〉闈紶閫掔殑鏁版嵁
var self = plus.webview.currentWebview();
data.data.depotId = self.depotId
+ data1.data.depotId = self.depotId
depotId = self.depotId
+ console.log(depotId)
// depotType = self.depotType
// depotName = self.depotName
getDeviceList();
@@ -93,6 +96,10 @@
if (deviceData) {
var deviceList = deviceData.listDevice;
if (deviceList && deviceList.length > 0) {
+ frontList=[];
+ backList=[];
+ leftList=[];
+ rightList=[];
$.each(deviceList, function(index, item) {
if (item.location == '01') {
frontList.push(item)
@@ -104,231 +111,334 @@
rightList.push(item)
}
})
-
if (frontList && frontList.length > 0) { //浠撳簱姝ｉ潰
html += '<div class="m-tf"><div class="g-tittf1">浠撳簱姝ｉ潰</div><ul class="ul-listmana1 ullisttf1">';
$.each(frontList, function(index, item) {
+ targetStatus = item.status
+ if (item.type == '01') { //椋庣獥
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' + item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="01">';
+ if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e5.png);">'+ item.name +'</div>'
+ }else if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_CLOSE.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
+ }
+ html += '</div></li>'
+ } else if (item.type == '02') { //杞存祦椋庢満
+ html += '<li><div class="con myfancy zhouliu" status="'+ item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_CLOSE.png"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +'</div>'
+ html += '</div></li>'
+ } else if (item.type == '04') { //鐜祦椋庢満
+ html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_ClOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_OPEN.gif"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0B') { //閫氶鍙�
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="0B">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
+ html += '</div></li>'
+ } else if (item.type == '0C') { //娣锋祦椋庢満
+ html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_w_CLOSE.png"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_W_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0D') { //鍔犲帇椋庢満
+ html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ }
+ })
+ html += '</ul></div>'
+ }
+ if (backList && backList.length > 0) { //浠撳簱鍙嶉潰
+ html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙嶉潰</div><ul class="ul-listmana1 ullisttf1">';
+ $.each(frontList, function(index, item) {
+ targetStatus = item.status
+ if (item.type == '01') { //椋庣獥
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' + item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="01">';
+ if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e5.png);">'+ item.name +'</div>'
+ }else if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_CLOSE.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
+ }
+ html += '</div></li>'
+ } else if (item.type == '02') { //杞存祦椋庢満
+ html += '<li><div class="con myfancy zhouliu" status="'+ item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_CLOSE.png"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +'</div>'
+ html += '</div></li>'
+ } else if (item.type == '04') { //鐜祦椋庢満
+ html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_ClOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_OPEN.gif"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0B') { //閫氶鍙�
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="0B">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
+ html += '</div></li>'
+ } else if (item.type == '0C') { //娣锋祦椋庢満
+ html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_w_CLOSE.png"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_W_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0D') { //鍔犲帇椋庢満
+ html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ }
+ })
+ html += '</ul></div>'
+ }
+ if (leftList && leftList.length > 0) { //浠撳簱宸︿晶闈�
+ html += '<div class="m-tf"><div class="g-tittf1">浠撳簱宸︿晶闈�</div><ul class="ul-listmana1 ullisttf1">';
+ $.each(frontList, function(index, item) {
+ targetStatus = item.status
+ if (item.type == '01') { //椋庣獥
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' + item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="01">';
+ if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e5.png);">'+ item.name +'</div>'
+ }else if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_CLOSE.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
+ }
+ html += '</div></li>'
+ } else if (item.type == '02') { //杞存祦椋庢満
+ html += '<li><div class="con myfancy zhouliu" status="'+ item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_CLOSE.png"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +'</div>'
+ html += '</div></li>'
+ } else if (item.type == '04') { //鐜祦椋庢満
+ html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_ClOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_OPEN.gif"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0B') { //閫氶鍙�
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="0B">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
+ html += '</div></li>'
+ } else if (item.type == '0C') { //娣锋祦椋庢満
+ html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_w_CLOSE.png"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_W_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0D') { //鍔犲帇椋庢満
+ html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
+ html += '</div></li>'
+ }
+ })
+ html += '</ul></div>'
+ }
+ if (rightList && rightList.length > 0) { //浠撳簱鍙充晶闈�
+ html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙充晶闈�</div><ul class="ul-listmana1 ullisttf1">';
+ $.each(frontList, function(index, item) {
+ targetStatus = item.status
if (item.type == '01') { //椋庣獥
html += '<li><div class="con myfancy chuangkou" status="' + item.status +
'" passCode="' +
item.passCode + '" serId="' + item.serId + '"name="' + item.name +
'" location="front" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
- .name +
- '</div>'
+ if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e5.png);">'+ item.name +'</div>'
+ }else if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_CLOSE.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
+ }
html += '</div></li>'
} else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
+ html += '<li><div class="con myfancy zhouliu" status="'+ item.status + '" passCode="' +
item.passCode + '" serId="' + item.serId + '"name="' + item.name +
'" location="front">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
- .name +
- '</div>'
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_CLOSE.png"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_02_W_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +'</div>'
html += '</div></li>'
} else if (item.type == '04') { //鐜祦椋庢満
html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
item.passCode + '" serId="' + item.serId + '"name="' + item.name +
'" location="front">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_ClOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_04_OPEN.gif"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
html += '</div></li>'
} else if (item.type == '0B') { //閫氶鍙�
html += '<li><div class="con myfancy chuangkou" status="' + item.status +
- '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" passCode="' +item.passCode + '" serId="' + item.serId + '"name="' + item.name +
'" location="front" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ }
+ html += '<div class="info in" style="background-image: url(images/e3.png);">'+ item.name +'</div>'
html += '</div></li>'
} else if (item.type == '0C') { //娣锋祦椋庢満
html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'W_CLOSE'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_w_CLOSE.png"></div>'
+ }else if(targetStatus == 'F_OPEN_F'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN_F.gif"></div>'
+ }else if(targetStatus == 'F_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_F_OPEN.gif"></div>'
+ }else if(targetStatus == 'W_OPEN'){
+ html += '<div class="pic"><img src="images/device-status/STATUS_0C_W_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
html += '</div></li>'
} else if (item.type == '0D') { //鍔犲帇椋庢満
html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- }
- })
- html += '</ul></div>'
- } else if (backList && backList.length > 0) { //浠撳簱鍙嶉潰
- html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙嶉潰</div><ul class="ul-listmana1 ullisttf1">';
- $.each(backList, function(index, item) {
- if (item.type == '01') { //椋庣獥
- html += '<li><div class="con myfancy chuangkou" status="' + item.status +
- '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
- .name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
- .name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '04') { //鐜祦椋庢満
- html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0B') { //閫氶鍙�
- html += '<li><div class="con myfancy chuangkou" status="' + item.status +
- '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0C') { //娣锋祦椋庢満
- html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0D') { //鍔犲帇椋庢満
- html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- }
- })
- html += '</ul></div>'
- } else if (leftList && leftList.length > 0) { //浠撳簱宸︿晶闈�
- html += '<div class="m-tf"><div class="g-tittf1">浠撳簱宸︿晶闈�</div><ul class="ul-listmana1 ullisttf1">';
- $.each(leftList, function(index, item) {
- if (item.type == '01') { //椋庣獥
- html += '<li><div class="con myfancy chuangkou" status="' + item.status +
- '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
- .name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
- .name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '04') { //鐜祦椋庢満
- html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0B') { //閫氶鍙�
- html += '<li><div class="con myfancy chuangkou" status="' + item.status +
- '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0C') { //娣锋祦椋庢満
- html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0D') { //鍔犲帇椋庢満
- html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- }
- })
- html += '</ul></div>'
- } else if (rightList && rightList.length > 0) { //浠撳簱鍙充晶闈�
- html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙充晶闈�</div><ul class="ul-listmana1 ullisttf1">';
- $.each(rightList, function(index, item) {
- if (item.type == '01') { //椋庣獥
- html += '<li><div class="con myfancy chuangkou" status="' + item.status +
- '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
- .name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
- .name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '04') { //鐜祦椋庢満
- html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0B') { //閫氶鍙�
- html += '<li><div class="con myfancy chuangkou" status="' + item.status +
- '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0C') { //娣锋祦椋庢満
- html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0D') { //鍔犲帇椋庢満
- html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +'" location="front">';
+ if(targetStatus == 'CLOSE'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_CLOSE.png"></div>'
+ }else if(targetStatus == 'OPEN'){
+ html += '<div class="pic pic1"><img src="images/device-status/STATUS_0D_OPEN.png"></div>'
+ }
+ html += '<div class="info out" style="background-image: url(images/e3.png);"> ' + item.name + '</div>'
html += '</div></li>'
}
})
@@ -336,9 +446,9 @@
}
} else {
- html +=
- '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
- }
+ html +=
+ '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
+ }
} else {
html +=
'<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
@@ -349,6 +459,7 @@
//璁惧鎿嶄綔璇锋眰
function toControlDevice() {
+ console.log(JSON.stringify(data))
mui.ajax(url, {
type: "POST",
dataType: "json",
@@ -503,114 +614,17 @@
targetStatus = 'CLOSE';
batchTag = true;
}
+console.log(batchTag);
- //浠撳簱鍓嶉潰
- if (deviceDetail.location == "front") {
- //鍙傛暟娓呯┖
- data.data = [];
- if (batchTag) { //鎵归噺鎿嶄綔
- $.each(frontList, function(index, item) {
- if (deviceDetail.type == item.type) {
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": item.passCode,
- "serId": item.serId,
- "type": item.type,
- "targetStatus": targetStatus
- })
- }
- })
- } else { //鍗曡澶囨搷浣�
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": deviceDetail.passCode,
- "serId": deviceDetail.serId,
- "type": deviceDetail.type,
- "targetStatus": targetStatus
- })
- }
- } else if (deviceDetail.location == "back") {
- //鍙傛暟娓呯┖
- data.data = [];
- if (batchTag) { //鎵归噺鎿嶄綔
- $.each(backList, function(index, item) {
- if (deviceDetail.type == item.type) {
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": item.passCode,
- "serId": item.serId,
- "type": item.type,
- "targetStatus": targetStatus
- })
- }
- })
- } else { //鍗曡澶囨搷浣�
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": deviceDetail.passCode,
- "serId": deviceDetail.serId,
- "type": deviceDetail.type,
- "targetStatus": targetStatus
- })
- }
- } else if (deviceDetail.location == "left") {
- //鍙傛暟娓呯┖
- data.data = [];
- if (batchTag) { //鎵归噺鎿嶄綔
- $.each(leftList, function(index, item) {
- if (deviceDetail.type == item.type) {
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": item.passCode,
- "serId": item.serId,
- "type": item.type,
- "targetStatus": targetStatus
- })
- }
- })
- } else { //鍗曡澶囨搷浣�
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": deviceDetail.passCode,
- "serId": deviceDetail.serId,
- "type": deviceDetail.type,
- "targetStatus": targetStatus
- })
- }
- } else if (deviceDetail.location == "right") {
- //鍙傛暟娓呯┖
- data.data = [];
- if (batchTag) { //鎵归噺鎿嶄綔
- $.each(rightList, function(index, item) {
- if (deviceDetail.type == item.type) {
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": item.passCode,
- "serId": item.serId,
- "type": item.type,
- "targetStatus": targetStatus
- })
- }
- })
- } else { //鍗曡澶囨搷浣�
- data.data.push({
- "deptId": deptId,
- "depotId": depotId,
- "passCode": deviceDetail.passCode,
- "serId": deviceDetail.serId,
- "type": deviceDetail.type,
- "targetStatus": targetStatus
- })
- }
- }
-
+ // //浠撳簱鍓嶉潰
+ data.data.deptId=deptId;
+ data.data.depotId=depotId;
+ data.data.passCode=deviceDetail.passCode;
+ data.data.serId=deviceDetail.serId;
+ data.data.targetStatus=targetStatus;
+ data.data.type=deviceDetail.type;
+ data.data.batchTag=batchTag;
+ console.log(JSON.stringify(data.data))
//鍙戦�佹搷浣滆姹�
toControlDevice();
diff --git a/igds-app/js/admin/es-detail.js b/igds-app/js/admin/es-detail.js
index 45bce06..cdfc843 100644
--- a/igds-app/js/admin/es-detail.js
+++ b/igds-app/js/admin/es-detail.js
@@ -18,7 +18,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
startTime = getDate(new Date());
diff --git a/igds-app/js/admin/es-read-meter.js b/igds-app/js/admin/es-read-meter.js
index 4d3dde2..3fb5887 100644
--- a/igds-app/js/admin/es-read-meter.js
+++ b/igds-app/js/admin/es-read-meter.js
@@ -15,7 +15,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
dateTime = getDate(new Date());
diff --git a/igds-app/js/admin/es-real-electric.js b/igds-app/js/admin/es-real-electric.js
index ed3f907..f16ca9f 100644
--- a/igds-app/js/admin/es-real-electric.js
+++ b/igds-app/js/admin/es-real-electric.js
@@ -14,7 +14,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
dateTime = getDate(new Date());
diff --git a/igds-app/js/admin/grain-detail.js b/igds-app/js/admin/grain-detail.js
index 91fb0bb..194057e 100644
--- a/igds-app/js/admin/grain-detail.js
+++ b/igds-app/js/admin/grain-detail.js
@@ -34,6 +34,7 @@
function init() {
//鑾峰彇鍙傛暟
var curr = plus.webview.currentWebview();
+ console.log(JSON.stringify(curr))
depotType = curr.depotType;
depotId = curr.depotId;
depotName = curr.depotName;
@@ -43,7 +44,7 @@
}
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
data.data.depotId = depotId;
diff --git a/igds-app/js/admin/grain-gas.js b/igds-app/js/admin/grain-gas.js
index 777e9ae..fe871a1 100644
--- a/igds-app/js/admin/grain-gas.js
+++ b/igds-app/js/admin/grain-gas.js
@@ -27,7 +27,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
data0.tokenAuth = user.tokenAuth;
diff --git a/igds-app/js/admin/grain-history.js b/igds-app/js/admin/grain-history.js
index 475606d..b492358 100644
--- a/igds-app/js/admin/grain-history.js
+++ b/igds-app/js/admin/grain-history.js
@@ -33,7 +33,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
data0.tokenAuth = user.tokenAuth;
diff --git a/igds-app/js/admin/grain-pest.js b/igds-app/js/admin/grain-pest.js
index 68503e4..0cc4b30 100644
--- a/igds-app/js/admin/grain-pest.js
+++ b/igds-app/js/admin/grain-pest.js
@@ -27,7 +27,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
data0.tokenAuth = user.tokenAuth;
diff --git a/igds-app/js/admin/index.js b/igds-app/js/admin/index.js
index 9b8e9c7..17f7efb 100644
--- a/igds-app/js/admin/index.js
+++ b/igds-app/js/admin/index.js
@@ -8,7 +8,8 @@
"reqDateTime": new Date(),
"tokenAuth": "",
"data": {
- "companyId": ""
+ "companyId": "",
+ "deptId":""
}
};
@@ -33,8 +34,8 @@
mui('.mui-off-canvas-wrap').offCanvas().toggle();
var id = this.getAttribute("id");
var dept = listDept[id];
- $("#deptName").html("鎵�鍦ㄥ簱鍖猴細" + dept.name);
- localStorage.setItem('selectDeptId', JSON.stringify(dept.id));
+ $("#deptName").html("鎵�鍦ㄥ簱鍖猴細" + dept.deptName);
+ localStorage.setItem('selectDeptId', JSON.stringify(dept.deptId));
});
//娓叉煋鍒嗗簱鍒楄〃
@@ -43,7 +44,7 @@
var html = '';
$.each(listDept, function(index, item) {
html += '<li><a id="' + index + '" href="" class="link">';
- html += '<span class="t">' + item.name + '</span>';
+ html += '<span class="t">' + item.deptName + '</span>';
html += '<span class="mui-icon mui-icon-arrowright"></span>';
html += '</a></li>';
})
@@ -53,6 +54,8 @@
//鑾峰彇搴撳尯鍒楄〃
function getListDept() {
+ console.log(url)
+ console.log(JSON.stringify(data.data))
//璇锋眰
mui.ajax(url, {
type: "POST",
diff --git a/igds-app/js/admin/inout-in-handle-list.js b/igds-app/js/admin/inout-in-handle-list.js
index bdfa53f..c7e9aaa 100644
--- a/igds-app/js/admin/inout-in-handle-list.js
+++ b/igds-app/js/admin/inout-in-handle-list.js
@@ -28,7 +28,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
diff --git a/igds-app/js/admin/inout-in-handle.js b/igds-app/js/admin/inout-in-handle.js
index c2a2043..423d85b 100644
--- a/igds-app/js/admin/inout-in-handle.js
+++ b/igds-app/js/admin/inout-in-handle.js
@@ -41,8 +41,8 @@
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
- uploadUrl = user.url + "/api-phone/v35/upload-img";
+ url = user.url + "/api/phone/v35/gateway";
+ uploadUrl = user.url + "/api/phone/v35/upload-img";
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data1.data.handleUser = user.cname;
diff --git a/igds-app/js/admin/inout-in-record.js b/igds-app/js/admin/inout-in-record.js
index 283d619..914df64 100644
--- a/igds-app/js/admin/inout-in-record.js
+++ b/igds-app/js/admin/inout-in-record.js
@@ -17,7 +17,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
diff --git a/igds-app/js/admin/inout-in-register.js b/igds-app/js/admin/inout-in-register.js
index bb28c6e..8f35b7a 100644
--- a/igds-app/js/admin/inout-in-register.js
+++ b/igds-app/js/admin/inout-in-register.js
@@ -19,7 +19,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
}
diff --git a/igds-app/js/admin/inout-out-handle-list.js b/igds-app/js/admin/inout-out-handle-list.js
index b776db7..f503814 100644
--- a/igds-app/js/admin/inout-out-handle-list.js
+++ b/igds-app/js/admin/inout-out-handle-list.js
@@ -27,7 +27,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
diff --git a/igds-app/js/admin/inout-out-handle.js b/igds-app/js/admin/inout-out-handle.js
index d46e298..9da55a6 100644
--- a/igds-app/js/admin/inout-out-handle.js
+++ b/igds-app/js/admin/inout-out-handle.js
@@ -41,8 +41,8 @@
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
- uploadUrl = user.url + "/api-phone/v35/upload-img";
+ url = user.url + "/api/phone/v35/gateway";
+ uploadUrl = user.url + "/api/phone/v35/upload-img";
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data1.data.handleUser = user.cname;
diff --git a/igds-app/js/admin/inout-out-record.js b/igds-app/js/admin/inout-out-record.js
index c34aa0d..23272f7 100644
--- a/igds-app/js/admin/inout-out-record.js
+++ b/igds-app/js/admin/inout-out-record.js
@@ -17,7 +17,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
diff --git a/igds-app/js/admin/inout-out-register.js b/igds-app/js/admin/inout-out-register.js
index 946170e..c575f98 100644
--- a/igds-app/js/admin/inout-out-register.js
+++ b/igds-app/js/admin/inout-out-register.js
@@ -19,7 +19,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
}
diff --git a/igds-app/js/admin/inout-real.js b/igds-app/js/admin/inout-real.js
index 3703003..ee1e018 100644
--- a/igds-app/js/admin/inout-real.js
+++ b/igds-app/js/admin/inout-real.js
@@ -16,7 +16,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
diff --git a/igds-app/js/admin/login.js b/igds-app/js/admin/login.js
index cdb0338..4bdb90d 100644
--- a/igds-app/js/admin/login.js
+++ b/igds-app/js/admin/login.js
@@ -71,10 +71,10 @@
//璁剧疆璇锋眰鍙�
data.data.username = username;
data.data.password = password;
- console.log(url + "/api-phone/v35/login");
+ console.log(url + "/api/phone/v35/login");
console.log(JSON.stringify(data));
//鍙戦�佺櫥闄嗚姹�
- mui.ajax(url + "/api-phone/v35/login", {
+ mui.ajax(url + "/api/phone/v35/login", {
type: "POST",
dataType: "json",
crossDomain: true,
@@ -97,7 +97,8 @@
"tokenAuth": result.data.tokenAuth,
"companyId": result.data.companyId,
"deptId": result.data.deptId,
- "deptName": result.data.deptName
+ "deptName": result.data.deptName,
+ "deptType":result.data.type,
};
localStorage.setItem('user', JSON.stringify(regInfo));
localStorage.removeItem("selectDeptId");
diff --git a/igds-app/js/admin/security-patrol.js b/igds-app/js/admin/security-patrol.js
index d03d23e..accbd4f 100644
--- a/igds-app/js/admin/security-patrol.js
+++ b/igds-app/js/admin/security-patrol.js
@@ -48,8 +48,8 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
- uploadUrl = user.url + "/api-phone/v35/upload-img"
+ url = user.url + "/api/phone/v35/gateway";
+ uploadUrl = user.url + "/api/phone/v35/upload-img"
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data1.data.userName = user.cname;
diff --git a/igds-app/js/admin/security-video.js b/igds-app/js/admin/security-video.js
index 4f3e1c7..e24ad2f 100644
--- a/igds-app/js/admin/security-video.js
+++ b/igds-app/js/admin/security-video.js
@@ -28,7 +28,7 @@
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
getVideoList();
@@ -140,11 +140,13 @@
success: function(result) {
if (result.code == "0000") {
playData = result.data;
- console.log(JSON.stringify(playData))
- toVideo(playData.playAddr);
- } else {
+ // toVideo(playData.playAddr);
// toVideo("http://player.alicdn.com/video/aliyunmedia.mp4");
- toVideo('')
+ toVideo("http://192.168.1.62:8889/zlm/rtp/gb_play_41010200492000000001_34020000001310000001.flv");
+
+ } else {
+ toVideo("http://192.168.1.62:8889/zlm/rtp/gb_play_41010200492000000001_34020000001310000001.flv");
+ // toVideo('')
mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
}
},
@@ -155,15 +157,23 @@
})
}
+// function toVideo(playAddr) {
+// var html = '';
+// html += '<video id="mainvideo" src="' + playAddr +
+// '" poster="images/pos1.png" class="video" webkit-playsinline="true" playsinline="true" autoplay controls></video>'
+// $("#toVideo").html(html);
+// }
function toVideo(playAddr) {
- var html = '';
- html += '<video src="' + playAddr +
- '" poster="images/pos1.png" class="video" webkit-playsinline="true" playsinline="true" controls></video>'
- $("#toVideo").html(html);
-}
+ var html = "";
+ //鍏抽棴杞湀绛夊緟妗�
+ html = '<easy-player id="easyPlayer" video-url="' + playAddr +
+ '" live="true" show-custom-button="true" auto-play="true" muted="true"></easy-player>';
+ $('#toVideo').html(html);
+}
+
mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
diff --git a/igds-app/js/admin/warn-list.js b/igds-app/js/admin/warn-list.js
index 34116fa..ec009c8 100644
--- a/igds-app/js/admin/warn-list.js
+++ b/igds-app/js/admin/warn-list.js
@@ -33,7 +33,7 @@
dataPop.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
dataPop.data.completeUser = user.cname
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
dateTime = getDate(new Date())
document.getElementById("date").value = dateTime
@@ -156,14 +156,20 @@
'</div><div class="ort">浠撳簱鍚嶇О</div></div></div>';
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 == '02') {
+ '<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 {
diff --git a/igds-app/js/admin/work-apply.js b/igds-app/js/admin/work-apply.js
index 20daf74..0181b08 100644
--- a/igds-app/js/admin/work-apply.js
+++ b/igds-app/js/admin/work-apply.js
@@ -78,7 +78,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data2.tokenAuth = user.tokenAuth;
diff --git a/igds-app/js/admin/work-audit.js b/igds-app/js/admin/work-audit.js
index fa16475..3058289 100644
--- a/igds-app/js/admin/work-audit.js
+++ b/igds-app/js/admin/work-audit.js
@@ -27,7 +27,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
diff --git a/igds-app/js/admin/work-record.js b/igds-app/js/admin/work-record.js
index acc668a..5136efd 100644
--- a/igds-app/js/admin/work-record.js
+++ b/igds-app/js/admin/work-record.js
@@ -14,7 +14,7 @@
function init() {
var user = JSON.parse(localStorage.getItem('user'));
- url = user.url + "/api-phone/v35/gateway";
+ url = user.url + "/api/phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.userName = user.username;
console.log(JSON.stringify(data.data),"work-record")
diff --git a/igds-app/security-video.html b/igds-app/security-video.html
index 184cfc5..813a840 100644
--- a/igds-app/security-video.html
+++ b/igds-app/security-video.html
@@ -28,7 +28,8 @@
<video src="" poster="images/pos1.png"
class="video" webkit-playsinline="true" playsinline="true" controls></video>
</div>
- <ul class="ul-locb1" id="recordList">
+ <ul class="ul-locb1" id="recordList"></ul>
+
<!-- <li>
<a onclick="getVideo(1,1)" class="con" style="background-image: url(images/icons/g-i15.png);">
<div class="left">
@@ -128,8 +129,7 @@
<div class="right"><span class="mui-icon mui-icon-forward"></span></div>
</a>
</li>
- -->
- </ul>
+ </ul> -->
</div>
</div>
</div>
@@ -138,6 +138,7 @@
<script src="./js/mui.min.js"></script>
<script src="./js/jquery.js"></script>
<script src="./js/admin/security-video.js"></script>
+ <script src="./js/EasyPlayer-element.min.js"></script>
<script type="text/javascript" charset="utf-8">
mui.init();
mui.plusReady(function() {
--
Gitblit v1.9.3