From c542ab1f2b5e406553c79c7c7b69ebe095a231c5 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 13 Dec 2024 14:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dutyTask/violation/addViolationForm.html | 1 +
.../dutyTask/violation/editViolationForm.html | 1 +
.../violation/editViolationForm2.html | 1 +
bns/html/dutyTask/violation/handAddVio.html | 1 +
.../dutyTask/violation/handRectifyForm.html | 1 +
bns/html/dutyTask/violation/rectifyForm.html | 1 +
.../dutyTask/violation/rectifyFormByCity.html | 1 +
bns/js/base/user/userManage.js | 6 ++++-
bns/js/compreDisplay/child/classMeeting.js | 2 +-
.../cityHome/cityHomeEchartsMap.js | 2 +-
bns/js/compreDisplay/map.js | 2 +-
bns/js/dutyTask/abnormalRepStatistics.js | 2 +-
bns/js/dutyTask/admittedPerson.js | 5 ++++-
.../dutyTask/backboneScore/backboneScore.js | 5 ++++-
.../backboneScore/backboneScoreForm.js | 7 ++++--
bns/js/dutyTask/newTodayTask.js | 2 +-
bns/js/dutyTask/todayTask.js | 2 +-
bns/js/dutyTask/violation/addViolationForm.js | 7 +++++-
.../dutyTask/violation/editViolationForm.js | 7 +++++-
.../dutyTask/violation/editViolationForm2.js | 7 +++++-
bns/js/dutyTask/violation/handAddVio.js | 7 +++++-
bns/js/dutyTask/violation/handRectifyForm.js | 22 ++++++++++++++++---
bns/js/dutyTask/violation/rectifyForm.js | 22 ++++++++++++++++---
.../dutyTask/violation/rectifyFormByCity.js | 22 +++++++++++++++++--
bns/js/dutyTask/violationStatistics.js | 2 +-
bns/js/earlyWarning/tableDisPose.js | 8 +++----
bns/js/public/public.js | 3 ++-
bns/js/staging/stagingAjax.js | 2 +-
bns/js/system/public_utils.js | 20 ++++++++---------
bns/js/teamInformation/classMeet.js | 2 +-
bns/js/teamInformation/teamBlackList.js | 5 ++++-
bns/js/teamInformation/teamDetails.js | 2 +-
32 files changed, 137 insertions(+), 43 deletions(-)
diff --git a/bns/html/dutyTask/violation/addViolationForm.html b/bns/html/dutyTask/violation/addViolationForm.html
index a4117bc..92d0331 100644
--- a/bns/html/dutyTask/violation/addViolationForm.html
+++ b/bns/html/dutyTask/violation/addViolationForm.html
@@ -17,6 +17,7 @@
+
diff --git a/bns/html/dutyTask/violation/editViolationForm.html b/bns/html/dutyTask/violation/editViolationForm.html
index 9331f2e..bbd012c 100644
--- a/bns/html/dutyTask/violation/editViolationForm.html
+++ b/bns/html/dutyTask/violation/editViolationForm.html
@@ -17,6 +17,7 @@
+
diff --git a/bns/html/dutyTask/violation/editViolationForm2.html b/bns/html/dutyTask/violation/editViolationForm2.html
index bafed99..d309704 100644
--- a/bns/html/dutyTask/violation/editViolationForm2.html
+++ b/bns/html/dutyTask/violation/editViolationForm2.html
@@ -18,6 +18,7 @@
+
diff --git a/bns/html/dutyTask/violation/handAddVio.html b/bns/html/dutyTask/violation/handAddVio.html
index 2bdec10..6e6e960 100644
--- a/bns/html/dutyTask/violation/handAddVio.html
+++ b/bns/html/dutyTask/violation/handAddVio.html
@@ -17,6 +17,7 @@
+
diff --git a/bns/html/dutyTask/violation/handRectifyForm.html b/bns/html/dutyTask/violation/handRectifyForm.html
index c12697e..6558630 100644
--- a/bns/html/dutyTask/violation/handRectifyForm.html
+++ b/bns/html/dutyTask/violation/handRectifyForm.html
@@ -21,6 +21,7 @@
+
diff --git a/bns/html/dutyTask/violation/rectifyForm.html b/bns/html/dutyTask/violation/rectifyForm.html
index 939dc88..cfab6b0 100644
--- a/bns/html/dutyTask/violation/rectifyForm.html
+++ b/bns/html/dutyTask/violation/rectifyForm.html
@@ -21,6 +21,7 @@
+
diff --git a/bns/html/dutyTask/violation/rectifyFormByCity.html b/bns/html/dutyTask/violation/rectifyFormByCity.html
index b042a9e..7e18fbb 100644
--- a/bns/html/dutyTask/violation/rectifyFormByCity.html
+++ b/bns/html/dutyTask/violation/rectifyFormByCity.html
@@ -21,6 +21,7 @@
+
diff --git a/bns/js/base/user/userManage.js b/bns/js/base/user/userManage.js
index 7f6df89..9bc210b 100644
--- a/bns/js/base/user/userManage.js
+++ b/bns/js/base/user/userManage.js
@@ -218,7 +218,11 @@ function initTable(dataList, limit, page) {
}
}
},
- {field: 'phone', title: '手机号', align: 'center'},
+ {field: 'phone', title: '手机号', align: 'center',
+ templet: function (d) {
+ return phoneHide(d.phone);
+ }
+ },
{field: 'unit', title: '单位', align: 'center'},
{field: 'orgName', title: '组织机构', align: 'center'},
{field: 'roleName', title: '角色', align: 'center'},
diff --git a/bns/js/compreDisplay/child/classMeeting.js b/bns/js/compreDisplay/child/classMeeting.js
index c32a64f..39de3c7 100644
--- a/bns/js/compreDisplay/child/classMeeting.js
+++ b/bns/js/compreDisplay/child/classMeeting.js
@@ -126,7 +126,7 @@ function initTable(dataList, limit, page) {
align: "center",
sort:true,
templet: function (d) {
- return '' + setValue2(d.workManage) + ' ' + setValue2(d.workManagePhone) + ''
+ return '' + setValue2(d.workManage) + ' ' + setValue2(phoneHide(d.workManagePhone)) + ''
}
},
{
diff --git a/bns/js/compreDisplay/cityHome/cityHomeEchartsMap.js b/bns/js/compreDisplay/cityHome/cityHomeEchartsMap.js
index a1204bb..b5db893 100644
--- a/bns/js/compreDisplay/cityHome/cityHomeEchartsMap.js
+++ b/bns/js/compreDisplay/cityHome/cityHomeEchartsMap.js
@@ -26,7 +26,7 @@ function map2(dataMap) {
riskLevel: data[i].riskType,
workContent: dealEmptyString(data[i].workContent),
isOnline: isOnline(data[i].ballStatus),
- workManager: dealEmptyString(data[i].workManage) + '' + dealEmptyString(data[i].workManagePhone),
+ workManager: dealEmptyString(data[i].workManage) + '' + dealEmptyString(phoneHide(data[i].workManagePhone)),
value: geoCoord.concat(data[i].value),
coordinate: data[i].coordinate,
});
diff --git a/bns/js/compreDisplay/map.js b/bns/js/compreDisplay/map.js
index 1c5be5c..1ec637b 100644
--- a/bns/js/compreDisplay/map.js
+++ b/bns/js/compreDisplay/map.js
@@ -29,7 +29,7 @@ function map(dataMap) {
riskLevel: data[i].riskType,
workContent: dealEmptyString(data[i].workContent),
isOnline: isOnline(data[i].ballStatus),
- workManager: dealEmptyString(data[i].workManage) + '' + dealEmptyString(data[i].workManagePhone),
+ workManager: dealEmptyString(data[i].workManage) + '' + dealEmptyString(phoneHide(data[i].workManagePhone)),
value: geoCoord.concat(data[i].value,data[i].proName,data[i].num),
coordinate: data[i].coordinate,
});
diff --git a/bns/js/dutyTask/abnormalRepStatistics.js b/bns/js/dutyTask/abnormalRepStatistics.js
index 91651a6..932669c 100644
--- a/bns/js/dutyTask/abnormalRepStatistics.js
+++ b/bns/js/dutyTask/abnormalRepStatistics.js
@@ -140,7 +140,7 @@ function initTable(dataList, limit, page) {
align: "center",
sort: true,
templet: function (d) {
- return '' + setValue2(d.teamLeader) + '
' + setValue2(d.teamLeaderPhone) + ''
+ return '' + setValue2(d.teamLeader) + '
' + setValue2(phoneHide(d.teamLeaderPhone)) + ''
}
},
{
diff --git a/bns/js/dutyTask/admittedPerson.js b/bns/js/dutyTask/admittedPerson.js
index 16afd5c..11375d4 100644
--- a/bns/js/dutyTask/admittedPerson.js
+++ b/bns/js/dutyTask/admittedPerson.js
@@ -100,7 +100,10 @@ function initTable(dataList, limit, page) {
title: "身份证号",
unresize: true,
align: "center",
- sort: true
+ sort: true,
+ templet: function (d) {
+ return desensitizeIDCard(d.idNumber)
+ }
},
{
field: "szr",
diff --git a/bns/js/dutyTask/backboneScore/backboneScore.js b/bns/js/dutyTask/backboneScore/backboneScore.js
index ed34980..04fc9b4 100644
--- a/bns/js/dutyTask/backboneScore/backboneScore.js
+++ b/bns/js/dutyTask/backboneScore/backboneScore.js
@@ -104,7 +104,10 @@ function initTable(dataList, limit, page) {
width: '240',
unresize: true,
align: "center",
- sort: true
+ sort: true,
+ templet: function (d) {
+ return desensitizeIDCard(d.idNumber)
+ }
},
{
field: "score",
diff --git a/bns/js/dutyTask/backboneScore/backboneScoreForm.js b/bns/js/dutyTask/backboneScore/backboneScoreForm.js
index f30a4d4..d850b4d 100644
--- a/bns/js/dutyTask/backboneScore/backboneScoreForm.js
+++ b/bns/js/dutyTask/backboneScore/backboneScoreForm.js
@@ -46,7 +46,7 @@ function getPeopleInfoById(idNumber) {
function setFormData(data) {
$('#userCode').val(data.userCode)
$('#userName').val(data.userName)
- $('#idNumber').val(data.idNumber).attr('readonly', 'readonly').css('background-color', '#eee');
+ $('#idNumber').val(desensitizeIDCard(data.idNumber)).attr('readonly', 'readonly').css('background-color', '#eee');
$('#unit').val(data.unit)
$('#part').val(data.part)
$('#score').val(data.score)
@@ -61,6 +61,9 @@ function setFormData(data) {
// 保存数据
function saveData() {
let idNumber = $('#idNumber').val();
+ if(idNumber.indexOf('********') > -1){
+ idNumber = dataObj.idNumber;
+ }
let flag = false;
if (dataObj.idNumber) {
if (dataObj.idNumber === idNumber) {
@@ -80,7 +83,7 @@ function saveData() {
id: $('#id').val(),
userCode: $('#userCode').val(),
userName: $('#userName').val(),
- idNumber: $('#idNumber').val(),
+ idNumber: idNumber,
unit: $('#unit').val(),
part: $('#part').val(),
score: $('#score').val(),
diff --git a/bns/js/dutyTask/newTodayTask.js b/bns/js/dutyTask/newTodayTask.js
index f873525..bf0c195 100644
--- a/bns/js/dutyTask/newTodayTask.js
+++ b/bns/js/dutyTask/newTodayTask.js
@@ -154,7 +154,7 @@ function initTable(dataList, limit, page) {
sort: true,
align: "center",
templet: function (d) {
- return '
' + setValue2(d.bzzName) + '
' + setValue2(d.bzzPhone) + '
' + return '' + setValue2(d.bzzName) + '
' + setValue2(phoneHide(d.bzzPhone)) + '
' } }, { diff --git a/bns/js/dutyTask/todayTask.js b/bns/js/dutyTask/todayTask.js index c0e22a2..12c86bb 100644 --- a/bns/js/dutyTask/todayTask.js +++ b/bns/js/dutyTask/todayTask.js @@ -335,7 +335,7 @@ function initTable(dataList, limit, page) { sort: true, align: "center", templet: function (d) { - return '' + setValue2(d.foreman) + '
' + setValue2(d.foremanPhone) + '
' + return '' + setValue2(d.foreman) + '
' + setValue2(phoneHide(d.foremanPhone)) + '
' } }, { diff --git a/bns/js/dutyTask/violation/addViolationForm.js b/bns/js/dutyTask/violation/addViolationForm.js index a289ebe..fbff7e5 100644 --- a/bns/js/dutyTask/violation/addViolationForm.js +++ b/bns/js/dutyTask/violation/addViolationForm.js @@ -2,6 +2,7 @@ let form, layer, laydate, upload, formSelects, classId, riskLevel = null, teamNa fileList = new Array(), imgListUp = new Array(), orgList, vioTypeList, voiLevelList, typeList,typeChildList; // 违章类别默认手动输入 let checkVoiType = '1'; +var sm4 = new SM4Util(); layui.config({ base: "../../../js/layui/", //此处路径请自行处理, 可以使用绝对路径 }).extend({ @@ -118,7 +119,8 @@ function saveData() { for (let i = 0; i < fileList.length; i++) { formData.append("file[]", fileList[i].file) } - formData.append("params", objStr) + // formData.append("params", objStr) + formData.append("params", sm4.encryptDefault_CBC(objStr)) // 加载提示 let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); $.ajax({ @@ -128,6 +130,9 @@ function saveData() { dataType: 'json', processData: false, contentType: false, + headers: { + 'decrypt':'decrypt' + }, beforeSend: function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); diff --git a/bns/js/dutyTask/violation/editViolationForm.js b/bns/js/dutyTask/violation/editViolationForm.js index 12e4498..a4b41ac 100644 --- a/bns/js/dutyTask/violation/editViolationForm.js +++ b/bns/js/dutyTask/violation/editViolationForm.js @@ -3,6 +3,7 @@ let form, layer, laydate, upload,formSelects, orgList, vioTypeList, voiLevelList let fileList = new Array(), imgListUp = new Array(); // 违章类别默认手动输入 let checkVoiType = '1'; +var sm4 = new SM4Util(); function setParams(id) { idParam = id; layui.config({ @@ -195,7 +196,8 @@ function saveData() { for (let i = 0; i < fileList.length; i++) { formData.append("file[]", fileList[i].file) } - formData.append("params", objStr) + // formData.append("params", objStr) + formData.append("params", sm4.encryptDefault_CBC(objStr)) // 加载提示 let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); $.ajax({ @@ -205,6 +207,9 @@ function saveData() { dataType: 'json', processData: false, contentType: false, + headers: { + 'decrypt':'decrypt' + }, beforeSend: function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); diff --git a/bns/js/dutyTask/violation/editViolationForm2.js b/bns/js/dutyTask/violation/editViolationForm2.js index 216e58d..ff2e888 100644 --- a/bns/js/dutyTask/violation/editViolationForm2.js +++ b/bns/js/dutyTask/violation/editViolationForm2.js @@ -3,6 +3,7 @@ let form, layer, laydate, upload,formSelects, orgList, vioTypeList, voiLevelList let fileList = new Array(), imgListUp = new Array(); // 违章类别默认手动输入 let checkVoiType = '1'; +var sm4 = new SM4Util(); function setParams(id) { idParam = id; layui.config({ @@ -196,7 +197,8 @@ function saveData() { for (let i = 0; i < fileList.length; i++) { formData.append("file[]", fileList[i].file) } - formData.append("params", objStr) + // formData.append("params", objStr) + formData.append("params", sm4.encryptDefault_CBC(objStr)) // 加载提示 let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); $.ajax({ @@ -206,6 +208,9 @@ function saveData() { dataType: 'json', processData: false, contentType: false, + headers: { + 'decrypt':'decrypt' + }, beforeSend: function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); diff --git a/bns/js/dutyTask/violation/handAddVio.js b/bns/js/dutyTask/violation/handAddVio.js index 17116a0..832dbb8 100644 --- a/bns/js/dutyTask/violation/handAddVio.js +++ b/bns/js/dutyTask/violation/handAddVio.js @@ -2,6 +2,7 @@ let form, layer, laydate, upload, formSelects, classId, riskLevel = null, teamNa fileList = new Array(), imgListUp = new Array(), orgList, vioTypeList, voiLevelList, typeList,typeChildList; // 违章类别默认手动输入 let checkVoiType = '1'; +var sm4 = new SM4Util(); layui.config({ base: "../../../js/layui/", //此处路径请自行处理, 可以使用绝对路径 }).extend({ @@ -122,7 +123,8 @@ function saveData() { for (let i = 0; i < fileList.length; i++) { formData.append("file[]", fileList[i].file) } - formData.append("params", objStr) + // formData.append("params", objStr) + formData.append("params", sm4.encryptDefault_CBC(objStr)) // 加载提示 let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); $.ajax({ @@ -132,6 +134,9 @@ function saveData() { dataType: 'json', processData: false, contentType: false, + headers: { + 'decrypt':'decrypt' + }, beforeSend: function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); diff --git a/bns/js/dutyTask/violation/handRectifyForm.js b/bns/js/dutyTask/violation/handRectifyForm.js index c76fde6..04fa278 100644 --- a/bns/js/dutyTask/violation/handRectifyForm.js +++ b/bns/js/dutyTask/violation/handRectifyForm.js @@ -1,6 +1,6 @@ let form, layer, upload, laydate, idParam, isAppealParam, statusParam,formSelects,classParam,scoreParam,userParam; let fileList = new Array(), imgListUp = new Array(); - +var sm4 = new SM4Util(); function setParams(id,classId) { idParam = id; classParam=classId; @@ -188,7 +188,7 @@ function saveData() { for (let i = 0; i < fileList.length; i++) { formData.append("file[]", fileList[i].file) } - formData.append("params", JSON.stringify({ + /* formData.append("params", JSON.stringify({ 'usersParam':users, 'scoreParam':scoreParam, 'namesParam':namesParam, @@ -199,7 +199,20 @@ function saveData() { 'dutyUser': dutyUser, 'contactPhone': contactPhone, 'rectFinshTime': rectFinshTime, - })) + })) */ + let objStr = JSON.stringify({ + 'usersParam':users, + 'scoreParam':scoreParam, + 'namesParam':namesParam, + 'rectExplain': rectExplain, + 'classParam':classParam, + 'notiId': idParam, + 'dutyUnit': dutyUnit, + 'dutyUser': dutyUser, + 'contactPhone': contactPhone, + 'rectFinshTime': rectFinshTime, +}) + formData.append("params", sm4.encryptDefault_CBC(objStr)) if (isAppealParam) { formData.append("isAppeal", isAppealParam); } else { @@ -217,6 +230,9 @@ function saveData() { dataType: 'json', processData: false, contentType: false, + headers: { + 'decrypt':'decrypt' + }, beforeSend: function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); diff --git a/bns/js/dutyTask/violation/rectifyForm.js b/bns/js/dutyTask/violation/rectifyForm.js index 0bcbcc4..8f9f3ca 100644 --- a/bns/js/dutyTask/violation/rectifyForm.js +++ b/bns/js/dutyTask/violation/rectifyForm.js @@ -1,6 +1,6 @@ let form, layer, upload, laydate, idParam, isAppealParam, statusParam,formSelects,classParam,scoreParam,userParam; let fileList = new Array(), imgListUp = new Array(); - +var sm4 = new SM4Util(); function setParams(id,classId) { idParam = id; classParam=classId; @@ -188,7 +188,7 @@ function saveData() { for (let i = 0; i < fileList.length; i++) { formData.append("file[]", fileList[i].file) } - formData.append("params", JSON.stringify({ + /* formData.append("params", JSON.stringify({ 'usersParam':users, 'scoreParam':scoreParam, 'namesParam':namesParam, @@ -199,7 +199,20 @@ function saveData() { 'dutyUser': dutyUser, 'contactPhone': contactPhone, 'rectFinshTime': rectFinshTime, - })) + })) */ + let objStr = JSON.stringify({ + 'usersParam':users, + 'scoreParam':scoreParam, + 'namesParam':namesParam, + 'rectExplain': rectExplain, + 'classParam':classParam, + 'notiId': idParam, + 'dutyUnit': dutyUnit, + 'dutyUser': dutyUser, + 'contactPhone': contactPhone, + 'rectFinshTime': rectFinshTime, + }); + formData.append("params", sm4.encryptDefault_CBC(objStr)) if (isAppealParam) { formData.append("isAppeal", isAppealParam); } else { @@ -217,6 +230,9 @@ function saveData() { dataType: 'json', processData: false, contentType: false, + headers: { + 'decrypt':'decrypt' + }, beforeSend: function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); diff --git a/bns/js/dutyTask/violation/rectifyFormByCity.js b/bns/js/dutyTask/violation/rectifyFormByCity.js index c2bc60a..97e2d7f 100644 --- a/bns/js/dutyTask/violation/rectifyFormByCity.js +++ b/bns/js/dutyTask/violation/rectifyFormByCity.js @@ -1,6 +1,7 @@ let form, layer, upload, laydate, idParam, isAppealParam, statusParam,formSelects,classParam,scoreParam,userParam; let fileList = new Array(), imgListUp = new Array(); let supTypeParam = ''; +var sm4 = new SM4Util(); function setParams(id,classId) { idParam = id; classParam=classId; @@ -188,7 +189,7 @@ function saveData() { for (let i = 0; i < fileList.length; i++) { formData.append("file[]", fileList[i].file) } - formData.append("params", JSON.stringify({ + /* formData.append("params", JSON.stringify({ 'usersParam':users, 'scoreParam':scoreParam, 'namesParam':namesParam, @@ -200,7 +201,21 @@ function saveData() { 'contactPhone': contactPhone, 'rectFinshTime': rectFinshTime, 'supType':supTypeParam - })) + })) */ + let objStr = JSON.stringify({ + 'usersParam':users, + 'scoreParam':scoreParam, + 'namesParam':namesParam, + 'rectExplain': rectExplain, + 'classParam':classParam, + 'notiId': idParam, + 'dutyUnit': dutyUnit, + 'dutyUser': dutyUser, + 'contactPhone': contactPhone, + 'rectFinshTime': rectFinshTime, + 'supType':supTypeParam + }); + formData.append("params", sm4.encryptDefault_CBC(objStr)) if (isAppealParam) { formData.append("isAppeal", isAppealParam); } else { @@ -218,6 +233,9 @@ function saveData() { dataType: 'json', processData: false, contentType: false, + headers: { + 'decrypt':'decrypt' + }, beforeSend: function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); diff --git a/bns/js/dutyTask/violationStatistics.js b/bns/js/dutyTask/violationStatistics.js index 0c73bb6..0438ae8 100644 --- a/bns/js/dutyTask/violationStatistics.js +++ b/bns/js/dutyTask/violationStatistics.js @@ -184,7 +184,7 @@ function initTable(dataList, limit, page) { sort: true, templet: function (d) { return '