diff --git a/WebRoot/Excel/00A99375-DAA9-49AC-89C4-D413B0D698B0.jpg b/WebRoot/Excel/00A99375-DAA9-49AC-89C4-D413B0D698B0.jpg new file mode 100644 index 00000000..d6211d13 Binary files /dev/null and b/WebRoot/Excel/00A99375-DAA9-49AC-89C4-D413B0D698B0.jpg differ diff --git a/WebRoot/Excel/267AF5A1-0EFE-4D40-9ADB-4610DDEE4A6B.jpg b/WebRoot/Excel/267AF5A1-0EFE-4D40-9ADB-4610DDEE4A6B.jpg new file mode 100644 index 00000000..d6211d13 Binary files /dev/null and b/WebRoot/Excel/267AF5A1-0EFE-4D40-9ADB-4610DDEE4A6B.jpg differ diff --git a/WebRoot/Excel/28FDE7BE-EC1C-44AC-87D0-7771C86DE025.xlsx b/WebRoot/Excel/28FDE7BE-EC1C-44AC-87D0-7771C86DE025.xlsx new file mode 100644 index 00000000..4659b908 Binary files /dev/null and b/WebRoot/Excel/28FDE7BE-EC1C-44AC-87D0-7771C86DE025.xlsx differ diff --git a/WebRoot/Excel/299BBEDE-1FEB-421E-9262-4EE7C90640DF.xlsx b/WebRoot/Excel/299BBEDE-1FEB-421E-9262-4EE7C90640DF.xlsx new file mode 100644 index 00000000..e2214224 Binary files /dev/null and b/WebRoot/Excel/299BBEDE-1FEB-421E-9262-4EE7C90640DF.xlsx differ diff --git a/WebRoot/Excel/2F9BE4DD-C8A7-4D5D-AD1F-29F72CB4AD97.xlsx b/WebRoot/Excel/2F9BE4DD-C8A7-4D5D-AD1F-29F72CB4AD97.xlsx new file mode 100644 index 00000000..34cc405f Binary files /dev/null and b/WebRoot/Excel/2F9BE4DD-C8A7-4D5D-AD1F-29F72CB4AD97.xlsx differ diff --git a/WebRoot/Excel/31E40D92-C5CE-46F3-877B-0DC3CDB85A8A.xlsx b/WebRoot/Excel/31E40D92-C5CE-46F3-877B-0DC3CDB85A8A.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/31E40D92-C5CE-46F3-877B-0DC3CDB85A8A.xlsx differ diff --git a/WebRoot/Excel/3AD64D5C-8742-4796-AADE-42058EC19108.xlsx b/WebRoot/Excel/3AD64D5C-8742-4796-AADE-42058EC19108.xlsx new file mode 100644 index 00000000..34cc405f Binary files /dev/null and b/WebRoot/Excel/3AD64D5C-8742-4796-AADE-42058EC19108.xlsx differ diff --git a/WebRoot/Excel/47E51320-245C-484E-8D0A-406627616BC6.xlsx b/WebRoot/Excel/47E51320-245C-484E-8D0A-406627616BC6.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/47E51320-245C-484E-8D0A-406627616BC6.xlsx differ diff --git a/WebRoot/Excel/5A90E252-C599-4948-A96B-A33EAEE8BFCC.xlsx b/WebRoot/Excel/5A90E252-C599-4948-A96B-A33EAEE8BFCC.xlsx new file mode 100644 index 00000000..1505783c Binary files /dev/null and b/WebRoot/Excel/5A90E252-C599-4948-A96B-A33EAEE8BFCC.xlsx differ diff --git a/WebRoot/Excel/6D07A981-45C0-4DD6-8F85-4BD74795F2BE.xlsx b/WebRoot/Excel/6D07A981-45C0-4DD6-8F85-4BD74795F2BE.xlsx new file mode 100644 index 00000000..34cc405f Binary files /dev/null and b/WebRoot/Excel/6D07A981-45C0-4DD6-8F85-4BD74795F2BE.xlsx differ diff --git a/WebRoot/Excel/6aaaddf9-87b5-498b-83e7-bba82dc9dd48.xlsx b/WebRoot/Excel/6aaaddf9-87b5-498b-83e7-bba82dc9dd48.xlsx new file mode 100644 index 00000000..990fbf5c Binary files /dev/null and b/WebRoot/Excel/6aaaddf9-87b5-498b-83e7-bba82dc9dd48.xlsx differ diff --git a/WebRoot/Excel/7007F8BC-39A1-4D02-A5E5-B2F2BA54DFDA.xlsx b/WebRoot/Excel/7007F8BC-39A1-4D02-A5E5-B2F2BA54DFDA.xlsx new file mode 100644 index 00000000..34cc405f Binary files /dev/null and b/WebRoot/Excel/7007F8BC-39A1-4D02-A5E5-B2F2BA54DFDA.xlsx differ diff --git a/WebRoot/Excel/707F30F9-0A22-484B-A51C-8D121EE96E9E.jpg b/WebRoot/Excel/707F30F9-0A22-484B-A51C-8D121EE96E9E.jpg new file mode 100644 index 00000000..57527eaf Binary files /dev/null and b/WebRoot/Excel/707F30F9-0A22-484B-A51C-8D121EE96E9E.jpg differ diff --git a/WebRoot/Excel/8F51C047-16C3-4F5F-AB19-843549CDE158.xlsx b/WebRoot/Excel/8F51C047-16C3-4F5F-AB19-843549CDE158.xlsx new file mode 100644 index 00000000..34cc405f Binary files /dev/null and b/WebRoot/Excel/8F51C047-16C3-4F5F-AB19-843549CDE158.xlsx differ diff --git a/WebRoot/Excel/9C5C553B-227E-41DB-B843-2224F7162D09.xlsx b/WebRoot/Excel/9C5C553B-227E-41DB-B843-2224F7162D09.xlsx new file mode 100644 index 00000000..e2214224 Binary files /dev/null and b/WebRoot/Excel/9C5C553B-227E-41DB-B843-2224F7162D09.xlsx differ diff --git a/WebRoot/Excel/A674D650-06DD-42DA-8B23-2A2256FCD9FD.jpg b/WebRoot/Excel/A674D650-06DD-42DA-8B23-2A2256FCD9FD.jpg new file mode 100644 index 00000000..b337c703 Binary files /dev/null and b/WebRoot/Excel/A674D650-06DD-42DA-8B23-2A2256FCD9FD.jpg differ diff --git a/WebRoot/Excel/AB23C609-A1FB-40FF-8DCF-85CFA707A152.xlsx b/WebRoot/Excel/AB23C609-A1FB-40FF-8DCF-85CFA707A152.xlsx new file mode 100644 index 00000000..34cc405f Binary files /dev/null and b/WebRoot/Excel/AB23C609-A1FB-40FF-8DCF-85CFA707A152.xlsx differ diff --git a/WebRoot/Excel/B078DAEC-5A17-49BC-9E8B-03613333A50C.jpg b/WebRoot/Excel/B078DAEC-5A17-49BC-9E8B-03613333A50C.jpg new file mode 100644 index 00000000..d6211d13 Binary files /dev/null and b/WebRoot/Excel/B078DAEC-5A17-49BC-9E8B-03613333A50C.jpg differ diff --git a/WebRoot/Excel/BBFD7116-E750-4373-B9D8-4CE8413D02D8.xlsx b/WebRoot/Excel/BBFD7116-E750-4373-B9D8-4CE8413D02D8.xlsx new file mode 100644 index 00000000..e2214224 Binary files /dev/null and b/WebRoot/Excel/BBFD7116-E750-4373-B9D8-4CE8413D02D8.xlsx differ diff --git a/WebRoot/Excel/CCA91710-6172-4AE8-B328-09AB75AB00BE.xlsx b/WebRoot/Excel/CCA91710-6172-4AE8-B328-09AB75AB00BE.xlsx new file mode 100644 index 00000000..4659b908 Binary files /dev/null and b/WebRoot/Excel/CCA91710-6172-4AE8-B328-09AB75AB00BE.xlsx differ diff --git a/WebRoot/Excel/E4B611B6-9463-4823-B719-B051B620C750.xlsx b/WebRoot/Excel/E4B611B6-9463-4823-B719-B051B620C750.xlsx new file mode 100644 index 00000000..e2214224 Binary files /dev/null and b/WebRoot/Excel/E4B611B6-9463-4823-B719-B051B620C750.xlsx differ diff --git a/WebRoot/Excel/E4BF2094-8F0C-45B6-8B40-AD59FFA87A31.xlsx b/WebRoot/Excel/E4BF2094-8F0C-45B6-8B40-AD59FFA87A31.xlsx new file mode 100644 index 00000000..4659b908 Binary files /dev/null and b/WebRoot/Excel/E4BF2094-8F0C-45B6-8B40-AD59FFA87A31.xlsx differ diff --git a/WebRoot/Excel/E9648961-2FE6-4D4C-9F89-AE000002AD76.xlsx b/WebRoot/Excel/E9648961-2FE6-4D4C-9F89-AE000002AD76.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/E9648961-2FE6-4D4C-9F89-AE000002AD76.xlsx differ diff --git a/WebRoot/Excel/FC0FF3E6-786A-4CD8-A084-D9F9CDC07B0A.xlsx b/WebRoot/Excel/FC0FF3E6-786A-4CD8-A084-D9F9CDC07B0A.xlsx new file mode 100644 index 00000000..4659b908 Binary files /dev/null and b/WebRoot/Excel/FC0FF3E6-786A-4CD8-A084-D9F9CDC07B0A.xlsx differ diff --git a/WebRoot/Excel/FE8CD973-73C8-4532-8086-B41F8BA728BC.xlsx b/WebRoot/Excel/FE8CD973-73C8-4532-8086-B41F8BA728BC.xlsx new file mode 100644 index 00000000..e2214224 Binary files /dev/null and b/WebRoot/Excel/FE8CD973-73C8-4532-8086-B41F8BA728BC.xlsx differ diff --git a/WebRoot/Excel/d4796e3f-5d46-4afc-9190-bec99c317614.xlsx b/WebRoot/Excel/d4796e3f-5d46-4afc-9190-bec99c317614.xlsx new file mode 100644 index 00000000..4a8798ed Binary files /dev/null and b/WebRoot/Excel/d4796e3f-5d46-4afc-9190-bec99c317614.xlsx differ diff --git a/WebRoot/view/tb/form/ayq/modules/formDesigner.js b/WebRoot/view/tb/form/ayq/modules/formDesigner.js index a86d0c06..d3a3e85e 100644 --- a/WebRoot/view/tb/form/ayq/modules/formDesigner.js +++ b/WebRoot/view/tb/form/ayq/modules/formDesigner.js @@ -2084,7 +2084,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele _html += ''; _html += '文件名大小上传进度操作'; _html += ''.format(json.id); - _html += ''.format(json.id); + // _html += ''.format(json.id); _html += ''; _html += ''; _html += ''; @@ -2152,7 +2152,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele _html += ''; _html += '文件名大小上传进度操作'; _html += ''.format(json.id); - _html += ''.format(json.id); + // _html += ''.format(json.id); _html += ''; _html += ''; _html += ''; diff --git a/WebRoot/view/tb/form/report.html b/WebRoot/view/tb/form/report.html index ebad0060..1f5ab3a5 100644 --- a/WebRoot/view/tb/form/report.html +++ b/WebRoot/view/tb/form/report.html @@ -117,11 +117,10 @@ }) } , done: function (res) { - layer.close(layer.msg());//关闭上传提示窗口 - console.log(res) + layer.close(layer.msg());//关闭上传提示窗口 //上传完毕 - $('#uploader-list-' + images[i].select.substring(5)).append( + $('#uploader-list-' + res.input_id).append( '
' + '
' + '' + @@ -133,6 +132,7 @@ var filesData = render.getFiles(); filesData = unique(filesData); + var file_input_id = filesData[0].select.substring(4); for (var i = 0; i < filesData.length; i++) { upload.render({ elem: '#' + filesData[i].select @@ -142,7 +142,7 @@ , accept: 'file' , multiple: true , number: 3 - , auto: false + , auto: true , bindAction: '#listAction-' + filesData[i].select.substring(4) , choose: function (obj) { var that = this; @@ -169,11 +169,10 @@ that.elemList.append(tr); element.render('progress'); //渲染新加的进度条组件 }); - } - , done: function (res, index, upload) { //成功的回调 + }, done: function (res, index, upload) { //成功的回调 console.log(res); var that = this; - //if(res.code == 0){ //上传成功 + var tr = that.elemList.find('tr#upload-' + index) , tds = tr.children(); tds.eq(3).html(''); //清空操作 @@ -181,23 +180,21 @@ return; //} this.error(index, upload); - } - , allDone: function (obj) { //多文件上传完毕后的状态回调 - console.log(obj) - } - , error: function (index, upload) { //错误回调 + }, allDone: function (obj) { //多文件上传完毕后的状态回调 + setTimeout(function () { + reloadFiles(file_input_id); + }, 700); + + }, error: function (index, upload) { //错误回调 var that = this; var tr = that.elemList.find('tr#upload-' + index) , tds = tr.children(); tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传 - } - , progress: function (n, elem, e, index) { + }, progress: function (n, elem, e, index) { element.progress('progress-demo-' + index, n + '%'); //执行进度条。n 即为返回的进度百分比 } }); } - - }, error: function (xhr, status, error) { layer.msg("获取任务信息异常!", { icon: 2, @@ -206,7 +203,6 @@ } }); - //获取表单数据 $.ajax({ url: "/QingLong/collect/getFormFillJob?job_id=" + jobId, @@ -218,6 +214,33 @@ } }); + window.reloadFiles = function (file_input_id) { + $.ajax({ + url: "/QingLong/collect/getJobUploadList?job_id=" + jobId, + async: false, + type: 'GET', + success: function (res) { + $('#list-' + file_input_id).html(''); + if (res.data.length > 0) { + for (var i = 0; i < res.data.length; i++) { + if (res.data[i].type_id == 1) { + var tr = $('#list-' + res.data[i].input_id).append( + '' + + '' + res.data[i].fileName + '' + + '' + res.data[i].file_size + '' + + '已上传' + + '' + + '' + + '' + + '' + ); + } + } + } + } + }); + } + //获取图片和文件数据 $.ajax({ url: "/QingLong/collect/getJobUploadList?job_id=" + jobId, @@ -227,6 +250,17 @@ if (res.data.length > 0) { for (var i = 0; i < res.data.length; i++) { if (res.data[i].type_id == 1) { + var tr = $('#list-' + res.data[i].input_id).append( + '' + + '' + res.data[i].fileName + '' + + '' + res.data[i].file_size + '' + + '已上传' + + '' + + '' + + '' + + '' + ); + } else { $('#uploader-list-' + res.data[i].input_id).append( @@ -274,66 +308,41 @@ return false; }); - //导入数据 - $('#importJsonData').on('click', function () { - layer.open({ - type: 1 - , title: 'JSON模板数据导入' - , id: 'Lay_layer_importjsoncodeview' - , content: $('.importjsoncodedataview') - , area: ['800px', '640px'] - , shade: false - , resize: false - , success: function (layero, index) { - } - , end: function () { - $('.importjsoncodeview').css("display", "none") - } - }); - }); + window.delfiles = function (file_id, file_input_id) { + event.preventDefault(); - //导入数据 - $('#getFormData').on('click', function () { - var _value = render.getFormData(); - $('#get-form-data').val(JSON.stringify(_value, null, 4)); - layer.open({ - type: 1 - , title: 'JSON模板数据导入' - , id: 'Lay_layer_importjsoncodeview' - , content: $('.getFormData') - , area: ['800px', '640px'] - , shade: false - , resize: false - , success: function (layero, index) { - } - , end: function () { - $('.getFormData').css("display", "none") + $.ajax({ + url: '/QingLong/collect/delUploadFile', + type: 'post', + data: { + "job_id": jobId, + "file_id": file_id + }, + success: function (result) { + if (result.success) { + layer.msg("成功!", { + icon: 1, + time: 1000 + }, function () { + reloadFiles(file_input_id); + }); + } else { + layer.msg(result.message, { + icon: 2, + time: 2000 + }); + } } }); - }); + return false; + } + + }); + + + - $('#import-json-code-data').on('click', function () { - var _value = document.getElementById("import-json-code-view").value; - try { - var json = JSON.parse(_value); - console.log(json); - render.setFormData(json); - layer.closeAll(); - layer.msg('导入成功'); - } catch (e) { - - layer.closeAll(); - layer.msg('导入数据格式异常'); - } - }); - $('#globalDisable').on('click', function () { - render.globalDisable(); - }); - $('#globalNoDisable').on('click', function () { - render.globalNoDisable(); - }); - }); function getSubmitData() { @@ -351,6 +360,8 @@ return null; } + + diff --git a/WebRoot/view/tb/school/task_list.html b/WebRoot/view/tb/school/task_list.html index 0ce27069..89ac558b 100644 --- a/WebRoot/view/tb/school/task_list.html +++ b/WebRoot/view/tb/school/task_list.html @@ -124,8 +124,7 @@ offset: 'r', anim: 'slideLeft', area: ['750px', '100%'], - shade: 0.1, - shadeClose: true, + shade: 0.1, content: "../form/report.html?job_id=" + obj.data.job_id }); } else {