Skip to content

潘建波 / taiyangnengxiangji

Go to a project
Commit 61a03e24 by 潘建波
Options

修改设置

1 parent befdbf36
Inline Side-by-side
Showing 2 changed files with 121 additions and 7 deletions
code/TrafficClient/client/settings/base/deviceInfo.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
margin-left: 10px; margin-left: 10px;
height: 226px; height: 250px;
width: 420px; width: 420px;
float: left; float: left;
} }
...@@ -76,6 +76,12 @@ ...@@ -76,6 +76,12 @@
<div id="6" name="6"></div> <div id="6" name="6"></div>
</td> </td>
</tr> </tr>
<tr>
<td class="tdTitle">单片机版本：</td>
<td class="tdContent">
<div id="scmVersion" name="scmVersion"></div>
</td>
</tr>
</table> </table>
<table class="settingsContainer basicTable" style="height:100px; clear: both; "> <table class="settingsContainer basicTable" style="height:100px; clear: both; ">
<tr> <tr>
...@@ -140,8 +146,14 @@ ...@@ -140,8 +146,14 @@
<div id="GPSSatelliteNumber" name="GPSSatelliteNumber"></div> <div id="GPSSatelliteNumber" name="GPSSatelliteNumber"></div>
</td> </td>
</tr> </tr>
<tr>
<td class="tdTitle">温度：</td>
<td class="tdContent">
<div id="Temperature" name="Temperature"></div>
</td>
</tr>
</table> </table>
<table class="settingsContainer basicTable" style="display: block; clear: both; position: absolute; left: 440px;top: 245px;height: 100px"> <table class="settingsContainer basicTable" style="display: block; clear: both; position: absolute; left: 440px;top: 270px;height: 100px">
<tr> <tr>
<td class="tdTitle">方向：</td> <td class="tdTitle">方向：</td>
<td class="tdContent"> <td class="tdContent">
...@@ -161,14 +173,47 @@ ...@@ -161,14 +173,47 @@
</td> </td>
</tr> </tr>
</table> </table>
<table class="settingsContainer basicTable" style="display: block; clear: both; height: 30px"> <table class="settingsContainer basicTable" style="display: block; clear: both; height: 190px">
<tr> <tr>
<td class="tdTitle">温度：</td> <td class="tdTitle">剩余电量：</td>
<td class="tdContent"> <td class="tdContent">
<div id="Temperature" name="Temperature"></div> <div id="dumpEnergy" name="dumpEnergy"></div>
</td>
</tr>
<tr>
<td class="tdTitle">相机在线时间：</td>
<td class="tdContent">
<div id="onLineTimer" name="onLineTimer"></div>
</td>
</tr>
<tr>
<td class="tdTitle">4G网络信号强度</td>
<td class="tdContent">
<div id="netSignal" name="netSignal"></div>
</td>
</tr>
<tr>
<td class="tdTitle">4GCCID：</td>
<td class="tdContent">
<div id="gccid" name="gccid"></div>
</td>
</tr>
<tr>
<td class="tdTitle">电流：</td>
<td class="tdContent">
<div id="currentEnergy" name="currentEnergy"></div>
</td> </td>
</tr> </tr>
</table> </table>
<div style="display: block; clear: both; height: 150px;margin: 10px;color: rgb(95, 134, 241);">
<p style="margin-bottom: 5px;">报警信息展示：</p>
<div>电池剩余电量状态报警：电量过低(低于30%)</div>
<div>电池最大电量异常报警：电池寿命异常(电池峰值电量下降到初始峰值电量的50%以下)</div>
<div>电池温度异常报警：温度过高(高于100°c);温度过低(低于-20°c)</div>
<div>加热模块异常报警：无法加热</div>
<div>相机与数据接收服务时间异常报警：相机与服务时间不同步</div>
<div>相机与服务网络连接状态报警：相机未连接到数据接收服务器</div>
</div>
</form> </form>
<script src="../../scripts/easyui/jquery.min.js"></script> <script src="../../scripts/easyui/jquery.min.js"></script>
<script src="../../scripts/easyui/jquery.easyui.min.js"></script> <script src="../../scripts/easyui/jquery.easyui.min.js"></script>
...@@ -181,7 +226,7 @@ ...@@ -181,7 +226,7 @@
var interval; var interval;
$().ready(function () { $().ready(function () {
loadDeviceInfo(); loadDeviceInfo();
interval = setInterval(queryGpsSensorData, 500); interval = setInterval(queryGpsSensorData, 10000);
}); });
function PreProcessJsonMsg(PreProcessMsg) { function PreProcessJsonMsg(PreProcessMsg) {
......
code/TrafficClient/client/settings/base/deviceManage.esp
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
width: 450px; width: 450px;
} }
table.settingsContainer .settimer{
width: 160px!important;
}
.settingBtn { .settingBtn {
float: left; float: left;
} }
...@@ -148,6 +152,30 @@ ...@@ -148,6 +152,30 @@
<a class="settingBtn" id="btnResetDefault">恢复出厂参数</a> <a class="settingBtn" id="btnResetDefault">恢复出厂参数</a>
</td> </td>
</tr> </tr>
<tr>
<td class="tdTitle">开机时间设置</td>
<td class="tdContent">
<select class="settimer" id="starttimer" placeholder="开始时间">
</select>
~
<select class="settimer" id="endtimer" placeholder="结束时间">
</select>
</td>
</tr>
<tr>
<td class="tdTitle">关机时间设置</td>
<td class="tdContent">
<select class="settimer" id="starttimer1" placeholder="开始时间">
</select> ~
<select class="settimer" id="endtimer1" placeholder="结束时间">
</select>
</td>
<td class="tdContent">
<a class="settingBtn" id="savetimer">保存</a>
<% inputSecurityToken(); %>
</td>
</tr>
<!-- <tr> <!-- <tr>
<td class="tdTitle">恢复出厂</td> <td class="tdTitle">恢复出厂</td>
<td class="tdContent"> <td class="tdContent">
...@@ -174,7 +202,8 @@ ...@@ -174,7 +202,8 @@
showDeviceTime(); showDeviceTime();
//加载校时相关参数 //加载校时相关参数
loadTimingInfo(); loadTimingInfo();
//加载时间段
gettimer();
//校时模式联动 //校时模式联动
$("#timingMode").change(onTimingModeChanged); $("#timingMode").change(onTimingModeChanged);
$("#btnSave").click(saveParametersToServer);//保存校时模式及NTP服务器参数 $("#btnSave").click(saveParametersToServer);//保存校时模式及NTP服务器参数
...@@ -190,6 +219,12 @@ ...@@ -190,6 +219,12 @@
$("#btnResetDefault").click(resetDefault);//恢复默认参数 $("#btnResetDefault").click(resetDefault);//恢复默认参数
$("#btnFactoryReset").click(factoryReset);//恢复出厂设置 $("#btnFactoryReset").click(factoryReset);//恢复出厂设置
$("#savetimer").click(savetimer) //时间设置
var html = '<option value=""></option>';
for(var i = 1; i < 25; i++){
html += "<option value="+i+">"+i+"</option>"
}
$('.settimer').html(html);
}); });
//保存参数到服务器 //保存参数到服务器
...@@ -214,6 +249,40 @@ ...@@ -214,6 +249,40 @@
function showDeviceTime() { function showDeviceTime() {
getServerTime(showTimeString); getServerTime(showTimeString);
} }
//开启时间设置
function savetimer(val) {
var timer = {};
var s1 = $("#starttimer").val();
var e1 = $("#endtimer").val();
var s2 = $("#starttimer1").val();
var e2 = $("#endtimer1").val();
var parms = {
open1:s1,
close1:e1,
open2:s2,
close2:e2
}
var security = document.getElementsByName("-xsrf-");
parms["-xsrf-"] = security[0].value;
var url = "/do/trafficController/setExtraDataOpenTime";
$.post(url, parms, function (data) {
if (data.error) {
} else {
}
}, "json");
}
function gettimer(){
var url = "/do/trafficController/getExtraDataOpenTime";
$.get(url, null,function (data) {
$("#starttimer").val(data.feedback.open1);
$("#endtimer").val(data.feedback.close1);
$("#starttimer1").val(data.feedback.open2);
$("#endtimer1").val(data.feedback.close2);
}, "json");
}
//负责显示时间字符串 //负责显示时间字符串
function showTimeString(time) { function showTimeString(time) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!