diff --git a/hxy-web/html/wireManager/viewResult/uploadSpecialPhoto.html b/hxy-web/html/wireManager/viewResult/uploadSpecialPhoto.html
new file mode 100644
index 0000000..cb2109d
--- /dev/null
+++ b/hxy-web/html/wireManager/viewResult/uploadSpecialPhoto.html
@@ -0,0 +1,54 @@
+
+
+
+
+ 特巡结果上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hxy-web/html/wireManager/viewResult/viewResultUpdate.html b/hxy-web/html/wireManager/viewResult/viewResultUpdate.html
index 96aec10..149affc 100644
--- a/hxy-web/html/wireManager/viewResult/viewResultUpdate.html
+++ b/hxy-web/html/wireManager/viewResult/viewResultUpdate.html
@@ -246,7 +246,7 @@
--
-
+
diff --git a/hxy-web/js/dataStatistics/workVisa/workVisaDetails.js b/hxy-web/js/dataStatistics/workVisa/workVisaDetails.js
index cea3d03..c34715d 100644
--- a/hxy-web/js/dataStatistics/workVisa/workVisaDetails.js
+++ b/hxy-web/js/dataStatistics/workVisa/workVisaDetails.js
@@ -27,6 +27,8 @@ layui.use(['form','layer','table','laydate','element'], function () {
$("#queryBt").click(function(){
var keyword = $('#keyword').val();
let json = {
+ proId:localStorage.getItem("resultVisaProId"),
+ makeMonth:localStorage.getItem("resultVisaMakeMonth"),orders:orders,
"keyword": keyword
}
// 对表格进行重载。id 即 table表格的id
@@ -47,6 +49,8 @@ layui.use(['form','layer','table','laydate','element'], function () {
orders=" order by state desc"
}else if(data.value==3){
orders=" order by state asc"
+ }else{
+ orders="";
}
});
@@ -55,6 +59,8 @@ layui.use(['form','layer','table','laydate','element'], function () {
$("#reset").click(function(){
$('#keyword').val('');
let json = {
+ proId:localStorage.getItem("resultVisaProId"),
+ makeMonth:localStorage.getItem("resultVisaMakeMonth"),orders:orders,
"keyword": ''
}
// 对表格进行重载。id 即 table表格的id
diff --git a/hxy-web/js/wireManager/staff/staffAdd.js b/hxy-web/js/wireManager/staff/staffAdd.js
index 5877cd1..15dd54c 100644
--- a/hxy-web/js/wireManager/staff/staffAdd.js
+++ b/hxy-web/js/wireManager/staff/staffAdd.js
@@ -70,14 +70,18 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
chosenum=1;
//预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
obj.preview(function(index, file, result){
- console.log(index); //得到文件索引
- console.log(file); //得到文件对象
- console.log(result); //得到文件base64编码，比如图片
-
- //这里还可以做一些 append 文件列表 DOM 的操作
-
- //obj.upload(index, file); //对上传失败的单个文件重新上传，一般在某个事件中使用
- //delete files[index]; //删除列表中对应的文件，一般在某个事件中使用
+ var length = $('#demo1 img').length;
+ if (length > 2) {
+ delete files[index];//删除指定图片
+ $(this).remove();
+ return layer.msg("附件为1-3张，请勿过多上传", {icon: 5});
+ }
+ $('#demo1').append('
');
+ $('#' + index).bind('dblclick', function () {//双击删除指定预上传图片
+ delete files[index];//删除指定图片
+ $(this).remove();
+ });
+ var imgNum = $("#demo1 img").length;
});
},
before: function (obj) {
@@ -248,6 +252,14 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
layer.msg("请上传附件！")
return;
}
+ var usertype=$("#userType").val();
+ if(usertype==0){
+ var gtid=$("#gtId").val();
+ if(gtid==null||gtid==""){
+ layer.msg("请选择范围、基数！")
+ return;
+ }
+ }
$("#hideUpload1").trigger("click");
}else{
updateData(data); // 修改
diff --git a/hxy-web/js/wireManager/staff/staffImport.js b/hxy-web/js/wireManager/staff/staffImport.js
index 9cacab6..79a85c8 100644
--- a/hxy-web/js/wireManager/staff/staffImport.js
+++ b/hxy-web/js/wireManager/staff/staffImport.js
@@ -1,9 +1,7 @@
var idNumber;
var loadingMsg;
-var trainFileNames = [];
-var trainFilePaths = [];
-var examFileNames = [];
-var examFilePaths = [];
+var parentValue;
+
layui.use(['layer', 'form', 'upload'], function () {
var upload1 = layui.upload;
@@ -11,8 +9,6 @@ layui.use(['layer', 'form', 'upload'], function () {
var form = layui.form;
var layer = layui.layer;
- getProjectSelect();
-
$("#closeBt").click(function () {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
@@ -25,63 +21,52 @@ layui.use(['layer', 'form', 'upload'], function () {
return
}
- $("#hideUpload1").trigger("click");
excelUpload();
});
+
});
+function setParam(data){
+ parentValue = data;
+}
-function importData() {
- var fileData = new FormData();
- fileData.append('file', $('#file')[0].files[0]);
- // 加载提示
- loadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']});
- // form请求地址
- var formUrl = oiPlanUrl + "/monthlyPlanSubmission/importData";
- $.ajax({
- type: 'POST',
- url: formUrl, // 请求地址
- data: fileData,
- processData: false,
- contentType: false,
- success: function (data) {
- top.layer.close(loadingMsg); //再执行关闭
- if (data.code == 200) {
- top.layer.alert(data.msg);
- reloading();
- } else {
- top.layer.alert(data.msg, {icon: 2});
- }
- },
- error: function (XMLHttpRequest, textStatus, e) {
- layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false});
- top.layer.close(addLoadingMsg); //再执行关闭
+/**
+ * 下拉框set值
+ */
+function setOption(id,resultObj,html) {
+ for (let i = 0; i < resultObj.length; i++) {
+ if (id == resultObj[i].id) {
+ html += '
';
+ } else {
+ html += '
';
}
- });
+ }
+ return html;
}
function excelUpload() {
- loadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); //④创建一个formData对象
+ loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); //④创建一个formData对象
var fileData = new FormData();
fileData.append('file', $('#file')[0].files[0]);
$.ajax({
- url : oiPlanUrl + "/monthlyPlanSubmission/importData",
+ url : PATH_URL + "/personbase/importData",
type : 'POST',
data : fileData,
processData : false,// ⑧告诉jQuery不要去处理发送的数据
contentType : false, // ⑨告诉jQuery不要去设置Content-Type请求头
success : function(result) {
console.log(result)
- top.layer.close(loadingMsg);
- if (result.data.success) {
- layer.msg(result.data.msg,{icon:1,time:1500},function () {
- // reloadData();
- reloading();
- });
+ layer.close(loadingMsg);
+ if (result.code == 200) {
+ parent.document.getElementById('powerNum').innerText = result.data.powerNum;
+
+ parent.layer.alert(result.msg,{icon:1});
+ var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
} else {
- showModal(result.data);
+ layer.alert(result.msg,{icon:2});
}
},
error : function(XMLHttpRequest, textStatus, errorThrown,result) {
@@ -124,6 +109,35 @@ function showModal(result) {
}, 1000);
}
+
+//初始化工程下拉选
+function getProSelect(subId,proId) {
+ $("#proId").empty();
+ $.ajax({
+ type: 'get',
+ url: systemPath + '/select/getProBySubId',
+ data: {
+ subId: subId
+ },
+ async: false,
+ success: function (data) {
+ console.log("获取工程下拉列表OK");
+ if(data.code == 200){
+ let html = '
';
+ let resultObj = data.data;
+ let htm = setOption(proId,resultObj,html);
+ $("#proId").html(htm);
+ }else{
+ $("#proId").html('
');
+ }
+ layui.form.render();
+ },
+ error: function (err) {
+ console.log("获取工程下拉列表出错：", err);
+ }
+ });
+}
+
//刷新页面
function reloading() {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
diff --git a/hxy-web/js/wireManager/staff/staffList.js b/hxy-web/js/wireManager/staff/staffList.js
index 87e02e1..e62adea 100644
--- a/hxy-web/js/wireManager/staff/staffList.js
+++ b/hxy-web/js/wireManager/staff/staffList.js
@@ -253,7 +253,6 @@ function updateView(id) {
* 删除
* */
function delView(id) {
-
let index = layer.confirm("是否确定删除数据？相关数据也会删除！", function () {
$.ajax({
type: 'post',
@@ -265,8 +264,8 @@ function delView(id) {
success: function (data) {
layer.close(index);
if (data.code == 200) {
- top.layer.alert('删除成功', {icon: 1});
- // example.ajax.reload(); // 刷新页面
+ layer.msg('删除成功');
+ $("#query").trigger("click"); // 刷新页面
} else {
layer.msg("删除失败", {icon: 2}, function () {
// example.ajax.reload(); // 刷新页面
@@ -300,34 +299,6 @@ function importData(){
});
}
-function importDataThread(formData, idx) {
- $.ajax({
- url: oiPlanUrl + "/basePerson/importData",
- type: 'POST',
- async: false,
- data: formData,
- timeout: 20000,
- // 告诉jQuery不要去处理发送的数据
- processData: false,
- // 告诉jQuery不要去设置Content-Type请求头
- contentType: false,
- success: function (data) {
- layer.close(idx);
- if (data.code == 200) {
- layer.alert(data.data, {icon: 1});
- // example.ajax.reload(); // 刷新页面
- } else{
- layer.alert(data.msg, {icon: 2});
- }
-
- },
- error: function (XMLHttpRequest, textStatus, errorThrown) {
- console.log(JSON.stringify(errorThrown));
- layer.close(idx);
- }
- });
- $("#basePersonFile").val("");
-}
//导出
function exportData() {
@@ -342,4 +313,47 @@ function exportData() {
+ "&userState=" + userState
+ "&contractState=" + contractState
+ "&yjId=" + yjId
+}
+function excelUpload() {
+ if($("#projecct").val() == ""){
+ layer.msg("请选择工程", { icon: 0 });
+ return
+ }
+
+ loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); //④创建一个formData对象
+ var fileData = new FormData();
+ fileData.append('file', $('#file')[0].files[0]);
+ fileData.append('proId', $("#projecct").val());
+ $.ajax({
+ url : PATH_URL + "/lineProject/importData",
+ type : 'POST',
+ data : fileData,
+ processData : false,// ⑧告诉jQuery不要去处理发送的数据
+ contentType : false, // ⑨告诉jQuery不要去设置Content-Type请求头
+ success : function(result) {
+ console.log(result)
+ layer.close(loadingMsg);
+ if (result.code == 200) {
+ parent.document.getElementById('powerNum').innerText = result.data.powerNum;
+
+ parent.layer.alert(result.msg,{icon:1});
+ var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ } else {
+ layer.alert(result.msg,{icon:2});
+ }
+ },
+ error : function(XMLHttpRequest, textStatus, errorThrown,result) {
+ top.layer.close(loadingMsg);
+ if(XMLHttpRequest.status === 401){
+ localStorage.removeItem("token");
+ layer.msg('用户登录过期,请重新登录',{icon:5,time:2000},function(){
+ location.href = ctxPath + '/login.html';
+ });
+ }else{
+ layer.msg(result.data.msg,{icon:5,time:2000});
+ }
+ // $.dialog({title: '提示', content: result.msg});
+ }
+ });
}
\ No newline at end of file
diff --git a/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js b/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js
index 61bdc98..f4c5fb6 100644
--- a/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js
+++ b/hxy-web/js/wireManager/viewResult/normalInspectionUpload.js
@@ -126,7 +126,7 @@ function firstDayStr(){
var year = today.getFullYear(); // 获取当前年份
// 当月的第一天
- var firstDay = new Date(year, thisMonth, 1);
+ var firstDay = new Date(year, thisMonth, 2);
var firstDayString = firstDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
// 当月的最后一天
@@ -142,7 +142,7 @@ function lastDayStr(){
var year = today.getFullYear(); // 获取当前年份
// 当月的第一天
- var firstDay = new Date(year, thisMonth, 1);
+ var firstDay = new Date(year, thisMonth, 2);
var firstDayString = firstDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
// 当月的最后一天
diff --git a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
index 15ff6aa..0ccd3e0 100644
--- a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
+++ b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
@@ -39,7 +39,9 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
})
form.on('submit(formDemo)', function (data) {
- $("#hideUpload").trigger("click");
+ console.log(data)
+ checkGt(data.field.gtId);
+ // $("#hideUpload").trigger("click");
});
form.on('select(proId)', function(data){
console.log(data);
@@ -47,13 +49,34 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
})
});
+function checkGt(gtid){
+ $.ajax({//id获取详情打开弹窗传值子页面
+ type: 'post',
+ url: PATH_URL + "/makeInfo/checkGt",
+ dataType: 'json',
+ async:false,
+ data: {
+ gtid:gtid,makeTime:$("#dataTime").val()
+ },
+ success: function (res) {
+ if(res.code==200){
+ $("#hideUpload").trigger("click");
+ }else{
+ layer.msg("该杆塔已被巡视！");
+ }
+ },
+ error:function(e){
+ layer.msg("该杆塔已被巡视！");
+ }
+ })
+}
function firstDayStr(){
var today = new Date();
var thisMonth = today.getMonth(); // 获取当前月份（从0开始）
var year = today.getFullYear(); // 获取当前年份
// 当月的第一天
- var firstDay = new Date(year, thisMonth, 1);
+ var firstDay = new Date(year, thisMonth, 2);
var firstDayString = firstDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
// 当月的最后一天
diff --git a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
index 56c8916..f07aff5 100644
--- a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
+++ b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
@@ -30,7 +30,7 @@ function firstDayStr(){
var year = today.getFullYear(); // 获取当前年份
// 当月的第一天
- var firstDay = new Date(year, thisMonth, 1);
+ var firstDay = new Date(year, thisMonth, 2);
var firstDayString = firstDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
// 当月的最后一天
@@ -46,7 +46,7 @@ function lastDayStr(){
var year = today.getFullYear(); // 获取当前年份
// 当月的第一天
- var firstDay = new Date(year, thisMonth, 1);
+ var firstDay = new Date(year, thisMonth, 2);
var firstDayString = firstDay.toISOString().slice(0, 10); // 转换为YYYY-MM-DD格式
// 当月的最后一天
diff --git a/hxy-web/js/wireManager/viewResult/uploadPhoto.js b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
index 8f1ac7e..f5fd4ca 100644
--- a/hxy-web/js/wireManager/viewResult/uploadPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
@@ -23,6 +23,9 @@ layui.use(['form', 'table', 'upload'], function () {
uploadFile();
form.on('submit(formDemo)', function (data) {
+ if(urls.length==0){
+ layer.msg("请上传文件！")
+ }
$("#hideUpload").trigger("click");
});
});
@@ -61,7 +64,7 @@ function uploadFile(){
console.log(index); //得到文件索引
console.log(file.name); //得到文件对象
var files = $('#demo img')
- if(files.length <= 2){
+ if(files.length <= 1){
$('#demo').append(
'
' +
'
' +
@@ -74,7 +77,7 @@ function uploadFile(){
'
'
);
}else{
- layer.msg('最多上传2张照片',{icon:2})
+ layer.msg('最多上传1张照片',{icon:2})
}
addDelete(startWorkFiles);
});
diff --git a/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
new file mode 100644
index 0000000..e7deb3a
--- /dev/null
+++ b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
@@ -0,0 +1,179 @@
+//全局的页面遮盖
+let loadingMsg;
+var startWorkFiles = {};
+var upload;
+var id;
+var formData;
+var gtId;
+var month;
+var numTimes;
+var userId;
+var makeType;
+var proId;
+layui.use(['form', 'table', 'upload'], function () {
+ let form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
+ form.render();
+ upload = layui.upload;
+ gtId=$("#gtId").val();
+ month=$("#month").val();
+ numTimes=$("#numTimes").val();
+ userId=$("#userId").val();
+ makeType=$("#makeType").val();
+ proId=$("#proId").val();
+ uploadFile();
+
+ form.on('submit(formDemo)', function (data) {
+ if(urls.length==0){
+ layer.msg("请上传文件！")
+ }
+ $("#hideUpload").trigger("click");
+ });
+});
+function setGtId(gtId,month,numTimes,resultUserId,makeType,proId){
+ console.log(gtId,"gtId");
+ console.log(month,"month");
+ $("#gtId").val(gtId);
+ $("#month").val(month);
+ $("#numTimes").val(numTimes);
+ $("#userId").val(resultUserId);
+ $("#makeType").val(makeType);
+ $("#proId").val(proId);
+}
+var ysUrls="";
+var urls="";
+function uploadFile(){
+ var uploadcom = upload.render({
+ elem: '#test',
+ url: FILE_URL + "/file/uploadmake" , //上传接口 //改成您自己的上传接口
+ multiple: true, //是否允许多文件上传，默认未false
+ dataType: "json",
+ exts: 'jpg|png|mp4',
+ //acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx',
+ auto: false, //是否自动上传 ，默认为true
+ number: 1, //最大上传数量
+ // size: 1024*5, //最大文件大小，单位k
+ bindAction: '#hideUpload', //绑定的按钮
+ field: 'file', //传到后台的字段名,默认file
+ choose: function (obj) {
+ flag = false;
+ var suffixType = ''; //后缀类型
+ uploadcom.config.elem.next()[0].value = '';
+ obj.files = obj.pushFile();
+ startWorkFiles = obj.pushFile();
+ obj.preview(function (index, file, result) {
+ console.log(index); //得到文件索引
+ console.log(file.name); //得到文件对象
+ var files = $('#demo img')
+ if(files.length <= 1){
+ $('#demo').append(
+ '
' +
+ '
' +
+ '
' +
+ '' +
+ '
' +
+ '
' +
+ '
' + (file.name.length > 8 ? (file.name.substr(0, 8) + "..") : file.name) + '
' +
+ '
'+
+ '
'
+ );
+ }else{
+ layer.msg('最多上传1张照片',{icon:2})
+ }
+ addDelete(startWorkFiles);
+ });
+ },
+ before: function (obj) {
+ ysUrls="";
+ urls="";
+ this.data = {
+ "gtId": gtId,uploadType:"one",photoType:"hxy",month:month,numTimes:numTimes
+ };
+ },
+ done: function (data) {
+ console.log(data,"donedata");
+ urls=data.data.url;
+ ysUrls=data.data.ysUrl;
+ },
+ allDone: function (data) {
+ console.log(data,"allDonedata");
+ if(ysUrls!=null&&urls!=null){
+ insertMakeGt();
+ var iframeWindow = parent.window['layui-layer-iframe' + localStorage.getItem("resultindex")];
+ iframeWindow.reloadData();
+ var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index);
+ }else{
+ layer.msg("上传错误！")
+ }
+
+ },
+ error: function (e) {
+ //请求异常回调
+ console.log(e)
+ }
+ });
+}
+function insertMakeGt(){
+ if(ysUrls.length == 0){
+ layer.msg('请上传文件', {icon: 2});
+ return;
+ }
+ $.ajax({
+ type:"post",
+ url : PATH_URL + "/makeInfo/insertMakeGt",
+ async:false,
+ data:{
+ "gtId": $("#gtId").val(),
+ userId:userId,
+ makeMonth:month,
+ sFilePath:ysUrls,
+ filePath:urls,makeType:3,proId:proId,
+ numTimes:numTimes
+ },
+ dataType:"json",
+ success:function(res){
+ console.log(res,"res")
+ if(res.code==500){
+ parent.layer.msg(res.msg)
+ return;
+ }
+ },
+ error:function(data){
+ }
+ });
+}
+
+
+
+
+var deletePhoto = [];
+function delPhoto(i,id) {
+ var parentcolor = document.getElementById("demo" + i);
+ var childcolor = document.getElementById(id + "");
+ var path = childcolor.name;
+ deletePhoto.push(path);
+ parentcolor.removeChild(childcolor);
+ var photoNum = $("#demo" + i).children().length;
+ if (photoNum == 0) {
+ $("#preview" + i).css("display", "none");
+ }
+}
+function addDelete(arr) {
+ $('#demo').click(function (e) {
+ var target = $(e.target)
+ if (target.hasClass('handle') || target.hasClass('layui-icon')) {
+ var dataIdx = target.attr('data-idx')
+ var filePath = $('#' + dataIdx).children().children().next().attr('file')
+ delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ target.parents('.item').remove() // 页面文件标签也删除
+ }
+ });
+}
+//设置弹窗关闭
+function reloading() {
+ var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ window.parent.location.reload();
+}
+
+
diff --git a/hxy-web/js/wireManager/viewResult/viewResult.js b/hxy-web/js/wireManager/viewResult/viewResult.js
index 7c8aa5c..5c761d1 100644
--- a/hxy-web/js/wireManager/viewResult/viewResult.js
+++ b/hxy-web/js/wireManager/viewResult/viewResult.js
@@ -16,6 +16,8 @@ layui.use(['form','layer','table','laydate'], function () {
// 触发submit提交 按钮点击或者表单被执行提交时触发
form.on('submit(query)', function (data) {
console.log(data,"搜索")
+ yjId=localStorage.getItem("oneselectyj");
+ data.field.yjId=yjId;
// 对表格进行重载。id 即 table表格的id
table.reload('table', {
// //设定异步数据接口的额外参数
@@ -154,7 +156,6 @@ function init(){
}
-
//详情
function detailsView(id,userId,makeMonth) {
localStorage.setItem("resultId",id);
diff --git a/hxy-web/js/wireManager/viewResult/viewResultDetails.js b/hxy-web/js/wireManager/viewResult/viewResultDetails.js
index 286a127..ef3ddd9 100644
--- a/hxy-web/js/wireManager/viewResult/viewResultDetails.js
+++ b/hxy-web/js/wireManager/viewResult/viewResultDetails.js
@@ -198,10 +198,20 @@ function getView(){
var gtName = viewList1[i].gtName.length>4?viewList1[i].gtName.substring(0,4) + '...': viewList1[i].gtName;
html += `
`
+ var ystate=0;
+ for (var j = 0; j < photoList1.length; j++) {
+ if(viewList1[i].gtId == photoList1[j].gtId){
+ //照片存在，直接显示
+ ystate=1;
+ break;
+ }
+ }
if("1"==viewList1[i].makeType){
html +=`
+
+
+ 
+ 
