Browse Source

资料归集,预览相关

MaiXinRong 2 years ago
parent
commit
42c8aa1f6f
4 changed files with 6 additions and 7 deletions
  1. 3 2
      app/public/js/file_detail.js
  2. 2 1
      app/service/file.js
  3. 0 3
      app/service/sub_project.js
  4. 1 1
      app/view/file/file.ejs

+ 3 - 2
app/public/js/file_detail.js

@@ -44,6 +44,7 @@ $(document).ready(function() {
             html.push(`<tr><td><input type="checkbox" name="bd-check" fid="${file.id}"></td>`);
             const editHtml = file.canEdit ? '<a href="javascript: void(0);" class="mr-1"><i class="fa fa-pencil fa-fw"></i></a>' : '';
             const viewHtml = file.viewpath ? `<a href="${file.viewpath}" class="mr-1"><i class="fa fa-eye fa-fw"></i></a>` : '';
+            console.log(viewHtml);
             const downHtml = `<a href="javascript: void(0);" onclick="AliOss.downloadFile('${file.filepath}', '${file.filename + file.fileext}')" class="mr-1"><i class="fa fa-download fa-fw"></i></a>`;
             const delHtml = file.canEdit ? '<a href="javascript: void(0);" class="mr-1"><i class="fa fa-trash-o fa-fw"></i></a>' : '';
             html.push(`<td><div class="d-flex justify-content-between align-items-center table-file"><div>${file.filename}${file.fileext}</div><div class="btn-group-table" style="display: none;">${editHtml}${viewHtml}${downHtml}${delHtml}</div></div></td>`);
@@ -207,9 +208,9 @@ $(document).ready(function() {
                 filingObj.refreshFilesTable();
             }
             if (filingObj.curFiling.source_node.filing_type === 5) {
-                $('[href=#rela-file]').parent().show();
+                $('#rela-file-btn').show();
             } else {
-                $('[href=#rela-file]').parent().hide();
+                $('#rela-file-btn').hide();
             }
         }
         prePage() {

+ 2 - 1
app/service/file.js

@@ -30,11 +30,12 @@ module.exports = app => {
             const userId = this.ctx.session.sessionUser.accountId;
             const ossPath = this.ctx.app.config.fujianOssPath;
             files.forEach(x => {
-                x.filepath = ossPath + x.filepath;
                 x.viewpath = helper.canPreview(x.fileext) ? ossPath + x.filepath : '';
+                x.filepath = ossPath + x.filepath;
                 x.fileext_str = helper.fileExtStr(x.fileext);
                 x.canEdit = x.user_id === userId;
             });
+            console.log(files);
         }
 
         async getFiles(condition) {

+ 0 - 3
app/service/sub_project.js

@@ -273,10 +273,7 @@ module.exports = app => {
                 await conn.update(this.tableName, { id: subProject.id, management: data.management });
                 await this.ctx.service.filing.initFiling(subProject.id, conn);
                 if (dm.length > 0) await conn.delete(this.ctx.service.subProjPermission.tableName, { id: dm });
-                console.log(um);
-                console.log(1);
                 if (um.length > 0) await conn.updateRows(this.ctx.service.subProjPermission.tableName, um);
-                console.log(2);
                 if (im.length > 0) await conn.insert(this.ctx.service.subProjPermission.tableName, im);
 
                 await conn.commit();

+ 1 - 1
app/view/file/file.ejs

@@ -30,7 +30,7 @@
                     <div class="d-flex flex-row">
                         <% if (canUpload) { %>
                         <div class="py-2 pr-2"><a href="#add-file" data-toggle="modal" data-target="#add-file">上传文件</a></div>
-                        <div class="p-2"><a href="#rela-file" data-toggle="modal" data-target="#rela-file">导入文件</a></div>
+                        <div class="p-2" id="rela-file-btn"><a href="#rela-file" data-toggle="modal" data-target="#rela-file">导入文件</a></div>
                         <div class="p-2"><a href="#batch-del-file" data-toggle="modal" data-target="#batch-del-file">批量删除</a></div>
                         <% } %>
                         <div class="p-2"><a href="javascript: void(0)" id="batch-download">批量下载</a></div>