' +
'
' +
diff --git a/hxy-web/js/wireManager/header.js b/hxy-web/js/wireManager/header.js
index 985480f..042da43 100644
--- a/hxy-web/js/wireManager/header.js
+++ b/hxy-web/js/wireManager/header.js
@@ -9,6 +9,17 @@ layui.use(['element', 'layer', 'form', 'element','laypage'], function(){
dropdown = layui.dropdown;
init()
+ element.on('tab(chosenTab)', function(data){
+ var elem = data.elem; // 当前Tab的DOM对象
+ var index = data.index; // 当前Tab的所在下标
+ // 处理你的逻辑
+ console.log('Tab切换到：' + data);
+ if(index==0){
+ var iframe = $("#indexFrame")[0];
+ var iframeWindow = iframe.contentWindow;
+ iframeWindow.setData();
+ }
+ });
})
function init(){
diff --git a/hxy-web/js/wireManager/index.js b/hxy-web/js/wireManager/index.js
index 1f5f383..9f39546 100644
--- a/hxy-web/js/wireManager/index.js
+++ b/hxy-web/js/wireManager/index.js
@@ -6,13 +6,18 @@ layui.use(['element', 'layer', 'form', 'element','laypage'], function(){
laypage = layui.laypage; //分页
table = layui.table; //表格
form=layui.form;
-
-
+ var dd=localStorage.getItem("intervalIdd")
+ if(dd){
+ clearInterval(dd);
+ }
setData();
})
function setData(){
-
+ var dd=localStorage.getItem("intervalIdd")
+ if(dd){
+ clearInterval(dd);
+ }
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
localStorage.setItem("oneselectyj",yjId)
$.ajax({
@@ -124,6 +129,7 @@ function getTableData(list){
clearInterval(intervalId);
},function(){
intervalId = setInterval(scrolldiv, 40);
+ localStorage.setItem("intervalIdd",intervalId)
});
// 开始滚动
scrollableDiv = $('.scrollable'); // 假设你的滚动容器类名为.scrollable
@@ -131,6 +137,7 @@ function getTableData(list){
visibleHeight = scrollableDiv.innerHeight();
currentScrollTop = 0;
intervalId = setInterval(scrolldiv, 40); // 这个数字是滚动间隔的时间，单位是毫秒
+ localStorage.setItem("intervalIdd",intervalId)
// 如果需要停止滚动，可以使用以下代码
// clearInterval(intervalId);
}else{
diff --git a/hxy-web/js/wireManager/project/projectAdd.js b/hxy-web/js/wireManager/project/projectAdd.js
index 5791eee..29e2349 100644
--- a/hxy-web/js/wireManager/project/projectAdd.js
+++ b/hxy-web/js/wireManager/project/projectAdd.js
@@ -28,7 +28,26 @@ layui.use(['layer', 'form', 'upload','laydate','dropdown'], function () {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
});
-
+ $('#volLevel').blur('input', function() {
+ var inputVal = $(this).val();
+ if (inputVal==''){
+ $(this).val('');
+ }
+ if(inputVal.indexOf("kV")<0){
+ layer.msg('请输入kV结尾电压等级', {icon: 5});
+ $(this).val('');
+ return;
+ }
+ inputVal=inputVal.replace("kV","");
+ // 转换为数字，并检查是否超出范围
+ var numVal = Number(inputVal);
+ if (isNaN(numVal) || numVal < 0 || numVal > 10000) {
+ // 如果值不合法，清空输入框
+ layer.msg('请输入正整数', {icon: 5});
+ $(this).val('');
+ return;
+ }
+ });
// 验证成功后才会执行下面的操作
form.on('submit(formDemo)', function (data) {
if($("#proId").val()==''){
diff --git a/hxy-web/js/wireManager/project/projectDetail.js b/hxy-web/js/wireManager/project/projectDetail.js
index c2f5529..347f6ae 100644
--- a/hxy-web/js/wireManager/project/projectDetail.js
+++ b/hxy-web/js/wireManager/project/projectDetail.js
@@ -38,7 +38,7 @@ layui.use(['form','layer','table','element'], function () {
})
return false; // 阻止表单跳转。如果需要表单跳转，去掉这段即可。
});
-
+ console.log(parentData,"parentData")
initStaffTable();
});
//杆塔信息搜索
@@ -502,7 +502,8 @@ function initStaffTable(){
function editProject(){
- window.parent.updateView(parentData.proId);
+ var proid=$("#proId").val();
+ window.parent.updateView(parentData);
}
function projectAddUser(){
diff --git a/hxy-web/js/wireManager/project/projectImport.js b/hxy-web/js/wireManager/project/projectImport.js
index ae47744..9035413 100644
--- a/hxy-web/js/wireManager/project/projectImport.js
+++ b/hxy-web/js/wireManager/project/projectImport.js
@@ -25,6 +25,12 @@ layui.use(['layer', 'form', 'upload'], function () {
excelUpload();
});
+
+
+});
+function setParam(data){
+ parentValue = data;
+ $("#yjId").val(data.yjId);
if(parentValue.type == '1'){
//从工程主页面打开，此时工程默认没有选中
getProjectSelect("");
@@ -33,11 +39,6 @@ layui.use(['layer', 'form', 'upload'], function () {
//从工程详情页面打开，此时工程有值
getProjectSelect(parentValue.proId);
}
-
-});
-function setParam(data){
- parentValue = data;
- $("#yjId").val(data.yjId);
}
function getProjectSelect(proId) {
diff --git a/hxy-web/js/wireManager/staff/staffAdd.js b/hxy-web/js/wireManager/staff/staffAdd.js
index 18a6e58..e1acf64 100644
--- a/hxy-web/js/wireManager/staff/staffAdd.js
+++ b/hxy-web/js/wireManager/staff/staffAdd.js
@@ -61,7 +61,7 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
,auto: false //选择文件后不自动上传
,multiple: true //是否允许多文件上传，默认未false
,dataType: "json"
- ,exts: 'pdf'
+ // ,exts: 'pdf'
,accept: 'file'
,number: 1 //最大上传数量
,size: 1024 * 5 //最大文件大小，单位k
@@ -73,6 +73,13 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
chosenum=1;
//预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
obj.preview(function(index, file, result){
+ var fileExtension = file.name.split('.').pop().toLowerCase();
+ // 检查文件是否为支持的格式
+ if("pdf".indexOf(fileExtension) == -1){
+ layer.msg('文件格式不支持', {time: 2000, icon: 5});
+ // 阻止文件上传
+ return false;
+ }
var length = $('#demo1 img').length;
if (length > 1) {
delete files[index];//删除指定图片
diff --git a/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js b/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js
index f4c5fb6..f26cff5 100644
--- a/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js
+++ b/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js
@@ -27,7 +27,7 @@ layui.use(['upload','laydate','form'], function () {
dataType: "json",
// exts: 'jpg|png|jpeg|txt|pdf|xlsx|xls|docx|doc|ppt|pptx|mp4|avi|flv',
//'avi','mpg','wmv','3gp','mov','asf','asx','flv','mkv'
- exts: 'jpg|png',
+ // exts: 'jpg|png',
number: 10, //最大上传数量
auto: false, //是否自动上传 ，默认为true
// size: 1024 * 30, //最大文件大小，单位k
@@ -37,6 +37,13 @@ layui.use(['upload','laydate','form'], function () {
var files = this.files = obj.pushFile(); // 将每次选择的文件追加到文件队列
// 读取本地文件
obj.preview(function(index, file, result){
+ var fileExtension = file.name.split('.').pop().toLowerCase();
+ // 检查文件是否为支持的格式
+ if("jpg|png".indexOf(fileExtension) == -1){
+ layer.msg('文件格式不支持', {time: 2000, icon: 5});
+ // 阻止文件上传
+ return false;
+ }
var tr = $(['
',
'| '+ file.name +' | ',
''+ (file.size/1024).toFixed(1) +'kb | ',
diff --git a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
index f176c0f..4e8a6b6 100644
--- a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
+++ b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
@@ -159,7 +159,7 @@ function uploadFile(){
multiple: true, //是否允许多文件上传，默认未false
dataType: "json",
// data: {"pickId": id},
- exts: 'jpg|png',
+ // exts: 'jpg|png',
//acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx',
auto: false, //是否自动上传 ，默认为true
number: 9, //最大上传数量
@@ -173,6 +173,13 @@ function uploadFile(){
obj.files = obj.pushFile();
startWorkFiles = obj.pushFile();
obj.preview(function (index, file, result) {
+ var fileExtension = file.name.split('.').pop().toLowerCase();
+ // 检查文件是否为支持的格式
+ if("jpg|png".indexOf(fileExtension) == -1){
+ layer.msg('文件格式不支持', {time: 2000, icon: 5});
+ // 阻止文件上传
+ return false;
+ }
console.log(index); //得到文件索引
console.log(file.name); //得到文件对象
var files = $('#demo img')
diff --git a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
index 1989e31..7c00579 100644
--- a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
+++ b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
@@ -69,7 +69,7 @@ function uploadFile(){
multiple: true, //是否允许多文件上传，默认未false
dataType: "json",
// data: {"pickId": id},
- exts: 'jpg|png|mp4',
+ // exts: 'jpg|png|mp4',
//acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx',
auto: false, //是否自动上传 ，默认为true
number: 9, //最大上传数量
@@ -83,6 +83,13 @@ function uploadFile(){
obj.files = obj.pushFile();
startWorkFiles = obj.pushFile();
obj.preview(function (index, file, result) {
+ var fileExtension = file.name.split('.').pop().toLowerCase();
+ // 检查文件是否为支持的格式
+ if("jpg|png|mp4".indexOf(fileExtension) == -1){
+ layer.msg('文件格式不支持', {time: 2000, icon: 5});
+ // 阻止文件上传
+ return false;
+ }
console.log(index); //得到文件索引
console.log(file.name); //得到文件对象
var files = $('#demo img')
diff --git a/hxy-web/js/wireManager/viewResult/uploadPhoto.js b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
index 2f8c435..0b03656 100644
--- a/hxy-web/js/wireManager/viewResult/uploadPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
@@ -48,11 +48,11 @@ function uploadFile(){
url: FILE_URL + "/file/uploadmake" , //上传接口 //改成您自己的上传接口
multiple: true, //是否允许多文件上传，默认未false
dataType: "json",
- exts: 'jpg|png',
+ // exts: 'jpg|png',
// acceptMime: 'file',
accept: 'file',
auto: false, //是否自动上传 ，默认为true
- number: 9, //最大上传数量
+ number: 1, //最大上传数量
// size: 1024*5, //最大文件大小，单位k
bindAction: '#hideUpload', //绑定的按钮
field: 'file', //传到后台的字段名,默认file
@@ -66,6 +66,13 @@ function uploadFile(){
console.log(index); //得到文件索引
console.log(file.name); //得到文件对象
var files = $('#demo img')
+ var fileExtension = file.name.split('.').pop().toLowerCase();
+ // 检查文件是否为支持的格式
+ if("jpg|png".indexOf(fileExtension) == -1){
+ layer.msg('文件格式不支持', {time: 2000, icon: 5});
+ // 阻止文件上传
+ return false;
+ }
if(files.length <= 1){
$('#demo').append(
'' +
diff --git a/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
index aee3bb3..92d8bb9 100644
--- a/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
@@ -61,6 +61,13 @@ function uploadFile(){
obj.files = obj.pushFile();
startWorkFiles = obj.pushFile();
obj.preview(function (index, file, result) {
+ var fileExtension = file.name.split('.').pop().toLowerCase();
+ // 检查文件是否为支持的格式
+ if("jpg|png|mp4".indexOf(fileExtension) == -1){
+ layer.msg('文件格式不支持', {time: 2000, icon: 5});
+ // 阻止文件上传
+ return false;
+ }
console.log(index); //得到文件索引
console.log(file.name); //得到文件对象
var files = $('#demo img')
diff --git a/hxy-web/js/wireManager/wagesReport/wagesReportList.js b/hxy-web/js/wireManager/wagesReport/wagesReportList.js
index 8a5652d..df16e26 100644
--- a/hxy-web/js/wireManager/wagesReport/wagesReportList.js
+++ b/hxy-web/js/wireManager/wagesReport/wagesReportList.js
@@ -17,6 +17,7 @@ layui.use(['form', 'layer', 'table', 'laydate'], function() {
table.on('tool(layui_table)', function(obj) {
+ console.log(obj),"obj";
switch (obj.event) {
case 'details':
console.log('详情', obj)
@@ -28,7 +29,7 @@ layui.use(['form', 'layer', 'table', 'laydate'], function() {
break;
case 'del':
console.log('删除', obj)
- delView(yjId, obj.data.wagesMonth)
+ delView(obj.data.yjId, obj.data.wagesMonth)
break;
}
});
@@ -350,8 +351,9 @@ function importDataThread(formData, idx) {
function exportData() {
var yjName = $("#yjName").val();
var wagesMonth = $("#wagesMonth").val();
-
+ var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
window.location.href = PATH_URL + `/wages/exportWagesEscalationData?token=` + token +
"&yjName=" + yjName +
+ "&yjId=" + yjId +
"&wagesMonth=" + wagesMonth
}
\ No newline at end of file