From 956f10584a109456c1bb8c72c9a4e02494812c03 Mon Sep 17 00:00:00 2001
From: lgq <1015864684@qq.com>
Date: 星期二, 18 十一月 2025 15:13:21 +0800
Subject: [PATCH] 1.修改启动脚本，增加crond启动相关的目录配置
---
local/www/cgi-bin/device/query-note | 20 ++++
local/www/device-common.html | 2
local/bin/db | 0
local/www/js/page/detail-yg-hw-ls.js | 15 +-
local/www/cgi-bin/note/query | 6 +
local/version | 2
local/www/detail-video.html | 67 ++++--------
upgrade/app.tgz | 0
local/app/NetModule | 0
local/www/detail-jmkt.html | 28 +----
local/www/cgi-bin/upload/upload.cgi | 0
local/www/js/page/device-common.js | 6
local/www/js/page/single/single.js | 2
local/www/cgi-bin/sys-set/systemSpace | 20 ++--
local/www/cgi-bin/device/batch-note | 50 ++++++++++
local/default/snmp.json | 4
local/www/sys-port.html | 1
local/www/js/page/sys-port.js | 1
local/default/app.ini | 3
local/www/cgi-bin/device/add-note | 15 +++
local/init.sh | 4
local/www/cgi-bin/device-ctrl/reboot-service | 2
local/bin/msg | 0
local/www/cgi-bin/note/save | 7 +
local/bin/export.sh | 2
/dev/null | 0
local/bin/getval | 0
local/www/detail-yg.html | 6 +
local/www/detail-ups.html | 8
local/app/svr | 0
local/app/MainControl | 0
local/www/cgi-bin/device-ctrl/reboot-device | 2
local/www/detail-dcz.html | 5
33 files changed, 178 insertions(+), 100 deletions(-)
diff --git a/local/app/MainControl b/local/app/MainControl
index 668df0b..a4534ca 100755
--- a/local/app/MainControl
+++ b/local/app/MainControl
Binary files differ
diff --git a/local/app/NetModule b/local/app/NetModule
index b4ce25f..034a203 100755
--- a/local/app/NetModule
+++ b/local/app/NetModule
Binary files differ
diff --git a/local/app/svr b/local/app/svr
index e17015d..ff83511 100755
--- a/local/app/svr
+++ b/local/app/svr
Binary files differ
diff --git a/local/bin/db b/local/bin/db
index 193872d..cdd19e0 100755
--- a/local/bin/db
+++ b/local/bin/db
Binary files differ
diff --git a/local/bin/export.sh b/local/bin/export.sh
index d21d1e0..171cda6 100755
--- a/local/bin/export.sh
+++ b/local/bin/export.sh
@@ -9,4 +9,4 @@
/usr/local/bin/snmp_cfg -f /work/snmp.json /tmp/oid_list.csv
-jsoner -s /work/snmp.json script_handler \"/usr/local/bin/getval\"
\ No newline at end of file
+jsoner -s /work/snmp.json script_handler \"/usr/local/bin/getval\"
diff --git a/local/bin/getval b/local/bin/getval
index b83df51..38d364d 100755
--- a/local/bin/getval
+++ b/local/bin/getval
Binary files differ
diff --git a/local/bin/msg b/local/bin/msg
index aaee5e1..281b994 100755
--- a/local/bin/msg
+++ b/local/bin/msg
Binary files differ
diff --git a/local/default/app.ini b/local/default/app.ini
index 2f36733..a14d178 100644
--- a/local/default/app.ini
+++ b/local/default/app.ini
@@ -9,6 +9,5 @@
mul=MulticastIP
lk=linkage
rtsp=rtsp
-dp=display
-export applist=" $main $dc $net $gate $svr $mul $dp"
+export applist=" $main $dc $net $gate $svr $lk"
diff --git a/local/default/snmp.json b/local/default/snmp.json
index dc8e2d8..1c5f19a 100644
--- a/local/default/snmp.json
+++ b/local/default/snmp.json
@@ -1,5 +1,5 @@
{
- "script_handler": "/usr/local/bin/snmp_val.sh",
+ "script_handler": "/usr/local/bin/getval",
"oids": [
{
"oid": "1.3.6.1.4.1.71116.1.1",
@@ -26,4 +26,4 @@
"description": "hum"
}
]
-}
\ No newline at end of file
+}
diff --git a/local/init.sh b/local/init.sh
index 2460357..9b57ca3 100755
--- a/local/init.sh
+++ b/local/init.sh
@@ -47,7 +47,6 @@
then
sh $startScript &
fi
-
#----------------------------------------------------
echo "set eth ..."
/usr/sbin/set_net
@@ -58,6 +57,9 @@
#----------------------------------------------------
#鍚姩crontab鏈嶅姟
+rm /var/spool
+ln -s /usr/local/spool /var/spool
+
/usr/sbin/crond
#sys off time
diff --git a/local/userlib/libfz_ivg.so b/local/userlib/libfz_ivg.so
deleted file mode 100644
index f4cb114..0000000
--- a/local/userlib/libfz_ivg.so
+++ /dev/null
Binary files differ
diff --git a/local/userlib/libivg_2.so b/local/userlib/libivg_2.so
deleted file mode 100644
index 397f6a1..0000000
--- a/local/userlib/libivg_2.so
+++ /dev/null
Binary files differ
diff --git a/local/version b/local/version
index e784f84..b6aeeab 100644
--- a/local/version
+++ b/local/version
@@ -1,3 +1,3 @@
-2025-07-18-v001
+2025-11-18-v001
type=1
IGD5300
diff --git a/local/www/cgi-bin/device-ctrl/reboot-device b/local/www/cgi-bin/device-ctrl/reboot-device
index 5a71adf..caf6559 100755
--- a/local/www/cgi-bin/device-ctrl/reboot-device
+++ b/local/www/cgi-bin/device-ctrl/reboot-device
@@ -6,7 +6,7 @@
echo "{\"code\": \"success\"}"
pontime=`date '+%Y-%m-%d %H:%M:%S: '`
-echo "$pontime web椤甸潰鎵嬪姩閲嶅惎" > /work/data/power.log
+echo "$pontime web椤甸潰鎵嬪姩閲嶅惎" >> /work/data/power.log
result=`/usr/local/script/backup_cfg.sh`
diff --git a/local/www/cgi-bin/device-ctrl/reboot-service b/local/www/cgi-bin/device-ctrl/reboot-service
index d1fedaa..759b60c 100755
--- a/local/www/cgi-bin/device-ctrl/reboot-service
+++ b/local/www/cgi-bin/device-ctrl/reboot-service
@@ -6,7 +6,7 @@
echo "{\"code\": \"success\"}"
pontime=`date '+%Y-%m-%d %H:%M:%S: '`
-echo "$pontime web椤甸潰鎵嬪姩閲嶅惎涓荤▼搴�" > /work/data/power.log
+echo "$pontime web椤甸潰鎵嬪姩閲嶅惎涓荤▼搴�" >> /work/data/power.log
#result=`/usr/local/script/backup_cfg.sh`
killall -9 MainControl
diff --git a/local/www/cgi-bin/device/add-note b/local/www/cgi-bin/device/add-note
new file mode 100755
index 0000000..9647097
--- /dev/null
+++ b/local/www/cgi-bin/device/add-note
@@ -0,0 +1,15 @@
+#!/bin/sh
+# 淇濆瓨杞箟涓棿琛�
+echo -en "Content-type: text/html; charset=utf-8\n\n"
+#*****************************************************
+source ../bin/env.sh
+db="../bin/db"
+
+read data
+content=`$db add_note "$data"`
+echo $content
+
+#echo " add db common device : $data" > log
+#echo " add result : $content" >> log
+
+
diff --git a/local/www/cgi-bin/device/batch-note b/local/www/cgi-bin/device/batch-note
new file mode 100755
index 0000000..5eb1a77
--- /dev/null
+++ b/local/www/cgi-bin/device/batch-note
@@ -0,0 +1,50 @@
+#!/bin/sh
+# 鎵归噺閰嶇疆璁惧杞箟淇℃伅
+#
+echo -en "Content-type: text/html; charset=utf-8\n\n"
+#*****************************************************
+source ../bin/env.sh
+db="../bin/db"
+jsoner="../bin/jsoner"
+msg="../bin/msg"
+dbFile="/work/iot_cfg.db"
+
+
+read content
+
+#echo $content > log
+
+startChn=`$jsoner $content passcode0`
+if [ $? -ne 0 ]
+then
+ echo "{\"code\": \"error\"}"
+ exit
+fi
+endChn=`$jsoner $content passcode1`
+if [ $? -ne 0 ]
+then
+ echo "{\"code\": \"error\"}"
+ exit
+fi
+
+ids=`$jsoner $content devIds`
+if [ $? -ne 0 ]
+then
+ echo "{\"code\": \"error\"}"
+fi
+
+
+dictType=`$jsoner $content dictType`
+if [ $? -eq 0 ]
+then
+ sqlite3 $dbFile "update escape set dictType=$dictType where id in ($ids) and passcode>=$startChn and passcode<=$endChn"
+ if [ $? -ne 0 ]
+ then
+ echo "{\"code\": \"error\"}"
+ echo "dictType exec error " >> log
+ exit
+ fi
+fi
+
+echo "{\"code\": \"success\"}"
+
diff --git a/local/www/cgi-bin/device/query-note b/local/www/cgi-bin/device/query-note
new file mode 100755
index 0000000..a40baf9
--- /dev/null
+++ b/local/www/cgi-bin/device/query-note
@@ -0,0 +1,20 @@
+#!/bin/sh
+# 鏌ヨ-杞箟涓棿琛�
+echo -en "Content-type: text/html; charset=utf-8\n\n"
+#*****************************************************
+source ../bin/env.sh
+
+db="../bin/db"
+
+
+content=`$db query_note`
+if [ $? -eq 0 ]
+then
+ echo "$content"
+else
+ echo "[]"
+fi
+
+#echo "query_all: $content" > log
+
+
diff --git a/local/www/cgi-bin/note/query b/local/www/cgi-bin/note/query
new file mode 100755
index 0000000..af8d269
--- /dev/null
+++ b/local/www/cgi-bin/note/query
@@ -0,0 +1,6 @@
+#!/bin/sh
+# 鏌ヨ鎵�鏈夎浆涔夊瓧鍏镐俊鎭�
+#
+file="/work/escape.json"
+
+cat $file
\ No newline at end of file
diff --git a/local/www/cgi-bin/note/save b/local/www/cgi-bin/note/save
new file mode 100755
index 0000000..c91d52a
--- /dev/null
+++ b/local/www/cgi-bin/note/save
@@ -0,0 +1,7 @@
+#!/bin/sh
+# 淇濆瓨鎵�鏈夎浆涔夊瓧鍏镐俊鎭�
+#
+file="/work/escape.json"
+
+read data
+echo $data > $file
\ No newline at end of file
diff --git a/local/www/cgi-bin/sys-set/systemSpace b/local/www/cgi-bin/sys-set/systemSpace
index 37c9a22..a26c1c6 100755
--- a/local/www/cgi-bin/sys-set/systemSpace
+++ b/local/www/cgi-bin/sys-set/systemSpace
@@ -1,5 +1,5 @@
#!/bin/sh
-# 淇濆瓨涓插彛璁惧淇℃伅
+# 杈撳嚭瀛樺偍淇℃伅
echo -en "Content-type: text/html; charset=utf-8\n\n"
#*****************************************************
source ../bin/env.sh
@@ -31,7 +31,8 @@
if [[ "$used_unit" = "G" ]]
then
- used_value=$(echo "$used_value * 1024" | bc)
+ # 浣跨敤awk鏇夸唬bc杩涜涔樻硶璁＄畻锛�%g鑷姩澶勭悊灏忔暟浣�
+ used_value=$(awk -v val="$used_value" 'BEGIN{printf "%g", val * 1024}')
used_unit="M"
used="$used_value$used_unit"
fi
@@ -44,7 +45,8 @@
if [[ "$available_unit" = "G" ]]
then
- available_value=$(echo "$available_value * 1024" | bc)
+ # 浣跨敤awk鏇夸唬bc杩涜涔樻硶璁＄畻
+ available_value=$(awk -v val="$available_value" 'BEGIN{printf "%g", val * 1024}')
available_unit="M"
available="$available_value$available_unit"
fi
@@ -55,17 +57,15 @@
exit 1
fi
-# 璁＄畻 Size 瀛楁鐨勫��
-size_value=$(echo "$used_value + $available_value" | bc)
+# 璁＄畻 Size 瀛楁鐨勫�硷紙浣跨敤awk鏇夸唬bc鍔犳硶锛�
+size_value=$(awk -v u="$used_value" -v a="$available_value" 'BEGIN{printf "%g", u + a}')
size="${size_value}${used_unit}" # 淇濈暀鍗曚綅
-# 璁＄畻 Use% 瀛楁鐨勫��
-use_percent_value=$(echo "scale=2; $used_value / $size_value * 100" | bc)
+# 璁＄畻 Use% 瀛楁鐨勫�硷紙浣跨敤awk鏇夸唬bc闄ゆ硶鍜屼箻娉曪紝淇濈暀涓や綅灏忔暟锛�
+use_percent_value=$(awk -v u="$used_value" -v s="$size_value" 'BEGIN{printf "%.2f", (u / s) * 100}')
use_percent="${use_percent_value}%"
# 杈撳嚭瑙ｆ瀽缁撴灉
-echo "{\"size\":\"$size\",\"used\":\"$used\",\"available\":\"$available\",\"use%\":\"$use_percent\"}"
-
-
+echo "{\"size\":\"$size\",\"used\":\"$used\",\"available\":\"$available\",\"use%\":\"$use_percent\"}"
\ No newline at end of file
diff --git a/local/www/cgi-bin/upload/upload.cgi b/local/www/cgi-bin/upload/upload.cgi
index 248b509..a1dcebe 100755
--- a/local/www/cgi-bin/upload/upload.cgi
+++ b/local/www/cgi-bin/upload/upload.cgi
Binary files differ
diff --git a/local/www/detail-dcz.html b/local/www/detail-dcz.html
index 2588cf6..a98d215 100644
--- a/local/www/detail-dcz.html
+++ b/local/www/detail-dcz.html
@@ -35,7 +35,7 @@
<div class="pdgxq-group-item jmkt-yichuli">
<span id="conState">姝ｅ父</span>閫氳鐘舵��
</div>
- <div class="pdgxq-group-item" style="width: 200px;">
+ <div class="pdgxq-group-item paixu" style="width: 200px;">
<select lay-ignore="" class="layui-input" id="sort-value">
<option value="all" selected>榛樿鎺掑簭</option>
<option value="u1">鎸夌數鍘嬪崌搴�</option>
@@ -547,7 +547,8 @@
}
// console.log(tag);
// console.log(batteryList);
- renderData(list,batteryList,tag);
+ // renderData(list,batteryList,tag);
+ renderData2(list,batteryList,tag);
}
function renderData(list,batteryList,tag) {
diff --git a/local/www/detail-jmkt.html b/local/www/detail-jmkt.html
index be5c207..28fff78 100644
--- a/local/www/detail-jmkt.html
+++ b/local/www/detail-jmkt.html
@@ -473,36 +473,22 @@
function renderValue(type,item) {
var result = item.value;
- // if(type == "2002" || type == "2020" || type == "2022"){
- // if(item.passcode >= 8 && item.passcode <= 998){
- // result = (item.value=="0"?"姝ｅ父":"鍛婅");
- // if(item.passcode == 16){
- // if(item.value=="0"){
- // result = "閫侀";
- // }
- // if(item.value=="1"){
- // result = "鍒剁儹";
- // }
- // if(item.value=="2"){
- // result = "鍒跺喎";
- // }
- // // result = (item.value=="0"?"鍏抽棴":"寮�鍚�");
- // }
- // }
- // }
+ if(type == "2002" || type == "2020" || type == "2022"){
+ if(item.passcode >= 13 && item.passcode <= 100){
+ result = (item.value=="0"?"姝ｅ父":"鍛婅");
+ }
+ }
var str = "";
if(item.note && item.note.length > 0){
str += item.note;
}else{
- str += item.value;
+ str += result;
}
if(item.unit && item.unit.length > 0){
str += " " + item.unit;
}
- result = str;
-
- return result;
+ return str;
}
diff --git a/local/www/detail-ups.html b/local/www/detail-ups.html
index f33b2a8..9b0186d 100644
--- a/local/www/detail-ups.html
+++ b/local/www/detail-ups.html
@@ -203,7 +203,7 @@
}
html += "<tr><td>"+cur.name+"</td><td>"+str+"</td><td>"+time+"</td></tr>";
}else{
- html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur.passcode,cur.value)+"</td><td>"+time+"</td></tr>";
+ html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur)+"</td><td>"+time+"</td></tr>";
//娓叉煋鍒楄〃
@@ -284,7 +284,7 @@
}
html += "<tr><td>"+cur.name+"</td><td>"+str+"</td><td>"+time+"</td></tr>";
}else{
- html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur.passcode,cur.value)+"</td><td>"+time+"</td></tr>";
+ html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur)+"</td><td>"+time+"</td></tr>";
//娓叉煋鍒楄〃
// html += "<tr><td>"+cur.name+"</td><td>"+(cur.value?cur.value:"")+"</td><td>"+time+"</td></tr>";
@@ -357,8 +357,8 @@
}
}
- function renderValue(id,type,code,value) {
- var res = value;
+ function renderValue(id,type,cur) {
+ var res = cur.value;
// if(type == "1001"){
// if(code == 3 || code == 5){
diff --git a/local/www/detail-video.html b/local/www/detail-video.html
index e4d44d3..dfad0f5 100644
--- a/local/www/detail-video.html
+++ b/local/www/detail-video.html
@@ -33,7 +33,7 @@
</head>
<body class="pdgxq-body">
-<div class="i-container div-body">
+<div class="i-container">
<div class="jmkt-main">
<div class="layui-fluid">
@@ -43,65 +43,46 @@
<div class="pdgxq-H">
<h3><i></i>鐩戞帶淇℃伅</h3>
-<!-- <div class="sp-tab-hd">-->
-<!-- <select id="select_type" class="videoType">-->
-<!-- <option value="IN">VLC鍐呯綉鎾斁</option>-->
-<!-- <option value="OUT">VLC澶栫綉鎾斁</option>-->
-<!-- <option value="WEB">Web鐩存挱璁块棶</option>-->
-<!-- </select>-->
-<!-- <span><img src="./images/sp-tabImg2.png"/></span>-->
-<!-- <span class="active"><img src="./images/sp-tabImg1.png"/></span>-->
-<!-- </div>-->
+ <div class="sp-tab-hd">
+ <select id="select_type" class="videoType">
+ <option value="IN">VLC鍐呯綉鎾斁</option>
+ <option value="OUT">VLC澶栫綉鎾斁</option>
+ <option value="WEB">Web鐩存挱璁块棶</option>
+ </select>
+ <span><img src="./images/sp-tabImg2.png"/></span>
+ <span class="active"><img src="./images/sp-tabImg1.png"/></span>
+ </div>
</div>
<div class="sp-tab-bd">
- <div class="sp-showBox layui-row ">
- <div class="layui-col-lg4 layui-col-md4">
+ <div class="sp-showBox layui-row">
+ <div class="layui-col-lg6 layui-col-md6">
<div id="video1" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
+<!-- <iframe id="myPlayer1" width="100%" height="100%"style="border-radius: 5px;"-->
+<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�1" ></iframe>-->
</div>
</div>
- <div class="layui-col-lg4 layui-col-md4">
+ <div class="layui-col-lg6 layui-col-md6">
<div id="video2" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
+<!-- <iframe id="myPlayer2" width="100%" height="100%"style="border-radius: 5px;"-->
+<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�2" ></iframe>-->
</div>
</div>
- <div class="layui-col-lg4 layui-col-md4">
+ <div class="layui-col-lg6 layui-col-md6">
<div id="video3" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
+<!-- <iframe id="myPlayer3" width="100%" height="100%"style="border-radius: 5px;"-->
+<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�3" ></iframe>-->
</div>
</div>
- <div class="layui-col-lg4 layui-col-md4">
+ <div class="layui-col-lg6 layui-col-md6">
<div id="video4" class="sp-showItem ">
<img src="./images/sp-img.png" class="sp-hideImg"/>
+<!-- <iframe id="myPlayer4" width="100%" height="100%"style="border-radius: 5px;"-->
+<!-- src="http://127.0.0.1:8083/stream/player/鎽勫儚鏈�4" ></iframe>-->
</div>
</div>
-
- <div class="layui-col-lg4 layui-col-md4">
- <div id="video5" class="sp-showItem ">
- <img src="./images/sp-img.png" class="sp-hideImg"/>
- </div>
- </div>
- <div class="layui-col-lg4 layui-col-md4">
- <div id="video6" class="sp-showItem ">
- <img src="./images/sp-img.png" class="sp-hideImg"/>
- </div>
- </div>
- <div class="layui-col-lg4 layui-col-md4">
- <div id="video7" class="sp-showItem ">
- <img src="./images/sp-img.png" class="sp-hideImg"/>
- </div>
- </div>
- <div class="layui-col-lg4 layui-col-md4">
- <div id="video8" class="sp-showItem ">
- <img src="./images/sp-img.png" class="sp-hideImg"/>
- </div>
- </div>
- <div class="layui-col-lg4 layui-col-md4">
- <div id="video9" class="sp-showItem ">
- <img src="./images/sp-img.png" class="sp-hideImg"/>
- </div>
- </div>
-
</div>
<div class="sp-showBox layui-row show">
@@ -218,7 +199,7 @@
<script src="./plugins/layui/layui.js"></script>
<script src="./js/constant.js"></script>
<script src="./plugins/EZUIKit/ezuikit.js"></script>
-<script src="./js/page/detail-video-dkkj.js"></script>
+<script src="./js/page/detail-video.js"></script>
</body>
diff --git a/local/www/detail-yg.html b/local/www/detail-yg.html
index 22429cc..5f65399 100644
--- a/local/www/detail-yg.html
+++ b/local/www/detail-yg.html
@@ -152,6 +152,9 @@
if (item.passcode == 1) {
if (item.value == "0") { //姝ｅ父
html1 += '<td>姝ｅ父</td>';
+ if(!conTag){
+ conTag = true;
+ }
} else { //寮傚父
html1 += '<td>寮傚父</td>';
tag1 = false;
@@ -164,6 +167,9 @@
if (item.passcode == 2) {
if (item.value == "0") { //姝ｅ父
html1 += '<td>姝ｅ父</td>';
+ if(!warnTag){
+ warnTag = true;
+ }
} else { //寮傚父
html1 += '<td>鎶ヨ</td>';
tag2 = false;
diff --git a/local/www/device-common.html b/local/www/device-common.html
index 161ad4f..e0eb316 100644
--- a/local/www/device-common.html
+++ b/local/www/device-common.html
@@ -137,7 +137,7 @@
<label class="layui-form-label">璁惧ID</label>
<div class="layui-input-block">
<input type="text" id="device-id" name="id" class="layui-input pop-input"
- placeholder="璇疯緭鍏ワ細0~999">
+ placeholder="璇疯緭鍏ワ細1~999">
</div>
</div>
</div>
diff --git a/local/www/js/page/detail-yg-hw-ls.js b/local/www/js/page/detail-yg-hw-ls.js
index f078ee9..b5350ac 100644
--- a/local/www/js/page/detail-yg-hw-ls.js
+++ b/local/www/js/page/detail-yg-hw-ls.js
@@ -27,12 +27,15 @@
var dataList = new Array();
//閬嶅巻鍚岀被鍨嬭澶囬泦鍚堬紝鏍规嵁id鏌ヨ鏁版嵁鍚庝繚瀛�
for (var i = 0; i < deviceList.length; i++) {
- $.post("./cgi-bin/detail/query-data", JSON.stringify({id: deviceList[i].id}), function (data, status) {
- if ("success" == status) {
- console.log(data);
- dataList.push(data);
- }
- }, "json");
+ var cur = deviceList[i];
+ if(cur.vld != 1){
+ $.post("./cgi-bin/detail/query-data", JSON.stringify({id: deviceList[i].id}), function (data, status) {
+ if ("success" == status) {
+ console.log(data);
+ dataList.push(data);
+ }
+ }, "json");
+ }
}
if (dataList != null && dataList.length > 0) {
renderInfo(dataList);
diff --git a/local/www/js/page/device-common.js b/local/www/js/page/device-common.js
index 2791415..9f1c719 100644
--- a/local/www/js/page/device-common.js
+++ b/local/www/js/page/device-common.js
@@ -286,11 +286,11 @@
}
var r = /^\d{1,3}$/;
if(!r.test(data.id)){
- window.parent.notify("鎮ㄨ緭鍏ョ殑ID涓嶇鍚堣姹傦紒璁惧ID璁剧疆鑼冨洿涓�0~999鐨勬鏁存暟锛�");
+ window.parent.notify("鎮ㄨ緭鍏ョ殑ID涓嶇鍚堣姹傦紒璁惧ID璁剧疆鑼冨洿涓�1~999鐨勬鏁存暟锛�");
return;
}
- if (data.id<0 || data.id>999) {
- window.parent.notify("璁惧ID璁剧疆鑼冨洿涓�0~999锛�");
+ if (data.id<1 || data.id>999) {
+ window.parent.notify("璁惧ID璁剧疆鑼冨洿涓�1~999锛�");
return;
}
if (valueList.length == 0) {
diff --git a/local/www/js/page/single/single.js b/local/www/js/page/single/single.js
index b917943..de5e9f4 100644
--- a/local/www/js/page/single/single.js
+++ b/local/www/js/page/single/single.js
@@ -152,7 +152,7 @@
sysStart = sysStart.substring(0, 4) + "-" + sysStart.substring(4, 6) + "-" + sysStart.substring(6, 8) + " 00:00:00";
// 璁剧疆涓荤晫闈㈢殑鏍囬screenName
- $("#main-title span").text(screenName);
+ $("#main-title").text(screenName);
// 璁剧疆涓荤晫闈㈢殑鏍囪screenSlogan
$("#main-slogan").text(screenSlogan);
// 鍒濆鍖栬繍琛屽ぉ鏁�
diff --git a/local/www/js/page/sys-port.js b/local/www/js/page/sys-port.js
index d8d2821..1d14fc8 100644
--- a/local/www/js/page/sys-port.js
+++ b/local/www/js/page/sys-port.js
@@ -94,6 +94,7 @@
html += '<option value="9600">9600</option>';
html += '<option value="4800">4800</option>';
html += '<option value="2400">2400</option>';
+ html += '<option value="1200">1200</option>';
html += '</select>';
html += '</td>';
html += '<td>';
diff --git a/local/www/sys-port.html b/local/www/sys-port.html
index 77ebc87..0c3f832 100644
--- a/local/www/sys-port.html
+++ b/local/www/sys-port.html
@@ -104,6 +104,7 @@
<option value="9600" selected>9600</option>
<option value="4800">4800</option>
<option value="2400">2400</option>
+ <option value="1200">1200</option>
</select>
</td>
<td>
diff --git a/upgrade/app.tgz b/upgrade/app.tgz
index b733f40..c319aba 100644
--- a/upgrade/app.tgz
+++ b/upgrade/app.tgz
Binary files differ
--
Gitblit v1.9.3