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/security-patrol.js | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
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);
}
--
Gitblit v1.9.3