diff --git a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js
index b93127f..579fe92 100644
--- a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js
+++ b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js
@@ -107,10 +107,10 @@ layui.use(['laydate', 'upload'], function () {
let files = obj.pushFile();
obj.preview(function (index, file, result) {
var length = $('#demo2 img').length;
- if (length > 8) {
+ if (length > 49) {
delete files[index];//删除指定图片
$(this).remove();
- return layer.msg("附件为1-9张,请勿过多上传", {icon: 5});
+ return layer.msg("附件为1-50张,请勿过多上传", {icon: 5});
}
const uniqueId = new Date().getTime() + '-' + index;
$('#demo2').append(
diff --git a/src/main/resources/static/js/imageUpload/coordinatePhoto/coordinatePhotoList.js b/src/main/resources/static/js/imageUpload/coordinatePhoto/coordinatePhotoList.js
index 207cc73..8901fcd 100644
--- a/src/main/resources/static/js/imageUpload/coordinatePhoto/coordinatePhotoList.js
+++ b/src/main/resources/static/js/imageUpload/coordinatePhoto/coordinatePhotoList.js
@@ -7,7 +7,6 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
table = layui.table;
layui.form.render();
getProSelected();
- getProTypeSelected();
getProcessIdSelected();
pages(1, 10, 1);
@@ -74,15 +73,15 @@ function initTable(dataList, limit, page) {
return (page - 1) * limit + d.LAY_INDEX;
}
},
- {field: "proName", title: "项目名称",width: 310, unresize: true, align: "center" },
- {field: "gxName", title: "工序",width: 110, unresize: true, align: "center"},
- {field: "buildPlace", title: "违章地点",width: 230, unresize: true, align: "center"},
- {title: "建设阶段", width: 110, unresize: true, align: "center",
+ {field: "proName", title: "项目名称", unresize: true, align: "center" },
+ {field: "gxName", title: "工序", unresize: true, align: "center"},
+ {field: "buildPlace", title: "违章地点", unresize: true, align: "center"},
+ {title: "建设阶段", unresize: true, align: "center",
templet: function(d) {
return '建设前
建设中
恢复后';
}
},
- {title: "建设照片", width: 110, unresize: true, align: "center",
+ {title: "建设照片", unresize: true, align: "center",
templet: function (d) {
// 统计各阶段的照片数量
let beforeCount = countPhotosBySourceType(d, "6");
@@ -96,13 +95,13 @@ function initTable(dataList, limit, page) {
return html;
}
},
- {title: "建设描述", width: 310, unresize: true, align: "center",
+ {title: "建设描述", unresize: true, align: "center",
templet: function (d) {
return d.buildBeforeDesc + '
' + d.buildUnderDesc + '
' + d.buildAfterDesc;
}
},
- {field: "createUserName", title: "更新人",width: 110, unresize: true, align: "center"},
- {field: "createTime", title: "更新时间 ",width: 110, unresize: true, align: "center"},
+ {field: "createUserName", title: "更新人", unresize: true, align: "center"},
+ {field: "createTime", title: "更新时间 ", unresize: true, align: "center"},
{title: "操作", unresize: true, width: 170, align: "center",
templet: function (d) {
let html = '';
@@ -131,7 +130,6 @@ function getReqParams(page, limit, type) {
if (type === 2) {
$('#keyWord').val('')
$('#proId').val('')
- $('#proTypeId').val('')
$('#processId').val('')
layui.form.render();
}
@@ -140,7 +138,6 @@ function getReqParams(page, limit, type) {
limit: limit + "",
keyWord: $('#keyWord').val(),
proId: $('#proId').val(),
- proType: $('#proTypeId').val(),
gxId: $('#processId').val()
};
@@ -242,27 +239,6 @@ function getProSelected() {
});
}
-/**
- * 获取工程类型
- */
-function getProTypeSelected() {
- let url = dataUrl + '/sys/select/getDictSelectByType';
-
- let data={
- encryptedData:encryptCBC(JSON.stringify({"code":"pro_type"}))
- }
- ajaxRequest(url, "GET", data, true, function () {
- }, function (result) {
- if (result.code === 200) {
- setSelectValue(result.data, 'proTypeId','请选择工程类型');
- } else {
- layer.alert(result.msg, {icon: 2})
- }
- }, function (xhr) {
- error(xhr)
- });
-}
-
/**
* 获取工序
*/
@@ -308,7 +284,6 @@ function exportExcel() {
let obj = {
keyWord: $('#keyWord').val(),
proId: $('#proId').val(),
- proType: $('#proTypeId').val(),
gxId: $('#processId').val(),
};
let loadingMsg = layer.msg("数据导出中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
diff --git a/src/main/resources/static/js/imageUpload/importantMatter/importantMatterList.js b/src/main/resources/static/js/imageUpload/importantMatter/importantMatterList.js
index 18dba75..735e9ee 100644
--- a/src/main/resources/static/js/imageUpload/importantMatter/importantMatterList.js
+++ b/src/main/resources/static/js/imageUpload/importantMatter/importantMatterList.js
@@ -7,7 +7,6 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
table = layui.table;
layui.form.render();
getProSelected();
- getProTypeSelected();
getProcessIdSelected();
pages(1, 10, 1);
@@ -70,18 +69,18 @@ function initTable(dataList, limit, page) {
return (page - 1) * limit + d.LAY_INDEX;
}
},
- {field: "proName", title: "项目名称",width: 310, unresize: true, align: "center" },
- {field: "gxName", title: "工序",width: 200, unresize: true, align: "center"},
- {field: "title", title: "标题",width: 210, unresize: true, align: "center"},
- {field: "content", title: "内容",width: 310, unresize: true, align: "center"},
- {field: "", title: "照片",width: 150, unresize: true, align: "center",
+ {field: "proName", title: "项目名称", unresize: true, align: "center" },
+ {field: "gxName", title: "工序", unresize: true, align: "center"},
+ {field: "title", title: "标题", unresize: true, align: "center"},
+ {field: "content", title: "内容", unresize: true, align: "center"},
+ {field: "", title: "照片", unresize: true, align: "center",
templet: function (d) {
let html=""+d.sysFileResourceList.length+"";
return html;
}
},
- {field: "createUserName", title: "上传人",width: 110, unresize: true, align: "center"},
- {field: "createTime", title: "更新时间",width: 140, unresize: true, align: "center"},
+ {field: "createUserName", title: "上传人", unresize: true, align: "center"},
+ {field: "createTime", title: "更新时间", unresize: true, align: "center"},
{title: "操作", unresize: true, width: 170, align: "center",
templet: function (d) {
let html = '';
@@ -111,7 +110,6 @@ function getReqParams(page, limit, type) {
if (type === 2) {
$('#keyWord').val('')
$('#proId').val('')
- $('#proTypeId').val('')
$('#processId').val('')
layui.form.render();
}
@@ -121,7 +119,6 @@ function getReqParams(page, limit, type) {
limit: limit + "",
keyWord: $('#keyWord').val(),
proId: $('#proId').val(),
- majorId: $('#proTypeId').val(),
gxId: $('#processId').val(),
};
console.log(obj)
@@ -222,27 +219,6 @@ function getProSelected() {
});
}
-/**
- * 获取工程类型
- */
-function getProTypeSelected() {
- let url = dataUrl + '/sys/select/getDictSelectByType';
-
- let data={
- encryptedData:encryptCBC(JSON.stringify({"code":"pro_type"}))
- }
- ajaxRequest(url, "GET", data, true, function () {
- }, function (result) {
- if (result.code === 200) {
- setSelectValue(result.data, 'proTypeId','请选择工程类型');
- } else {
- layer.alert(result.msg, {icon: 2})
- }
- }, function (xhr) {
- error(xhr)
- });
-}
-
/**
* 获取工序
*/
@@ -286,7 +262,6 @@ function exportExcel() {
let obj = {
keyWord: $('#keyWord').val(),
proId: $('#proId').val(),
- majorId: $('#proTypeId').val(),
gxId: $('#processId').val(),
};
let loadingMsg = layer.msg("数据导出中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
diff --git a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
index cb49265..b042489 100644
--- a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
+++ b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
@@ -296,10 +296,10 @@ function setFormData(data) {
var demo1 = $("#demo1");
for (var i = 0; i < vioPhotoListEdit.length; i++) {
let filePath = imgUrl + data.vioPhotoList[i].originalFilePath + "?token=" + tokens
- html = html + '