From 57233e23e69d04672f9721def4d00c2905922d25 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 12 二月 2026 14:40:07 +0800
Subject: [PATCH] APP

---
 igdss-app/js/admin/inout-in-handle-list.js  |    8 
 igdss-app/js/admin/security-snapshot.js     |  194 +++
 igdss-app/js/admin/login.js                 |    9 
 igdss-app/security-video.html               |  206 +-
 igdss-app/css/admin/grain-quantity.css      |  162 ++
 igdss-app/js/admin/grain-detail.js          |   30 
 igdss-app/js/admin/inout-out-handle-list.js |    6 
 igdss-app/work-manager.html                 |   46 
 igdss-app/index.html                        |   16 
 igdss-app/inout-real.html                   |    4 
 igdss-app/security-snapshot.html            |  160 ++
 igdss-app/inout-in-handle-list.html         |    1 
 igdss-app/css/admin/security-video.css      |   91 +
 igdss-app/js/admin/security-patrol.js       |   38 
 igdss-app/security-ai.html                  |  145 ++
 igdss-app/css/admin/security-ai.css         |  162 ++
 igdss-app/js/admin/index.js                 |   36 
 igdss-app/js/admin/grain-quantity.js        |  235 +++
 igdss-app/css/admin/height-all.css          |  221 +++
 igdss-app/js/admin/height-all.js            |   91 +
 igdss-app/work-audit.html                   |   75 
 igdss-app/grain-manager.html                |   22 
 igdss-app/js/admin/depot-list.js            |   23 
 igdss-app/js/admin/grain-history.js         |   19 
 igdss-app/security-manager.html             |   27 
 igdss-app/grain-detail.html                 |    1 
 igdss-app/inout-manager.html                |   40 
 igdss-app/security-patrol.html              |   10 
 igdss-app/inout-out-handle-list.html        |    1 
 igdss-app/privacy.html                      |    7 
 igdss-app/js/admin/inout-in-handle.js       |  292 ++--
 igdss-app/grain-quantity.html               |  140 ++
 igdss-app/js/admin/inout-out-handle.js      |  336 +++--
 /dev/null                                   |  146 --
 igdss-app/js/admin/security-video.js        |   23 
 igdss-app/css/admin/security-snapshot.css   |  140 ++
 igdss-app/height-all.html                   |  127 +-
 igdss-app/js/admin/work-audit.js            |   58 
 igdss-app/css/admin/grain-detail.css        |   17 
 igdss-app/css/admin/security-patrol.css     |    2 
 igdss-app/js/admin/inout-real.js            |    9 
 igdss-app/js/admin/security-ai.js           |  199 +++
 42 files changed, 2,663 insertions(+), 912 deletions(-)

diff --git a/igdss-app/basic-depot.html b/igdss-app/basic-depot.html
deleted file mode 100644
index 299bbb4..0000000
--- a/igdss-app/basic-depot.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!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/basic-depot.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">
-						<ul id="depotList" class="ul-listmana ul-listmana2 ul-listmana3">
-							<li>
-								<div class="con">
-									<div class="tit">
-										<span>鏆傛棤浠撳簱鏁版嵁</span>
-									</div>
-									<div class="txt">
-										<div class="box">
-											<div class="group type">
-												<div class="desc">--</div>
-												<div class="ort">浠撳簱绫诲瀷</div>
-											</div>
-
-										</div>
-										<div class="box">
-											<div class="group state">
-												<div class="desc">--</div>
-												<div class="ort">浠撳簱鐘舵��</div>
-											</div>
-
-										</div>
-										<div class="box">
-											<div class="group weight">
-												<div class="desc">--<span class="w"> KG</span> </div>
-												<div class="ort">瀹為檯鍌ㄩ噺</div>
-											</div>
-
-										</div>
-									</div>
-									<div class="edit">
-										<div class="sel">
-											<div class="name">绮鍝佺</div>
-											<div class="cont">娣峰悎灏忛害</div>
-										</div>
-										<div class="peo">
-											<div class="name">淇濈鍛�</div>
-											<div class="cont">鍝佸搧濂�</div>
-										</div>
-									</div>
-
-								</div>
-							</li>
-							<!-- <li>
-								<div class="con">
-									<div class="tit">
-										浠撳簱鍚嶇О锛�<span>浜屽彿浠�</span>
-									</div>
-									<div class="txt">
-										<div class="box">
-											<div class="group type">
-												<div class="desc">骞虫柟浠�</div>
-												<div class="ort">浠撳簱绫诲瀷</div>
-											</div>
-
-										</div>
-										<div class="box">
-											<div class="group state">
-												<div class="desc">鍏ュ簱涓�</div>
-												<div class="ort">浠撳簱鐘舵��</div>
-											</div>
-
-										</div>
-										<div class="box">
-											<div class="group weight">
-												<div class="desc">10000 <span class="w">KG</span> </div>
-												<div class="ort">瀹為檯鍌ㄩ噺</div>
-											</div>
-
-										</div>
-									</div>
-									<div class="edit">
-										<div class="sel">
-											<div class="name">绮鍝佺</div>
-											<div class="cont">灏忛害</div>
-										</div>
-										<div class="peo">
-											<div class="name">淇濈鍛�</div>
-											<div class="cont">寮犱笁</div>
-										</div>
-									</div>
-
-								</div>
-							</li>
-							<li>
-								<div class="con">
-									<div class="tit">
-										浠撳簱鍚嶇О锛�<span>涓夊彿浠�</span>
-									</div>
-									<div class="txt">
-										<div class="box">
-											<div class="group type">
-												<div class="desc">骞虫柟浠�</div>
-												<div class="ort">浠撳簱绫诲瀷</div>
-											</div>
-
-										</div>
-										<div class="box">
-											<div class="group state">
-												<div class="desc">鍏ュ簱涓�</div>
-												<div class="ort">浠撳簱鐘舵��</div>
-											</div>
-
-										</div>
-										<div class="box">
-											<div class="group weight">
-												<div class="desc">10000 <span class="w">KG</span> </div>
-												<div class="ort">瀹為檯鍌ㄩ噺</div>
-											</div>
-
-										</div>
-									</div>
-									<div class="edit">
-										<div class="sel">
-											<div class="name">绮鍝佺</div>
-											<div class="cont">灏忛害</div>
-										</div>
-										<div class="peo">
-											<div class="name">淇濈鍛�</div>
-											<div class="cont">寮犱笁</div>
-										</div>
-									</div>
-								</div>
-							</li> -->
-						</ul>
-					</div>
-				</div>
-			</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script src="./js/jquery.js"></script>
-	<script src="./js/admin/basic-depot.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		//mui鍒濆鍖�
-		mui.init();
-
-		mui.plusReady(function() {
-			//鏁版嵁鍒濆鍖�
-			init();
-		})
-	</script>
-</html>
diff --git a/igdss-app/basic-dept.html b/igdss-app/basic-dept.html
deleted file mode 100644
index bbebae7..0000000
--- a/igdss-app/basic-dept.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!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/basic-dept.css">
-	</head>
-
-	<body class="g-bg" style="background-image: url(images/m-bg2.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="mui-scroll">
-					<div class="wp">
-						<div class="m-infob2">
-							<div class="con">
-								<div class="top">
-									<div class="line">
-										<div class="t">鍚嶇О锛�</div>
-										<div class="v" id="deptName">##</div>
-									</div>
-									<div class="line">
-										<div class="t">鍦板潃锛�</div>
-										<div class="v" id="deptAddress">##</div>
-									</div>
-								</div>
-								<div class="box">
-									<div class="ul-rkzc">
-										<div class="item">
-											<div class="conbox"
-												style="background: linear-gradient(45deg,#819ada,#88bae3);">
-												<div class="h3" id="depotNum">0</div>
-												<div class="bot">浠撳簱涓暟</div>
-											</div>
-										</div>
-										<div class="item">
-											<div class="conbox"
-												style="background: linear-gradient(45deg,#63bf9a,#7dd08f);">
-												<div class="h3" id="oilNum">0</div>
-												<div class="bot">娌圭綈涓暟</div>
-											</div>
-										</div>
-										<div class="item">
-											<div class="conbox"
-												style="background: linear-gradient(45deg,#4fb9bf,#59cabc);">
-												<div class="h3"><span id="designStorage">0</span><span class="unit">
-														鍚�</span></div>
-												<div class="bot">璁捐鍌ㄩ噺</div>
-											</div>
-										</div>
-										<div class="item">
-											<div class="conbox"
-												style="background: linear-gradient(45deg,#4e7ea7,#5eaae8);">
-												<div class="h3"><span id="realStorage">0</span><span class="unit">
-														鍚�</span></div>
-												<div class="bot">瀹為檯鍌ㄩ噺</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div class="m-infob3">
-							<div class="title">搴撳瓨缁熻</div>
-							<div class="g-boxb1">
-								<div class="m-titb1">
-									<div class="h3">绮鎬ц川(鍚�)</div>
-								</div>
-								<div class="g-chart">
-									<div class="chart" id="chartType"></div>
-									<div class="info">
-										<b id="sum1">0</b>
-										<div class="p">鎬婚噺</div>
-									</div>
-								</div>
-							</div>
-							<div class="g-boxb1">
-								<div class="m-titb1">
-									<div class="h3">绮鍝佺(鍚�)</div>
-								</div>
-								<div class="g-chart">
-									<div class="chart" id="chartVariety"></div>
-									<div class="info">
-										<b id="sum2">0</b>
-										<div class="p">鎬婚噺</div>
-									</div>
-								</div>
-							</div>
-							<div class="g-boxb1">
-								<div class="m-titb1">
-									<div class="h3">绮绛夌骇(鍚�)</div>
-								</div>
-								<div class="g-chart">
-									<div class="chart" id="chartLevel"></div>
-									<div class="info">
-										<b id="sum3">0</b>
-										<div class="p">鎬婚噺</div>
-									</div>
-								</div>
-							</div>
-						</div>
-
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script src="./js/jquery.js"></script>
-	<script src="./js/admin/basic-dept.js"></script>
-	<script src="./js/echarts.min.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		//mui鍒濆鍖�
-		mui.init();
-
-		mui.plusReady(function() {
-			//鏁版嵁鍒濆鍖�
-			init();
-		})
-	</script>
-</html>
diff --git a/igdss-app/basic-manager.html b/igdss-app/basic-manager.html
deleted file mode 100644
index 356ae6c..0000000
--- a/igdss-app/basic-manager.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!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" />
-	</head>
-	<body class="g-bg" style="background-image: url(images/m-bg2.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="mui-scroll">
-					<div class="m-listbox">
-						<ul class="g-listb1 fix">
-							<li>
-								<a id="basic-dept" class="con"
-									style="background-image: url(images/icons/a-bg1.png);">
-									<div class="tit">搴撳尯淇℃伅</div>
-									<div class="icon">
-										<img src="images/icons/a-i11.png" alt="">
-									</div>
-								</a>
-							</li>
-							<li>
-								<a id="basic-depot" class="con" style="background-image: url(images/icons/a-bg2.png);">
-									<div class="tit">浠撳簱鍒楄〃</div>
-									<div class="icon">
-										<img src="images/icons/a-i2.png" alt="">
-									</div>
-								</a>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		mui.init();
-
-		mui('.mui-scroll-wrapper').scroll({
-			indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
-			deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
-			bounce: false, //鏄惁鍚敤鍥炲脊
-			deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
-		});
-		
-		//鍔熻兘妯″潡璺宠浆
-		mui(".mui-content").on("tap", ".mui-scroll ul li a", function() {
-			
-			var id = this.getAttribute("id");
-			if (id) {
-				var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
-				if(selectDeptId){
-					mui.openWindow({
-						url: id + ".html",
-						id: id
-					})
-				}else{
-				mui.alert('璇峰厛閫夋嫨搴撳尯锛�', '鎻愮ず', ["纭畾"], function() {}, "div");
-				}	
-			}else{
-				mui.alert('鏃犳潈鏌ョ湅姝ゅ姛鑳斤紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		});
-	</script>
-</html>
\ No newline at end of file
diff --git a/igdss-app/css/admin/grain-detail.css b/igdss-app/css/admin/grain-detail.css
index 6fc333d..9ee3afa 100644
--- a/igdss-app/css/admin/grain-detail.css
+++ b/igdss-app/css/admin/grain-detail.css
@@ -400,13 +400,16 @@
 }
 
 .m-sslq-btn .bot-btn {
-	width: 46%;
-	float: left;
-	margin: 0 2%;
-	background-image: url(../../images/g8.png);
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: cover;
+    width: 46%;
+    /* 绉婚櫎娴姩鍜屽乏鍙冲杈硅窛 */
+    float: none;
+    margin: 0 auto;
+    /* 鎴栬�呯敤display: block閰嶅悎margin灞呬腑 */
+    display: block;
+    background-image: url(../../images/g8.png);
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
 }
 
 .m-sslq-btn .bot-btn1 {
diff --git a/igdss-app/css/admin/grain-quantity.css b/igdss-app/css/admin/grain-quantity.css
new file mode 100644
index 0000000..e6f51bc
--- /dev/null
+++ b/igdss-app/css/admin/grain-quantity.css
@@ -0,0 +1,162 @@
+
+.index-dzxg{
+  top: 119px;
+  height: calc(100vh - 119px - 30px);
+}
+.index-dzxg .mui-scroll{
+  padding: 0 20px 20px;
+}
+.m-bot_btn{
+  height: 65px;
+}
+.m-bot_btn .box{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 65px;
+  padding: 9px 20px;
+  background-color: #fff;
+  box-shadow: 0px -10px 10px -10px rgba(40,48,58,.08);
+}
+.m-bot_btn .bot-btn{
+  color: #fff;
+  background-color: #1e875b;
+  padding: 9px 0;
+  border-radius: 25px;
+  margin-bottom: 0;
+  border: none;
+}
+.ul-cardb1 .item{
+  background-color: #fff;
+  border-radius: 10px;
+  box-shadow: 0 0 4px rgba(0,64,40,.1);
+  padding-bottom: 20px;
+  margin-bottom: 15px;
+}
+.ul-cardb1 .top{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px 0 5px 15px;
+}
+.ul-cardb1 .top-tit{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 2px 0 8px 15px;
+}
+.ul-cardb1 .text{
+  font-size: 16px;
+  color: #888;
+}
+.ul-cardb1 .r-btn{
+  font-size: 14px;
+  color: #ff9c54;
+  font-weight: bold;
+  border: 1px solid #ff9c54;
+  border-radius: 15px 0 0 15px;
+  border-right: none;
+  width: 90px;
+  line-height: 28px;
+  text-align: center;
+}
+.ul-cardb1 .cards{
+  overflow: hidden;
+  margin: 0 7px;
+}
+.ul-cardb1 .cd{
+  float: left;
+  width: 50%;
+}
+.ul-cardb1 .con{
+  position: relative;
+  height: 88px;
+  border-radius: 10px;
+  overflow: hidden;
+  margin: 0 8px;
+}
+.ul-cardb1 .txt{
+  font-size: 19px;
+  /* font-weight: bold; */
+  color: #fff;
+}
+.ul-cardb1 .tit{
+  padding-left: 13px;
+  position: relative;
+  font-size: 15px;
+  color: #fff;
+  margin: 15px 0 5px 0;
+}
+.ul-cardb1 .tit::before{
+  content: "";
+  display: block;
+  width: 3px;
+  height: 15px;
+  background-color: #fff;
+  opacity: .6;
+  border-radius: 0 3px 3px 0;
+  position: absolute;
+  top: 50%;
+  left: 0;
+  margin-top: -8px;
+  
+}
+.ul-cardb1 .user .txt{
+  text-align: center;
+}
+.ul-cardb1 .loc .txt{
+  text-align: center;
+}
+.ul-cardb1 .user{
+  background: linear-gradient(90deg,#38b382,#6ad192);
+}
+.ul-cardb1 .user::after{
+  content: "";
+  display: block;
+  width: 48px;
+  height: 60px;
+  background: url(../images/icons/g-i4.png) no-repeat center;
+  background-size: 100%;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  pointer-events: none;
+}
+.ul-cardb1 .loc{
+  background: linear-gradient(90deg,#f78960,#f6a05c);
+}
+.ul-cardb1 .loc::after{
+  content: "";
+  display: block;
+  width: 46px;
+  height: 65px;
+  background: url(../images/icons/g-i5.png) no-repeat center;
+  background-size: 100%;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  pointer-events: none;
+}
+.m-pop .nav-arrow {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 40px;
+    height: 40px;
+    background-color: rgba(255, 255, 255, 0.8);
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 24px;
+    cursor: pointer;
+    z-index: 1002;
+    user-select: none;
+}
+.m-pop .left-arrow {
+    left: 10px;
+}
+.m-pop .right-arrow {
+    right: 10px;
+}
\ No newline at end of file
diff --git a/igdss-app/css/admin/height-all.css b/igdss-app/css/admin/height-all.css
new file mode 100644
index 0000000..91925f7
--- /dev/null
+++ b/igdss-app/css/admin/height-all.css
@@ -0,0 +1,221 @@
+.m-mana{
+	position: relative;
+	min-height: 100vh;
+	padding: 0 20px;
+}
+.ul-listmana{
+	display: block;
+	  
+}
+.ul-listmana li{
+	margin-bottom: 15px;
+}
+.ul-listmana .con{
+	display: block;
+	background-color: #fff;
+	border-radius: 10px;
+	padding: 18px 15px 10px;
+	box-shadow: 0px 0px 8px rgb(40 48 58 / 8%);
+}
+.ul-listmana .tit{
+	font-size: 16px;
+	overflow: hidden;
+	color: #666;
+	margin-bottom: 18px;
+}
+
+
+.ul-listmana .txt{
+	overflow: hidden;
+	margin: 0 -8px;
+	margin-bottom: 6px;
+}
+.ul-listmana .box{
+	width: 50%;
+	padding: 0 8px;
+	float: left;
+	margin-bottom: 14px;
+}
+.ul-listmana .group{
+	border-radius: 10px;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: cover;
+	text-align: center;
+	color: #fff;
+	overflow: hidden;
+}
+.ul-listmana .desc{
+	height: 55px;
+	line-height: 55px;
+	font-size: 20px;
+}
+.ul-listmana .ort{
+	height: 30px;
+	line-height: 30px;
+	font-size: 20px;
+	font-size: 13px;
+	background-color: rgba(0,0,0,.08);
+}
+.ul-listmana .time{
+	font-size: 13px;
+	color: #666;
+}
+.m-caution-mana{
+	padding: 0 20px;
+}
+.ul-listcaut1 .con{
+	position: relative;
+	overflow: hidden;
+}
+.ul-listcaut1 .con .type{
+	background-color: #eb5a41;
+	position: absolute;
+	color: #fff;
+	font-size: 12px;
+	padding: 0 24px;
+	top: 10px;
+	right: -20px;
+	transform: rotate(45deg);
+	line-height: 16px;
+}
+.ul-listcaut1 .con .k{
+	background-color: #31976e;
+}
+.ul-listcaut1 .txt{
+	margin: 0 -6px;
+}
+.ul-listcaut1 .desc{
+	font-size: 16px;
+}
+.ul-listcaut1 .box{
+	float: left;
+	width: 33.3%;
+	padding: 0 6px;
+}
+.ul-listcaut1 .tit span{
+	font-size: 15px;
+	color: #ff9341;
+	display: inline-block;
+	background-color: #Fff6f0;
+	padding: 4px 10px;
+	border-radius: 4px;
+	font-weight: normal;
+	
+}
+.ul-listcaut1 .coation{
+	padding: 10px 0 10px;
+	border-bottom: 1px solid #F2F2F2;
+	margin-bottom: 10px;
+}
+.ul-listcaut1 .coation  span{
+	background-color: transparent;
+	color: #333;
+	padding: 0;
+}
+.ul-listcaut1 .time{
+	color: #888;
+}
+.ul-listcaut1 .c{
+	    background-image: url(../../images/g1.png);
+}
+.ul-listcaut1 .c1{
+	    background-image: url(../../images/f8.png);
+}
+.ul-listcaut1 .level-1{
+	    background-image: url(../../images/f9.png);
+}
+.ul-listcaut1 .level-2{
+	    background-image: url(../../images/f3-1.png);
+}
+.m-pop-caution{
+	padding: 15px 15px 25px;
+}
+.m-pop-caution .btns{
+	display: block;
+	text-align: center;
+}
+.m-pop-caution .btns button{
+	margin: 0 6px;
+}
+.m-pop-caution .h3{
+	text-align: left;
+	font-size: 16px;
+}
+.m-pop-caution .h3 span{
+	color: #ff2323;
+	
+}
+.m-pop-caution textarea{
+	    background-color: #f5f6f7;
+	    border-radius: 10px;
+	    margin-bottom: 15px;
+		border: none;
+		min-height: 100px;
+		
+}
+.m-pop-caution .mui-input-row{
+	margin-bottom: 25px;
+}
+
+.jglb{
+	top: 44px;
+	height: calc(100vh - 44px - 30px);
+}
+
+
+.m-server{
+  width: 300px;
+  background-color: #fff;
+  border-radius: 10px;
+  overflow: hidden;
+  padding: 28px 25px 30px;
+}
+.m-server .h3{
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  color: #000;
+  margin-bottom: 18px;
+}
+
+
+.m-server .mui-input-row{
+  background-color: #f5f6f7;
+  border-radius: 10px;
+  margin-bottom: 15px;
+  padding: 4px 0;
+}
+.m-server .mui-input-row label{
+  font-size: 16px;
+  font-weight: bold;
+  width: 27%;
+  padding-right: 0;
+}
+.m-server .mui-input-row input{
+  font-size: 16px;
+  color: #000;
+  width: 73%;
+}
+.m-server .btns{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 25px;
+}
+.m-server .mui-btn{
+  width: 110px;
+  border-radius: 20px;
+  font-size: 15px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  border: none;
+}
+.m-server .mui-btn.cancel{
+  color: #888888;
+  background-color: #eeeeee;
+}
+.m-server .mui-btn.confirm{
+  color: #fff;
+  background: linear-gradient(90deg,#52b88f,#64c388);
+}
\ No newline at end of file
diff --git a/igdss-app/css/admin/security-ai.css b/igdss-app/css/admin/security-ai.css
new file mode 100644
index 0000000..a1fd66d
--- /dev/null
+++ b/igdss-app/css/admin/security-ai.css
@@ -0,0 +1,162 @@
+
+.index-dzxg{
+  top: 119px;
+  height: calc(100vh - 119px - 30px);
+}
+.index-dzxg .mui-scroll{
+  padding: 0 20px 20px;
+}
+.m-bot_btn{
+  height: 65px;
+}
+.m-bot_btn .box{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 65px;
+  padding: 9px 20px;
+  background-color: #fff;
+  box-shadow: 0px -10px 10px -10px rgba(40,48,58,.08);
+}
+.m-bot_btn .bot-btn{
+  color: #fff;
+  background-color: #1e875b;
+  padding: 9px 0;
+  border-radius: 25px;
+  margin-bottom: 0;
+  border: none;
+}
+.ul-cardb1 .item{
+  background-color: #fff;
+  border-radius: 10px;
+  box-shadow: 0 0 4px rgba(0,64,40,.1);
+  padding-bottom: 20px;
+  margin-bottom: 15px;
+}
+.ul-cardb1 .top{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px 0 5px 15px;
+}
+.ul-cardb1 .top-tit{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 2px 0 8px 15px;
+}
+.ul-cardb1 .text{
+  font-size: 16px;
+  color: #888;
+}
+.ul-cardb1 .r-warn1{
+  font-size: 14px;
+  color: #ff0000;
+  font-weight: bold;
+  border: 1px solid #ff0000;
+  border-radius: 15px 0 0 15px;
+  border-right: none;
+  width: 90px;
+  line-height: 28px;
+  text-align: center;
+}
+.ul-cardb1 .r-warn2{
+  font-size: 14px;
+  color: #ff9c54;
+  font-weight: bold;
+  border: 1px solid #ff9c54;
+  border-radius: 15px 0 0 15px;
+  border-right: none;
+  width: 90px;
+  line-height: 28px;
+  text-align: center;
+}
+.ul-cardb1 .r-warn3{
+  font-size: 14px;
+  color: #38b382;
+  font-weight: bold;
+  border: 1px solid #38b382;
+  border-radius: 15px 0 0 15px;
+  border-right: none;
+  width: 90px;
+  line-height: 28px;
+  text-align: center;
+}
+.ul-cardb1 .cards{
+  overflow: hidden;
+  margin: 0 7px;
+}
+.ul-cardb1 .cd{
+  float: left;
+  width: 50%;
+}
+.ul-cardb1 .con{
+  position: relative;
+  height: 88px;
+  border-radius: 10px;
+  overflow: hidden;
+  margin: 0 8px;
+}
+.ul-cardb1 .txt{
+  font-size: 19px;
+  /* font-weight: bold; */
+  color: #fff;
+}
+.ul-cardb1 .tit{
+  padding-left: 13px;
+  position: relative;
+  font-size: 15px;
+  color: #fff;
+  margin: 15px 0 5px 0;
+}
+.ul-cardb1 .tit::before{
+  content: "";
+  display: block;
+  width: 3px;
+  height: 15px;
+  background-color: #fff;
+  opacity: .6;
+  border-radius: 0 3px 3px 0;
+  position: absolute;
+  top: 50%;
+  left: 0;
+  margin-top: -8px;
+  
+}
+.ul-cardb1 .user .txt{
+  text-align: center;
+}
+.ul-cardb1 .loc .txt{
+  text-align: center;
+}
+.ul-cardb1 .user{
+  background: linear-gradient(90deg,#38b382,#6ad192);
+}
+.ul-cardb1 .user::after{
+  content: "";
+  display: block;
+  width: 48px;
+  height: 60px;
+  background: url(../images/icons/g-i4.png) no-repeat center;
+  background-size: 100%;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  pointer-events: none;
+}
+.ul-cardb1 .loc{
+  background: linear-gradient(90deg,#f78960,#f6a05c);
+}
+.ul-cardb1 .loc::after{
+  content: "";
+  display: block;
+  width: 46px;
+  height: 65px;
+  background: url(../images/icons/g-i5.png) no-repeat center;
+  background-size: 100%;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  pointer-events: none;
+}
\ No newline at end of file
diff --git a/igdss-app/css/admin/security-patrol.css b/igdss-app/css/admin/security-patrol.css
index 53f56ba..07509c7 100644
--- a/igdss-app/css/admin/security-patrol.css
+++ b/igdss-app/css/admin/security-patrol.css
@@ -97,7 +97,7 @@
   
 }
 .ul-cardb1 .user .txt{
-  margin-left: 45px;
+  text-align: center
 }
 .ul-cardb1 .loc .txt{
   text-align: center;
diff --git a/igdss-app/css/admin/security-snapshot.css b/igdss-app/css/admin/security-snapshot.css
new file mode 100644
index 0000000..9b8ed8b
--- /dev/null
+++ b/igdss-app/css/admin/security-snapshot.css
@@ -0,0 +1,140 @@
+
+.index-dzxg{
+  top: 119px;
+  height: calc(100vh - 119px - 30px);
+}
+.index-dzxg .mui-scroll{
+  padding: 0 20px 20px;
+}
+.m-bot_btn{
+  height: 65px;
+}
+.m-bot_btn .box{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 65px;
+  padding: 9px 20px;
+  background-color: #fff;
+  box-shadow: 0px -10px 10px -10px rgba(40,48,58,.08);
+}
+.m-bot_btn .bot-btn{
+  color: #fff;
+  background-color: #1e875b;
+  padding: 9px 0;
+  border-radius: 25px;
+  margin-bottom: 0;
+  border: none;
+}
+.ul-cardb1 .item{
+  background-color: #fff;
+  border-radius: 10px;
+  box-shadow: 0 0 4px rgba(0,64,40,.1);
+  padding-bottom: 20px;
+  margin-bottom: 15px;
+}
+.ul-cardb1 .top{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px 0 5px 15px;
+}
+.ul-cardb1 .top-tit{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 2px 0 8px 15px;
+}
+.ul-cardb1 .text{
+  font-size: 16px;
+  color: #888;
+}
+.ul-cardb1 .r-btn{
+  font-size: 14px;
+  color: #ff9c54;
+  font-weight: bold;
+  border: 1px solid #ff9c54;
+  border-radius: 15px 0 0 15px;
+  border-right: none;
+  width: 90px;
+  line-height: 28px;
+  text-align: center;
+}
+.ul-cardb1 .cards{
+  overflow: hidden;
+  margin: 0 7px;
+}
+.ul-cardb1 .cd{
+  float: left;
+  width: 50%;
+}
+.ul-cardb1 .con{
+  position: relative;
+  height: 88px;
+  border-radius: 10px;
+  overflow: hidden;
+  margin: 0 8px;
+}
+.ul-cardb1 .txt{
+  font-size: 19px;
+  /* font-weight: bold; */
+  color: #fff;
+}
+.ul-cardb1 .tit{
+  padding-left: 13px;
+  position: relative;
+  font-size: 15px;
+  color: #fff;
+  margin: 15px 0 5px 0;
+}
+.ul-cardb1 .tit::before{
+  content: "";
+  display: block;
+  width: 3px;
+  height: 15px;
+  background-color: #fff;
+  opacity: .6;
+  border-radius: 0 3px 3px 0;
+  position: absolute;
+  top: 50%;
+  left: 0;
+  margin-top: -8px;
+  
+}
+.ul-cardb1 .user .txt{
+  text-align: center
+}
+.ul-cardb1 .loc .txt{
+  text-align: center;
+}
+.ul-cardb1 .user{
+  background: linear-gradient(90deg,#38b382,#6ad192);
+}
+.ul-cardb1 .user::after{
+  content: "";
+  display: block;
+  width: 48px;
+  height: 60px;
+  background: url(../images/icons/g-i4.png) no-repeat center;
+  background-size: 100%;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  pointer-events: none;
+}
+.ul-cardb1 .loc{
+  background: linear-gradient(90deg,#f78960,#f6a05c);
+}
+.ul-cardb1 .loc::after{
+  content: "";
+  display: block;
+  width: 46px;
+  height: 65px;
+  background: url(../images/icons/g-i5.png) no-repeat center;
+  background-size: 100%;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  pointer-events: none;
+}
\ No newline at end of file
diff --git a/igdss-app/css/admin/security-video.css b/igdss-app/css/admin/security-video.css
index 15b8063..505e6b4 100644
--- a/igdss-app/css/admin/security-video.css
+++ b/igdss-app/css/admin/security-video.css
@@ -1,44 +1,75 @@
+/* 椤甸潰鑷畾涔夋牱寮� */
 .m-videob1{
-  border-radius: 10px;
-  overflow: hidden;
-  margin-top: 10px;
+	border-radius: 10px;
+	overflow: hidden;
+	margin: 10px 0;
+	height: 246px;;
+	flex-shrink: 0; /* 闃叉瑙嗛鍖哄煙琚帇缂� */
 }
 .m-videob1 .video{
-  display: block;
-  width: 100%;
+	
+	width: 100%;
+	height: 100%;
+	
+}
+.m-videob1 .iframe{
+	width: 100%;
+	height: 100%;
 }
 
 .ul-locb1 .con{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
-  height: 62px;
-  border-radius: 10px;
-  overflow: hidden;
-  font-size: 16px;
-  color: #fff;
-  padding: 0 15px;
-  margin-top: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+	height: 62px;
+	border-radius: 10px;
+	overflow: hidden;
+	font-size: 16px;
+	color: #fff;
+	padding: 0 15px;
+	margin-top: 8px;
 }
 .ul-locb1 .left{
-  flex:1;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
+	flex:1;
+	overflow: hidden;
+	display: flex;
+	align-items: center;
 }
 .ul-locb1 .icon{
-  width: 35px;
-  overflow: hidden;
+	width: 35px;
+	overflow: hidden;
 }
 .ul-locb1 .icon img{
-  display: block;
-  max-width: 20px;
+	display: block;
+	max-width: 20px;
 }
 
-.box{
-	top: 45px;
-	height: calc(100vh - 84px);
-}
\ No newline at end of file
+/* 鏂扮殑甯冨眬鏍峰紡 */
+.mui-content {
+	display: flex;
+	flex-direction: column;
+	height: calc(100vh - 30px); /* 鍑忓幓header楂樺害 */
+	padding: 0;
+	overflow: hidden;
+}
+
+.video-container {
+	flex-shrink: 0;
+	padding: 10px 10px 0;
+	background: transparent;
+}
+
+.list-container {
+	flex: 1;
+	overflow: hidden;
+	padding: 0 10px 10px;
+}
+
+.scroll-wrapper {
+	height: 100%;
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch; /* 娴佺晠婊氬姩 */
+}
diff --git a/igdss-app/grain-detail.html b/igdss-app/grain-detail.html
index ded9ae0..8fc4866 100644
--- a/igdss-app/grain-detail.html
+++ b/igdss-app/grain-detail.html
@@ -332,7 +332,6 @@
 		<div class="m-bot_btn m-sslq-btn">
 			<div class="box">
 				<button id="1" type="button" class="mui-btn mui-btn-block bot-btn bot-btn1">鍘嗗彶鏁版嵁</button>
-				<button id="2" type="button" class="mui-btn mui-btn-block bot-btn">绮儏閲囬泦</button>
 			</div>
 		</div>
 	</body>
diff --git a/igdss-app/grain-manager.html b/igdss-app/grain-manager.html
index ddd0b86..e315795 100644
--- a/igdss-app/grain-manager.html
+++ b/igdss-app/grain-manager.html
@@ -4,7 +4,7 @@
 		<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>
+		<title>鏅鸿兘浠撳偍</title>
 		<!-- MUI鏍峰紡 -->
 		<link rel="stylesheet" href="./css/mui.min.css" />
 		<!-- 鍏叡css -->
@@ -13,7 +13,7 @@
 	<body class="g-bg" style="background-image: url(images/m-bg2.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>
+			<h1 class="mui-title">鏅鸿兘浠撳偍</h1>
 		</header>
 		<div class="mui-content">
 			<div class="mui-scroll-wrapper g-src_box">
@@ -22,28 +22,28 @@
 						<ul class="g-listb1 fix">
 							<li>
 								<a id="depot-list" class="con" style="background-image: url(images/icons/a-bg1.png);">
-									<div class="tit">绮儏绠$悊</div>
+									<div class="tit">绮儏鏁版嵁鏌ョ湅</div>
 									<div class="icon">
 										<img src="images/icons/a-i12.png" style="max-width: 50px;" alt="">
 									</div>
 								</a>
 							</li>
-<!-- 							<li>
-								<a id="grain-gas" class="con" style="background-image: url(images/icons/a-bg2.png);">
-									<div class="tit">姘斾綋绠$悊</div>
+							<li>
+								<a id="height-all" class="con" style="background-image: url(images/icons/a-bg2.png);">
+									<div class="tit">鏂欎綅鎬昏</div>
 									<div class="icon">
-										<img src="images/icons/a-i14.png" style="max-width: 50px;" alt="">
+										<img src="images/icons/a-i5.png" style="max-width: 50px;" alt="">
 									</div>
 								</a>
 							</li>
 							<li>
-								<a id="grain-pest" class="con" style="background-image: url(images/icons/a-bg3.png);">
-									<div class="tit">铏绠$悊</div>
+								<a id="grain-quantity" class="con" style="background-image: url(images/icons/a-bg3.png);">
+									<div class="tit">鏁伴噺鐩戞祴</div>
 									<div class="icon">
-										<img src="images/icons/a-i13.png" style="max-width: 55px;" alt="">
+										<img src="images/icons/a-i11.png" style="max-width: 55px;" alt="">
 									</div>
 								</a>
-							</li> -->
+							</li>
 						</ul>
 					</div>
 				</div>
diff --git a/igdss-app/grain-quantity.html b/igdss-app/grain-quantity.html
new file mode 100644
index 0000000..bb6d474
--- /dev/null
+++ b/igdss-app/grain-quantity.html
@@ -0,0 +1,140 @@
+<!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/grain-quantity.css">
+		<!--App鑷畾涔夌殑css-->
+		<link rel="stylesheet" href="./css/mui.picker.min.css"/>
+	</head>
+	<body class="g-bg" style="background-image: url(images/m-bg2.png);">
+		<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="g-date_box">
+				<span class="day prev">鍓嶄竴澶�</span>
+				<div class="inpbox" onclick="chooseDate();">
+					<input id="date" type="text" value="2022-04-15" readonly class="inp" />
+				</div>
+				<span class="day next">鍚庝竴澶�</span>
+			</div>
+			<div class="mui-scroll-wrapper index-dzxg">
+				<div class="mui-scroll">
+					<ul class="ul-cardb1" id="recordList">
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn">杩囩▼鎶撴媿</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">妫�娴嬮噸閲忎负---- KG锛屽疄闄呴噸閲忎负---- KG锛岃宸皬浜�-%銆�</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">妫�娴嬮噸閲�</div>
+											<div class="txt">100000 KG</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn">杩囩▼鎶撴媿</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">妫�娴嬮噸閲忎负---- KG锛屽疄闄呴噸閲忎负---- KG锛岃宸皬浜�-%銆�</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">妫�娴嬮噸閲�</div>
+											<div class="txt">100000 KG</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn">杩囩▼鎶撴媿</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">妫�娴嬮噸閲忎负---- KG锛屽疄闄呴噸閲忎负---- KG锛岃宸皬浜�-%銆�</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">妫�娴嬮噸閲�</div>
+											<div class="txt">100000 KG</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+					
+					</ul>
+				</div>
+			</div>
+			<!-- 棰勮鍥剧墖 -->
+			<div class="m-pop">
+				<div class="pop-bg"></div>
+				<div class="inner">
+					<div class="m-viewer" >
+						<img id="viewerImg" src="images/p-j1.jpg" alt="" class="img" />
+						 <!-- 宸﹀彸鍒囨崲绠ご -->
+						<div class="nav-arrow left-arrow" onclick="showPrevImage(-1)">鈥�</div>
+						<div class="nav-arrow right-arrow" onclick="showPrevImage(1)">鈥�</div>
+					</div>
+					
+					<div class="close"><span class="mui-icon mui-icon-close"></span></div>
+				</div>
+			</div>
+		</div>
+	</body>
+	<script src="./js/mui.min.js"></script>
+	<script src="./js/mui.picker.min.js"></script>
+	<script src="./js/jquery.js"></script>
+	<script src="./js/admin/grain-quantity.js"></script>
+	<script type="text/javascript" charset="utf-8">
+		//mui鍒濆鍖�
+		mui.init();
+
+		mui.plusReady(function(){
+			//鏁版嵁鍒濆鍖�
+			init();
+		})
+	</script>
+</html>
diff --git a/igdss-app/warn-list.html b/igdss-app/height-all.html
similarity index 62%
rename from igdss-app/warn-list.html
rename to igdss-app/height-all.html
index 8b655e8..36593e9 100644
--- a/igdss-app/warn-list.html
+++ b/igdss-app/height-all.html
@@ -5,134 +5,127 @@
 		<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>
+		<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/warn-list.css">
+		<link rel="stylesheet" href="./css/admin/height-all.css">
 		<!--App鑷畾涔夌殑css-->
 		<link rel="stylesheet" type="text/css" href="./css/mui.picker.min.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>
+			<h1 class="mui-title">鏂欎綅鎬昏</h1>
 		</header>
 		<div class="mui-content">
-			<div class="g-date_box">
-				<span class="day prev" onclick="addAndReduceMonth(-1)">鍓嶄竴澶�</span>
-				<div class="inpbox" onclick="chooseDate();">
-					<input id="date" type="text" value="" readonly class="inp" />
-				</div>
-				<span class="day next" onclick="addAndReduceMonth(1)">鍚庝竴澶�</span>
-			</div>
 			<div class="mui-scroll-wrapper jglb">
 				<div class="g-in-sl">
 					<div class="m-pow-dist">
 						<div class="m-caution-mana">
 							<ul class="ul-listmana ul-listcaut1" id="recordList">
-								<!-- <li>
-									<div class="con myfancy" onclick="openPop('11')">
-										<span class="type">鏈鐞�</span>
+								<li>
+									<div class="con myfancy">
 										<div class="tit">
-											璀﹀憡鍚嶇О: <span>绮儏楂樻俯璀﹀憡</span>
+											搴撳尯鍚嶇О: <span>浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</span>
 										</div>
 										<div class="txt">
 											<div class="box">
 												<div class="group c">
-													<div class="desc">楂樻俯璀﹀憡</div>
-													<div class="ort">璀﹀憡绫诲瀷</div>
+													<div class="desc">浠撴埧鍚嶇О</div>
+													<div class="ort">1鍙风瓛浠�</div>
 												</div>
 											</div>
 											<div class="box">
 												<div class="group c1">
-													<div class="desc">涓�鍙蜂粨</div>
-													<div class="ort">浠撳簱绫诲瀷</div>
+													<div class="desc">鐜夌背</div>
+													<div class="ort">绮鍝佺</div>
 												</div>
 											</div>
 											<div class="box">
 												<div class="group level-1">
-													<div class="desc">涓骇</div>
-													<div class="ort">璀﹀憡绾у埆</div>
+													<div class="desc">楂樺害</div>
+													<div class="ort">11.527 绫�</div>
 												</div>
 											</div>
 										</div>
 										<div class="tit coation">
-											璀﹀憡鍚嶇О: <span>涓�鍙蜂粨搴撶伯娌规娴嬪埌楂樻俯</span>
+											璁$畻鍌ㄩ噺: <span>290789.9 KG</span>
 										</div>
-										<div class="time">2022-03-02 10:10
+										<div class="time">妫�娴嬫椂闂�: <span>2025-03-02 10:10</span>
 										</div>
 
 									</div>
 								</li>
 								<li>
 									<div class="con myfancy" onclick="openPop('11')">
-										<span class="type k">宸插鐞�</span>
 										<div class="tit">
-											璀﹀憡鍚嶇О: <span>绮儏楂樻俯璀﹀憡</span>
+											搴撳尯鍚嶇О: <span>浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</span>
 										</div>
 										<div class="txt">
 											<div class="box">
 												<div class="group c">
-													<div class="desc">楂樻俯璀﹀憡</div>
-													<div class="ort">璀﹀憡绫诲瀷</div>
+													<div class="desc">浠撴埧鍚嶇О</div>
+													<div class="ort">1鍙风瓛浠�</div>
 												</div>
 											</div>
 											<div class="box">
 												<div class="group c1">
-													<div class="desc">涓�鍙蜂粨</div>
-													<div class="ort">浠撳簱绫诲瀷</div>
-												</div>
-											</div>
-											<div class="box">
-												<div class="group level-2">
-													<div class="desc">楂樼骇</div>
-													<div class="ort">璀﹀憡绾у埆</div>
-												</div>
-											</div>
-										</div>
-										<div class="tit coation">
-											璀﹀憡鍚嶇О: <span>涓�鍙蜂粨搴撶伯娌规娴嬪埌楂樻俯</span>
-										</div>
-										<div class="time">2022-03-02 10:10</div>
-
-									</div>
-								</li>
-								<li>
-									<div class="con myfancy" onclick="openPop('11')">
-										<span class="type">鏈鐞�</span>
-										<div class="tit">
-											璀﹀憡鍚嶇О: <span>绮儏楂樻俯璀﹀憡</span>
-										</div>
-										<div class="txt">
-											<div class="box">
-												<div class="group c">
-													<div class="desc">楂樻俯璀﹀憡</div>
-													<div class="ort">璀﹀憡绫诲瀷</div>
-												</div>
-											</div>
-											<div class="box">
-												<div class="group c1">
-													<div class="desc">涓�鍙蜂粨</div>
-													<div class="ort">浠撳簱绫诲瀷</div>
+													<div class="desc">鐜夌背</div>
+													<div class="ort">绮鍝佺</div>
 												</div>
 											</div>
 											<div class="box">
 												<div class="group level-1">
-													<div class="desc">涓骇</div>
-													<div class="ort">璀﹀憡绾у埆</div>
+													<div class="desc">楂樺害</div>
+													<div class="ort">11.527 绫�</div>
 												</div>
 											</div>
 										</div>
 										<div class="tit coation">
-											璀﹀憡鍚嶇О: <span>涓�鍙蜂粨搴撶伯娌规娴嬪埌楂樻俯</span>
+											璁$畻鍌ㄩ噺: <span>290789.9 KG</span>
 										</div>
-										<div class="time">2022-03-02 10:10</div>
+										<div class="time">妫�娴嬫椂闂�: <span>2025-03-02 10:10</span>
+										</div>
+										
 									</div>
 								</li>
-							 -->
+								<li>
+									<div class="con myfancy" onclick="openPop('11')">
+										<div class="tit">
+											搴撳尯鍚嶇О: <span>浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</span>
+										</div>
+										<div class="txt">
+											<div class="box">
+												<div class="group c">
+													<div class="desc">浠撴埧鍚嶇О</div>
+													<div class="ort">1鍙风瓛浠�</div>
+												</div>
+											</div>
+											<div class="box">
+												<div class="group c1">
+													<div class="desc">鐜夌背</div>
+													<div class="ort">绮鍝佺</div>
+												</div>
+											</div>
+											<div class="box">
+												<div class="group level-1">
+													<div class="desc">楂樺害</div>
+													<div class="ort">11.527 绫�</div>
+												</div>
+											</div>
+										</div>
+										<div class="tit coation">
+											璁$畻鍌ㄩ噺: <span>290789.9 KG</span>
+										</div>
+										<div class="time">妫�娴嬫椂闂�: <span>2025-03-02 10:10</span>
+										</div>
+										
+									</div>
+								</li>
+							
 							</ul>
 						</div>
 					</div>
@@ -163,7 +156,7 @@
 	<script src="./js/mui.min.js"></script>
 	<script src="./js/mui.picker.min.js"></script>
 	<script src="./js/jquery.js"></script>
-	<script src="./js/admin/warn-list.js"></script>
+	<script src="./js/admin/height-all.js"></script>
 	<script type="text/javascript" charset="utf-8">
 		//mui鍒濆鍖�
 		mui.init();
diff --git a/igdss-app/index.html b/igdss-app/index.html
index 1e28b2b..e7c54ef 100644
--- a/igdss-app/index.html
+++ b/igdss-app/index.html
@@ -87,7 +87,7 @@
 								<li>
 									<a id="work-manager" class="con">
 										<div class="icon">
-											<img src="images/s-p9.png" alt="">
+											<img src="images/s-p5.png" alt="">
 										</div>
 										<div class="txt">鐩戠绠$悊</div>
 									</a>
@@ -95,7 +95,7 @@
 								<li>
 									<a id="grain-manager" class="con">
 										<div class="icon">
-											<img src="images/s-p4.png" alt="">
+											<img src="images/s-p1.png" alt="">
 										</div>
 										<div class="txt">鏅鸿兘浠撳偍</div>
 									</a>
@@ -160,15 +160,21 @@
 	<script type="text/javascript" charset="utf-8">
 		//mui鍒濆鍖�
 		mui.init();
-
+		
 		mui.plusReady(function() {
 			var user = JSON.parse(localStorage.getItem('user'));
 			data.tokenAuth = user.tokenAuth;
-			url = user.url + "/api-phone/gateway";
-
+			url = user.url + "/api/phone/v1/gateway";
+			userType = user.userType;
+			console.log(JSON.stringify(user))
 			$("#cname").html(user.cname);
+			if(userType=="30"){
+				document.getElementById('work-manager').closest('li').remove();
+				return;
+			}
 			if (user.companyId == user.deptId) {
 				data.data.companyId = user.companyId;
+				data.data.deptId = user.deptId;
 				getListDept();
 			} else {
 				$("#deptName").html("鎵�鍦ㄥ簱鍖猴細" + user.deptName);
diff --git a/igdss-app/inout-in-handle-list.html b/igdss-app/inout-in-handle-list.html
index 13e0782..c07d872 100644
--- a/igdss-app/inout-in-handle-list.html
+++ b/igdss-app/inout-in-handle-list.html
@@ -29,7 +29,6 @@
 						<div class="inpbox">
 							<input type="search" id="plateNum" class="mui-input-clear" placeholder="璇疯緭鍏ヨ溅鐗屼俊鎭绱�" value="">
 						</div>
-						<div class="s-btn"><img src="images/icons/g-i22.png" alt="" onclick="readCard()">璇诲崱</div>
 						<button type="button" class="mui-btn">鏌ヨ</button>
 					</div>
 				</form>
diff --git a/igdss-app/inout-in-record.html b/igdss-app/inout-in-record.html
deleted file mode 100644
index 7a5278a..0000000
--- a/igdss-app/inout-in-record.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!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/inout-in-record.css">
-		<!--App鑷畾涔夌殑css-->
-		<link rel="stylesheet" type="text/css" href="css/mui.picker.min.css" />
-	</head>
-
-	<body class="g-bg" style="background-image: url(images/m-bg2.png);">
-		<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="g-date_box">
-				<span class="day prev" onclick="addAndReduceMonth(-1)">鍓嶄竴澶�</span>
-				<div class="inpbox" onclick="chooseDate();">
-					<input id="dateTime" type="text" value="2022-04-15" readonly class="inp"/>
-				</div>
-				<span class="day next" onclick="addAndReduceMonth(1)">鍚庝竴澶�</span>
-			</div>
-			<div class="record-box">
-				<div class="total">鍏ュ簱鍚堣:<b id="sum">0</b><span>KG</span></div>
-				<div class="mui-scroll-wrapper rkjl">
-					<div class="mui-scroll">
-						<div class="m-record" id="recordList">
-							<!-- <div class="id" style="text-align: center;font-size: 20px;color:#dd524d">鎵�閫夋棩鏈熸殏鏃犲叆搴撹褰曚俊鎭�</div> -->
-							<!-- <div class="item">
-								<div class="id">鍗曟嵁鍙�: 202205050002</div>
-								<ul class="g-listb2">
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											杞︾墝鍙�:<b>璞獳123GM</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i25.png);">
-											浠撳簱鍚嶇О:<b>15鍙蜂粨</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i32.png);">
-											绮鍝佺:<b>灏忛害</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											缁撶畻閲嶉噺:<span><em>3000</em>KG</span>
-										</div>
-									</li>
-								</ul>
-								<div class="time">瀹屾垚鏃堕棿: 2021-05-08 12:00 </div>
-							</div>
-							 
-							 <div class="item">
-								<div class="id">鍗曟嵁鍙�: 202205050002</div>
-								<ul class="g-listb2">
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											杞︾墝鍙�:<b>璞獳123GM</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i25.png);">
-											浠撳簱鍚嶇О:<b>15鍙蜂粨</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i32.png);">
-											绮鍝佺:<b>灏忛害</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											缁撶畻閲嶉噺:<span><em>3000</em>KG</span>
-										</div>
-									</li>
-								</ul>
-								<div class="time">瀹屾垚鏃堕棿: 2021-05-08 12:00 </div>
-							</div>
-							<div class="item">
-								<div class="id">鍗曟嵁鍙�: 202205050002</div>
-								<ul class="g-listb2">
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											杞︾墝鍙�:<b>璞獳123GM</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i25.png);">
-											浠撳簱鍚嶇О:<b>15鍙蜂粨</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i32.png);">
-											绮鍝佺:<b>灏忛害</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											缁撶畻閲嶉噺:<span><em>3000</em>KG</span>
-										</div>
-									</li>
-								</ul>
-								<div class="time">瀹屾垚鏃堕棿: 2021-05-08 12:00 </div>
-								-->
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script src="./js/mui.picker.min.js"></script>
-	<script src="./js/jquery.js"></script>
-	<script src="./js/admin/inout-in-record.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		//mui鍒濆鍖�
-		mui.init();
-		
-		mui.plusReady(function() {
-			//鏁版嵁鍒濆鍖�
-			init();
-		})
-	</script>
-</html>
\ No newline at end of file
diff --git a/igdss-app/inout-in-register.html b/igdss-app/inout-in-register.html
deleted file mode 100644
index b1b5a0c..0000000
--- a/igdss-app/inout-in-register.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!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/inout-in-register.css">
-	</head>
-
-	<body class="g-bg" style="background-image: url(images/m-bg2.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">
-			<form action="" class="m-formb1 mui-input-group">
-				<div class="box">
-					<div class="mui-input-row">
-						<label>
-							鏅烘収鍗″彿:
-						</label>
-						<div class="por">
-							<input id="intelCard" type="text" class="mui-input-clear" placeholder="璇诲彇鏅烘収鍗″彿">
-							<div class="s-btn" onclick="readCard()"><img src="images/icons/g-i18.png" alt="">璇诲崱</div>
-						</div>
-					</div>
-				</div>
-				<div class="box">
-					<div class="mui-input-row">
-						<label>
-							杞︾墝鍙�:
-						</label>
-						<input id="plateNum" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ヨ溅鐗屽彿">
-					</div>
-					<div class="mui-input-row">
-						<label>鎵胯繍浜�:</label>
-						<input id="userName" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ュ鍚�">
-					</div>
-					<div class="mui-input-row">
-						<label>
-							韬唤璇佸彿:
-						</label>
-						<input id="userId" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�">
-					</div>
-					<div class="mui-input-row">
-						<label>
-							鎵嬫満鍙�:
-						</label>
-						<input id="userContact" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ユ墜鏈哄彿">
-					</div>
-				</div>
-				<input onclick="registerInSubmit()" value="纭鐧昏" type="button" class="submit"/>
-			</form>
-		</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script src="./js/jquery.js"></script>
-	<script src="./js/admin/inout-in-register.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		//mui鍒濆鍖�
-		mui.init();
-		
-		mui.plusReady(function() {
-			//鏁版嵁鍒濆鍖�
-			init();
-		})
-	</script>
-</html>
\ No newline at end of file
diff --git a/igdss-app/inout-manager.html b/igdss-app/inout-manager.html
index e3bfd46..7eaaab9 100644
--- a/igdss-app/inout-manager.html
+++ b/igdss-app/inout-manager.html
@@ -4,7 +4,7 @@
 		<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>
+		<title>绮璐攢</title>
 		<!-- MUI鏍峰紡 -->
 		<link rel="stylesheet" href="./css/mui.min.css" />
 		<!-- 鍏叡css -->
@@ -13,29 +13,13 @@
 	<body class="g-bg" style="background-image: url(images/m-bg2.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>
+			<h1 class="mui-title">绮璐攢</h1>
 		</header>
 		<div class="mui-content">
 			<div class="mui-scroll-wrapper g-src_box">
 				<div class="mui-scroll">
 					<div class="m-listbox">
 						<ul class="g-listb1 fix">
-							<li>
-								<a id="inout-in-register" class="con" style="background-image: url(images/icons/a-bg5.png);">
-									<div class="tit">鍏ュ簱鐧昏</div>
-									<div class="icon">
-										<img src="images/icons/a-i4.png" alt="">
-									</div>
-								</a>
-							</li>
-							<li>
-								<a id="inout-out-register" class="con" style="background-image: url(images/icons/a-bg8.png);">
-									<div class="tit">鍑哄簱鐧昏</div>
-									<div class="icon">
-										<img src="images/icons/a-i7.png" alt="">
-									</div>
-								</a>
-							</li>
 							<li>
 								<a id="inout-in-handle-list" class="con" style="background-image: url(images/icons/a-bg6.png);">
 									<div class="tit">鍏ュ簱鍊间粨</div>
@@ -53,24 +37,8 @@
 								</a>
 							</li>
 							<li>
-								<a id="inout-in-record" class="con" style="background-image: url(images/icons/a-bg7.png);">
-									<div class="tit">鍏ュ簱璁板綍</div>
-									<div class="icon">
-										<img src="images/icons/a-i6.png" alt="">
-									</div>
-								</a>
-							</li>
-							<li>
-								<a id="inout-out-record" class="con" style="background-image: url(images/icons/a-bg10.png);">
-									<div class="tit">鍑哄簱璁板綍</div>
-									<div class="icon">
-										<img src="images/icons/a-i9.png" alt="">
-									</div>
-								</a>
-							</li>
-							<li>
-								<a id="inout-real" class="con" style="background-image: url(images/icons/a-bg11.png);">
-									<div class="tit">瀹炴椂鍑哄叆搴�</div>
+								<a id="inout-real" class="con" style="background-image: url(images/icons/a-bg10.png);">
+									<div class="tit">瀹炴椂璁板綍</div>
 									<div class="icon">
 										<img src="images/icons/a-i10.png" alt="">
 									</div>
diff --git a/igdss-app/inout-out-handle-list.html b/igdss-app/inout-out-handle-list.html
index 75a8fec..afea7b2 100644
--- a/igdss-app/inout-out-handle-list.html
+++ b/igdss-app/inout-out-handle-list.html
@@ -28,7 +28,6 @@
 						<div class="inpbox">
 							<input id="plateNum" type="search" class="mui-input-clear" placeholder="璇疯緭鍏ヨ溅鐗屼俊鎭绱�" value="">
 						</div>
-						<div class="s-btn"><img src="images/icons/g-i22.png" alt="" onclick="readCard()">璇诲崱</div>
 						<button type="button" class="mui-btn">鏌ヨ</button>
 					</div>
 				</form>
diff --git a/igdss-app/inout-out-record.html b/igdss-app/inout-out-record.html
deleted file mode 100644
index dcf687a..0000000
--- a/igdss-app/inout-out-record.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!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/inout-out-record.css">
-		<!--App鑷畾涔夌殑css-->
-		<link rel="stylesheet" type="text/css" href="css/mui.picker.min.css" />
-	</head>
-
-	<body class="g-bg" style="background-image: url(images/m-bg2.png);">
-		<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="g-date_box">
-				<span class="day prev" onclick="addAndReduceMonth(-1)">鍓嶄竴澶�</span>
-				<div class="inpbox" onclick="chooseDate();">
-					<input id="dateTime" type="text" value="" readonly class="inp" />
-				</div>
-				<span class="day next" onclick="addAndReduceMonth(1)">鍚庝竴澶�</span>
-			</div>
-			<div class="record-box">
-				<div class="total">鍏ュ簱鍚堣:<b id="sum">0</b><span>KG</span></div>
-				<div class="mui-scroll-wrapper rkjl">
-					<div class="mui-scroll">
-						<div class="m-record" id="recordList">
-							<div class="id" style="text-align: center;font-size: 20px;color:#dd524d">鎵�閫夋棩鏈熸殏鏃犲嚭搴撹褰曚俊鎭�</div>
-							<!-- <div class="item">
-								<div class="id">鍗曟嵁鍙�: 202205050002</div>
-								<ul class="g-listb2">
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											杞︾墝鍙�:<b>璞獳123GM</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i25.png);">
-											浠撳簱鍚嶇О:<b>15鍙蜂粨</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i32.png);">
-											绮鍝佺:<b>灏忛害</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											缁撶畻閲嶉噺:<span><em>3000</em>KG</span>
-										</div>
-									</li>
-								</ul>
-								<div class="time">瀹屾垚鏃堕棿: 2021-05-08 12:00 </div>
-							</div>
-							<div class="item">
-								<div class="id">鍗曟嵁鍙�: 202205050002</div>
-								<ul class="g-listb2">
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											杞︾墝鍙�:<b>璞獳123GM</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i25.png);">
-											浠撳簱鍚嶇О:<b>15鍙蜂粨</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i32.png);">
-											绮鍝佺:<b>灏忛害</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											缁撶畻閲嶉噺:<span><em>3000</em>KG</span>
-										</div>
-									</li>
-								</ul>
-								<div class="time">瀹屾垚鏃堕棿: 2021-05-08 12:00 </div>
-							</div>
-							<div class="item">
-								<div class="id">鍗曟嵁鍙�: 202205050002</div>
-								<ul class="g-listb2">
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											杞︾墝鍙�:<b>璞獳123GM</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i25.png);">
-											浠撳簱鍚嶇О:<b>15鍙蜂粨</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i32.png);">
-											绮鍝佺:<b>灏忛害</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											缁撶畻閲嶉噺:<span><em>3000</em>KG</span>
-										</div>
-									</li>
-								</ul>
-								<div class="time">瀹屾垚鏃堕棿: 2021-05-08 12:00 </div>
-							</div>
-							<div class="item">
-								<div class="id">鍗曟嵁鍙�: 202205050002</div>
-								<ul class="g-listb2">
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											杞︾墝鍙�:<b>璞獳123GM</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i25.png);">
-											浠撳簱鍚嶇О:<b>15鍙蜂粨</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i32.png);">
-											绮鍝佺:<b>灏忛害</b>
-										</div>
-									</li>
-									<li>
-										<div class="con" style="background-image: url(images/icons/g-i24.png);">
-											缁撶畻閲嶉噺:<span><em>3000</em>KG</span>
-										</div>
-									</li>
-								</ul>
-								<div class="time">瀹屾垚鏃堕棿: 2021-05-08 12:00 </div>
-							</div> -->
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script src="./js/mui.picker.min.js"></script>
-	<script src="./js/jquery.js"></script>
-	<script src="./js/admin/inout-out-record.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		//mui鍒濆鍖�
-		mui.init();
-		
-		mui.plusReady(function() {
-			//鏁版嵁鍒濆鍖�
-			init();
-		})
-	</script>
-</html>
\ No newline at end of file
diff --git a/igdss-app/inout-out-register.html b/igdss-app/inout-out-register.html
deleted file mode 100644
index 235bb3a..0000000
--- a/igdss-app/inout-out-register.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!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/inout-out-register.css">
-	</head>
-
-	<body class="g-bg" style="background-image: url(images/m-bg2.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">
-			<form action="" class="m-formb1 mui-input-group">
-				<div class="box">
-					<div class="mui-input-row">
-						<label>
-							鏅烘収鍗″彿:
-						</label>
-						<div class="por">
-							<input id="intelCard" type="text" class="mui-input-clear" placeholder="璇诲彇鏅烘収鍗″彿">
-							<div class="s-btn" onclick="readCard()"><img src="images/icons/g-i18.png" alt="">璇诲崱</div>
-						</div>
-					</div>
-				</div>
-				<div class="box">
-					<div class="mui-input-row">
-						<label>
-							杞︾墝鍙�:
-						</label>
-						<input id="plateNum" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ヨ溅鐗屽彿">
-					</div>
-					<div class="mui-input-row">
-						<label>鎵胯繍浜�:</label>
-						<input id="userName" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ュ鍚�">
-					</div>
-					<div class="mui-input-row">
-						<label>
-							韬唤璇佸彿:
-						</label>
-						<input id="userId" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�">
-					</div>
-					<div class="mui-input-row">
-						<label>
-							鎵嬫満鍙�:
-						</label>
-						<input id="userContact" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ユ墜鏈哄彿">
-					</div>
-				</div>
-				<input onclick="registerOutSubmit()" value="纭鐧昏" type="button" class="submit"/>
-			</form>
-		</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script src="./js/jquery.js"></script>
-	<script src="./js/admin/inout-out-register.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		//mui鍒濆鍖�
-		mui.init();
-		
-		mui.plusReady(function() {
-			//鏁版嵁鍒濆鍖�
-			init();
-		})
-	</script>
-</html>
\ No newline at end of file
diff --git a/igdss-app/inout-real.html b/igdss-app/inout-real.html
index f56adaf..f500713 100644
--- a/igdss-app/inout-real.html
+++ b/igdss-app/inout-real.html
@@ -4,7 +4,7 @@
 		<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>
+		<title>瀹炴椂璁板綍</title>
 		<!-- MUI鏍峰紡 -->
 		<link rel="stylesheet" href="./css/mui.min.css" />
 		<!-- 鍏叡css -->
@@ -16,7 +16,7 @@
 	<body class="g-bg" style="background-image: url(images/m-bg2.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>
+			<h1 class="mui-title">瀹炴椂璁板綍</h1>
 		</header>
 		<div class="mui-content">
 
diff --git a/igdss-app/js/admin/depot-list.js b/igdss-app/js/admin/depot-list.js
index 4fdc9fa..5d68c0e 100644
--- a/igdss-app/js/admin/depot-list.js
+++ b/igdss-app/js/admin/depot-list.js
@@ -2,9 +2,8 @@
 var depotList = null;
 var tag = "";
 var data = {
-	"interfaceId": "5102",
-	"sign": "10102",
-	"outId": "10102",
+	"interfaceId": "5201",
+	"outId": "10201",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -23,7 +22,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/v1/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
 	getData();
@@ -123,22 +122,6 @@
 	//绮儏璇︾粏
 	if (tag == "grain") {
 		html = "grain-detail";
-	}
-	//闂ㄧ鎺у埗
-	if (tag == "door") {
-		html = "security-door";
-	}
-	//閫氶鎿嶄綔
-	if (tag == "verb") {
-		html = "device-verb";
-	}
-	//姘旇皟鎿嶄綔
-	if (tag == "n2") {
-		html = "device-n2";
-	}
-	//娓╂帶鎿嶄綔
-	if (tag == "temp") {
-		html = "device-temp";
 	}
 	if (html) {
 		mui.openWindow({
diff --git a/igdss-app/js/admin/grain-detail.js b/igdss-app/js/admin/grain-detail.js
index 91fb0bb..c8bb4d4 100644
--- a/igdss-app/js/admin/grain-detail.js
+++ b/igdss-app/js/admin/grain-detail.js
@@ -7,9 +7,9 @@
 var tagLie = 0; //绮儏灞傛暟
 var grainData;
 var data = {
-	"interfaceId": "5301",
-	"sign": "10301",
-	"outId": "10301",
+	"interfaceId": "5205",
+	"sign": "10205",
+	"outId": "10205",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -43,7 +43,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/v1/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
 	data.data.depotId = depotId;
@@ -292,24 +292,4 @@
 
 });
 
-//绮儏閲囬泦
-function gatherGrain() {
-	//鍙戦�佽幏鍙栫伯鎯呰姹�
-	mui.ajax(url, {
-		type: "POST",
-		dataType: "json",
-		crossDomain: true,
-		contentType: "application/json;charset=utf-8",
-		data: JSON.stringify(data0),
-		success: function(data) {
-			if (data.code == "0000") {
-				mui.alert('閲囬泦鍛戒护鍙戦�佹垚鍔燂紝璇风瓑寰�10绉掗噸鏂版墦寮�姝ら〉闈㈡煡鐪嬮噰闆嗘暟鎹紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-			} else {
-				mui.alert(data.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		},
-		error: function() {
-			mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-		}
-	})
-}
+
diff --git a/igdss-app/js/admin/grain-history.js b/igdss-app/js/admin/grain-history.js
index 475606d..3d1f8d7 100644
--- a/igdss-app/js/admin/grain-history.js
+++ b/igdss-app/js/admin/grain-history.js
@@ -6,9 +6,9 @@
 var dateTime; //鏃ユ湡锛歽yyy-MM
 //鏌ヨ绮儏鍘嗗彶鏁版嵁鍙傛暟
 var data = {
-	"interfaceId": "5302",
-	"sign": "10302",
-	"outId": "10302",
+	"interfaceId": "5204",
+	"sign": "105204",
+	"outId": "105204",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -19,9 +19,9 @@
 };
 //鏌ヨ浠撳簱鍒楄〃鍙傛暟
 var data0 = {
-	"interfaceId": "5102",
-	"sign": "10102",
-	"outId": "10102",
+	"interfaceId": "5201",
+	"sign": "10201",
+	"outId": "10201",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -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/v1/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
 	data0.tokenAuth = user.tokenAuth;
@@ -62,7 +62,7 @@
 	}
 	data.data.depotId = depotId;
 	data.data.dateTime = dateTime;
-
+	
 	//璇锋眰
 	mui.ajax(url, {
 		type: "POST",
@@ -73,9 +73,11 @@
 		success: function(result) {
 			if (result.code == "0000") {
 				historyList = result.data;
+				console.log(JSON.stringify("000"))
 				renderData();
 			} else {
 				renderData();
+				console.log(JSON.stringify("001"))
 				mui.toast(result.mag);
 			}
 		},
@@ -90,6 +92,7 @@
 	var html = '';
 	if (historyList != null && historyList.length > 0) {
 		$.each(historyList, function(index, item) {
+			console.log(JSON.stringify(item))
 			html += '<li><div class="con"><div class="tit">妫�娴嬫椂闂�: ' + item.receiveDate;
 			html += '<a id="' + index + '" class="more"></a></div><div class="inner">';
 			html += '<div class="info">绮娓╁害</div><div class="txt">';
diff --git a/igdss-app/js/admin/grain-quantity.js b/igdss-app/js/admin/grain-quantity.js
new file mode 100644
index 0000000..ae19665
--- /dev/null
+++ b/igdss-app/js/admin/grain-quantity.js
@@ -0,0 +1,235 @@
+var url = null;
+var uploadUrl = null;
+var quantityList = null;
+var ImgFile = null;
+var dateTime;
+var length;
+var currentImageIndex;
+//鐢靛瓙宸℃洿璁板綍
+var data = {
+	"interfaceId": "5207",
+	"outId": "10207",
+	"reqDateTime": new Date(),
+	"tokenAuth": "",
+	"data": {
+		"deptId": "",
+		"dateTime": "",
+	}
+};
+
+//宸℃洿鐓х墖鏌ョ湅
+var data2 = {
+	"interfaceId": "5208",
+	"outId": "10208",
+	"reqDateTime": new Date(),
+	"tokenAuth": "",
+	"data": {
+		"id": "",
+	}
+};
+
+function init() {
+	var user = JSON.parse(localStorage.getItem('user'));
+	var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
+	url = user.url + "/api/phone/v1/gateway";
+	data.tokenAuth = user.tokenAuth;
+	data2.tokenAuth = user.tokenAuth;
+	data.data.deptId = selectDeptId;
+	dateTime = getDate(new Date())
+	document.getElementById("date").value = dateTime;
+	//鑾峰彇鏁伴噺妫�娴嬪垪琛�
+	getQuantityList()
+
+}
+
+//榛樿鑾峰彇褰撳墠鏃ユ湡(yyyy-MM-dd)
+function getDate(date) {
+	var year = date.getFullYear();
+	var month, day;
+	month = date.getMonth() + 1;
+	if (month > 0 && month <= 9) {
+		month = "0" + month;
+	}
+	day = date.getDate();
+	if (day > 0 && day <= 9) {
+		day = "0" + day;
+	}
+	return year + "-" + month + "-" + day
+}
+//鍔犲噺澶╂暟
+function addAndReduceMonth(tag) {
+
+	var date = new Date(dateTime);
+	date = date.setDate(date.getDate() + tag);
+	date = new Date(date);
+	dateTime = getDate(date);
+	document.getElementById("date").value = dateTime;
+	//鑾峰彇鏁伴噺妫�娴嬪垪琛�
+	getQuantityList()
+}
+
+//閫夋嫨鏃ユ湡
+function chooseDate() {
+	var dtpicker = new mui.DtPicker({
+		type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 
+		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� 
+		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 
+		value: dateTime
+	})
+	var time = dateTime;
+	dtpicker.show(function(e) {
+		dateTime = e.value;
+		document.getElementById("date").value = e.value
+		if (time != dateTime) {
+			getQuantityList();
+		}
+	})
+}
+//鑾峰彇鏁伴噺妫�娴嬪垪琛�
+function getQuantityList() {
+	//璧嬪�煎弬鏁扮殑鏃ユ湡
+	data.data.dateTime = dateTime;
+	console.log(JSON.stringify(data.data), "鏁伴噺妫�娴�", "grain-quantity")
+	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") {
+				quantityList = result.data;
+				renderPatrol();
+			} else {
+				renderPatrol();
+				mui.toast(result.msg);
+				console.log(JSON.stringify(result))
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+
+}
+
+function renderPatrol() {
+	var html = '';
+	if (quantityList && quantityList.length > 0) {
+		$.each(quantityList, function(index, item) {
+			html += '<li><div class="item"><div class="top"><div class="text">'+item.deptName+'</div><div class="r-btn" id = '+item.batchId+'>杩囩▼鎶撴媿</div></div>'
+			html += '<div class="top-tit"><div class="text">'+item.remark+'</div></div>';
+			html += '<div class="cards"><div class="cd"><div class="con user"><div class="tit">妫�娴嬮噸閲�</div><div class="txt">'+item.weight+' KG</div></div></div>'
+			html += '<div class="cd"><div class="con loc"><div class="tit">鏃堕棿</div><div class="txt">'+item.receiveDate+'</div></div></div></div></div></li>';
+		})
+	} else {
+			html += '<li><div class="item"><div class="top"><div class="text"> ----- </div><div class="r-btn">杩囩▼鎶撴媿</div></div>'
+			html += '<div class="top-tit"><div class="text">妫�娴嬮噸閲忎负 --- KG锛屽疄闄呴噸閲忎负 --- KG锛岃宸皬浜�-%銆�</div></div>';
+			html += '<div class="cards"><div class="cd"><div class="con user"><div class="tit">妫�娴嬮噸閲�</div><div class="txt"> ---- KG</div></div></div>'
+			html += '<div class="cd"><div class="con loc"><div class="tit">鏃堕棿</div><div class="txt"> -- </div></div></div></div></div></li>';
+
+	}
+	$("#recordList").html(html)
+}
+
+mui('.mui-scroll-wrapper').scroll({
+	indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
+	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
+	bounce: false, //鏄惁鍚敤鍥炲脊
+	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
+});
+
+mui(".mui-content").on("tap", ".g-date_box .prev", function() {
+	var curDate = document.getElementById("date").value;
+	addAndReduceMonth(-1)
+	// document.getElementById("date").value = e.value
+});
+mui(".mui-content").on("tap", ".g-date_box .next", function() {
+	var curDate = document.getElementById("date").value;
+	addAndReduceMonth(1)
+	// document.getElementById("date").value = e.value
+});
+
+//鏌ョ湅鐓х墖
+mui(".mui-content").on("tap", ".ul-cardb1 li .r-btn", function() {
+	var id = this.getAttribute('id');
+	data2.data.id = id;
+	mui.ajax(url, {
+		type: "POST",
+		dataType: "json",
+		crossDomain: true,
+		contentType: "application/json;charset=utf-8",
+		data: JSON.stringify(data2),
+		success: function(result) {
+			if (result.code == "0000") {
+				ImgFile = result.data;
+				length = ImgFile.length;
+				currentImageIndex = 0;
+				// 鑾峰彇鍥剧墖鍏冪礌
+				const imgElement = document.getElementById('viewerImg');
+				// 鏇存崲src
+				imgElement.src = ImgFile[currentImageIndex].base64Img;
+				
+				
+			} else {
+				mui.toast(result.msg);
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+	$('.m-pop').css('display', 'flex');
+});
+//鍏抽棴鐓х墖
+$('.pop-bg,.m-pop .close').click(function(e) {
+	e.stopPropagation();
+	$('.m-pop').fadeOut();
+});
+
+    // 宸﹀彸绠ご浜嬩欢
+$('.left-arrow').on('click', showPrevImage(-1));
+$('.right-arrow').on('click', showNextImage(1));
+
+// 鏄剧ず涓婁竴寮犲浘鐗�
+function showPrevImage(index) {
+
+	if(index>0){
+		 currentImageIndex = (currentImageIndex + 1)%length;
+	}else{
+		 currentImageIndex = (currentImageIndex - 1)%length;
+	}
+	if(currentImageIndex<0){
+		currentImageIndex = length-1;
+	}
+	const imgElement = document.getElementById('viewerImg');
+	// 鏇存崲src
+	imgElement.src = ImgFile[currentImageIndex].base64Img;
+}
+
+//鏁伴噺妫�娴�
+function patrolClock() {
+
+	console.log(latitude)
+	console.log(longitude)
+	data1.data.latitude = latitude;
+	data1.data.longitude = longitude
+	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") {
+				// mui.toast(result.msg);
+				setInterval(getQuantityList(), 500)
+			} else {
+				mui.toast(result.msg);
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+}
diff --git a/igdss-app/js/admin/height-all.js b/igdss-app/js/admin/height-all.js
new file mode 100644
index 0000000..a04ba46
--- /dev/null
+++ b/igdss-app/js/admin/height-all.js
@@ -0,0 +1,91 @@
+var url = null;
+var dateTime;
+var heightList = null;
+var data = {
+	"interfaceId": "5206",
+	"tokenAuth": "",
+	"outId": "10206",
+	"reqDateTime": new Date(),
+	"data": {
+		"deptId": "",
+		"dataTime": ""
+	}
+};
+
+function init() {
+
+	var user = JSON.parse(localStorage.getItem('user'));
+	var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
+	data.tokenAuth = user.tokenAuth;
+	data.data.deptId = selectDeptId;
+	url = user.url + "/api/phone/v1/gateway";
+
+	//鑾峰彇璀﹀憡璁板綍
+	getHeightList();
+
+}
+
+
+//鑾峰彇璀﹀憡璁板綍
+function getHeightList() {
+	warnData = null;
+	//璧嬪�煎弬鏁扮殑鏃ユ湡
+	//璇锋眰
+	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") {
+				heightList = result.data;
+				renderHeight();
+			} else {
+				renderHeight();
+				mui.toast(result.msg);
+				console.log(JSON.stringify(result))
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+
+}
+
+//娓叉煋椤甸潰
+function renderHeight() {
+	var html = '';
+	if (heightList && heightList.length > 0) {
+		console.log(JSON.stringify(heightList))
+		$.each(heightList, function(index, item) {
+			html += '<li><div class="con myfancy"><div class="tit">搴撳尯鍚嶇О: <span>'+item.deptName+'</span></div><div class="txt">';
+			html += '<div class="box"><div class="group c"><div class="desc">'+item.depotData.name+'</div><div class="ort">浠撴埧鍚嶇О</div></div></div>';
+			html += '<div class="box"><div class="group c1"><div class="desc">'+item.depotData.foodVarietyName+'</div><div class="ort">绮鍝佺</div></div></div>';
+			html += '<div class="box"><div class="group level-1"><div class="desc">'+item.height+' 绫�</div><div class="ort">楂樺害</div></div></div></div>';
+			html += '<div class="tit coation">璁$畻鍌ㄩ噺: <span>'+item.weight+' KG</span></div>';
+
+			html += '<div class="time">妫�娴嬫椂闂�: <span>'+item.receiveDate+'</span></div></div></li>';
+
+		})
+	} else {
+			html += '<li><div class="con myfancy"><div class="tit">搴撳尯鍚嶇О: <span> -- </span></div><div class="txt">';
+			html += '<div class="box"><div class="group c"><div class="desc"> -- </div><div class="ort">浠撴埧鍚嶇О</div></div></div>';
+			html += '<div class="box"><div class="group c1"><div class="desc"> -- </div><div class="ort">绮鍝佺</div></div></div>';
+			html += '<div class="box"><div class="group level-1"><div class="desc"> -- 绫�</div><div class="ort">楂樺害</div></div></div></div>';
+			html += '<div class="tit coation">璁$畻鍌ㄩ噺: <span> -- KG</span></div>';
+
+			html += '<div class="time">妫�娴嬫椂闂�: <span> -- </span></div></div></li>';
+
+	}
+	$("#recordList").html(html);
+}
+
+//婊戝姩
+mui('.mui-scroll-wrapper').scroll({
+	indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
+	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
+	bounce: false, //鏄惁鍚敤鍥炲脊
+	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
+});
\ No newline at end of file
diff --git a/igdss-app/js/admin/index.js b/igdss-app/js/admin/index.js
index 9b8e9c7..49de0ba 100644
--- a/igdss-app/js/admin/index.js
+++ b/igdss-app/js/admin/index.js
@@ -1,5 +1,6 @@
 var listDept = null;
 var url;
+var userType;
 var slider = mui(".mui-slider");
 var data = {
 	"interfaceId": "5002",
@@ -33,17 +34,18 @@
 	mui('.mui-off-canvas-wrap').offCanvas().toggle();
 	var id = this.getAttribute("id");
 	var dept = listDept[id];
-	$("#deptName").html("鎵�鍦ㄥ簱鍖猴細" + dept.name);
+	$("#deptName").html("鎵�鍦ㄥ簱鍖猴細" + dept.kqmc);
 	localStorage.setItem('selectDeptId', JSON.stringify(dept.id));
 });
 
 //娓叉煋鍒嗗簱鍒楄〃
 function renderListDept() {
+	
 	if (listDept) {
 		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.kqmc + '</span>';
 			html += '<span class="mui-icon mui-icon-arrowright"></span>';
 			html += '</a></li>';
 		})
@@ -92,6 +94,15 @@
 	
 	var id = this.getAttribute("id");
 	if (id) {
+		
+		if(id.includes("work-manager")&userType!="30"){
+			mui.openWindow({
+				url: id + ".html",
+				id: id
+			})
+			return;
+		}
+
 		var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
 		if(selectDeptId){
 			mui.openWindow({
@@ -105,24 +116,3 @@
 		mui.alert('鏃犳潈鏌ョ湅姝ゅ姛鑳斤紒', '鎻愮ず', ["纭畾"], function() {}, "div");
 	}
 });
-
-// //璺宠浆姘旇薄椤甸潰
-// function getWeatherView() {
-// 	mui.openWindow({
-// 		url: "./weather.html?url=" +
-// 			"https://widget-page.heweather.net/h5/index.html?md=03456&bg=1&lc=accu&key=3cb8c045697b43c2b858751a145464aa&demo=true&v=_1617326246190&demo=true",
-// 		id: 'weather'
-// 	})
-// }
-
-// //璺宠浆璁惧鎿嶄綔椤甸潰
-// function getDeviceView(tag, typeName) {
-// 	mui.openWindow({
-// 		url: "device-listDepot.html",
-// 		id: "device-listDepot",
-// 		extras: {
-// 			tag: tag,
-// 			typeName: typeName
-// 		}
-// 	})
-// }
diff --git a/igdss-app/js/admin/inout-in-handle-list.js b/igdss-app/js/admin/inout-in-handle-list.js
index bdfa53f..fb25248 100644
--- a/igdss-app/js/admin/inout-in-handle-list.js
+++ b/igdss-app/js/admin/inout-in-handle-list.js
@@ -1,9 +1,9 @@
 var url = null;
 var inHandleData = null;
 var data = {
-	"interfaceId": "5206",
-	"sign": "10206",
-	"outId": "10206",
+	"interfaceId": "5401",
+	"sign": "10401",
+	"outId": "10401",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -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/v1/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data1.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
diff --git a/igdss-app/js/admin/inout-in-handle.js b/igdss-app/js/admin/inout-in-handle.js
index c2a2043..cb63a5c 100644
--- a/igdss-app/js/admin/inout-in-handle.js
+++ b/igdss-app/js/admin/inout-in-handle.js
@@ -7,8 +7,8 @@
 var uploadUrl; //鐓х墖涓婁紶璺緞
 var deHandle; //鍊间粨鎵i噸
 var data = {
-	"interfaceId": "5208",
-	"outId": "10208",
+	"interfaceId": "5402",
+	"outId": "10402",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -19,8 +19,8 @@
 };
 
 var data1 = {
-	"interfaceId": "5207",
-	"outId": "10207",
+	"interfaceId": "5402",
+	"outId": "10402",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -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/v1/gateway";
+	uploadUrl = user.url + "/api/phone/v1/upload-img";
 	data.tokenAuth = user.tokenAuth;
 	data1.tokenAuth = user.tokenAuth;
 	data1.data.handleUser = user.cname;
@@ -59,145 +59,165 @@
 
 }
 
+// function toHandle(tag) {
+// 	//鍊间粨
+// 	if (tag == 'start') { //寮�濮嬪�间粨
+// 		data1.data.type = tag;
+// 		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') {
+// 					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
+// 					if (result.data.progress == 'HANDLE') {
+// 						//鍒ゆ柇鍗曞瓙鏄惁宸茬粡寮�濮嬭繘琛屽�间粨
+
+// 						//鍙戦�佽姹傦紝寮�濮嬪�间粨
+// 						mui.ajax(url, {
+// 							type: "POST",
+// 							dataType: "json",
+// 							crossDomain: true,
+// 							contentType: "application/json;charset=utf-8",
+// 							data: JSON.stringify(data1),
+// 							success: function(result) {
+// 								mui.toast("寮�濮嬭绮紝璇蜂笂浼犲浘鐗囷紒");
+// 							},
+// 							error: function() {
+// 								mui.alert('寮�濮嬭绮彁浜ゅけ璐ワ紝璇烽噸鏂版搷浣滐紒', '鎻愮ず', ["纭畾"], function() {},
+// 									"div");
+// 							}
+// 						})
+// 					} else {
+// 						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
+// 						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
+// 					}
+// 				} else {
+// 					mui.toast(result.msg);
+// 				}
+// 			},
+// 			error: function() {
+// 				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+// 			}
+// 		})
+// 	} else { //缁撴潫鍊间粨
+// 		data1.data.type = tag;
+// 		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') {
+// 					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
+// 					if (result.data.progress == 'HANDLE') {
+// 						deHandle = $("#number")[0].value;
+// 						if (fileName1 == null || fileName2 == null) {
+// 							mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
+// 						} else {
+// 							if (deHandle) {
+// 								data1.data.type = tag;
+// 								data1.data.fileName1 = fileName1;
+// 								data1.data.fileName2 = fileName2;
+// 								data1.data.deHandle = deHandle;
+// 								mui.ajax(url, {
+// 									type: "POST",
+// 									dataType: "json",
+// 									crossDomain: true,
+// 									contentType: "application/json;charset=utf-8",
+// 									data: JSON.stringify(data1),
+// 									success: function(result) {
+// 										// mui.toast("鍊间粨瀹屾垚锛�");
+// 										mui.toast(result.msg)
+// 										//杩斿洖涓婁竴椤�
+// 										mui.back();
+// 									},
+// 									error: function(result) {
+// 										mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
+// 											"div");
+// 									}
+// 								})
+// 							} else {
+// 								mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
+// 							}
+// 						}
+
+// 					} else {
+// 						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
+// 						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
+// 					}
+// 				} else {
+// 					mui.toast(result.msg)
+// 				}
+
+// 			},
+// 			error: function() {
+// 				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+// 			}
+// 		})
+// 	}
+
+// }
+
+
+
 function toHandle(tag) {
 	//鍊间粨
-	if (tag == 'start') { //寮�濮嬪�间粨
-		data1.data.type = tag;
-		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') {
-					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
-					if (result.data.progress == 'HANDLE') {
-						//鍒ゆ柇鍗曞瓙鏄惁宸茬粡寮�濮嬭繘琛屽�间粨
+	data1.data.type = tag;
 
-						//鍙戦�佽姹傦紝寮�濮嬪�间粨
-						mui.ajax(url, {
-							type: "POST",
-							dataType: "json",
-							crossDomain: true,
-							contentType: "application/json;charset=utf-8",
-							data: JSON.stringify(data1),
-							success: function(result) {
-								mui.toast("寮�濮嬭绮紝璇蜂笂浼犲浘鐗囷紒");
-							},
-							error: function() {
-								mui.alert('寮�濮嬭绮彁浜ゅけ璐ワ紝璇烽噸鏂版搷浣滐紒', '鎻愮ず', ["纭畾"], function() {},
-									"div");
-							}
-						})
-					} else {
-						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
-						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
-					}
-				} else {
-					mui.toast(result.msg);
-				}
-			},
-			error: function() {
-				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		})
-	} else { //缁撴潫鍊间粨
-		data1.data.type = tag;
-		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') {
-					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
-					if (result.data.progress == 'HANDLE') {
-						deHandle = $("#number")[0].value;
-						if (fileName1 == null || fileName2 == null) {
-							mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
-						} else {
-							if (deHandle) {
-								data1.data.type = tag;
-								data1.data.fileName1 = fileName1;
-								data1.data.fileName2 = fileName2;
-								data1.data.deHandle = deHandle;
-								mui.ajax(url, {
-									type: "POST",
-									dataType: "json",
-									crossDomain: true,
-									contentType: "application/json;charset=utf-8",
-									data: JSON.stringify(data1),
-									success: function(result) {
-										// mui.toast("鍊间粨瀹屾垚锛�");
-										mui.toast(result.msg)
-										//杩斿洖涓婁竴椤�
-										mui.back();
-									},
-									error: function(result) {
-										mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
-											"div");
-									}
-								})
-							} else {
-								mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
-							}
-						}
-
-					} else {
-						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
-						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
-					}
-				} else {
+	deHandle = $("#number")[0].value;
+	if (fileName1 == null || fileName2 == null) {
+		mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
+	} else {
+		if (deHandle) {
+			data1.data.type = tag;
+			data1.data.fileName1 = fileName1;
+			data1.data.fileName2 = fileName2;
+			data1.data.deHandle = deHandle;
+			mui.ajax(url, {
+				type: "POST",
+				dataType: "json",
+				crossDomain: true,
+				contentType: "application/json;charset=utf-8",
+				data: JSON.stringify(data1),
+				success: function(result) {
+					// mui.toast("鍊间粨瀹屾垚锛�");
 					mui.toast(result.msg)
+					//杩斿洖涓婁竴椤�
+					mui.back();
+				},
+				error: function(result) {
+					mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
+						"div");
 				}
-
-			},
-			error: function() {
-				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		})
+			})
+		} else {
+			mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
+		}
 	}
-
+	
 }
+
+
 //鎷嶇収涓婁紶
 function choosePic(typeNum) {
-	// //鑾峰彇瀹氫綅淇℃伅
-	// if (latitude == null || longitude == null) {
-	// 	return;
-	// }
-	// 涓婁紶鍥剧墖鍓嶏紝璇锋眰鏌ョ湅鍗曞瓙鏄兘宸茬粡寮�濮嬪嵏绮�
-	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') {
-				var picker = new mui.PopPicker();
-				picker.setData([{
-					value: "cameraImg",
-					text: "鎷嶇収涓婁紶"
-				}, {
-					value: "galleryImg",
-					text: "浠庣浉鍐岄�夋嫨"
-				}])
-				picker.show(function(SelectedItem) {
-					console.log(JSON.stringify(SelectedItem));
-					if (SelectedItem[0].value == 'cameraImg') {
-						cameraImg(typeNum);
-					} else {
-						galleryImg(typeNum);
-					}
-				})
-			} else {
-				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		},
-		error: function() {
-			mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+	var picker = new mui.PopPicker();
+	picker.setData([{
+		value: "cameraImg",
+		text: "鎷嶇収涓婁紶"
+	}, {
+		value: "galleryImg",
+		text: "浠庣浉鍐岄�夋嫨"
+	}])
+	picker.show(function(SelectedItem) {
+		console.log(JSON.stringify(SelectedItem));
+		if (SelectedItem[0].value == 'cameraImg') {
+			cameraImg(typeNum);
+		} else {
+			galleryImg(typeNum);
 		}
 	})
 
diff --git a/igdss-app/js/admin/inout-out-handle-list.js b/igdss-app/js/admin/inout-out-handle-list.js
index b776db7..7e8f1b7 100644
--- a/igdss-app/js/admin/inout-out-handle-list.js
+++ b/igdss-app/js/admin/inout-out-handle-list.js
@@ -1,8 +1,8 @@
 var url = null;
 var outHandleData = null;
 var data = {
-	"interfaceId": "5206",
-	"outId": "10206",
+	"interfaceId": "5401",
+	"outId": "10401",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -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/v1/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data1.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
diff --git a/igdss-app/js/admin/inout-out-handle.js b/igdss-app/js/admin/inout-out-handle.js
index d46e298..a472b37 100644
--- a/igdss-app/js/admin/inout-out-handle.js
+++ b/igdss-app/js/admin/inout-out-handle.js
@@ -7,8 +7,8 @@
 var uploadUrl; //鐓х墖涓婁紶璺緞
 var deHandle; //鍊间粨鎵i噸
 var data = {
-	"interfaceId": "5208",
-	"outId": "10208",
+	"interfaceId": "5402",
+	"outId": "10402",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -19,8 +19,8 @@
 };
 
 var data1 = {
-	"interfaceId": "5207",
-	"outId": "10207",
+	"interfaceId": "5402",
+	"outId": "10402",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -36,13 +36,14 @@
 }
 
 
+
 //鍒濆鍖栨暟鎹�
 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/v1/gateway";
+	uploadUrl = user.url + "/api/phone/v1/upload-img";
 	data.tokenAuth = user.tokenAuth;
 	data1.tokenAuth = user.tokenAuth;
 	data1.data.handleUser = user.cname;
@@ -59,151 +60,210 @@
 
 }
 
+
 function toHandle(tag) {
 	//鍊间粨
-	if (tag == 'start') { //寮�濮嬪�间粨
-		data1.data.type = tag;
-		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') {
-					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
-					if (result.data.progress == 'HANDLE') {
-						//鍒ゆ柇鍗曞瓙鏄惁宸茬粡寮�濮嬭繘琛屽�间粨
+	data1.data.type = tag;
 
-						//鍙戦�佽姹傦紝寮�濮嬪�间粨
-						mui.ajax(url, {
-							type: "POST",
-							dataType: "json",
-							crossDomain: true,
-							contentType: "application/json;charset=utf-8",
-							data: JSON.stringify(data1),
-							success: function(result) {
-								mui.toast("寮�濮嬭绮紝璇蜂笂浼犲浘鐗囷紒");
-							},
-							error: function() {
-								mui.alert('寮�濮嬭绮彁浜ゅけ璐ワ紝璇烽噸鏂版搷浣滐紒', '鎻愮ず', ["纭畾"], function() {},
-									"div");
-							}
-						})
-					} else {
-						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
-						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
-					}
-				} else {
-					mui.toast(result.msg);
-				}
-			},
-			error: function() {
-				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		})
-	} else { //缁撴潫鍊间粨
-		data1.data.type = tag;
-		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') {
-					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
-					if (result.data.progress == 'HANDLE') {
-						deHandle = $("#number")[0].value;
-						if (fileName1 == null || fileName2 == null) {
-							mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
-						} else {
-							if (deHandle) {
-								data1.data.type = tag;
-								data1.data.fileName1 = fileName1;
-								data1.data.fileName2 = fileName2;
-								data1.data.deHandle = deHandle;
-								mui.ajax(url, {
-									type: "POST",
-									dataType: "json",
-									crossDomain: true,
-									contentType: "application/json;charset=utf-8",
-									data: JSON.stringify(data1),
-									success: function(result) {
-										// mui.toast("鍊间粨瀹屾垚锛�");
-										mui.toast(result.msg)
-										//杩斿洖涓婁竴椤�
-										mui.back();
-										
-									},
-									error: function(result) {
-										mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
-											"div");
-									}
-								})
-							} else {
-								mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
-							}
-						}
-
-					} else {
-						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
-						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
-					}
-				} else {
+	deHandle = $("#number")[0].value;
+	if (fileName1 == null || fileName2 == null) {
+		mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
+	} else {
+		if (deHandle) {
+			data1.data.type = tag;
+			data1.data.fileName1 = fileName1;
+			data1.data.fileName2 = fileName2;
+			data1.data.deHandle = deHandle;
+			console.log(JSON.stringify(fileName1))
+			console.log(JSON.stringify(fileName2))
+			mui.ajax(url, {
+				type: "POST",
+				dataType: "json",
+				crossDomain: true,
+				contentType: "application/json;charset=utf-8",
+				data: JSON.stringify(data1),
+				success: function(result) {
+					// mui.toast("鍊间粨瀹屾垚锛�");
 					mui.toast(result.msg)
+					//杩斿洖涓婁竴椤�
+					mui.back();
+				},
+				error: function(result) {
+					mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
+						"div");
 				}
-
-			},
-			error: function() {
-				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		})
+			})
+		} else {
+			mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
+		}
 	}
-
+	
 }
+// function toHandle(tag) {
+// 	//鍊间粨
+// 	if (tag == 'start') { //寮�濮嬪�间粨
+// 		data1.data.type = tag;
+// 		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') {
+// 					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
+// 					if (result.data.progress == 'HANDLE') {
+// 						//鍒ゆ柇鍗曞瓙鏄惁宸茬粡寮�濮嬭繘琛屽�间粨
+
+// 						//鍙戦�佽姹傦紝寮�濮嬪�间粨
+// 						mui.ajax(url, {
+// 							type: "POST",
+// 							dataType: "json",
+// 							crossDomain: true,
+// 							contentType: "application/json;charset=utf-8",
+// 							data: JSON.stringify(data1),
+// 							success: function(result) {
+// 								mui.toast("寮�濮嬭绮紝璇蜂笂浼犲浘鐗囷紒");
+// 							},
+// 							error: function() {
+// 								mui.alert('寮�濮嬭绮彁浜ゅけ璐ワ紝璇烽噸鏂版搷浣滐紒', '鎻愮ず', ["纭畾"], function() {},
+// 									"div");
+// 							}
+// 						})
+// 					} else {
+// 						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
+// 						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
+// 					}
+// 				} else {
+// 					mui.toast(result.msg);
+// 				}
+// 			},
+// 			error: function() {
+// 				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+// 			}
+// 		})
+// 	} else { //缁撴潫鍊间粨
+// 		data1.data.type = tag;
+// 		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') {
+// 					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
+// 					if (result.data.progress == 'HANDLE') {
+// 						deHandle = $("#number")[0].value;
+// 						if (fileName1 == null || fileName2 == null) {
+// 							mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
+// 						} else {
+// 							if (deHandle) {
+// 								data1.data.type = tag;
+// 								data1.data.fileName1 = fileName1;
+// 								data1.data.fileName2 = fileName2;
+// 								data1.data.deHandle = deHandle;
+// 								mui.ajax(url, {
+// 									type: "POST",
+// 									dataType: "json",
+// 									crossDomain: true,
+// 									contentType: "application/json;charset=utf-8",
+// 									data: JSON.stringify(data1),
+// 									success: function(result) {
+// 										// mui.toast("鍊间粨瀹屾垚锛�");
+// 										mui.toast(result.msg)
+// 										//杩斿洖涓婁竴椤�
+// 										mui.back();
+										
+// 									},
+// 									error: function(result) {
+// 										mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
+// 											"div");
+// 									}
+// 								})
+// 							} else {
+// 								mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
+// 							}
+// 						}
+
+// 					} else {
+// 						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
+// 						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
+// 					}
+// 				} else {
+// 					mui.toast(result.msg)
+// 				}
+
+// 			},
+// 			error: function() {
+// 				mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+// 			}
+// 		})
+// 	}
+
+// }
 //鎷嶇収涓婁紶
+// function choosePic(typeNum) {
+// 	// //鑾峰彇瀹氫綅淇℃伅
+// 	// if (latitude == null || longitude == null) {
+// 	// 	return;
+// 	// }
+// 	// 涓婁紶鍥剧墖鍓嶏紝璇锋眰鏌ョ湅鍗曞瓙鏄兘宸茬粡寮�濮嬪嵏绮�
+// 	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') {
+// 				var picker = new mui.PopPicker();
+// 				picker.setData([{
+// 					value: "cameraImg",
+// 					text: "鎷嶇収涓婁紶"
+// 				}, {
+// 					value: "galleryImg",
+// 					text: "浠庣浉鍐岄�夋嫨"
+// 				}])
+// 				picker.show(function(SelectedItem) {
+// 					console.log(JSON.stringify(SelectedItem));
+// 					if (SelectedItem[0].value == 'cameraImg') {
+// 						cameraImg(typeNum);
+// 					} else {
+// 						galleryImg(typeNum);
+// 					}
+// 				})
+// 			} else {
+// 				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
+// 			}
+// 		},
+// 		error: function() {
+// 			mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+// 		}
+// 	})
+
+// };
 function choosePic(typeNum) {
-	// //鑾峰彇瀹氫綅淇℃伅
-	// if (latitude == null || longitude == null) {
-	// 	return;
-	// }
-	// 涓婁紶鍥剧墖鍓嶏紝璇锋眰鏌ョ湅鍗曞瓙鏄兘宸茬粡寮�濮嬪嵏绮�
-	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') {
-				var picker = new mui.PopPicker();
-				picker.setData([{
-					value: "cameraImg",
-					text: "鎷嶇収涓婁紶"
-				}, {
-					value: "galleryImg",
-					text: "浠庣浉鍐岄�夋嫨"
-				}])
-				picker.show(function(SelectedItem) {
-					console.log(JSON.stringify(SelectedItem));
-					if (SelectedItem[0].value == 'cameraImg') {
-						cameraImg(typeNum);
-					} else {
-						galleryImg(typeNum);
-					}
-				})
-			} else {
-				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		},
-		error: function() {
-			mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+
+	var picker = new mui.PopPicker();
+	picker.setData([{
+		value: "cameraImg",
+		text: "鎷嶇収涓婁紶"
+	}, {
+		value: "galleryImg",
+		text: "浠庣浉鍐岄�夋嫨"
+	}])
+	picker.show(function(SelectedItem) {
+		console.log(JSON.stringify(SelectedItem));
+		if (SelectedItem[0].value == 'cameraImg') {
+			cameraImg(typeNum);
+		} else {
+			galleryImg(typeNum);
 		}
 	})
+			
 
 };
-
 //鐩告満鎷嶇収
 function cameraImg(typeNum) {
 	var cmr = plus.camera.getCamera();
diff --git a/igdss-app/js/admin/inout-real.js b/igdss-app/js/admin/inout-real.js
index 3703003..e19f3b5 100644
--- a/igdss-app/js/admin/inout-real.js
+++ b/igdss-app/js/admin/inout-real.js
@@ -2,9 +2,9 @@
 var recordData = null;
 var recordList = null;
 var data = {
-	"interfaceId": "5205",
-	"sign": "10205",
-	"outId": "10205",
+	"interfaceId": "5405",
+	"sign": "10405",
+	"outId": "10405",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -12,11 +12,12 @@
 	}
 };
 
+
 //鍒濆鍖栨暟鎹�
 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/v1/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
 
diff --git a/igdss-app/js/admin/login.js b/igdss-app/js/admin/login.js
index cdb0338..1919f3d 100644
--- a/igdss-app/js/admin/login.js
+++ b/igdss-app/js/admin/login.js
@@ -71,17 +71,15 @@
 	//璁剧疆璇锋眰鍙�
 	data.data.username = username;
 	data.data.password = password;
-    console.log(url + "/api-phone/v35/login");
-    console.log(JSON.stringify(data));
 	//鍙戦�佺櫥闄嗚姹�
-	mui.ajax(url + "/api-phone/v35/login", {
+	mui.ajax(url + "/api/phone/v1/login", {
 		type: "POST",
 		dataType: "json",
 		crossDomain: true,
 		contentType: "application/json;charset=utf-8",
 		data: JSON.stringify(data),
 		success: function(result) {
-			
+	
 			wt.close();
 			//鐧诲綍鎴愬姛鍒欒繘鍏ヤ富椤甸潰
 			if (result.code == "0000") {
@@ -97,7 +95,8 @@
 					"tokenAuth": result.data.tokenAuth,
 					"companyId": result.data.companyId,
 					"deptId": result.data.deptId,
-					"deptName": result.data.deptName
+					"deptName": result.data.deptName,
+					"userType": result.data.type
 				};
 				localStorage.setItem('user', JSON.stringify(regInfo));
 				localStorage.removeItem("selectDeptId");
diff --git a/igdss-app/js/admin/security-ai.js b/igdss-app/js/admin/security-ai.js
new file mode 100644
index 0000000..1546676
--- /dev/null
+++ b/igdss-app/js/admin/security-ai.js
@@ -0,0 +1,199 @@
+var url = null;
+var uploadUrl = null;
+var PatrolList = null;
+var ImgFile = null;
+var dateTime;
+//AI璁板綍鍒楄〃
+var data = {
+	"interfaceId": "5110",
+	"outId": "10110",
+	"reqDateTime": new Date(),
+	"tokenAuth": "",
+	"data": {
+		"deptId": "",
+		"dateTime": "",
+	}
+};
+//AI宸℃洿鐓х墖鏌ョ湅
+var data1 = {
+	"interfaceId": "5111",
+	"outId": "10111",
+	"reqDateTime": new Date(),
+	"tokenAuth": "",
+	"data": {
+		"imgName": "",
+	}
+};
+
+
+function init() {
+	var user = JSON.parse(localStorage.getItem('user'));
+	var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
+	url = user.url + "/api/phone/v1/gateway";
+	data.tokenAuth = user.tokenAuth;
+	data1.tokenAuth = user.tokenAuth;
+	data1.data.userName = user.cname;
+	deptId = selectDeptId;
+	if(deptId == null){
+		deptId = user.deptId
+	}
+	data.data.deptId = deptId;
+	data1.data.deptId = deptId;
+	dateTime = getDate(new Date())
+	document.getElementById("date").value = dateTime;
+	//鑾峰彇宸℃洿璁板綍
+	getPatrolList()
+
+}
+
+//榛樿鑾峰彇褰撳墠鏃ユ湡(yyyy-MM-dd)
+function getDate(date) {
+	var year = date.getFullYear();
+	var month, day;
+	month = date.getMonth() + 1;
+	if (month > 0 && month <= 9) {
+		month = "0" + month;
+	}
+	day = date.getDate();
+	if (day > 0 && day <= 9) {
+		day = "0" + day;
+	}
+	return year + "-" + month + "-" + day
+}
+//鍔犲噺澶╂暟
+function addAndReduceMonth(tag) {
+
+	var date = new Date(dateTime);
+	date = date.setDate(date.getDate() + tag);
+	date = new Date(date);
+	dateTime = getDate(date);
+	document.getElementById("date").value = dateTime;
+	//鑾峰彇宸℃洿璁板綍
+	getPatrolList()
+}
+
+//閫夋嫨鏃ユ湡
+function chooseDate() {
+	var dtpicker = new mui.DtPicker({
+		type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 
+		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� 
+		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 
+		value: dateTime
+	})
+	var time = dateTime;
+	dtpicker.show(function(e) {
+		dateTime = e.value;
+		document.getElementById("date").value = e.value
+		if (time != dateTime) {
+			getPatrolList();
+		}
+	})
+}
+//鑾峰彇宸℃洿璁板綍
+function getPatrolList() {
+	//璧嬪�煎弬鏁扮殑鏃ユ湡
+	data.data.dateTime = dateTime;
+	console.log(JSON.stringify(data.data), "AI浜嬩欢绠$悊", "security-ai")
+	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") {
+				PatrolList = result.data;
+				renderPatrol();
+			} else {
+				renderPatrol();
+				mui.toast(result.msg);
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+
+}
+
+function renderPatrol() {
+	var html = '';
+	if (PatrolList && PatrolList.length > 0) {
+		$.each(PatrolList, function(index, item) {
+			html += '<li><div class="item"><div class="top">'
+			if(item.bizType =="01"){
+				html += '<div class="text">'+item.deptName+'</div><div class="r-btn r-warn1" imgName = "' + item.imgName +'">璀﹀憡</div></div>';
+			}
+			if(item.bizType =="02"){
+				html += '<div class="text">'+item.deptName+'</div><div class="r-btn r-warn2" imgName = "' + item.imgName +'">棰勮</div></div>';
+			}
+			if(item.bizType =="03"){
+				html += '<div class="text">'+item.deptName+'</div><div class="r-btn r-warn3" imgName = "' + item.imgName +'">閫氱煡</div></div>';
+			}
+			html += '<div class="top-tit"><div class="text">鎶撴媿璁惧锛�'+item.serId+'</div></div>';
+			html += '<div class="cards"><div class="cd"><div class="con user">'
+			html += '<div class="tit">鏍囩</div><div class="txt">' + item.tags + '</div></div></div>';
+			html += '<div class="cd"><div class="con loc"><div class="tit">鏃堕棿</div>'
+			html += '<div class="txt">' +item.time + '</div></div></div></div></div></li>'
+		})
+	} else {
+		html += '<li><div class="item"><div class="top">'
+		html += '<div class="text"> ----- </div><div class="r-btn r-warn3" >閫氱煡</div></div>';
+		html += '<div class="top-tit"><div class="text">鎶撴媿璁惧锛�----- </div></div>';
+		html += '<div class="cards"><div class="cd"><div class="con user">'
+		html += '<div class="tit">鏍囩</div><div class="txt">--,--</div></div></div>';
+		html += '<div class="cd"><div class="con loc"><div class="tit">鏃堕棿</div>'
+		html += '<div class="txt">'+dateTime+'</div></div></div></div></div></li>'
+	}
+	$("#recordList").html(html)
+}
+mui('.mui-scroll-wrapper').scroll({
+	indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
+	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
+	bounce: false, //鏄惁鍚敤鍥炲脊
+	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
+});
+
+mui(".mui-content").on("tap", ".g-date_box .prev", function() {
+	var curDate = document.getElementById("date").value;
+	addAndReduceMonth(-1)
+	// document.getElementById("date").value = e.value
+});
+mui(".mui-content").on("tap", ".g-date_box .next", function() {
+	var curDate = document.getElementById("date").value;
+	addAndReduceMonth(1)
+	// document.getElementById("date").value = e.value
+});
+
+//鏌ョ湅鐓х墖
+mui(".mui-content").on("tap", ".ul-cardb1 li .r-btn", function() {
+	var imgName = this.getAttribute('imgName');
+	data1.data.imgName = imgName;
+	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") {
+				ImgFile = result.data;
+				var html = '<img src="' + ImgFile.imgName + '" alt="" class="img" />';
+				$('#viewerImg').html(html);
+			} else {
+				// var html = '<img src="" alt="" class="img" />';
+				// $('#viewerImg').html(html);
+				mui.toast(result.msg);
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+	$('.m-pop').css('display', 'flex');
+});
+//鍏抽棴鐓х墖
+$('.pop-bg,.m-pop .close').click(function(e) {
+	e.stopPropagation();
+	$('.m-pop').fadeOut();
+});
diff --git a/igdss-app/js/admin/security-patrol.js b/igdss-app/js/admin/security-patrol.js
index d03d23e..75b4969 100644
--- a/igdss-app/js/admin/security-patrol.js
+++ b/igdss-app/js/admin/security-patrol.js
@@ -1,5 +1,6 @@
 var url = null;
 var uploadUrl = null;
+var deptId = null;
 var PatrolList = null;
 var ImgFile = null;
 var dateTime;
@@ -11,8 +12,8 @@
 var ee = 0.00669342162296594323;
 //鐢靛瓙宸℃洿璁板綍
 var data = {
-	"interfaceId": "5601",
-	"outId": "10601",
+	"interfaceId": "5105",
+	"outId": "10105",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -22,8 +23,8 @@
 };
 //鐢靛瓙宸℃洿鎵撳崱
 var data1 = {
-	"interfaceId": "5602",
-	"outId": "10602",
+	"interfaceId": "5106",
+	"outId": "10106",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -36,8 +37,8 @@
 };
 //宸℃洿鐓х墖鏌ョ湅
 var data2 = {
-	"interfaceId": "5603",
-	"outId": "10603",
+	"interfaceId": "5107",
+	"outId": "10107",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -48,16 +49,24 @@
 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/v1/gateway";
+	uploadUrl = user.url + "/api/phone/v1/patrol-img";
 	data.tokenAuth = user.tokenAuth;
 	data1.tokenAuth = user.tokenAuth;
 	data1.data.userName = user.cname;
 	data2.tokenAuth = user.tokenAuth;
-	data.data.deptId = selectDeptId;
-	data1.data.deptId = selectDeptId;
+
+	deptId = selectDeptId;
+	if(deptId == null){
+		deptId = user.deptId
+	}
+	data.data.deptId = deptId;
+	data1.data.deptId = deptId;
 	dateTime = getDate(new Date())
 	document.getElementById("date").value = dateTime;
+	if(user.userType == "10"){
+		document.getElementById('cameraImgBtn').remove();
+	}
 	//鑾峰彇宸℃洿璁板綍
 	getPatrolList()
 
@@ -110,7 +119,6 @@
 function getPatrolList() {
 	//璧嬪�煎弬鏁扮殑鏃ユ湡
 	data.data.dateTime = dateTime;
-	console.log(JSON.stringify(data.data), "鐢靛瓙宸℃洿璁板綍", "security-patrol")
 	mui.ajax(url, {
 		type: "POST",
 		dataType: "json",
@@ -142,7 +150,7 @@
 			html += '<div class="date">' + item.createTime + '</div><div class="r-btn" id = "' + item.id +
 				'">鏌ョ湅鐓х墖</div></div>';
 			html += '<div class="cards"><div class="cd"><div class="con user">'
-			html += '<div class="tit">鎵撳崱浜�</div><div class="txt">' + item.userName + '</div></div></div>';
+			html += '<div class="tit">鎵撳崱浜�</div><div class="txt">' + item.createBy + '</div></div></div>';
 			html += '<div class="cd"><div class="con loc"><div class="tit">鍧愭爣</div>'
 			html += '<div class="txt">' + item.longitude + ', ' + item.latitude +
 				'</div></div></div></div></div></li>'
@@ -189,7 +197,7 @@
 		success: function(result) {
 			if (result.code == "0000") {
 				ImgFile = result.data;
-				var html = '<img src="' + ImgFile.base64Img + '" alt="" class="img" />';
+				var html = '<img src="' + ImgFile.imgName + '" alt="" class="img" />';
 				$('#viewerImg').html(html);
 			} else {
 				// var html = '<img src="" alt="" class="img" />';
@@ -232,6 +240,7 @@
 
 //涓婁紶鐓х墖
 function uploadImg(path) {
+	console.log("patrol")
 	//杞湀绛夊緟妗�
 	var wt = plus.nativeUI.showWaiting();
 	//涓婁紶
@@ -255,7 +264,7 @@
 			}
 		});
 	//涓氬姟绫诲瀷
-	task.addData("bizType", "02");
+	task.addData("deptId", deptId);
 	//鍥剧墖淇℃伅
 	task.addFile(path, {
 		key: "uploadkey"
@@ -280,6 +289,7 @@
 			if (result.code == "0000") {
 				// mui.toast(result.msg);
 				setInterval(getPatrolList(), 500)
+				
 			} else {
 				mui.toast(result.msg);
 			}
diff --git a/igdss-app/js/admin/security-snapshot.js b/igdss-app/js/admin/security-snapshot.js
new file mode 100644
index 0000000..0f25039
--- /dev/null
+++ b/igdss-app/js/admin/security-snapshot.js
@@ -0,0 +1,194 @@
+var url = null;
+var uploadUrl = null;
+var PatrolList = null;
+var ImgFile = null;
+var dateTime;
+var deptId;
+//鎶撴媿璁板綍鍒楄〃
+var data = {
+	"interfaceId": "5108",
+	"outId": "10108",
+	"reqDateTime": new Date(),
+	"tokenAuth": "",
+	"data": {
+		"deptId": "",
+		"dateTime": "",
+	}
+};
+//鎶撴媿鐓х墖鏌ョ湅
+var data1 = {
+	"interfaceId": "5109",
+	"outId": "10109",
+	"reqDateTime": new Date(),
+	"tokenAuth": "",
+	"data": {
+		"id": "",
+	}
+};
+
+function init() {
+	var user = JSON.parse(localStorage.getItem('user'));
+	var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
+	url = user.url + "/api/phone/v1/gateway";
+	data.tokenAuth = user.tokenAuth;
+	data1.tokenAuth = user.tokenAuth;
+	data1.data.userName = user.cname;
+	deptId = selectDeptId;
+	if(deptId == null){
+		deptId = user.deptId
+	}
+	data.data.deptId = deptId;
+	data1.data.deptId = deptId;
+	dateTime = getDate(new Date())
+	document.getElementById("date").value = dateTime;
+	//鑾峰彇宸℃洿璁板綍
+	getPatrolList()
+
+}
+
+//榛樿鑾峰彇褰撳墠鏃ユ湡(yyyy-MM-dd)
+function getDate(date) {
+	var year = date.getFullYear();
+	var month, day;
+	month = date.getMonth() + 1;
+	if (month > 0 && month <= 9) {
+		month = "0" + month;
+	}
+	day = date.getDate();
+	if (day > 0 && day <= 9) {
+		day = "0" + day;
+	}
+	return year + "-" + month + "-" + day
+}
+//鍔犲噺澶╂暟
+function addAndReduceMonth(tag) {
+
+	var date = new Date(dateTime);
+	date = date.setDate(date.getDate() + tag);
+	date = new Date(date);
+	dateTime = getDate(date);
+	document.getElementById("date").value = dateTime;
+	//鑾峰彇宸℃洿璁板綍
+	getPatrolList()
+}
+
+//閫夋嫨鏃ユ湡
+function chooseDate() {
+	var dtpicker = new mui.DtPicker({
+		type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 
+		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� 
+		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 
+		value: dateTime
+	})
+	var time = dateTime;
+	dtpicker.show(function(e) {
+		dateTime = e.value;
+		document.getElementById("date").value = e.value
+		if (time != dateTime) {
+			getPatrolList();
+		}
+	})
+}
+//鑾峰彇宸℃洿璁板綍
+function getPatrolList() {
+	//璧嬪�煎弬鏁扮殑鏃ユ湡
+	data.data.dateTime = dateTime;
+	console.log(JSON.stringify(data.data), "鎶撴媿绠$悊", "security-patrol")
+	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") {
+				PatrolList = result.data;
+				renderPatrol();
+			} else {
+				renderPatrol();
+				mui.toast(result.msg);
+				// console.log(JSON.stringify(result))
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+
+}
+
+function renderPatrol() {
+	var html = '';
+	if (PatrolList && PatrolList.length > 0) {
+		$.each(PatrolList, function(index, item) {
+			html += '<li><div class="item"><div class="top">'
+			html += '<div class="text">'+item.deptName+'</div><div class="r-btn r-warn1" id = "' + item.id +'">鏌ョ湅鐓х墖</div></div>';
+			html += '<div class="top-tit"><div class="text">鎶撴媿璁惧锛�'+item.cameraId+'</div></div>';
+			html += '<div class="cards"><div class="cd"><div class="con user">'
+			html += '<div class="tit">鏍囩</div><div class="txt">' + item.tags + '</div></div></div>';
+			html += '<div class="cd"><div class="con loc"><div class="tit">鏃堕棿</div>'
+			html += '<div class="txt">' +item.snapTime + '</div></div></div></div></div></li>'
+		})
+	} else {
+		html += '<li><div class="item"><div class="top">'
+		html += '<div class="text"> ----- </div><div class="r-btn r-warn1"  id = "0">鏌ョ湅鐓х墖</div></div>';
+		html += '<div class="top-tit"><div class="text">鎶撴媿璁惧锛�----- </div></div>';
+		html += '<div class="cards"><div class="cd"><div class="con user">'
+		html += '<div class="tit">鏍囩</div><div class="txt">--,--</div></div></div>';
+		html += '<div class="cd"><div class="con loc"><div class="tit">鏃堕棿</div>'
+		html += '<div class="txt">'+dateTime+'</div></div></div></div></div></li>'
+	}
+	$("#recordList").html(html)
+}
+
+mui('.mui-scroll-wrapper').scroll({
+	indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
+	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
+	bounce: false, //鏄惁鍚敤鍥炲脊
+	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
+});
+
+mui(".mui-content").on("tap", ".g-date_box .prev", function() {
+	var curDate = document.getElementById("date").value;
+	addAndReduceMonth(-1)
+	// document.getElementById("date").value = e.value
+});
+mui(".mui-content").on("tap", ".g-date_box .next", function() {
+	var curDate = document.getElementById("date").value;
+	addAndReduceMonth(1)
+	// document.getElementById("date").value = e.value
+});
+
+//鏌ョ湅鐓х墖
+mui(".mui-content").on("tap", ".ul-cardb1 li .r-btn", function() {
+	var id = this.getAttribute('id');
+	data1.data.id = id;
+	console.log(JSON.stringify(data1))
+	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") {
+				ImgFile = result.data;
+				var html = '<img src="' + ImgFile.imgName + '" alt="" class="img" />';
+				$('#viewerImg').html(html);
+			} else {
+				// var html = '<img src="" alt="" class="img" />';
+				// $('#viewerImg').html(html);
+				mui.toast(result.msg);
+			}
+		},
+		error: function() {
+			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
+		}
+	})
+	$('.m-pop').css('display', 'flex');
+});
+//鍏抽棴鐓х墖
+$('.pop-bg,.m-pop .close').click(function(e) {
+	e.stopPropagation();
+	$('.m-pop').fadeOut();
+});
diff --git a/igdss-app/js/admin/security-video.js b/igdss-app/js/admin/security-video.js
index 4f3e1c7..e133cf6 100644
--- a/igdss-app/js/admin/security-video.js
+++ b/igdss-app/js/admin/security-video.js
@@ -2,18 +2,18 @@
 var videoList = null;
 var playData = null;
 var data = {
-	"interfaceId": "5604",
+	"interfaceId": "5103",
 	"tokenAuth": "",
-	"outId": "56041",
+	"outId": "10103",
 	"reqDateTime": new Date(),
 	"data": {
 		"deptId": ""
 	}
 };
 var data1 = {
-	"interfaceId": "5605",
+	"interfaceId": "5104",
 	"tokenAuth": "",
-	"outId": "56051",
+	"outId": "10104",
 	"reqDateTime": new Date(),
 	"data": {
 		"id": "",
@@ -27,8 +27,13 @@
 	var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
 	data.tokenAuth = user.tokenAuth;
 	data1.tokenAuth = user.tokenAuth;
-	data.data.deptId = selectDeptId;
-	url = user.url + "/api-phone/v35/gateway";
+	deptId = selectDeptId;
+	if(deptId == null){
+		deptId = user.deptId
+	}
+	data.data.deptId = deptId;
+	
+	url = user.url + "/api/phone/v1/gateway";
 
 	getVideoList();
 
@@ -141,7 +146,7 @@
 			if (result.code == "0000") {
 				playData = result.data;
 				console.log(JSON.stringify(playData))
-				toVideo(playData.playAddr);
+				toVideo(playData.playUrl);
 			} else {
 				// toVideo("http://player.alicdn.com/video/aliyunmedia.mp4");
 				toVideo('')
@@ -157,8 +162,8 @@
 
 function toVideo(playAddr) {
 	var html = '';
-	html += '<video src="' + playAddr +
-		'" poster="images/pos1.png" class="video" webkit-playsinline="true" playsinline="true" controls></video>'
+	html += '<iframe src="' + playAddr +
+		'" poster="images/pos1.png" class="video" webkit-playsinline="true" playsinline="true" controls></iframe>'
 	$("#toVideo").html(html);
 }
 
diff --git a/igdss-app/js/admin/warn-list.js b/igdss-app/js/admin/warn-list.js
deleted file mode 100644
index 34116fa..0000000
--- a/igdss-app/js/admin/warn-list.js
+++ /dev/null
@@ -1,266 +0,0 @@
-var url = null;
-var dateTime;
-var warnList = null;
-var data = {
-	"interfaceId": "5801",
-	"tokenAuth": "",
-	"outId": "58011",
-	"reqDateTime": new Date(),
-	"data": {
-		"deptId": "",
-		"dataTime": ""
-	}
-};
-var dataPop = {
-	"interfaceId": "5802",
-	"tokenAuth": "",
-	"outId": "58021",
-	"reqDateTime": new Date(),
-	"data": {
-		"id": "",
-		"status": "",
-		"remark": "",
-		"completeUser":""
-	}
-};
-
-function init() {
-
-	console.log("init")
-	var user = JSON.parse(localStorage.getItem('user'));
-	var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
-	data.tokenAuth = user.tokenAuth;
-	dataPop.tokenAuth = user.tokenAuth;
-	data.data.deptId = selectDeptId;
-	dataPop.data.completeUser = user.cname
-	url = user.url + "/api-phone/v35/gateway";
-
-	dateTime = getDate(new Date())
-	document.getElementById("date").value = dateTime
-
-	//鑾峰彇璀﹀憡璁板綍
-	getWarnList();
-
-}
-
-
-//鑾峰彇璀﹀憡璁板綍
-function getWarnList() {
-	warnData = null;
-	//璧嬪�煎弬鏁扮殑鏃ユ湡
-	data.data.dateTime = dateTime;
-	//璇锋眰
-	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") {
-				warnList = result.data;
-				renderWarn();
-			} else {
-				renderWarn();
-				mui.toast(result.msg);
-				console.log(JSON.stringify(result))
-			}
-		},
-		error: function() {
-			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
-		}
-	})
-
-}
-
-
-//榛樿鑾峰彇褰撳ぉ鏃ユ湡(yyyy-MM-dd)
-function getDate() {
-	var date = new Date();
-	var year = date.getFullYear();
-	var month, day;
-	month = date.getMonth() + 1;
-	if (month >= 1 && month <= 9) {
-		month = "0" + month;
-	}
-	day = date.getDate();
-	if (day >= 1 && day <= 9) {
-		day = "0" + day;
-	}
-	return year + "-" + month + "-" + day
-}
-//榛樿鑾峰彇褰撳墠鏃ユ湡(yyyy-MM-dd)
-function getDate(date) {
-	var year = date.getFullYear();
-	var month, day;
-	month = date.getMonth() + 1;
-	if (month >= 1 && month <= 9) {
-		month = "0" + month;
-	}
-	day = date.getDate();
-	if (day >= 1 && day <= 9) {
-		day = "0" + day;
-	}
-	return year + "-" + month + "-" + day;
-}
-
-//鍔犲噺澶╂暟
-function addAndReduceMonth(tag) {
-	var date = new Date(dateTime);
-	date = date.setDate(date.getDate() + tag);
-	date = new Date(date);
-	dateTime = getDate(date);
-	document.getElementById("date").value = dateTime
-	//鑾峰彇璀﹀憡璁板綍
-	getWarnList();
-}
-
-function chooseDate() {
-	var dtpicker = new mui.DtPicker({
-		type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 
-		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� 
-		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 
-		value: dateTime
-	})
-	var time = dateTime
-	dtpicker.show(function(e) {
-		dateTime = e.value;
-		document.getElementById("date").value = e.value
-		if(time != dateTime){
-			getWarnList();
-		}
-	})
-}
-
-//娓叉煋椤甸潰
-function renderWarn() {
-	var html = '';
-	if (warnList && warnList.length > 0) {
-		$.each(warnList, function(index, item) {
-			html += '<li><div class="con myfancy" id="'+item.id+'" remark="'+(item.remark == null ? "" : item.remark) +'" status="'+item.status+'" >';
-			if (item.status == '10') {
-				html += '<span class="type">鏈鐞�</span>';
-			}else if (item.status == '20') {
-				html += '<span class="type k">澶勭悊寤惰繜</span>';
-			}else if (item.status == '30') {
-				html += '<span class="type k">宸插鐞�</span>';
-			}else if (item.status == '40') {
-				html += '<span class="type k">蹇界暐</span>';
-			}
-			html += '<div class="tit">璀﹀憡鍚嶇О: <span>' + item.name + '</span></div>';
-			html += '<div class="txt">';
-			html += '<div class="box"><div class="group c"><div class="desc">' + item.type +
-				'</div><div class="ort">璀﹀憡绫诲瀷</div></div></div>';
-			html += '<div class="box"><div class="group c1"><div class="desc">' + (item.depotName == null ||
-					item.depotName == "" ? "--" : item.depotName) +
-				'</div><div class="ort">浠撳簱鍚嶇О</div></div></div>';
-			if (item.level == '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') {
-				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="time">' + item.time + '</div></div></li>';
-		})
-	} else {
-		html += '<li><div class="con myfancy" id="0" remark="鏆傛棤璀﹀憡淇℃伅" status="30">';
-		html += '<span class="type k">宸插鐞�</span>';
-		html += '<div class="tit">璀﹀憡鍚嶇О: <span>鏆傛棤璀﹀憡淇℃伅</span></div>';
-		html += '<div class="txt">';
-		html += '<div class="box"><div class="group c"><div class="desc">--</div><div class="ort">璀﹀憡绫诲瀷</div></div></div>';
-		html += '<div class="box"><div class="group c1"><div class="desc">--</div><div class="ort">浠撳簱鍚嶇О</div></div></div>';
-		html += '<div class="box"><div class="group level-1"><div class="desc">鏃�</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
-		html += '<div class="tit coation">璀﹀憡鍐呭: <span>鏃犺鍛婂唴瀹�</span></div>';
-		html += '<div class="time">'+dateTime+'</div></div></li>';
-		// html +=
-		// 	'<li><div class="con myfancy" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤璀﹀憡淇℃伅</div></li>';
-	}
-	$("#recordList").html(html);
-}
-
-
-//鎵撳紑寮圭獥
-mui(".mui-scroll-wrapper").on("tap", ".m-caution-mana ul li .myfancy", function() {
-	var warnId = this.getAttribute("id");
-	var status = this.getAttribute("status");
-	var remark = this.getAttribute("remark");
-	dataPop.data.id = warnId;
-	var html = ''
-	if (status == '10') {
-		html += '<div type="button" class="mui-btn cancel"  onclick="handleWarn(\'' + 1 + '\')">蹇界暐</div>'
-		html += '<div type="button" class="mui-btn confirm" onclick="handleWarn(\'' + 2 + '\')">澶勭悊</div>'
-	}
-	$("#handleWarn").html(html);
-	document.getElementById("textareaPop").value = remark;
-	$('#m-pop').css('display', 'flex');
-})
-
-// //鎵撳紑寮圭獥
-// function openPop(warnId, remark, status) {
-// 	dataPop.data.id = warnId;
-// 	var html = ''
-// 	if (status == '10') {
-// 		html += '<div type="button" class="mui-btn cancel"  onclick="handleWarn(\'' + 1 + '\')">蹇界暐</div>'
-// 		html += '<div type="button" class="mui-btn confirm" onclick="handleWarn(\'' + 2 + '\')">澶勭悊</div>'
-// 	}
-// 	$("#handleWarn").html(html);
-// 	document.getElementById("textareaPop").value = remark;
-// 	$('#m-pop').css('display', 'flex');
-// }
-//璀﹀憡澶勭悊
-function handleWarn(tag) {
-	if (tag == "1") {
-		dataPop.data.status = '40'
-		// mui.toast("蹇界暐璀﹀憡");
-	}
-	if (tag == "2") {
-		dataPop.data.status = '30'
-		// mui.toast("璀﹀憡澶勭悊");
-	}
-	dataPop.data.remark = document.getElementById("textareaPop").value;
-	console.log(JSON.stringify(dataPop.data),"warn-list")
-	//璇锋眰
-	mui.ajax(url, {
-		type: "POST",
-		dataType: "json",
-		crossDomain: true,
-		contentType: "application/json;charset=utf-8",
-		data: JSON.stringify(dataPop),
-		success: function(result) {
-			if (result.code == "0000") {
-				mui.toast(result.msg);
-				getWarnList();
-				// console.log(JSON.stringify(result))
-			} else {
-				mui.toast(result.msg);
-				getWarnList();
-				// console.log(JSON.stringify(result))
-			}
-		},
-		error: function() {
-			mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
-		}
-	})
-	closePop();
-}
-//鍏抽棴寮圭獥
-function closePop() {
-	$("#m-pop").css('display', 'none');
-}
-$('.pop-bg,.m-pop .close').click(function(e) {
-	e.stopPropagation();
-	$('.m-pop').fadeOut();
-});
-
-
-//婊戝姩
-mui('.mui-scroll-wrapper').scroll({
-	indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
-	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
-	bounce: false, //鏄惁鍚敤鍥炲脊
-	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
-});
\ No newline at end of file
diff --git a/igdss-app/js/admin/work-apply.js b/igdss-app/js/admin/work-apply.js
deleted file mode 100644
index 20daf74..0000000
--- a/igdss-app/js/admin/work-apply.js
+++ /dev/null
@@ -1,329 +0,0 @@
-var url = null;
-var depotData;
-var typeData;
-var startTime = '';
-var endTime = '';
-var name = ''
-var info = '';
-var listPicker2 = [];
-var listPicker1 = [];
-var list = [{
-	value: 'ywj',
-	text: '钁d簨闀� 鍙舵枃娲�'
-}, {
-	value: 'aaa',
-	text: '鎬荤粡鐞� 鑹続A'
-}, {
-	value: 'lj',
-	text: '缃楄緫'
-}, {
-	value: 'ymt',
-	text: '浜戝ぉ鏄�'
-}, {
-	value: 'shq',
-	text: '鍙插己'
-}, {
-	value: 'zhbh',
-	text: '绔犲寳娴�'
-}, {
-	value: 'zhy',
-	text: '搴勯'
-}, {
-	value: 'gyf',
-	text: '鍏充竴甯�'
-}, {
-	value: 'zhz',
-	text: '鏅哄瓙'
-}, {
-	value: 'gezh',
-	text: '姝岃��'
-}]
-//宸ュ崟鐢宠
-var data = {
-	"interfaceId": "5701",
-	"outId": "10701",
-	"reqDateTime": new Date(),
-	"tokenAuth": "",
-	"data": {
-		"depotId": "",
-		"type": "",
-		"startTime": "",
-		"endTime": "",
-		"info": ""
-	}
-};
-
-//鑾峰彇浠撳簱鍒楄〃
-var data2 = {
-	"interfaceId": "5102",
-	"outId": "10102",
-	"reqDateTime": new Date(),
-	"tokenAuth": "",
-	"data": {
-		"deptId": ""
-	}
-};
-
-//鑾峰彇涓氬姟绫诲瀷
-var data1 = {
-	"interfaceId": "5705",
-	"outId": "11101",
-	"reqDateTime": new Date(),
-	"tokenAuth": "",
-	"data": {
-		
-	}
-};
-
-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;
-	data1.tokenAuth = user.tokenAuth;
-	data2.tokenAuth = user.tokenAuth;
-	data2.data.deptId = selectDeptId;
-	
-	depotList();
-	typeList();
-
-}
-
-
-//寮�濮嬫椂闂�
-function chooseDate() {
-	var dtpicker = new mui.DtPicker({
-		// type: "hour", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
-		type: "datetime",
-		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
-		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
-		value: startTime
-	})
-	dtpicker.show(function(e) {
-		var date_el = document.getElementById("date1-val")
-		date_el.innerText = e.value
-		startTime = e.value
-		data.data.startTime = startTime;
-		jQuery(date_el).prev().hide()
-	})
-}
-//
-function chooseDate1() {
-	var dtpicker = new mui.DtPicker({
-		// type: "hour", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
-		type: "datetime",
-		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
-		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
-		value:endTime
-	})
-	dtpicker.show(function(e) {
-		var date_el = document.getElementById("date2-val")
-		date_el.innerText = e.value
-		endTime = e.value
-		data.data.endTime = endTime
-		jQuery(date_el).prev().hide()
-	})
-}
-
-//宸ュ崟鐢宠
-function workApply() {
-	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") {
-				console.log(JSON.stringify(result))
-				mui.toast(result.msg);
-			} else {
-				// console.log(JSON.stringify(result))
-				// mui.toast(result.msg);
-				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		},
-		error: function() {
-			mui.alert('绯荤粺绻佸繖,璇烽噸鏂扮櫥褰曞皾璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-		}
-	})
-}
-
-function depotList() {
-	//鑾峰彇浠撳簱鍒楄〃
-	mui.ajax(url, {
-		type: "POST",
-		dataType: "json",
-		crossDomain: true,
-		contentType: "application/json;charset=utf-8",
-		data: JSON.stringify(data2),
-		success: function(result) {
-			if (result.code == "0000") {
-				depotData = result.data
-				conversion(depotData);
-				// console.log(JSON.stringify(result))
-			} else {
-				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		},
-		error: function() {
-			mui.alert('绯荤粺绻佸繖,璇烽噸鏂扮櫥褰曞皾璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-		}
-	})
-}
-//鑾峰彇涓氬姟绫诲瀷鍒楄〃
-function typeList() {
-	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") {
-				typeData = result.data
-				conversionType(typeData);
-				// console.log(JSON.stringify(result))
-			} else {
-				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		},
-		error: function() {
-			mui.alert('绯荤粺绻佸繖,璇烽噸鏂扮櫥褰曞皾璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-		}
-	})
-}
-function conversion(data) {
-	var fenl = {}
-	$.each(data, function(index, item) {
-		fenl = {
-			value: item.name,
-			text: item.id,
-		}
-		listPicker2.push(fenl)
-	})
-}
-function conversionType(data){
-	var fenl = {}
-	$.each(data, function(index, item) {
-		fenl = {
-			value: item.typeName,
-			text: item.typeId,
-		}
-		listPicker1.push(fenl)
-	})
-}
-function refresh(){
-	var html = '';
-	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="glck"><div class="placeholder">璇烽�夋嫨</div>';
-	html += '<div class="real-val" id="glck-val" ></div></div></div></div>';
-	html += '<div class="group"><div class="l">鏈夋晥寮�濮嬫椂闂�:</div><div class="r">';
-	html += '<div class="val" id="date1" onclick="chooseDate();"><div class="placeholder">璇烽�夋嫨</div>';
-	html += '<div class="real-val" id="date1-val"></div></div></div></div>';
-	html += '<div class="group"><div class="l">鏈夋晥缁撴潫鏃堕棿:</div><div class="r">';
-	html += '<div class="val" id="date2" onclick="chooseDate1();"><div class="placeholder">璇烽�夋嫨</div>';
-	html += '<div class="real-val" id="date2-val"></div></div></div></div>';
-	html += '<div class="group"><div class="l">宸ュ崟鍐呭:</div><div class="r">'
-	html += '<div class="gdnr" id="gdnr" "><div class="placeholder">璇烽�夋嫨</div>'
-	html += '<div class="real-val" id="gdnr-val"></div></div></div></div>'
-	html += '<div type="submit" class="submit">鎻愪氦</div></div>';
-	$("#refresh").html(html);
-	data.data.depotId = '';
-	data.data.type = ''
-	data.data.startTime = ''
-	data.data.endTime = ''
-	info = ''
-	data.data.info = info
-	
-}
-
-//鎻愪氦
-mui(".mui-scroll").on("tap", ".wp form .submit", function() {
-	data.data.info = info;
-	workApply();
-	// window.location.reload();
-	window.setTimeout(function() {
-		refresh();
-	}, 200)
-})
-
-mui('.mui-scroll-wrapper').scroll({
-	indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
-	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
-	bounce: false, //鏄惁鍚敤鍥炲脊
-	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
-});
-
-
-(function($, doc) {
-	$.init();
-	$.ready(function() {
-		/**
-		 * 鑾峰彇瀵硅薄灞炴�х殑鍊�
-		 * 涓昏鐢ㄤ簬杩囨护涓夌骇鑱斿姩涓紝鍙兘鍑虹幇鐨勬渶浣庣骇鐨勬暟鎹笉瀛樺湪鐨勬儏鍐碉紝瀹為檯寮�鍙戜腑闇�瑕佹敞鎰忚繖涓�鐐癸紱
-		 * @param {Object} obj 瀵硅薄
-		 * @param {String} param 灞炴�у悕
-		 */
-		var _getParam = function(obj, param) {
-			return obj[param] || '';
-		};
-		//涓氬姟绫诲瀷
-		var showUserPickerButton = doc.getElementById('ywlx');
-		showUserPickerButton.addEventListener('tap', function(event) {
-			var userResult = doc.getElementById('ywlx-val');
-			var userPicker = new $.PopPicker();
-			userPicker.setData(listPicker1);
-			userPicker.show(function(items) {
-				// userResult.innerText = JSON.stringify(items[0]);
-				console.log(JSON.stringify(items))
-				userResult.innerText = items[0].text;
-				// userResult.previousSibling.style.display="none"
-				jQuery(userResult).prev().hide()
-				//杩斿洖 false 鍙互闃绘閫夋嫨妗嗙殑鍏抽棴
-				//return false;
-			});
-		}, false);
-		//----------------------------------------
-		//鍏宠仈浠撳簱:
-		var showPicker2Button = doc.getElementById('glck');
-		showPicker2Button.addEventListener('tap', function(event) {
-			var picker2Result = doc.getElementById('glck-val');
-			var picker2 = new $.PopPicker();
-			picker2.setData(listPicker2);
-			picker2.show(function(items) {
-				// userResult.innerText = JSON.stringify(items[0]);
-				picker2Result.innerText = items[0].text;
-				data.data.depotId = items[0].value;
-				// userResult.previousSibling.style.display="none"
-				jQuery(picker2Result).prev().hide()
-				//杩斿洖 false 鍙互闃绘閫夋嫨妗嗙殑鍏抽棴
-				//return false;
-			});
-		}, false);
-	});
-})(mui, document);
-
-//鎵撳紑寮圭獥
-mui(".mui-scroll").on("tap", ".wp form .gdnr", function() {
-	document.getElementById("textareaPop").value = info;
-	$("#m-pop").css('display', 'flex');
-})
-
-//鍏抽棴寮圭獥
-function closePop() {
-	$("#m-pop").css('display', 'none');
-}
-//寮圭獥纭畾鎸夐挳
-mui(".mui-content").on("tap", ".m-pop .inner .confirm", function() {
-	info = document.getElementById("textareaPop").value;
-	if(info){
-		document.getElementById("gdnr").innerText = info	
-	}
-	closePop();
-})
\ No newline at end of file
diff --git a/igdss-app/js/admin/work-audit.js b/igdss-app/js/admin/work-audit.js
index fa16475..39d9329 100644
--- a/igdss-app/js/admin/work-audit.js
+++ b/igdss-app/js/admin/work-audit.js
@@ -4,8 +4,8 @@
 var dateTime;
 //宸ュ崟瀹℃牳鍒楄〃
 var data = {
-	"interfaceId": "5703",
-	"outId": "10703",
+	"interfaceId": "5101",
+	"outId": "10101",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -14,8 +14,8 @@
 };
 //宸ュ崟瀹℃牳
 var data1 = {
-	"interfaceId": "5704",
-	"outId": "10704",
+	"interfaceId": "5102",
+	"outId": "10102",
 	"reqDateTime": new Date(),
 	"tokenAuth": "",
 	"data": {
@@ -27,10 +27,17 @@
 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/v1/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data1.tokenAuth = user.tokenAuth;
-	data.data.deptId = selectDeptId;
+	
+	deptId = selectDeptId;
+	if(deptId == null){
+		deptId = user.deptId
+	}
+	data.data.deptId = deptId;
+	data1.data.deptId = deptId;
+
 	dateTime = getDate(new Date());
 	getAuditList();
 }
@@ -62,7 +69,6 @@
 		success: function(result) {
 			if (result.code == "0000") {
 				auditList = result.data;
-				// console.log(JSON.stringify(auditList))
 				renderAuditList();
 			} else {
 				renderAuditList();
@@ -82,28 +88,34 @@
 	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></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.createBy+'</div></div>';
+			html += '<div class="line"><div class="t">鎵�灞炲垎搴�: </div><div class="v">'+item.deptName+'</div></div>';
+			html += '<div class="line"><div class="t">宸ュ崟鍚嶇О: </div><div class="v">'+item.title+'</div></div></div>';
+			html += '<div class="right"><div class="icon" info="' + ((item.description==null)?"":item.description) + '"><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>';
+			html += '<div class="tit">涓氬姟绫诲瀷:</div><div class="name">' + item.bizTypeName + '</div></a></li>';
 			html += '<li><a href="" class="con" style="background-image: url(images/icons/a-bg13.png);">';
-			html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">' + (item.depotName == null ? "--" : item.depotName) + '</div></a></li></ul>';
-			html += '<div class="time">鏈夋晥鏈�: ' + item.startTime + '鑷�' + item.endTime + ' </div>';
-			html += '<div class="btns"><a href="" id = "' + item.id +
-				'" class="btn refuse">鎷掔粷</a><a href="" id = "' + item.id + '" class="btn adopt">閫氳繃</a></div>';
+			html += '<div class="tit">褰撳墠澶勭悊浜�:</div><div class="name">' +( (item.assigneeName==null)?"--":item.assigneeName )+ '</div></a></li></ul>';
+			html += '<div class="time">宸ュ崟鍒涘缓鏃堕棿: '+item.createTime+'</div>';
+			html += '<div class="time">褰撳墠鐜妭鎺ュ彈鏃堕棿: '+item.receiveTime+'</div>';
+			html += '<div class="btns"><a href=""  node = "' + item.node + '"  id = "' + item.id +
+				'" class="btn refuse">鎷掔粷</a><a href="" node = "' + item.node + '" id = "' + item.id + '" class="btn adopt">閫氳繃</a></div>';
 			html += '</div></div></div></li>';
 		})
 	} else {
 		html += '<li><div class="con"><div class="top"><div class="left">';
-		html += '<div class="line"><div class="t">鐢宠浜�: </div><div class="v">鏆傛棤宸ュ崟瀹℃牳</div></div></div>';
+		html += '<div class="line"><div class="t">鐢宠浜�: </div><div class="v">鏆傛棤宸ュ崟瀹℃牳</div></div>';
+		html += '<div class="line"><div class="t">鎵�灞炲垎搴�: </div><div class="v">鏆傛棤宸ュ崟瀹℃牳</div></div>';
+		html += '<div class="line"><div class="t">宸ュ崟鍚嶇О: </div><div class="v">鏆傛棤宸ュ崟瀹℃牳</div></div></div>';
 		html += '<div class="right"><div class="icon" 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">--</div></a></li>';
 		html += '<li><a href="" class="con" style="background-image: url(images/icons/a-bg13.png);">';
 		html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">--</div></a></li></ul>';
-		html += '<div class="time">鏈夋晥鏈�: ' + dateTime + '  鑷�  ' + dateTime + ' </div>';
+		html += '<div class="time">宸ュ崟鍒涘缓鏃堕棿: '+dateTime+'</div>';
+		html += '<div class="time">褰撳墠鐜妭鎺ュ彈鏃堕棿: '+dateTime+'</div>';
 		html += '</div></div></div></li>';
 		
 		// html +=
@@ -124,7 +136,7 @@
 		success: function(result) {
 			if (result.code == "0000") {
 				workAuditData = result.data;
-				// console.log(JSON.stringify(auditList))
+				getAuditList();
 			} else {
 				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
 			}
@@ -138,18 +150,22 @@
 //鎷掔粷
 mui(".mui-scroll").on("tap", ".wp ul li .refuse", function() {
 	var id = this.getAttribute("id");
+	var node = this.getAttribute("node");
 	console.log(id)
-	data1.data.id = id
-	data1.data.status = '10'
+	data1.data.orderId = id
+	data1.data.status = 'refuse'
+	data1.data.node = node
 	workAudit();
 })
 
 //閫氳繃
 mui(".mui-scroll").on("tap", ".wp ul li .adopt", function() {
 	var id = this.getAttribute("id");
+	var node = this.getAttribute("node");
 	console.log(id)
-	data1.data.id = id
-	data1.data.status = '20'
+	data1.data.orderId = id
+	data1.data.status = 'pass'
+	data1.data.node = node
 	workAudit();
 })
 //鏌ョ湅鐢宠鍐呭
diff --git a/igdss-app/js/admin/work-record.js b/igdss-app/js/admin/work-record.js
deleted file mode 100644
index acc668a..0000000
--- a/igdss-app/js/admin/work-record.js
+++ /dev/null
@@ -1,118 +0,0 @@
-var url = null;
-var recordList = null;
-var dateTime;
-//鐢宠璁板綍
-var data = {
-	"interfaceId": "5702",
-	"outId": "10702",
-	"reqDateTime": new Date(),
-	"tokenAuth": "",
-	"data": {
-		"userName": "",
-	}
-};
-
-function init() {
-	var user = JSON.parse(localStorage.getItem('user'));
-	url = user.url + "/api-phone/v35/gateway";
-	data.tokenAuth = user.tokenAuth;
-	data.data.userName = user.username;
-	console.log(JSON.stringify(data.data),"work-record")
-	dateTime = getDate(new Date());
-	getRecordList();
-}
-//鏃ユ湡鏍煎紡鍖杫yyy-MM-dd HH:mm
-function getDate(date) {
-	var year = date.getFullYear();
-	var month, day,hour,minute;
-	month = date.getMonth() + 1;
-	if (month > 0 && month <= 9) {
-		month = "0" + month;
-	}
-	day = date.getDate()
-	if (day > 0 && day <= 9) {
-		day = "0" + day
-	}
-	hour = date.getHours();
-	minute = date.getMinutes();
-	return year + "-" + month + "-" + day + " "+ hour + ":" + minute
-}
-
-//鑾峰彇鐢宠璁板綍鍒楄〃
-function getRecordList() {
-	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") {
-				recordList = result.data;
-				// console.log(JSON.stringify(recordList))
-				renderRecordList();
-			} else {
-				renderRecordList();
-				mui.toast(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-			}
-		},
-		error: function() {
-			renderRecordList();
-			mui.alert('绯荤粺绻佸繖,璇烽噸鏂扮櫥褰曞皾璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-		}
-	})
-}
-
-function renderRecordList() {
-	var html = '';
-	if (recordList && recordList.length > 0) {
-		$.each(recordList, function(index, item) {
-			html += '<li><div class="con conInfo" info = "' + item.info + '"><span class="status">';
-			//宸插鏍�
-			if (item.status == '10') {
-				html += '<img src="images/icons/g-i29.png" alt=""></span>'
-			} else if (item.status == '20') { // 寰呭鏍�
-				html += '<img src="images/icons/g-i28.png" alt=""></span>'
-			}
-			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);">';
-			html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">' + (item.depotName == null ? "--" : item.depotName) + '</div></a></li></ul>';
-			html += '<div class="time"><p>鏈夋晥寮�濮嬫椂闂�: <span>' + item.startTime + '</span></p><p>鏈夋晥缁撴潫鏃堕棿: <span>' +
-				item.endTime + '</span></p></div>';
-		})
-	} else {
-		html += '<li><div class="con conInfo" info = "鏆傛棤鐢宠璁板綍"><span class="status">';
-		//宸插鏍�
-		html += '<img src="images/icons/g-i29.png" alt=""></span>'
-		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">--</div></a></li>';
-		html += '<li><a href="" class="con"style="background-image: url(images/icons/a-bg13.png);">';
-		html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">--</div></a></li></ul>';
-		html += '<div class="time"><p>鏈夋晥寮�濮嬫椂闂�: <span>' + dateTime + '</span></p><p>鏈夋晥缁撴潫鏃堕棿: <span>' + dateTime + '</span></p></div>';
-	}
-	$("#handleList").html(html);
-}
-
-//鏌ョ湅淇℃伅
-mui(".mui-scroll").on("tap", ".wp ul li .conInfo", function() {
-	var info = this.getAttribute("info");
-	// mui.alert(info, '宸ュ崟鍐呭', ["纭畾"], function() {}, "div");
-	$("#textareaPop").val(info)
-	$('#m-pop').css('display', 'flex');
-	console.log("鏌ョ湅淇℃伅")
-})
-
-//鍏抽棴寮圭獥
-function closePop() {
-	$("#m-pop").css('display', 'none');
-}
-
-mui('.mui-scroll-wrapper').scroll({
-	indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
-	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
-	bounce: false, //鏄惁鍚敤鍥炲脊
-	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
-});
\ No newline at end of file
diff --git a/igdss-app/privacy.html b/igdss-app/privacy.html
index 86fbd3e..12f3fa5 100644
--- a/igdss-app/privacy.html
+++ b/igdss-app/privacy.html
@@ -4,7 +4,10 @@
 		<meta charset="utf-8">
 		<title>椋庢鑷磋繙绮簱闅愮鏀跨瓥</title>
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<link href="./css/mui.min.css" rel="stylesheet" />
+		<!-- MUI鏍峰紡 -->
+		<link rel="stylesheet" href="./css/mui.min.css" />
+		<!-- 鍏叡css -->
+		<link rel="stylesheet" href="./css/admin/public.css" />
 		<style>
 			.mui-content {
 				width: 97%;
@@ -38,7 +41,7 @@
 		</style>
 	</head>
 	<body>
-		<header class="mui-bar mui-bar-nav">
+		<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>
diff --git a/igdss-app/security-ai.html b/igdss-app/security-ai.html
new file mode 100644
index 0000000..c49ade5
--- /dev/null
+++ b/igdss-app/security-ai.html
@@ -0,0 +1,145 @@
+<!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>AI浜嬩欢绠$悊</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/security-ai.css">
+		<!--App鑷畾涔夌殑css-->
+		<link rel="stylesheet" href="./css/mui.picker.min.css"/>
+	</head>
+	<body class="g-bg" style="background-image: url(images/m-bg2.png);">
+		<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">AI浜嬩欢绠$悊</h1>
+		</header>
+		<div class="mui-content">
+			<div class="g-date_box">
+				<span class="day prev">鍓嶄竴澶�</span>
+				<div class="inpbox" onclick="chooseDate();">
+					<input id="date" type="text" value="2022-04-15" readonly class="inp" />
+				</div>
+				<span class="day next">鍚庝竴澶�</span>
+			</div>
+			<div class="mui-scroll-wrapper index-dzxg">
+				<div class="mui-scroll">
+					<ul class="ul-cardb1" id="recordList">
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn r-warn1">璀﹀憡</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">鎶撴媿璁惧锛�202512170926070560000</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">浜嬩欢鍚嶇О锛氱綉缁滄敾鍑绘娴�</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">鏍囩</div>
+											<div class="txt">缃愯溅锛屽崱杞�</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn r-warn2">棰勮</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">鎶撴媿璁惧锛�202512170926070560000</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">浜嬩欢鍚嶇О锛氱綉缁滄敾鍑绘娴�</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">鏍囩</div>
+											<div class="txt">缃愯溅锛屽崱杞�</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn r-warn3">閫氱煡</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">鎶撴媿璁惧锛�202512170926070560000</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">浜嬩欢鍚嶇О锛氱綉缁滄敾鍑绘娴�</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">鏍囩</div>
+											<div class="txt">缃愯溅锛屽崱杞�</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+					
+					</ul>
+				</div>
+			</div>
+			<!-- 棰勮鍥剧墖 -->
+			<div class="m-pop">
+				<div class="pop-bg"></div>
+				<div class="inner">
+					<div class="m-viewer" id="viewerImg">
+						<img src="images/p-j1.jpg" alt="" class="img" />
+					</div>
+					<div class="close"><span class="mui-icon mui-icon-close"></span></div>
+				</div>
+			</div>
+		</div>
+	</body>
+	<script src="./js/mui.min.js"></script>
+	<script src="./js/mui.picker.min.js"></script>
+	<script src="./js/jquery.js"></script>
+	<script src="./js/admin/security-ai.js"></script>
+	<script type="text/javascript" charset="utf-8">
+		//mui鍒濆鍖�
+		mui.init();
+
+		mui.plusReady(function(){
+			//鏁版嵁鍒濆鍖�
+			init();
+		})
+	</script>
+</html>
diff --git a/igdss-app/security-manager.html b/igdss-app/security-manager.html
index 8aeab86..61e1864 100644
--- a/igdss-app/security-manager.html
+++ b/igdss-app/security-manager.html
@@ -21,30 +21,21 @@
 					<div class="m-listbox">
 						<ul class="g-listb1 fix">
 							<li>
-								<a id="security-patrol" class="con" style="background-image: url(images/icons/a-bg1.png);">
-									<div class="tit">鐢靛瓙宸℃洿</div>
-									<div class="icon">
-										<img style="width: 30px;" src="images/icons/a-i1.png" alt="">
-									</div>
-								</a>
-							</li>
-							<li>
-								<!-- id="depot-list" -->
-								<a  class="con" style="background-image: url(images/icons/a-bg2.png);">
-									<div class="tit">闂ㄧ绠$悊</div>
-									<div class="icon">
-										<img src="images/icons/a-i2.png" alt="">
-									</div>
-								</a>
-							</li>
-							<li>
 								<a id="security-video" class="con" style="background-image: url(images/icons/a-bg3.png);">
-									<div class="tit">瑙嗛鐩戞帶</div>
+									<div class="tit">瑙嗛鏌ョ湅</div>
 									<div class="icon">
 										<img src="images/icons/a-i3.png" alt="">
 									</div>
 								</a>
 							</li>
+							<li>
+								<a id="security-patrol" class="con" style="background-image: url(images/icons/a-bg1.png);">
+									<div class="tit">绉诲姩宸℃</div>
+									<div class="icon">
+										<img style="width: 30px;" src="images/icons/a-i1.png" alt="">
+									</div>
+								</a>
+							</li>
 						</ul>
 					</div>
 				</div>
diff --git a/igdss-app/security-patrol.html b/igdss-app/security-patrol.html
index 837be78..0272c49 100644
--- a/igdss-app/security-patrol.html
+++ b/igdss-app/security-patrol.html
@@ -3,7 +3,7 @@
 	<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>
+		<title>宸¤鐩戠</title>
 		<!-- MUI鏍峰紡 -->
 		<link rel="stylesheet" href="./css/mui.min.css" />
 		<!-- 鍏叡css -->
@@ -16,7 +16,7 @@
 	<body class="g-bg" style="background-image: url(images/m-bg2.png);">
 		<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>
+			<h1 class="mui-title">宸¤鐩戠</h1>
 		</header>
 		<div class="mui-content">
 			<div class="g-date_box">
@@ -29,7 +29,7 @@
 			<div class="mui-scroll-wrapper index-dzxg">
 				<div class="mui-scroll">
 					<ul class="ul-cardb1" id="recordList">
-						<!-- <li>
+						<li>
 							<div class="item">
 								<div class="top">
 									<div class="date">2022-03-10 11:00</div>
@@ -139,12 +139,12 @@
 								</div>
 							</div>
 						</li>
-					 -->
+					
 					</ul>
 				</div>
 			</div>
 			<div class="m-bot_btn">
-				<div class="box">
+				<div class="box" id="cameraImgBtn">
 					<button type="button" class="mui-btn  mui-btn-block bot-btn" onclick="cameraImg()">鎷嶇収鎵撳崱</button>
 				</div>
 			</div>
diff --git a/igdss-app/security-snapshot.html b/igdss-app/security-snapshot.html
new file mode 100644
index 0000000..466e4be
--- /dev/null
+++ b/igdss-app/security-snapshot.html
@@ -0,0 +1,160 @@
+<!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/security-snapshot.css">
+		<!--App鑷畾涔夌殑css-->
+		<link rel="stylesheet" href="./css/mui.picker.min.css"/>
+	</head>
+	<body class="g-bg" style="background-image: url(images/m-bg2.png);">
+		<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="g-date_box">
+				<span class="day prev">鍓嶄竴澶�</span>
+				<div class="inpbox" onclick="chooseDate();">
+					<input id="date" type="text" value="2022-04-15" readonly class="inp" />
+				</div>
+				<span class="day next">鍚庝竴澶�</span>
+			</div>
+			<div class="mui-scroll-wrapper index-dzxg">
+				<div class="mui-scroll">
+					<ul class="ul-cardb1" id="recordList">
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn">鏌ョ湅鐓х墖</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">鎶撴媿璁惧锛�202512170926070560000</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">鏍囩</div>
+											<div class="txt">缃愯溅锛屽崱杞�</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn">鏌ョ湅鐓х墖</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">鎶撴媿璁惧锛�202512170926070560000</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">鏍囩</div>
+											<div class="txt">缃愯溅锛屽崱杞�</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li>
+							<div class="item">
+								<div class="top">
+									<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+									<div class="r-btn">鏌ョ湅鐓х墖</div>
+								</div>
+								<div class="top-tit">
+									<div class="text">鎶撴媿璁惧锛�202512170926070560000</div>
+								</div>
+								<div class="cards">
+									<div class="cd">
+										<div class="con user">
+											<div class="tit">鏍囩</div>
+											<div class="txt">缃愯溅锛屽崱杞�</div>
+										</div>
+									</div>
+									<div class="cd">
+										<div class="con loc">
+											<div class="tit">鏃堕棿</div>
+											<div class="txt">2025-12-23 13:56</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+					<li>
+						<div class="item">
+							<div class="top">
+								<div class="text">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</div>
+								<div class="r-btn">鏌ョ湅鐓х墖</div>
+							</div>
+							<div class="top-tit">
+								<div class="text">鎶撴媿璁惧锛�202512170926070560000</div>
+							</div>
+							<div class="cards">
+								<div class="cd">
+									<div class="con user">
+										<div class="tit">鏍囩</div>
+										<div class="txt">缃愯溅锛屽崱杞�</div>
+									</div>
+								</div>
+								<div class="cd">
+									<div class="con loc">
+										<div class="tit">鏃堕棿</div>
+										<div class="txt">2025-12-23 13:56</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</li>
+					</ul>
+				</div>
+			</div>
+			<!-- 棰勮鍥剧墖 -->
+			<div class="m-pop">
+				<div class="pop-bg"></div>
+				<div class="inner">
+					<div class="m-viewer" id="viewerImg">
+						<img src="images/p-j1.jpg" alt="" class="img" />
+					</div>
+					<div class="close"><span class="mui-icon mui-icon-close"></span></div>
+				</div>
+			</div>
+		</div>
+	</body>
+	<script src="./js/mui.min.js"></script>
+	<script src="./js/mui.picker.min.js"></script>
+	<script src="./js/jquery.js"></script>
+	<script src="./js/admin/security-snapshot.js"></script>
+	<script type="text/javascript" charset="utf-8">
+		//mui鍒濆鍖�
+		mui.init();
+
+		mui.plusReady(function(){
+			//鏁版嵁鍒濆鍖�
+			init();
+		})
+	</script>
+</html>
diff --git a/igdss-app/security-video.html b/igdss-app/security-video.html
index 184cfc5..0ccb27f 100644
--- a/igdss-app/security-video.html
+++ b/igdss-app/security-video.html
@@ -13,124 +13,124 @@
 		<link rel="stylesheet" href="./css/admin/security-video.css">
 	</head>
 
-	<body class="g-bg" style="background-image: url(images/m-bg2.png);">
+<body class="g-bg" style="background-image: url(images/m-bg2.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="video-container">
+				<div class="m-videob1" id="toVideo">
+					<video src="" poster="images/pos1.png"
+						class="video" webkit-playsinline="true" playsinline="true" controls></video>
+				</div>
+			</div>
 			
-			<div class="mui-scroll-wrapper box">
-				<div class="mui-scroll">
-					<div class="wp">
-						<div class="m-videob1" id="toVideo">
-							<!-- src="http://player.alicdn.com/video/aliyunmedia.mp4" -->
-							<video src="" poster="images/pos1.png"
-								class="video" webkit-playsinline="true" playsinline="true" controls></video>
-						</div>
-						<ul class="ul-locb1" id="recordList">
-							<!-- <li>
-								<a onclick="getVideo(1,1)" class="con" style="background-image: url(images/icons/g-i15.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i13.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�1 (鐞冩満)</div>
+			<!-- 鐙珛婊氬姩鐨勫垪琛ㄥ尯鍩� -->
+			<div class="list-container">
+				<div class="scroll-wrapper">
+					<ul class="ul-locb1" id="recordList">
+						<li>
+							<a onclick="getVideo(1,1)" class="con" style="background-image: url(images/icons/g-i15.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i13.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i16.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i14.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�2 (鏋満)</div>
+									<div class="name">鎽勫儚澶�1 (鐞冩満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i16.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i14.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i17.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i13.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�3 (鐞冩満)</div>
+									<div class="name">鎽勫儚澶�2 (鏋満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i17.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i13.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i15.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i13.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�4 (鐞冩満)</div>
+									<div class="name">鎽勫儚澶�3 (鐞冩満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i15.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i13.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i16.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i14.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�5 (鏋満)</div>
+									<div class="name">鎽勫儚澶�4 (鐞冩満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i16.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i14.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i17.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i13.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�6 (鐞冩満)</div>
+									<div class="name">鎽勫儚澶�5 (鏋満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i17.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i13.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i15.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i13.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�7 (鐞冩満)</div>
+									<div class="name">鎽勫儚澶�6 (鐞冩満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i15.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i13.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i16.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i14.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�8 (鏋満)</div>
+									<div class="name">鎽勫儚澶�7 (鐞冩満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i16.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i14.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-							<li>
-								<a href="" class="con" style="background-image: url(images/icons/g-i17.png);">
-									<div class="left">
-										<div class="icon">
-											<img src="images/icons/g-i13.png" alt="">
-										</div>
-										<div class="name">鎽勫儚澶�9 (鐞冩満)</div>
+									<div class="name">鎽勫儚澶�8 (鏋満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+						<li>
+							<a href="" class="con" style="background-image: url(images/icons/g-i17.png);">
+								<div class="left">
+									<div class="icon">
+										<img src="images/icons/g-i13.png" alt="">
 									</div>
-									<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
-								</a>
-							</li>
-						 -->
-						</ul>
-					</div>
+									<div class="name">鎽勫儚澶�9 (鐞冩満)</div>
+								</div>
+								<div class="right"><span class="mui-icon  mui-icon-forward"></span></div>
+							</a>
+						</li>
+					</ul>
 				</div>
 			</div>
 		</div>
diff --git a/igdss-app/work-apply.html b/igdss-app/work-apply.html
deleted file mode 100644
index 9b0f46b..0000000
--- a/igdss-app/work-apply.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!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" />
-			<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 -->
-			<link rel="stylesheet" href="./css/admin/work-apply.css">
-	</head>
-
-	<body class="g-bg" style="background-image: url(images/m-bg2.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="mui-scroll">
-					<div class="wp">
-						<form action="" id="refresh">
-
-							<div class="m-gd" >
-								<div class="group">
-									<div class="l">涓氬姟绫诲瀷:</div>
-									<div class="r">
-										<div class="val" id="ywlx">
-											<div class="placeholder">璇烽�夋嫨</div>
-											<div class="real-val" id="ywlx-val" ></div>
-										</div>
-									</div>
-								</div>
-								
-								<div class="group">
-									<div class="l">鍏宠仈浠撳簱:</div>
-									<div class="r">
-										<div class="val" id="glck">
-											<div class="placeholder">璇烽�夋嫨</div>
-											<div class="real-val" id="glck-val" ></div>
-										</div>
-									</div>
-								</div>
-								<div class="group">
-									<div class="l">鏈夋晥寮�濮嬫椂闂�:</div>
-									<div class="r">
-										<div class="val" id="date1" onclick="chooseDate();">
-											<div class="placeholder">璇烽�夋嫨</div>
-											<div class="real-val" id="date1-val"></div>
-										</div>
-									</div>
-								</div>
-								<div class="group">
-									<div class="l">鏈夋晥缁撴潫鏃堕棿:</div>
-									<div class="r">
-										<div class="val" id="date2" onclick="chooseDate1();">
-											<div class="placeholder">璇烽�夋嫨</div>
-											<div class="real-val" id="date2-val"></div>
-										</div>
-									</div>
-								</div>
-								<div class="group">
-									<div class="l">宸ュ崟鍐呭:</div>
-									<div class="r">
-										<div class="gdnr" id="gdnr" ">
-											<div class="placeholder">璇峰~鍐�</div>
-											<div class="real-val" id="gdnr-val"></div>
-										</div>
-									</div>
-								</div>
-
-								<!-- <input type="submit" value="鎻愪氦" class="submit"/> -->
-								<div type="submit" class="submit">鎻愪氦</div>
-							</div>
-						</form>
-
-					</div>
-				</div>
-			</div>
-			<!-- 缂栬緫璇存槑 -->
-			<div id="m-pop" class="m-pop">
-				<div class="pop-bg"></div>
-				<div class="inner">
-					<div class="m-server m-pop-caution">
-						<div class="h3"><span class="red">*</span> 宸ュ崟鍐呭</div>
-						<form class="">
-							<div class="mui-input-row">
-								<textarea id="textareaPop" rows="" cols="" placeholder="璇疯緭鍏ヨ鏄�"></textarea>
-							</div>
-						</form>
-						<div class="btns">
-							<div type="button" class="mui-btn confirm" ">纭畾</div>
-						</div>
-					</div>
-					<div class="close"><span class="mui-icon mui-icon-close" onclick="closePop()"></span></div>
-				</div>
-			</div>
-		</div>
-	</body>
-	<script src="./js/mui.min.js"></script>
-	<script src="./js/mui.poppicker.js"></script>
-	<script src="./js/mui.picker.min.js"></script>
-	<script src="./js/admin/work-apply.js"></script>
-	<script src="./js/jquery.js"></script>
-
-	<script type="text/javascript" charset="utf-8">
-		mui.init();
-
-		mui.plusReady(function(){
-			init();
-		})
-		
-	</script>
-</html>
diff --git a/igdss-app/work-audit.html b/igdss-app/work-audit.html
index 69a89e7..88c5330 100644
--- a/igdss-app/work-audit.html
+++ b/igdss-app/work-audit.html
@@ -4,7 +4,7 @@
 		<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>
+		<title>宸ュ崟绠$悊</title>
 		<!-- MUI鏍峰紡 -->
 		<link rel="stylesheet" href="./css/mui.min.css" />
 		<!-- 鍏叡css -->
@@ -15,7 +15,7 @@
 	<body class="g-bg" style="background-image: url(images/m-bg2.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>
+			<h1 class="mui-title">宸ュ崟绠$悊</h1>
 		</header>
 		<div class="mui-content">
 
@@ -23,46 +23,6 @@
 				<div class="mui-scroll">
 					<div class="wp">
 						<ul class="ul-gdsh" id="handleList">
-							<!-- <li>
-								<div class="con">
-									<div class="top">
-										<div class="left">
-											<div class="line">
-												<div class="t">鐢宠浜�: </div>
-												<div class="v">寮犱笁</div>
-											</div>
-										</div>
-										<div class="right">
-											<div class="icon" info = "11111">
-												<img src="images/icons/g-i26.png" alt="">
-											</div>
-										</div>
-									</div>
-									<div class="box">
-										<ul class="gd-list">
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg12.png);">
-													<div class="tit">涓氬姟绫诲瀷:</div>
-													<div class="name">闂ㄧ</div>
-												</a>
-											</li>
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg13.png);">
-													<div class="tit">鍏宠仈浠撳簱:</div>
-													<div class="name">10鍙蜂粨</div>
-												</a>
-											</li>
-										</ul>
-										<div class="time">鏈夋晥鏈�: 2021-05-08 12:00鑷�2021-05-08 12:00 </div>
-										<div class="btns">
-											<a href="" class="btn refuse">鎷掔粷</a>
-											<a href="" class="btn adopt">閫氳繃</a>
-										</div>
-									</div>
-								</div>
-							</li>
 							<li>
 								<div class="con">
 									<div class="top">
@@ -71,6 +31,14 @@
 												<div class="t">鐢宠浜�: </div>
 												<div class="v">寮犱笁</div>
 											</div>
+											<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">
 											<div class="icon" info = "11111">
@@ -84,18 +52,19 @@
 												<a href="" class="con"
 													style="background-image: url(images/icons/a-bg12.png);">
 													<div class="tit">涓氬姟绫诲瀷:</div>
-													<div class="name">闂ㄧ</div>
+													<div class="name">鍑哄叆搴�</div>
 												</a>
 											</li>
 											<li>
 												<a href="" class="con"
 													style="background-image: url(images/icons/a-bg13.png);">
-													<div class="tit">鍏宠仈浠撳簱:</div>
-													<div class="name">10鍙蜂粨</div>
+													<div class="tit">褰撳墠澶勭悊浜�:</div>
+													<div class="name">澶勭悊浜�</div>
 												</a>
 											</li>
 										</ul>
-										<div class="time">鏈夋晥鏈�: 2021-05-08 12:00鑷�2021-05-08 12:00 </div>
+										<div class="time">宸ュ崟鍒涘缓鏃堕棿: 2021-05-08 12:00</div>
+										<div class="time">褰撳墠鐜妭鎺ュ彈鏃堕棿: 2021-05-08 12:00</div>
 										<div class="btns">
 											<a href="" class="btn refuse">鎷掔粷</a>
 											<a href="" class="btn adopt">閫氳繃</a>
@@ -115,6 +84,10 @@
 												<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">
@@ -128,18 +101,19 @@
 												<a href="" class="con"
 													style="background-image: url(images/icons/a-bg12.png);">
 													<div class="tit">涓氬姟绫诲瀷:</div>
-													<div class="name">闂ㄧ</div>
+													<div class="name">鍑哄叆搴�</div>
 												</a>
 											</li>
 											<li>
 												<a href="" class="con"
 													style="background-image: url(images/icons/a-bg13.png);">
-													<div class="tit">鍏宠仈浠撳簱:</div>
-													<div class="name">10鍙蜂粨</div>
+													<div class="tit">褰撳墠澶勭悊浜�:</div>
+													<div class="name">澶勭悊浜�</div>
 												</a>
 											</li>
 										</ul>
-										<div class="time">鏈夋晥鏈�: 2021-05-08 12:00鑷�2021-05-08 12:00 </div>
+										<div class="time">宸ュ崟鍒涘缓鏃堕棿: 2021-05-08 12:00</div>
+										<div class="time">褰撳墠鐜妭鎺ュ彈鏃堕棿: 2021-05-08 12:00</div>
 										<div class="btns">
 											<a href="" class="btn refuse">鎷掔粷</a>
 											<a href="" class="btn adopt">閫氳繃</a>
@@ -147,7 +121,6 @@
 									</div>
 								</div>
 							</li>
-						 -->
 						</ul>
 					</div>
 				</div>
diff --git a/igdss-app/work-manager.html b/igdss-app/work-manager.html
index 1b33de3..164fd0d 100644
--- a/igdss-app/work-manager.html
+++ b/igdss-app/work-manager.html
@@ -3,7 +3,7 @@
 	<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>
+		<title>鐩戠绠$悊</title>
 		<!-- MUI鏍峰紡 -->
 		<link rel="stylesheet" href="./css/mui.min.css" />
 		<!-- 鍏叡css -->
@@ -12,7 +12,7 @@
 	<body class="g-bg" style="background-image: url(images/m-bg2.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>
+			<h1 class="mui-title">鐩戠绠$悊</h1>
 		</header>
 		<div class="mui-content">
 			<div class="mui-scroll-wrapper g-src_box">
@@ -20,29 +20,45 @@
 					<div class="m-listbox">
 						<ul class="g-listb1 fix">
 							<li>
-								<a id="work-apply" class="con" style="background-image: url(images/icons/a-bg1.png);">
-									<div class="tit">宸ュ崟鐢宠</div>
+								<a id="work-audit" class="con" style="background-image: url(images/icons/a-bg1.png);">
+									<div class="tit">宸ュ崟绠$悊</div>
 									<div class="icon">
-										<img style="width: 30px;" src="images/icons/a-i1.png" alt="">
+										<img style="width: 30px;" src="images/icons/a-i2.png" alt="">
 									</div>
 								</a>
 							</li>
 							<li>
-								<a id="work-record" class="con" style="background-image: url(images/icons/a-bg2.png);">
-									<div class="tit">鐢宠璁板綍</div>
-									<div class="icon">
-										<img src="images/icons/a-i2.png" alt="">
-									</div>
-								</a>
-							</li>
-							<li>
-								<a id="work-audit" class="con" style="background-image: url(images/icons/a-bg3.png);">
-									<div class="tit">宸ュ崟瀹℃牳</div>
+								<a id="security-video" class="con" style="background-image: url(images/icons/a-bg2.png);">
+									<div class="tit">瑙嗛鐩戠</div>
 									<div class="icon">
 										<img src="images/icons/a-i3.png" alt="">
 									</div>
 								</a>
 							</li>
+							<li>
+								<a id="security-patrol" class="con" style="background-image: url(images/icons/a-bg3.png);">
+									<div class="tit">宸℃鐩戠</div>
+									<div class="icon">
+										<img src="images/icons/a-i1.png" alt="">
+									</div>
+								</a>
+							</li>
+							<li>
+								<a id="security-snapshot" class="con" style="background-image: url(images/icons/a-bg1.png);">
+									<div class="tit">鎶撴媿绠$悊</div>
+									<div class="icon">
+										<img style="width: 30px;" src="images/icons/g-i14.png" alt="">
+									</div>
+								</a>
+							</li>
+							<li>
+								<a id="security-ai" class="con" style="background-image: url(images/icons/a-bg2.png);">
+									<div class="tit">AI浜嬩欢绠$悊</div>
+									<div class="icon">
+										<img src="images/icons/a-i15.png" alt="">
+									</div>
+								</a>
+							</li>
 						</ul>
 					</div>
 				</div>
diff --git a/igdss-app/work-record.html b/igdss-app/work-record.html
deleted file mode 100644
index bedac53..0000000
--- a/igdss-app/work-record.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!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/work-record.css" />
-	</head>
-	<body class="g-bg" style="background-image: url(images/m-bg2.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="mui-scroll">
-					<div class="wp">
-						<ul class="ul-sqjl" id="handleList">
-							<!-- <li>
-								<div class="con conInfo" info="111">
-									<span class="status">
-										<img src="images/icons/g-i28.png" alt="">
-									</span>
-									<div class="box">
-										<ul class="gd-list">
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg12.png);">
-													<div class="tit">涓氬姟绫诲瀷:</div>
-													<div class="name">闂ㄧ</div>
-												</a>
-											</li>
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg13.png);">
-													<div class="tit">鍏宠仈浠撳簱:</div>
-													<div class="name">10鍙蜂粨</div>
-												</a>
-											</li>
-										</ul>
-										<div class="time">
-											<p>鏈夋晥寮�濮嬫椂闂�: <span>2021-05-08 12:00</span></p>
-											<p>鏈夋晥缁撴潫鏃堕棿: <span>2021-05-09 12:00</span></p>
-										</div>
-									</div>
-								</div>
-							</li>
-							<li>
-								<div class="con conInfo" info="111" >
-									<span class="status">
-										<img src="images/icons/g-i28.png" alt="">
-									</span>
-									<div class="box">
-										<ul class="gd-list">
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg12.png);">
-													<div class="tit">涓氬姟绫诲瀷:</div>
-													<div class="name">闂ㄧ</div>
-												</a>
-											</li>
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg13.png);">
-													<div class="tit">鍏宠仈浠撳簱:</div>
-													<div class="name">10鍙蜂粨</div>
-												</a>
-											</li>
-										</ul>
-										<div class="time">
-											<p>鏈夋晥寮�濮嬫椂闂�: <span>2021-05-08 12:00</span></p>
-											<p>鏈夋晥缁撴潫鏃堕棿: <span>2021-05-09 12:00</span></p>
-										</div>
-									</div>
-								</div>
-							</li>
-							<li>
-								<div class="con conInfo" info="111">
-									<span class="status">
-										<img src="images/icons/g-i29.png" alt="">
-									</span>
-									<div class="title">鎵�灞炲垎搴�:<b>杩欓噷鏄竴涓垎搴撳悕绉�</b></div>
-									<div class="box">
-										<ul class="gd-list">
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg12.png);">
-													<div class="tit">涓氬姟绫诲瀷:</div>
-													<div class="name">闂ㄧ</div>
-												</a>
-											</li>
-											<li>
-												<a href="" class="con"
-													style="background-image: url(images/icons/a-bg13.png);">
-													<div class="tit">鍏宠仈浠撳簱:</div>
-													<div class="name">10鍙蜂粨</div>
-												</a>
-											</li>
-										</ul>
-										<div class="time">
-											<p>鏈夋晥寮�濮嬫椂闂�: <span>2021-05-08 12:00</span></p>
-											<p>鏈夋晥缁撴潫鏃堕棿: <span>2021-05-09 12:00</span></p>
-										</div>
-									</div>
-								</div>
-							</li>
-						 -->
-						</ul>
-
-					</div>
-				</div>
-				
-				<div id="m-pop" class="m-pop">
-					<div class="pop-bg"></div>
-					<div class="inner">
-						<div class="m-server m-pop-caution">
-							<div class="h3"><span class="red">*</span> 宸ュ崟鍐呭</div>
-							<form class="">
-								<div class="mui-input-row">
-									<textarea id="textareaPop" rows="" cols="" readonly></textarea>
-								</div>
-							</form>
-						</div>
-						<div class="close" onclick="closePop()"><span class="mui-icon mui-icon-close"></span></div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
-	<script src="js/mui.min.js"></script>
-	<script src="js/jquery.js"></script>
-	<script src="js/admin/work-record.js"></script>
-	<script type="text/javascript" charset="utf-8">
-		mui.init();
-
-		mui.plusReady(function() {
-			init();
-		})
-	</script>
-</html>
\ No newline at end of file

--
Gitblit v1.9.3