cwchen
/
ah_jjzhgd_webscreen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改默认条数

This commit is contained in:
haozq 2024-08-23 15:13:36 +08:00
parent 6dd7f53bd5
commit 86023302e4
6 changed files with 132 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/video/video.css
View File

@ -193,7 +193,8 @@ body {
#left-bottom { #left-bottom {
width: 100%; width: 100%;
height: 57.8%; height: 95.8%;
/*height: 57.8%;*/
background: url("../../img/video/ball_list.png") no-repeat 0 0 / 100% 100%; background: url("../../img/video/ball_list.png") no-repeat 0 0 / 100% 100%;
background-position: center center !important; background-position: center center !important;
} }

4
js/login/login2.js
View File

@ -2,8 +2,8 @@ let form, layer;
layui.use(function () { layui.use(function () {
let isc_login="http://iscssotest.ah.sgcc.com.cn/isc_sso/login?service="; let isc_login="http://iscssotest.ah.sgcc.com.cn/isc_sso/login?service=";
let logUrl="http://27.50.49.56:21624/zhgd-web/sgIndex.html"; let logUrl="http://27.50.49.56:21624/zhgd-web/sgIndex.html";
// window.location.href =isc_login+logUrl; window.location.href =isc_login+logUrl;
// return false; return false;
form = layui.form; form = layui.form;
layer = layui.layer; layer = layui.layer;
form.on('submit(demo-login)', function (data) { form.on('submit(demo-login)', function (data) {

22
js/operEnvironment/operEnvironment.js
View File

@ -102,12 +102,12 @@ function DaylightDisplacementList(deviceId){
{field: 'changeVal', title: '变化值'}, {field: 'changeVal', title: '变化值'},
{field: 'createTime', title: '检测时间'}, {field: 'createTime', title: '检测时间'},
{field: 'isWarn', title: '状态', templet: function (d) { {field: 'isWarn', title: '状态', templet: function (d) {
if (d.isWarn == 0) { if (d.isWarn == 1) {
return '<span style="color: #FF5722;">告警</span>'; return '<span style="color: #FF5722;">告警</span>';
} else if (d.isWarn == 1) { } else if (d.isWarn == 0) {
return '<span style="color: #5FB878;">正常</span>'; return '<span style="color: #5FB878;">正常</span>';
}else{ }else{
return '<span></span>'; return '<span style="color: #5FB878;">正常</span>';
} }
} }
} }
@ -137,7 +137,8 @@ function DaylightDisplacementApi(){
"roleCode": roleCode, "roleCode": roleCode,
"orgId": orgId, "orgId": orgId,
"userId": userId, "userId": userId,
"bidCode": bidCode "bidCode": bidCode,
"deviceType":1908
} }
let encryptStr = encryptCBC(JSON.stringify(params)); let encryptStr = encryptCBC(JSON.stringify(params));
ajaxRequest(url, "POST", encryptStr, true, function () { ajaxRequest(url, "POST", encryptStr, true, function () {
@ -204,10 +205,11 @@ function zephyrineWeather() {
// navigator.geolocation.getCurrentPosition(function (position) { // navigator.geolocation.getCurrentPosition(function (position) {
// let latitude = position.coords.latitude; // let latitude = position.coords.latitude;
// let longitude = position.coords.longitude; // let longitude = position.coords.longitude;
let latitude = '31.93566198931321';
let longitude = '117.16010067578883'; let latitude = '34.007143';
let longitude = '116.884782';
console.log("经度：" + longitude + ", 纬度：" + latitude); console.log("经度：" + longitude + ", 纬度：" + latitude);
let latLon = longitude + ',' + latitude; let latLon = '116.747321,33.934215';
// 百度地图API // 百度地图API
// 创建一个点坐标 // 创建一个点坐标
@ -581,7 +583,8 @@ function GPSInstallationApi(){
"roleCode": roleCode, "roleCode": roleCode,
"orgId": orgId, "orgId": orgId,
"userId": userId, "userId": userId,
"bidCode": bidCode "bidCode": bidCode,
"deviceType":"1910"
} }
let encryptStr = encryptCBC(JSON.stringify(params)); let encryptStr = encryptCBC(JSON.stringify(params));
ajaxRequest(url, "POST", encryptStr, true, function () { ajaxRequest(url, "POST", encryptStr, true, function () {
@ -599,7 +602,8 @@ function GPSInstallationApi(){
}, "application/json",aqEnnable); }, "application/json",aqEnnable);
} }
function GPSInstallation(environmentData) { function
GPSInstallation(environmentData) {
console.log(environmentData); console.log(environmentData);
if(environmentData && environmentData.length>0){ if(environmentData && environmentData.length>0){
GPSInstallationEnvironmentApi(environmentData[0].deviceId); GPSInstallationEnvironmentApi(environmentData[0].deviceId);

6
js/pages/accessMge/accessMge.js
View File

@ -204,9 +204,9 @@ function getVehicleStatisticsList(bidCode) {
}, },
cols: [[ cols: [[
{ type: 'numbers', title: '序号' }, // 添加序号列 { type: 'numbers', title: '序号' }, // 添加序号列
{ field: 'proName', title: '工程名称', align: 'center', width: '10%' }, { field: 'proName', title: '工程名称', align: 'center', width: '20%' },
{ field: 'carNum', title: '车牌号', align: 'center', width: '15%' }, { field: 'carNum', title: '车牌号', align: 'center', width: '10%' },
{ field: 'userName', title: '司机', align: 'center', width: '15%' }, { field: 'userName', title: '司机', align: 'center', width: '10%' },
{ field: 'phone', title: '司机电话', align: 'center', width: '20%' }, { field: 'phone', title: '司机电话', align: 'center', width: '20%' },
{ field: 'accessType', title: '状态', align: 'center', width: '10%' }, { field: 'accessType', title: '状态', align: 'center', width: '10%' },
{ field: 'accesssTime', title: '时间', align: 'center', width: '30%' } { field: 'accesssTime', title: '时间', align: 'center', width: '30%' }

2
js/pages/home/navigation.js
View File

@ -143,7 +143,7 @@ let loading;
// 当语音识别服务错误时触发 // 当语音识别服务错误时触发
recognition.onerror = function(error) { recognition.onerror = function(error) {
layer.close(loading); layer.close(loading);
// console.error('语音识别服务错误:', error); console.error('语音识别服务错误:', error);
layer.msg('浏览器不支持语音识别服务', { layer.msg('浏览器不支持语音识别服务', {
icon: 6, icon: 6,
time: 1000 time: 1000

10
pages/video/video.html
View File

@ -25,7 +25,7 @@
<div id="main-box" class="layout"> <div id="main-box" class="layout">
<div id="left-box" class="layout"> <div id="left-box" class="layout">
<!-- 云台控制 --> <!-- 云台控制 -->
<div id="left-top" class="layout"> <div id="left-top" class="layout" style="display: none">
<div id="left-top-one" class="layout"> <div id="left-top-one" class="layout">
<div id="one-child"> <div id="one-child">
<div id="yclx" class="layout"> <div id="yclx" class="layout">
@ -93,16 +93,16 @@
<div id="left-bottom"> <div id="left-bottom">
<div id="search-box"> <div id="search-box">
<form class="layui-form layout" onsubmit="return false;"> <form class="layui-form layout" onsubmit="return false;">
<input class="layui-input" autocomplete="off" id="keyWord" placeholder="请输入关键字"> <input class="layui-input" autocomplete="off" style="margin-top: 10px" id="keyWord" placeholder="请输入关键字">
<img src="../../img/video/search.png" id="search-img" alt="搜索" onclick="loadVideoTree()"> <img src="../../img/video/search.png" style="margin-top: 10px" id="search-img" alt="搜索" onclick="loadVideoTree()">
</form> </form>
</div> </div>
<div id="device-online-box" class="layout"> <div id="device-online-box" class="layout" style="margin-top: 10px">
<div class="device-status layout">全部（0）</div> <div class="device-status layout">全部（0）</div>
<div class="device-status layout">在线（0）</div> <div class="device-status layout">在线（0）</div>
<div class="device-status layout">离线（0）</div> <div class="device-status layout">离线（0）</div>
</div> </div>
<div id="device-tree"> <div id="device-tree" style="margin-top: 10px">
<ul id="video-tree" class="dtree" style="height: 100%;overflow: auto;margin: 0 2%;" data-id="-1"></ul> <ul id="video-tree" class="dtree" style="height: 100%;overflow: auto;margin: 0 2%;" data-id="-1"></ul>
</div> </div>
</div> </div>