From 397dbf892f842c834af17a91c788c94fd96003f8 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 29 五月 2023 19:13:31 +0800
Subject: [PATCH] 问题修改
---
igds-app/js/admin/es-detail.js | 47 +-
igds-app/js/admin/device-verb.js | 92 ++++++
igds-app/js/admin/security-patrol.js | 1
igds-app/device-temp.html | 25 +
igds-app/js/admin/work-apply.js | 23 -
igds-app/js/admin/work-record.js | 3
igds-app/js/admin/warn-list.js | 10
igds-app/js/admin/device-temp.js | 203 ++++++++++++
igds-app/device-verb.html | 43 --
igds-app/work-apply.html | 10
igds-app/work-audit.html | 8
igds-app/js/admin/device-n2.js | 232 +++++++++++++++
igds-app/js/admin/inout-in-record.js | 57 ++
igds-app/js/admin/inout-out-record.js | 40 ++
igds-app/device-n2.html | 37 --
igds-app/es-detail.html | 4
igds-app/js/admin/work-audit.js | 8
igds-app/work-record.html | 2
igds-app/js/admin/es-real-electric.js | 12
19 files changed, 666 insertions(+), 191 deletions(-)
diff --git a/igds-app/device-n2.html b/igds-app/device-n2.html
index b8bf5a5..7e2015c 100644
--- a/igds-app/device-n2.html
+++ b/igds-app/device-n2.html
@@ -19,11 +19,11 @@
<div class="mui-content">
<div class="mui-scroll-wrapper g-src_box">
<div class="m-mana">
- <div class="m-tf">
+ <div class="m-tf" id="recordList">
<div class="g-tittf1">浠撳簱姝ｉ潰</div>
<ul class="ul-listmana1 ullisttf1">
<li>
- <div class="con myfancy" data-win="#win_fm">
+ <div class="con myfancy" passCode="011" serId="100" data-win="#win_fm">
<div class="pic pic3">
<img src="images/e2.png">
</div>
@@ -158,37 +158,12 @@
<script src="./js/mui.min.js"></script>
<script src="./js/jquery.js"></script>
<script src="js/lib.js"></script>
+ <script src="./js/admin/device-n2.js"></script>
<script type="text/javascript" charset="utf-8">
mui.init();
- var slider = mui(".mui-slider");
- slider.slider({
- interval: 3000
- });
-
- mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
- deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
- bounce: false, //鏄惁鍚敤鍥炲脊
- deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
- });
-
- //绌鸿皟鎿嶄綔
- mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .con", function() {
- $('.m-pop').css('display', 'flex');
- });
- mui(".m-pop").on("tap", ".inner a", function() {
- var id = this.getAttribute("id");
- mui.toast(id);
- closePop();
- });
- //鍏抽棴寮圭獥
- function closePop() {
- $(".m-pop").css('display', 'none');
- }
- $('.pop-bg,.m-pop .close').click(function(e) {
- e.stopPropagation();
- $('.m-pop').fadeOut();
- });
+ mui.plusReady(function() {
+ init();
+ })
</script>
</html>
\ No newline at end of file
diff --git a/igds-app/device-temp.html b/igds-app/device-temp.html
index 2319560..67ef9b2 100644
--- a/igds-app/device-temp.html
+++ b/igds-app/device-temp.html
@@ -2,10 +2,13 @@
<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" />
+ <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" />
+ <link rel="stylesheet" href="css/mui.poppicker.css">
+ <link rel="stylesheet" href="css/mui.picker.min.css" />
<!-- 鍏叡css -->
<link rel="stylesheet" href="./css/admin/public.css" />
<!-- 椤甸潰css -->
@@ -18,12 +21,12 @@
</header>
<div class="mui-content">
<div class="mui-scroll-wrapper g-src_box">
- <div class="m-mana">
+ <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" data-win="#win_kt">
+ <div class="con myfancy" passCode="011" serId="100" targetStatus="OPEN" data-win="#win_kt">
<div class="pic pic2">
<img src="images/e1.png">
</div>
@@ -33,7 +36,7 @@
</div>
</li>
<li>
- <div class="con myfancy" data-win="#win_kt">
+ <div class="con myfancy" data-win="#win_kt" targetStatus="CLOSE">
<div class="pic pic2">
<img src="images/e1.png">
</div>
@@ -109,13 +112,19 @@
<div class="group sel-box">
<div class="l"><b>妯″紡:</b></div>
<div class="r">
- <select class="sel" id="targetModel">
+ <!-- <select class="sel" id="targetModel">
<option value="">璇烽�夋嫨</option>
<option value="HEATING">鍒剁儹</option>
<option value="01-REFRIGERATION">鍒跺喎</option>
<option value="02-AERATION">閫氶</option>
<option value="DEHU">闄ゆ箍</option>
</select>
+ <i class="mui-icon mui-icon-arrowright"></i> -->
+
+ <div class="val" id="targetModel">
+ <div class="placeholder">璇烽�夋嫨</div>
+ <div class="real-val" id="ywlx-val"></div>
+ </div>
<i class="mui-icon mui-icon-arrowright"></i>
</div>
</div>
@@ -138,13 +147,13 @@
</body>
<script src="./js/mui.min.js"></script>
<script src="./js/jquery.js"></script>
+ <script src="./js/mui.picker.min.js"></script>
<script src="./js/admin/device-temp.js"></script>
<script type="text/javascript" charset="utf-8">
mui.init();
-
- mui.plusReady(function(){
+
+ mui.plusReady(function() {
init();
})
-
</script>
</html>
\ No newline at end of file
diff --git a/igds-app/device-verb.html b/igds-app/device-verb.html
index becf351..e446e09 100644
--- a/igds-app/device-verb.html
+++ b/igds-app/device-verb.html
@@ -177,46 +177,11 @@
<script src="./js/mui.min.js"></script>
<script src="./js/jquery.js"></script>
<script src="js/lib.js"></script>
+ <script src="js/admin/device-verb.js"></script>
<script type="text/javascript" charset="utf-8">
mui.init();
-
- var slider = mui(".mui-slider");
- slider.slider({
- interval: 3000
- });
-
- mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
- deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
- bounce: false, //鏄惁鍚敤鍥炲脊
- deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
- });
-
- //绌鸿皟鎿嶄綔
- mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .huanliu", function() {
- $('#win_huanliu').css('display', 'flex');
- });
- mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .hunliu", function() {
- $('#win_hunliu').css('display', 'flex');
- });
- mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .zhouliu", function() {
- $('#win_zhouliu').css('display', 'flex');
- });
- mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .jiaya", function() {
- $('#win_jiaya').css('display', 'flex');
- });
- mui(".m-pop").on("tap", ".inner a", function() {
- var id = this.getAttribute("id");
-
- closePop();
- });
- //鍏抽棴寮圭獥
- function closePop() {
- $(".m-pop").css('display', 'none');
- }
- $('.pop-bg,.m-pop .close').click(function(e) {
- e.stopPropagation();
- $('.m-pop').fadeOut();
- });
+ mui.plusReady(function() {
+ init();
+ })
</script>
</html>
diff --git a/igds-app/es-detail.html b/igds-app/es-detail.html
index 2973aab..f9b8f5d 100644
--- a/igds-app/es-detail.html
+++ b/igds-app/es-detail.html
@@ -22,10 +22,10 @@
</header>
<div class="mui-content">
<div class="g-date_box m-energy-date">
- <div class="inpbox" onclick="chooseDate('start'); ;">
+ <div class="inpbox" onclick="chooseStartDate();">
<input id="start" type="text" value="2022-04-15" readonly class="inp inp1" />
</div>
- <div class="inpbox" onclick="chooseDate('end');">
+ <div class="inpbox" onclick="chooseEndDate();">
<input id="end" type="text" value="" readonly class="inp" placeholder="璇烽�夋嫨鎴鏃堕棿" />
</div>
</div>
diff --git a/igds-app/js/admin/device-n2.js b/igds-app/js/admin/device-n2.js
new file mode 100644
index 0000000..ea1a78f
--- /dev/null
+++ b/igds-app/js/admin/device-n2.js
@@ -0,0 +1,232 @@
+var deviceData;
+//闃�闂ㄦ帶鍒�
+var data = {
+ "interfaceId": "5402",
+ "outId": "10402",
+ "reqDateTime": new Date(),
+ "tokenAuth": "",
+ "data": {
+ "deptId": "",
+ "depotId": "",
+ "type": "09",
+ "passCode": "",
+ "serId": "",
+ "targetStatus":""
+ }
+};
+//璁惧鍒楄〃 - 鐢电闃�
+var data1 = {
+ "interfaceId": "5401",
+ "outId": "10401",
+ "reqDateTime": new Date(),
+ "tokenAuth": "",
+ "data": {
+ "deptId": "",
+ "depotId": "",
+ "type": "09",
+ }
+};
+
+function init() {
+
+ var user = JSON.parse(localStorage.getItem('user'));
+ var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
+ url = user.url + "/api-phone/v35/gateway";
+ data.tokenAuth = user.tokenAuth;
+ data.data.deptId = user.deptId;
+ data1.tokenAuth = user.tokenAuth;
+ data1.data.deptId = user.deptId;
+ //鑾峰彇浠庝笂涓�涓〉闈紶閫掔殑鏁版嵁
+ var self = plus.webview.currentWebview();
+ data.data.depotId = self.depotId
+ data1.data.depotId = self.depotId
+ // depotType = self.depotType
+ // depotName = self.depotName
+}
+
+
+//鑾峰彇璁惧鍒楄〃锛堢數纾侀榾锛�
+function getDeviceList() {
+ mui.ajax(url, {
+ type: "POST",
+ dataType: "json",
+ crossDomain: true,
+ contentType: "application/json;charset=utf-8",
+ data: JSON.stringify(data1),
+ success: function(result) {
+ if (result.code == "0000") {
+ deviceData = result.data;
+ } else {
+ mui.toast(result.msg);
+ }
+ },
+ error: function() {
+ mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+ }
+ })
+
+}
+
+
+//闃�闂ㄧ鐞�
+function setTemp() {
+ console.log(JSON.stringify(data.data))
+ mui.ajax(url, {
+ type: "POST",
+ dataType: "json",
+ crossDomain: true,
+ contentType: "application/json;charset=utf-8",
+ data: JSON.stringify(data),
+ success: function(result) {
+ if (result.code == "0000") {
+ mui.toast(result.msg);
+ } else {
+ mui.toast(result.msg);
+ }
+ },
+ error: function() {
+ mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+ }
+ })
+}
+
+//娓叉煋椤甸潰
+function renderDevice() {
+ var html = '';
+ if (deviceData) {
+ var deviceList = deviceData.listDevice
+ if (deviceList && deviceList.length > 0) {
+ var frontList = [];
+ var backList = [];
+ var leftList = [];
+ var rightList = [];
+ $.each(deviceList, function(index, item) {
+ if (item.location == '01') {
+ frontList.push(item)
+ } else if (item.location == '02') {
+ backList.push(item)
+ } else if (item.location == '03') {
+ leftList.push(item)
+ } else if (item.location == '04') {
+ 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) {
+ if (item.location == '01') {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" 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 {
+ html += '<div class="info out" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></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(backList, function(index, item) {
+ if (item.location == '02') {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" 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 {
+ html += '<div class="info full" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></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(leftList, function(index, item) {
+ if (item.location == '03') {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" 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 {
+ html += '<div class="info full" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></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(rightList, function(index, item) {
+ if (item.location == '04') {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" 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 {
+ html += '<div class="info full" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></div></li>'
+ }
+ })
+ html += '</ul></div>'
+ }
+ } else {
+ html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+ }
+ } else {
+ html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+ }
+ // $("#recordList").html(html);
+}
+
+//鐢电闃�鎿嶄綔
+mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .con", function() {
+ var passCode = this.getAttribute("passCode");
+ var serId = this.getAttribute("serId");
+ 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);
+ closePop();
+});
+//鍏抽棴寮圭獥
+function closePop() {
+ $(".m-pop").css('display', 'none');
+}
+$('.pop-bg,.m-pop .close').click(function(e) {
+ e.stopPropagation();
+ $('.m-pop').fadeOut();
+});
+
+
+var slider = mui(".mui-slider");
+slider.slider({
+ interval: 3000
+});
+
+mui('.mui-scroll-wrapper').scroll({
+ indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
+ bounce: false, //鏄惁鍚敤鍥炲脊
+ deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
+});
\ No newline at end of file
diff --git a/igds-app/js/admin/device-temp.js b/igds-app/js/admin/device-temp.js
index def7a1c..fe16e28 100644
--- a/igds-app/js/admin/device-temp.js
+++ b/igds-app/js/admin/device-temp.js
@@ -1,6 +1,8 @@
var targetStatus;
var targetModel;
var targetTemp;
+var deviceData;
+//绌鸿皟鎺у埗
var data = {
"interfaceId": "5403",
"outId": "10403",
@@ -9,7 +11,7 @@
"data": {
"deptId": "",
"depotId": "",
- "type": "",
+ "type": "05",
"passCode": "",
"serId": "",
"targetStatus": "",
@@ -18,20 +20,32 @@
"name": ""
}
};
+//璁惧鍒楄〃 - 绌鸿皟
+var data1 = {
+ "interfaceId": "5401",
+ "outId": "10401",
+ "reqDateTime": new Date(),
+ "tokenAuth": "",
+ "data": {
+ "deptId": "",
+ "depotId": "",
+ "type": "05",
+ }
+};
+
function init() {
var user = JSON.parse(localStorage.getItem('user'));
var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
url = user.url + "/api-phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
- data.deptId = user.deptId;
- //鏀瑰彉寮�鍏崇殑榛樿鍊�
- // document.getElementById("vibrationSwitch").classList.add('mui-active');
- //璁剧疆寮�鍏崇殑榛樿鍊�
- data.data.targetStatus = 'CLOSE'
+ data.data.deptId = user.deptId;
+ data1.tokenAuth = user.tokenAuth;
+ data1.data.deptId = user.deptId;
//鑾峰彇浠庝笂涓�涓〉闈紶閫掔殑鏁版嵁
var self = plus.webview.currentWebview();
data.data.depotId = self.depotId
+ data1.data.depotId = self.depotId
// depotType = self.depotType
// depotName = self.depotName
}
@@ -48,9 +62,32 @@
console.log("浣犲叧闂簡寮�鍏�");
}
})
+//鑾峰彇璁惧鍒楄〃锛堢┖璋冿級
+function getDeviceList() {
+ mui.ajax(url, {
+ type: "POST",
+ dataType: "json",
+ crossDomain: true,
+ contentType: "application/json;charset=utf-8",
+ data: JSON.stringify(data1),
+ success: function(result) {
+ if (result.code == "0000") {
+ deviceData = result.data;
+ } else {
+ mui.toast(result.msg);
+ }
+ },
+ error: function() {
+ mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+ }
+ })
+
+}
+
//娓╂帶绠＄悊
-function setTemp(){
+function setTemp() {
+ console.log(JSON.stringify(data.data))
mui.ajax(url, {
type: "POST",
dataType: "json",
@@ -62,13 +99,119 @@
mui.toast(result.msg);
} else {
mui.toast(result.msg);
- console.log(JSON.stringify(result))
}
},
error: function() {
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
+}
+//娓叉煋椤甸潰
+function renderDevice() {
+ var html = '';
+ if (deviceData) {
+ var deviceList = deviceData.listDevice
+ if (deviceList && deviceList.length > 0) {
+ var frontList = [];
+ var backList = [];
+ var leftList = [];
+ var rightList = [];
+ $.each(deviceList, function(index, item) {
+ if (item.location == '01') {
+ frontList.push(item)
+ } else if (item.location == '02') {
+ backList.push(item)
+ } else if (item.location == '03') {
+ leftList.push(item)
+ } else if (item.location == '04') {
+ 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) {
+ if (item.serId) {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ item.serId + '" targetStatus="' + item.targetStatus + '" 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>'
+ } else {
+ html += '<div class="info out" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></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(backList, function(index, item) {
+ if (item.serId) {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ item.serId + '" targetStatus="' + item.targetStatus + '" 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>'
+ } else {
+ html += '<div class="info out" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></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(leftList, function(index, item) {
+ if (item.serId) {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ item.serId + '" targetStatus="' + item.targetStatus + '" 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>'
+ } else {
+ html += '<div class="info out" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></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(rightList, function(index, item) {
+ if (item.serId) {
+ html += '<li><div class="con myfancy" passCode="' + item.passCode + '" serId="' +
+ item.serId + '" targetStatus="' + item.targetStatus + '" 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>'
+ } else {
+ html += '<div class="info out" style="background-image: url(images/e9.png);">' +
+ item.name + '</div>'
+ }
+ html += '</div></div></li>'
+ }
+ })
+ html += '</ul></div>'
+ }
+ } else {
+ html +=
+ '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+ }
+ } else {
+ html +=
+ '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+ }
+ // $("#recordList").html(html);
}
var slider = mui(".mui-slider");
@@ -85,17 +228,53 @@
//绌鸿皟鎿嶄綔
mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .con", function() {
- $('.m-pop').css('display', 'flex');
+ targetStatus = this.getAttribute("targetStatus")
+ data.data.targetStatus = targetStatus
+ if (targetStatus == 'OPEN') {
+ //鏀瑰彉寮�鍏崇殑榛樿鐘舵��
+ document.getElementById("vibrationSwitch").classList.add('mui-active');
+ }else if(targetStatus == 'CLOSE'){
+ document.getElementById("vibrationSwitch").classList.remove('mui-active');
+ }
+ var passCode = this.getAttribute("passCode");
+ var serId = this.getAttribute("serId");
+ var name = this.getAttribute("name");
+ data.data.passCode = passCode;
+ data.data.serId = serId;
+ data.data.name = name;
+ $('.m-pop').css('display', 'flex');
});
+
+//绌鸿皟妯″紡閫夋嫨
+mui(".m-pop").on("tap", ".inner .group .val", function() {
+ var modelPicker = new mui.PopPicker();
+ modelPicker.setData([{
+ value: "HEATING",
+ text: "鍒剁儹"
+ }, {
+ value: "01-REFRIGERATION",
+ text: "鍒跺喎"
+ }, {
+ value: "02-AERATION",
+ text: "閫氶"
+ }, {
+ value: "DEHU",
+ text: "闄ゆ箍"
+ }])
+ modelPicker.show(function(selectItems) {
+ targetModel = selectItems[0].value;
+ document.getElementById("targetModel").innerText = selectItems[0].text
+ })
+});
+
+//纭畾鎸夐敭锛屾妸閫夌殑鍙傛暟浼犵粰鍚庣
mui(".m-pop").on("tap", ".inner .confirm", function() {
var id = this.getAttribute("id");
- targetModel = document.getElementById("targetModel").value;
targetTemp = document.getElementById("range").value;
data.data.targetModel = targetModel;
data.data.targetTemp = targetTemp
- console.log(JSON.stringify(data.data))
- // setTemp();
+ setTemp();
closePop();
});
//鍏抽棴寮圭獥
diff --git a/igds-app/js/admin/device-verb.js b/igds-app/js/admin/device-verb.js
new file mode 100644
index 0000000..1e1b484
--- /dev/null
+++ b/igds-app/js/admin/device-verb.js
@@ -0,0 +1,92 @@
+var deviceData;
+var deviceList;
+var deptId;
+var depotId;
+var data = {
+ "interfaceId": "5403",
+ "outId": "10403",
+ "reqDateTime": new Date(),
+ "tokenAuth": "",
+ "data": [],
+ // {
+ // "deptId": "",
+ // "depotId": "",
+ // "type": "01",
+ // "passCode": "",
+ // "serId": "",
+ // "targetStatus": ""
+ // }
+};
+
+var data1 = {
+ "interfaceId": "5401",
+ "outId": "10401",
+ "reqDateTime": new Date(),
+ "tokenAuth": "",
+ "data": {
+ "deptId": "",
+ "depotId": "",
+ "type": "01", //椋庣獥
+ "type1": "02", //杞存祦椋庣獥
+ "type2": "04", //鐜祦椋庢満
+ "type3": "0B", //閫氶鍙�
+ "type4": "0C", //娣锋祦椋庡彛
+ "type5": "0D", //鍔犲帇椋庢満
+ }
+};
+
+function init() {
+
+ var user = JSON.parse(localStorage.getItem('user'));
+ var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
+ url = user.url + "/api-phone/v35/gateway";
+ data.tokenAuth = user.tokenAuth;
+ data.data.deptId = user.deptId;
+ data1.tokenAuth = user.tokenAuth;
+ deptId = user.deptId;
+ //鑾峰彇浠庝笂涓�涓〉闈紶閫掔殑鏁版嵁
+ var self = plus.webview.currentWebview();
+ data.data.depotId = self.depotId
+ depotId = self.depotId
+ // depotType = self.depotType
+ // depotName = self.depotName
+}
+
+var slider = mui(".mui-slider");
+slider.slider({
+ interval: 3000
+});
+
+mui('.mui-scroll-wrapper').scroll({
+ indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
+ bounce: false, //鏄惁鍚敤鍥炲脊
+ deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
+});
+
+//绌鸿皟鎿嶄綔
+mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .huanliu", function() {
+ $('#win_huanliu').css('display', 'flex');
+});
+mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .hunliu", function() {
+ $('#win_hunliu').css('display', 'flex');
+});
+mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .zhouliu", function() {
+ $('#win_zhouliu').css('display', 'flex');
+});
+mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .jiaya", function() {
+ $('#win_jiaya').css('display', 'flex');
+});
+mui(".m-pop").on("tap", ".inner a", function() {
+ var id = this.getAttribute("id");
+
+ closePop();
+});
+//鍏抽棴寮圭獥
+function closePop() {
+ $(".m-pop").css('display', 'none');
+}
+$('.pop-bg,.m-pop .close').click(function(e) {
+ e.stopPropagation();
+ $('.m-pop').fadeOut();
+});
\ No newline at end of file
diff --git a/igds-app/js/admin/es-detail.js b/igds-app/js/admin/es-detail.js
index 6643464..6cde7f7 100644
--- a/igds-app/js/admin/es-detail.js
+++ b/igds-app/js/admin/es-detail.js
@@ -40,31 +40,38 @@
return year + "-" + month + "-" + day
}
-function chooseDate(tag) {
+function chooseStartDate() {
var dtpicker = new mui.DtPicker({
type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
+ value: startTime
})
- if (tag == 'start') {
- var start = startTime;
- dtpicker.show(function(e) {
- startTime = e.value
- document.getElementById("start").value = e.value
- if(start != startTime){
- getEsDetailList();
- }
- })
- } else {
- var end = endTime;
- dtpicker.show(function(e) {
- endTime = e.value;
- document.getElementById("end").value = e.value
- if(end != endTime){
- getEsDetailList();
- }
- })
- }
+ var start = startTime;
+ dtpicker.show(function(e) {
+ startTime = e.value
+ document.getElementById("start").value = e.value
+ if (start != startTime) {
+ getEsDetailList();
+ }
+ })
+}
+
+function chooseEndDate() {
+ var dtpicker = new mui.DtPicker({
+ type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
+ // beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
+ // endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
+ value: endTime
+ })
+ var end = endTime;
+ dtpicker.show(function(e) {
+ endTime = e.value;
+ document.getElementById("end").value = e.value
+ if (end != endTime) {
+ getEsDetailList();
+ }
+ })
}
function getEsDetailList() {
diff --git a/igds-app/js/admin/es-real-electric.js b/igds-app/js/admin/es-real-electric.js
index d1147df..ed77e96 100644
--- a/igds-app/js/admin/es-real-electric.js
+++ b/igds-app/js/admin/es-real-electric.js
@@ -43,6 +43,7 @@
electricList = [{
"depotId": "18",
"depotName": "鍋氫竴鍑犲姞",
+ "depotType": "02",
"ua": 97,
"ub": 43,
"uc": 81,
@@ -54,6 +55,7 @@
{
"depotId": "35",
"depotName": "灞傝兘姣旂淮",
+ "depotType": "01",
"ua": 71,
"ub": 60,
"uc": 45,
@@ -65,6 +67,7 @@
{
"depotId": "61",
"depotName": "浠庡懆闃剁孩鍏�",
+ "depotType": "02",
"ua": 88,
"ub": 94,
"uc": 77,
@@ -76,6 +79,7 @@
{
"depotId": "31",
"depotName": "鐏簲鍐垫柉鏈簲鍘�",
+ "depotType": "03",
"ua": 76,
"ub": 76,
"uc": 68,
@@ -87,6 +91,7 @@
{
"depotId": "20",
"depotName": "璇濈編涔︾潃鍏锋潵鍒�",
+ "depotType": "01",
"ua": 96,
"ub": 5,
"uc": 83,
@@ -103,13 +108,12 @@
if (electricList && electricList.length > 0) {
$.each(electricList, function(index, item) {
html += '<li><div class="con"><div class="tit"><div class="t1">';
- if (index % 3 == 0) {
+ if (item.depotType == '01') {
html += '<span class="bg" style="background-image: url(images/d1.png);"></span>';
- }
- if (index % 3 == 1) {
+ }else if (item.depotType == '02') {
html += '<span class="bg" style="background-image: url(images/d2.png);"></span>'
}
- if (index % 3 == 2) {
+ if (item.depotType == '03') {
html += '<span class="bg" style="background-image: url(images/d3.png);"></span>'
}
html += '<span>' + item.depotName + '</span></div><span class="time">' + item.updateTime +
diff --git a/igds-app/js/admin/inout-in-record.js b/igds-app/js/admin/inout-in-record.js
index 36bb953..afe6967 100644
--- a/igds-app/js/admin/inout-in-record.js
+++ b/igds-app/js/admin/inout-in-record.js
@@ -20,7 +20,7 @@
url = user.url + "/api-phone/v35/gateway";
data.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
-
+
//鑾峰彇褰撳墠澶╂椂闂�
dateTime = getDate(new Date());
$("#dateTime").val(dateTime);
@@ -32,10 +32,10 @@
//鏌ヨ鍏ュ簱璁板綍
function getInRecordList() {
inRecordData = null;
-
+
//璧嬪�煎弬鏁扮殑鏃ユ湡
data.data.dateTime = dateTime;
-
+ console.log(JSON.stringify(data), "inout-in-record")
//璇锋眰
mui.ajax(url, {
type: "POST",
@@ -48,14 +48,41 @@
inRecordData = result.data;
renderData();
} else {
+
renderData();
- mui.toast(result.mag);
+ mui.toast(result.msg);
+ console.log(JSON.stringify(result))
}
},
error: function() {
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
+ inRecordData = {
+ "sum": "55",
+ "listInout": [{
+ "id": "98",
+ "plateNum": "39",
+ "depotId": "83",
+ "depotName": "鑳藉闄呮硶楂樼瓑",
+ "foodVariety": "quis Ut",
+ "foodVarietyName": "琚緳娴庢潵",
+ "recordWeight": "25",
+ "completeTime": "1971-10-20 14:45:38"
+ },
+ {
+ "id": "37",
+ "plateNum": "50",
+ "depotId": "16",
+ "depotName": "鍑嗘皯闈掑叡宸�",
+ "foodVariety": "aliquip eiusmod laborum nulla",
+ "foodVarietyName": "鍙疯蛋鏍瑰舰",
+ "recordWeight": "30",
+ "completeTime": "1971-04-09 06:42:06"
+ }
+ ],
+ }
+
}
//娓叉煋椤甸潰
@@ -63,10 +90,10 @@
var html = '';
var sumHtml = '0';
- if(inRecordData){
+ if (inRecordData) {
sumHtml = inRecordData.sum;
-
var inRecordList = inRecordData.listInout;
+ console.log(JSON.stringify(inRecordList))
if (inRecordList && inRecordList.length > 0) {
$.each(inRecordList, function(index, item) {
html += '<div class="item">';
@@ -77,15 +104,17 @@
html += '<li><div class="con" style="background-image: url(images/icons/g-i25.png);">';
html += '浠撳簱鍚嶇О:<b>' + (item.depotName == null ? "" : item.depotName) + '</b></div></li>';
html += '<li><div class="con" style="background-image: url(images/icons/g-i32.png);">';
- html += '绮鍝佺:<b>' + (item.foodVarietyName == null ? "" : item.foodVarietyName) + '</b></div></li>';
+ html += '绮鍝佺:<b>' + (item.foodVarietyName == null ? "" : item.foodVarietyName) +
+ '</b></div></li>';
html += '<li><div class="con" style="background-image: url(images/icons/g-i24.png);">';
- html += '缁撶畻閲嶉噺:<span><em>' + (item.recordWeight == null ? "0" : item.recordWeight) + '</em>KG</span></div></li>';
+ html += '缁撶畻閲嶉噺:<span><em>' + (item.recordWeight == null ? "0" : item.recordWeight) +
+ '</em>KG</span></div></li>';
html += '</ul><div class="time">瀹屾垚鏃堕棿锛�' + getStrDate(item.completeTime) + '</div></div>';
})
} else {
html += '<div class="id" style="text-align: center;font-size: 20px;color:#dd524d">鎵�閫夋棩鏈熸殏鏃犲叆搴撹褰曚俊鎭�</div>';
}
- }else{
+ } else {
html += '<div class="id" style="text-align: center;font-size: 20px;color:#dd524d">鎵�閫夋棩鏈熸殏鏃犲叆搴撹褰曚俊鎭�</div>';
}
$("#sum").html(sumHtml);
@@ -100,20 +129,21 @@
date = new Date(date);
dateTime = getDate(date);
$("#dateTime").val(dateTime);
-
+
getInRecordList();
}
//閫夋嫨鏃ユ湡
function chooseDate() {
var dtpicker = new mui.DtPicker({
- type: "date" //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
+ type: "date" ,//璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
+ value: dateTime
})
dtpicker.show(function(e) {
dateTime = e.value;
$("#dateTime").val(dateTime);
})
-
+
getInRecordList();
}
@@ -162,5 +192,4 @@
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
-});
-
+});
\ No newline at end of file
diff --git a/igds-app/js/admin/inout-out-record.js b/igds-app/js/admin/inout-out-record.js
index bf8e389..7431834 100644
--- a/igds-app/js/admin/inout-out-record.js
+++ b/igds-app/js/admin/inout-out-record.js
@@ -25,17 +25,17 @@
dateTime = getDate(new Date());
$("#dateTime").val(dateTime);
- //鑾峰彇鍏ュ簱璁板綍
+ //鑾峰彇鍑哄簱璁板綍
getOutRecordList();
}
-//鏌ヨ鍏ュ簱璁板綍
+//鏌ヨ鍑哄簱璁板綍
function getOutRecordList() {
outRecordData = null;
//璧嬪�煎弬鏁扮殑鏃ユ湡
data.data.dateTime = dateTime;
-
+ console.log(JSON.stringify(data.data), "inout-out-record")
//璇锋眰
mui.ajax(url, {
type: "POST",
@@ -45,27 +45,52 @@
data: JSON.stringify(data),
success: function(result) {
if (result.code == "0000") {
+ console.log(JSON.stringify(result))
outRecordData = result.data;
renderData();
} else {
- renderData();
mui.toast(result.mag);
+ renderData();
+
}
},
error: function() {
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
+ outRecordData = {
+ "sum": "55",
+ "listInout": [{
+ "id": "98",
+ "plateNum": "39",
+ "depotId": "83",
+ "depotName": "鑳藉闄呮硶楂樼瓑",
+ "foodVariety": "quis Ut",
+ "foodVarietyName": "琚緳娴庢潵",
+ "recordWeight": "25",
+ "completeTime": "1971-10-20 14:45:38"
+ },
+ {
+ "id": "37",
+ "plateNum": "50",
+ "depotId": "16",
+ "depotName": "鍑嗘皯闈掑叡宸�",
+ "foodVariety": "aliquip eiusmod laborum nulla",
+ "foodVarietyName": "鍙疯蛋鏍瑰舰",
+ "recordWeight": "30",
+ "completeTime": "1971-04-09 06:42:06"
+ }
+ ],
+ }
}
//娓叉煋椤甸潰
function renderData() {
-
var html = '';
var sumHtml = '0';
if(outRecordData){
sumHtml = outRecordData.sum;
-
+ console.log()
var outRecordList = outRecordData.listInout;
if (outRecordList && outRecordList.length > 0) {
$.each(outRecordList, function(index, item) {
@@ -107,7 +132,8 @@
//閫夋嫨鏃ユ湡
function chooseDate() {
var dtpicker = new mui.DtPicker({
- type: "date" //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
+ type: "date" ,//璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
+ value: dateTime
})
dtpicker.show(function(e) {
dateTime = e.value;
diff --git a/igds-app/js/admin/security-patrol.js b/igds-app/js/admin/security-patrol.js
index 1e58491..7b656bf 100644
--- a/igds-app/js/admin/security-patrol.js
+++ b/igds-app/js/admin/security-patrol.js
@@ -90,6 +90,7 @@
type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
+ value: dateTime
})
dtpicker.show(function(e) {
dateTime = e.value;
diff --git a/igds-app/js/admin/warn-list.js b/igds-app/js/admin/warn-list.js
index 10422bb..c157ce3 100644
--- a/igds-app/js/admin/warn-list.js
+++ b/igds-app/js/admin/warn-list.js
@@ -159,6 +159,7 @@
type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
+ value: dateTime
})
dtpicker.show(function(e) {
dateTime = e.value;
@@ -176,14 +177,11 @@
null ? "" : item.remark) + '\',\'' + 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>';
diff --git a/igds-app/js/admin/work-apply.js b/igds-app/js/admin/work-apply.js
index 0965d70..bf9b1a8 100644
--- a/igds-app/js/admin/work-apply.js
+++ b/igds-app/js/admin/work-apply.js
@@ -101,7 +101,7 @@
type: "datetime",
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
-
+ value: dateTime
})
dtpicker.show(function(e) {
var date_el = document.getElementById("date2-val")
@@ -176,9 +176,6 @@
html += '<div class="m-gd"><div class="group"><div class="l">涓氬姟绫诲瀷:</div><div class="r">'
html += '<div class="val" id="ywlx"><div class="placeholder">璇烽�夋嫨</div>'
html += '<div class="real-val" id="ywlx-val" ></div></div></div></div>'
- html += '<div class="group"><div class="l">鎵�灞炲垎搴�:</div><div class="r">'
- html += '<div class="val" id="ssfk"><div class="placeholder">璇烽�夋嫨</div>';
- html += '<div class="real-val" id="ssfk-val"></div></div></div></div>';
html += '<div class="group"><div class="l">鍏宠仈浠撳簱:</div><div class="r">';
html += '<div class="val" id="glck"><div class="placeholder">璇烽�夋嫨</div>';
html += '<div class="real-val" id="glck-val" ></div></div></div></div>';
@@ -242,23 +239,7 @@
//return false;
});
}, false);
- //-----------------------------------------
- //鎵�灞炲垎搴�:
- var showPicker1Button = doc.getElementById('ssfk');
- showPicker1Button.addEventListener('tap', function(event) {
- var picker1Result = doc.getElementById('ssfk-val');
- var picker1 = new $.PopPicker();
- picker1.setData(list);
- picker1.show(function(items) {
- // userResult.innerText = JSON.stringify(items[0]);
- picker1Result.innerText = items[0].text;
- // userResult.previousSibling.style.display="none"
- jQuery(picker1Result).prev().hide()
- //杩斿洖 false 鍙互闃绘閫夋嫨妗嗙殑鍏抽棴
- //return false;
- });
- }, false);
- //-----------------------------------------
+ //----------------------------------------
//鍏宠仈浠撳簱:
var showPicker2Button = doc.getElementById('glck');
showPicker2Button.addEventListener('tap', function(event) {
diff --git a/igds-app/js/admin/work-audit.js b/igds-app/js/admin/work-audit.js
index 056d700..16a56ff 100644
--- a/igds-app/js/admin/work-audit.js
+++ b/igds-app/js/admin/work-audit.js
@@ -115,12 +115,8 @@
if (auditList && auditList.length > 0) {
$.each(auditList, function(index, item) {
html += '<li><div class="con"><div class="top"><div class="left">';
- html += '<div class="line"><div class="t">鐢宠浜�: </div><div class="v">' + item.applyUserName +
- '</div></div>';
- html += '<div class="line"><div class="t">鎵�灞炲垎搴�:</div><div class="v">' + (item.deptName == null ?
- "" : item.deptName) + '</div></div></div>';
- html += '<div class="right"><div class="icon" info="' + item.info +
- '"><img src="images/icons/g-i26.png" alt=""></div></div></div>';
+ html += '<div class="line"><div class="t">鐢宠浜�: </div><div class="v">' + item.applyUserName +'</div></div></div>';
+ html += '<div class="right"><div class="icon" info="' + item.info + '"><img src="images/icons/g-i26.png" alt=""></div></div></div>';
html +=
'<div class="box"><ul class="gd-list"><li><a href="" class="con" style="background-image: url(images/icons/a-bg12.png);">';
html += '<div class="tit">涓氬姟绫诲瀷:</div><div class="name">' + item.type + '</div></a></li>';
diff --git a/igds-app/js/admin/work-record.js b/igds-app/js/admin/work-record.js
index bcbea44..fa8e1f2 100644
--- a/igds-app/js/admin/work-record.js
+++ b/igds-app/js/admin/work-record.js
@@ -105,8 +105,7 @@
} else if (item.status == '20') { // 寰呭鏍�
html += '<img src="images/icons/g-i28.png" alt=""></span>'
}
- html += '<div class="title">鎵�灞炲垎搴�:<b>' + item.deptName +
- '</b></div><div class="box"><ul class="gd-list">';
+ html += '<div class="title"><b></b></div><div class="box"><ul class="gd-list">';
html += '<li><a href="" class="con"style="background-image: url(images/icons/a-bg12.png);">';
html += '<div class="tit">涓氬姟绫诲瀷:</div><div class="name">' + item.type + '</div></a></li>';
html += '<li><a href="" class="con"style="background-image: url(images/icons/a-bg13.png);">';
diff --git a/igds-app/work-apply.html b/igds-app/work-apply.html
index 0315efe..cf547ae 100644
--- a/igds-app/work-apply.html
+++ b/igds-app/work-apply.html
@@ -37,15 +37,7 @@
</div>
</div>
</div>
- <div class="group">
- <div class="l">鎵�灞炲垎搴�:</div>
- <div class="r">
- <div class="val" id="ssfk">
- <div class="placeholder">璇烽�夋嫨</div>
- <div class="real-val" id="ssfk-val" ></div>
- </div>
- </div>
- </div>
+
<div class="group">
<div class="l">鍏宠仈浠撳簱:</div>
<div class="r">
diff --git a/igds-app/work-audit.html b/igds-app/work-audit.html
index 1f7c8a7..7bc9e9a 100644
--- a/igds-app/work-audit.html
+++ b/igds-app/work-audit.html
@@ -31,10 +31,6 @@
<div class="t">鐢宠浜�: </div>
<div class="v">寮犱笁</div>
</div>
- <div class="line">
- <div class="t">鎵�灞炲垎搴�:</div>
- <div class="v">杩欓噷鏄竴涓垎搴撳悕绉�</div>
- </div>
</div>
<div class="right">
<div class="icon" info = "11111">
@@ -74,10 +70,6 @@
<div class="line">
<div class="t">鐢宠浜�: </div>
<div class="v">寮犱笁</div>
- </div>
- <div class="line">
- <div class="t">鎵�灞炲垎搴�:</div>
- <div class="v">杩欓噷鏄竴涓垎搴撳悕绉�</div>
</div>
</div>
<div class="right">
diff --git a/igds-app/work-record.html b/igds-app/work-record.html
index 4ab1240..83fe109 100644
--- a/igds-app/work-record.html
+++ b/igds-app/work-record.html
@@ -27,7 +27,6 @@
<span class="status">
<img src="images/icons/g-i28.png" alt="">
</span>
- <div class="title">鎵�灞炲垎搴�:<b>杩欓噷鏄竴涓垎搴撳悕绉�</b></div>
<div class="box">
<ul class="gd-list">
<li>
@@ -57,7 +56,6 @@
<span class="status">
<img src="images/icons/g-i28.png" alt="">
</span>
- <div class="title">鎵�灞炲垎搴�:<b>杩欓噷鏄竴涓垎搴撳悕绉�</b></div>
<div class="box">
<ul class="gd-list">
<li>
--
Gitblit v1.9.3