diff --git a/application/admin/view/dashboard/task_complete.html b/application/admin/view/dashboard/task_complete.html index 9894c84..2d9d3ee 100644 --- a/application/admin/view/dashboard/task_complete.html +++ b/application/admin/view/dashboard/task_complete.html @@ -28,7 +28,7 @@
{if $row->prove_file_path} - + {/if}
diff --git a/application/admin/view/oa/doc/edit.html b/application/admin/view/oa/doc/edit.html index 8bd0a3d..22f1616 100644 --- a/application/admin/view/oa/doc/edit.html +++ b/application/admin/view/oa/doc/edit.html @@ -26,7 +26,7 @@
- +
diff --git a/application/admin/view/oa/task/review.html b/application/admin/view/oa/task/review.html index fd14383..ea11fae 100644 --- a/application/admin/view/oa/task/review.html +++ b/application/admin/view/oa/task/review.html @@ -49,7 +49,7 @@
{if $row.prove_file_path} - + {/if}
diff --git a/public/assets/js/backend/dashboard.js b/public/assets/js/backend/dashboard.js index c5db46c..84b87a9 100755 --- a/public/assets/js/backend/dashboard.js +++ b/public/assets/js/backend/dashboard.js @@ -100,21 +100,21 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart $(document).on('click', '.btn-preview', function (e) { e.preventDefault(); - var fileType = $(this).data('type'); // 自动从 data-type 获取,比如 pdf, jpg, doc - var url = $(this).data('url'); + var fileType = $(this).data('filetype'); // 自动从 data-type 获取,比如 pdf, jpg, doc + var fileUrl = $(this).data('fileurl'); if (fileType === 'pdf') { Layer.open({ type: 2, title: '预览PDF文件', area: ['80%', '80%'], - content: url + content: fileUrl }); } else if (['jpg', 'jpeg', 'png', 'gif', 'webp'].includes(fileType)) { Layer.photos({ photos: { "title": "图片预览", - "data": [{"src": url}] + "data": [{"src": fileUrl}] }, anim: 5 }); @@ -123,10 +123,10 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart type: 1, title: '视频预览', area: ['800px', '500px'], - content: `` + content: `` }); } else { - window.open(url, '_blank'); + window.open(fileUrl, '_blank'); } });