Merge remote-tracking branch 'origin/master'

yiming
2 parents dca40457 3613ed9e
Showing 17 changed files with 1132 additions and 78 deletions
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesFileController.java
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesCollectBox.java
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesFile.java
ruoyi-archives/src/main/java/com/ruoyi/mapper/ArchivesFileMapper.java
ruoyi-archives/src/main/java/com/ruoyi/service/IArchivesFileService.java
ruoyi-archives/src/main/java/com/ruoyi/service/impl/ArchivesFileServiceImpl.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
ruoyi-archives/src/main/resources/mapper/archives/ArchivesFileMapper.xml
ruoyi-ui/src/api/archives/file.js
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/views/archives/box/index.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
ruoyi-ui/src/views/archives/file/index.vue
ruoyi-ui/src/views/archives/index.vue
ruoyi-ui/src/views/archives/preview/preview.vue
ruoyi-ui/src/views/archives/volume/index.vue
ruoyi-ui/vue.config.js
+package com.ruoyi.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ArchivesFile;
+import com.ruoyi.service.IArchivesFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author li
+ * @date 2022-08-04
+ */
+@RestController
+@RequestMapping("/archives/file")
+public class ArchivesFileController extends BaseController
+{
+    @Autowired
+    private IArchivesFileService archivesFileService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('archives:file:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ArchivesFile archivesFile)
+    {
+        startPage();
+        List<ArchivesFile> list = archivesFileService.selectArchivesFileList(archivesFile);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('archives:file:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ArchivesFile archivesFile)
+    {
+        List<ArchivesFile> list = archivesFileService.selectArchivesFileList(archivesFile);
+        ExcelUtil<ArchivesFile> util = new ExcelUtil<ArchivesFile>(ArchivesFile.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('archives:file:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(archivesFileService.selectArchivesFileById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('archives:file:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ArchivesFile archivesFile)
+    {
+        return toAjax(archivesFileService.insertArchivesFile(archivesFile));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('archives:file:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ArchivesFile archivesFile)
+    {
+        return toAjax(archivesFileService.updateArchivesFile(archivesFile));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('archives:file:remove')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(archivesFileService.deleteArchivesFileByIds(ids));
+    }
+}
@@ -121,9 +121,7 @@ public class ArchivesCollectBox extends BaseEntity
     @Excel(name = "原文")
     private String text;
-    /** 文件 */
-    @Excel(name = "文件")
-    private String file;
+ 
     /** 1.未整理文件
 2.已整理文件
@@ -377,15 +375,7 @@ public class ArchivesCollectBox extends BaseEntity
     {
         return text;
     }
-    public void setFile(String file) 
-    {
-        this.file = file;
-    }
-    public String getFile() 
-    {
-        return file;
-    }
     public void setStatus(String status) 
     {
         this.status = status;
@@ -451,8 +441,7 @@ public class ArchivesCollectBox extends BaseEntity
             .append("draftName", getDraftName())
             .append("page", getPage())
             .append("documentMark", getDocumentMark())
-            .append("text", getText())
-            .append("file", getFile())
+            .append("text", getText()) 
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
+package com.ruoyi.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 archives_file
+ *
+ * @author li
+ * @date 2022-08-04
+ */
+public class ArchivesFile extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 所属文件id */
+    @Excel(name = "所属文件id")
+    private Long colletctId;
+
+    /** 原文名称 */
+    @Excel(name = "原文名称")
+    private String name;
+
+    /** 原文大小 */
+    @Excel(name = "原文大小")
+    private String size;
+
+    /** 原文类型 */
+    @Excel(name = "原文类型")
+    private String type;
+
+    /** 原文密级 */
+    @Excel(name = "原文密级")
+    private String secretLevel;
+
+    /** 原文版本 */
+    @Excel(name = "原文版本")
+    private String version;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String file;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setColletctId(Long colletctId)
+    {
+        this.colletctId = colletctId;
+    }
+
+    public Long getColletctId()
+    {
+        return colletctId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSize(String size)
+    {
+        this.size = size;
+    }
+
+    public String getSize()
+    {
+        return size;
+    }
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+    public void setSecretLevel(String secretLevel)
+    {
+        this.secretLevel = secretLevel;
+    }
+
+    public String getSecretLevel()
+    {
+        return secretLevel;
+    }
+    public void setVersion(String version)
+    {
+        this.version = version;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("colletctId", getColletctId())
+                .append("name", getName())
+                .append("size", getSize())
+                .append("type", getType())
+                .append("secretLevel", getSecretLevel())
+                .append("version", getVersion())
+                .append("file", getFile())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}
+package com.ruoyi.mapper;
+
+import com.ruoyi.domain.ArchivesFile;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ * 
+ * @author li
+ * @date 2022-08-04
+ */
+public interface ArchivesFileMapper 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public ArchivesFile selectArchivesFileById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<ArchivesFile> selectArchivesFileList(ArchivesFile archivesFile);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertArchivesFile(ArchivesFile archivesFile);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateArchivesFile(ArchivesFile archivesFile);
+
+    /**
+     * 删除【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteArchivesFileById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteArchivesFileByIds(Long[] ids);
+}
+package com.ruoyi.service;
+
+import com.ruoyi.domain.ArchivesFile;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ * 
+ * @author li
+ * @date 2022-08-04
+ */
+public interface IArchivesFileService 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public ArchivesFile selectArchivesFileById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<ArchivesFile> selectArchivesFileList(ArchivesFile archivesFile);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertArchivesFile(ArchivesFile archivesFile);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateArchivesFile(ArchivesFile archivesFile);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    public int deleteArchivesFileByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteArchivesFileById(Long id);
+}
+package com.ruoyi.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.domain.ArchivesFile;
+import com.ruoyi.mapper.ArchivesFileMapper;
+import com.ruoyi.service.IArchivesFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ * 
+ * @author li
+ * @date 2022-08-04
+ */
+@Service
+public class ArchivesFileServiceImpl implements IArchivesFileService 
+{
+    @Autowired
+    private ArchivesFileMapper archivesFileMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public ArchivesFile selectArchivesFileById(Long id)
+    {
+        return archivesFileMapper.selectArchivesFileById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<ArchivesFile> selectArchivesFileList(ArchivesFile archivesFile)
+    {
+        return archivesFileMapper.selectArchivesFileList(archivesFile);
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertArchivesFile(ArchivesFile archivesFile)
+    {
+        archivesFile.setCreateTime(DateUtils.getNowDate());
+        return archivesFileMapper.insertArchivesFile(archivesFile);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param archivesFile 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateArchivesFile(ArchivesFile archivesFile)
+    {
+        archivesFile.setUpdateTime(DateUtils.getNowDate());
+        return archivesFileMapper.updateArchivesFile(archivesFile);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteArchivesFileByIds(Long[] ids)
+    {
+        return archivesFileMapper.deleteArchivesFileByIds(ids);
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteArchivesFileById(Long id)
+    {
+        return archivesFileMapper.deleteArchivesFileById(id);
+    }
+}
@@ -31,7 +31,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="page"    column="page"    />
         <result property="documentMark"    column="document_mark"    />
         <result property="text"    column="text"    />
-        <result property="file"    column="file"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -43,7 +42,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
     <sql id="selectArchivesCollectBoxVo">
-        select id, general, year, title, sort, safekeeping_date, secret_level, pages, filing_number, zk_number, location_code, filing_dept, archival_code, responsibility_name, serial_mark, piece_mark, register_mark, counsellors, filing_name, summary_name, record_type, carrier_type, draft_name, page, document_mark, text, file, create_by, create_time, update_by, update_time, status, apprvoal, belong_role, box_mark from archives_collect_box
+        select id, general, year, title, sort, safekeeping_date, secret_level, pages, filing_number, zk_number, location_code, filing_dept, archival_code, responsibility_name, serial_mark, piece_mark, register_mark, counsellors, filing_name, summary_name, record_type, carrier_type, draft_name, page, document_mark, text, create_by, create_time, update_by, update_time, status, apprvoal, belong_role, box_mark from archives_collect_box
     </sql>
     <select id="selectArchivesCollectBoxList" parameterType="ArchivesCollectBox" resultMap="ArchivesCollectBoxResult">
@@ -74,7 +73,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="page != null  and page != ''"> and page = #{page}</if>
             <if test="documentMark != null  and documentMark != ''"> and document_mark = #{documentMark}</if>
             <if test="text != null  and text != ''"> and text = #{text}</if>
-            <if test="file != null  and file != ''"> and file = #{file}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="apprvoal != null  and apprvoal != ''"> and apprvoal = #{apprvoal}</if>
             <if test="belongRole != null  and belongRole != ''"> and belong_role = #{belongRole}</if>
@@ -115,7 +113,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="page != null">page,</if>
             <if test="documentMark != null">document_mark,</if>
             <if test="text != null">text,</if>
-            <if test="file != null">file,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -151,7 +148,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="page != null">#{page},</if>
             <if test="documentMark != null">#{documentMark},</if>
             <if test="text != null">#{text},</if>
-            <if test="file != null">#{file},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -191,7 +187,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="page != null">page = #{page},</if>
             <if test="documentMark != null">document_mark = #{documentMark},</if>
             <if test="text != null">text = #{text},</if>
-            <if test="file != null">file = #{file},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mapper.ArchivesFileMapper">
+
+    <resultMap type="ArchivesFile" id="ArchivesFileResult">
+        <result property="id"    column="id"    />
+        <result property="colletctId"    column="colletct_id"    />
+        <result property="name"    column="name"    />
+        <result property="size"    column="size"    />
+        <result property="type"    column="type"    />
+        <result property="secretLevel"    column="secret_level"    />
+        <result property="version"    column="version"    />
+        <result property="file"    column="file"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectArchivesFileVo">
+        select id, colletct_id, name, size, type, secret_level, version, file, create_by, create_time, update_by, update_time from archives_file
+    </sql>
+
+    <select id="selectArchivesFileList" parameterType="ArchivesFile" resultMap="ArchivesFileResult">
+        <include refid="selectArchivesFileVo"/>
+        <where>
+            <if test="colletctId != null "> and colletct_id = #{colletctId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="size != null  and size != ''"> and size = #{size}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="secretLevel != null  and secretLevel != ''"> and secret_level = #{secretLevel}</if>
+            <if test="version != null  and version != ''"> and version = #{version}</if>
+            <if test="file != null  and file != ''"> and file = #{file}</if>
+        </where>
+    </select>
+
+    <select id="selectArchivesFileById" parameterType="Long" resultMap="ArchivesFileResult">
+        <include refid="selectArchivesFileVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertArchivesFile" parameterType="ArchivesFile" useGeneratedKeys="true" keyProperty="id">
+        insert into archives_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="colletctId != null">colletct_id,</if>
+            <if test="name != null">name,</if>
+            <if test="size != null">size,</if>
+            <if test="type != null">type,</if>
+            <if test="secretLevel != null">secret_level,</if>
+            <if test="version != null">version,</if>
+            <if test="file != null">file,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="colletctId != null">#{colletctId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="size != null">#{size},</if>
+            <if test="type != null">#{type},</if>
+            <if test="secretLevel != null">#{secretLevel},</if>
+            <if test="version != null">#{version},</if>
+            <if test="file != null">#{file},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateArchivesFile" parameterType="ArchivesFile">
+        update archives_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="colletctId != null">colletct_id = #{colletctId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="size != null">size = #{size},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="secretLevel != null">secret_level = #{secretLevel},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="file != null">file = #{file},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteArchivesFileById" parameterType="Long">
+        delete from archives_file where id = #{id}
+    </delete>
+
+    <delete id="deleteArchivesFileByIds" parameterType="String">
+        delete from archives_file where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
 \ No newline at end of file
+import request from '@/utils/request'
+
+// 查询【请填写功能名称】列表
+export function listFile(query) {
+  return request({
+    url: '/archives/file/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询【请填写功能名称】详细
+export function getFile(id) {
+  return request({
+    url: '/archives/file/' + id,
+    method: 'get'
+  })
+}
+
+// 新增【请填写功能名称】
+export function addFile(data) {
+  return request({
+    url: '/archives/file',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改【请填写功能名称】
+export function updateFile(data) {
+  return request({
+    url: '/archives/file',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除【请填写功能名称】
+export function delFile(id) {
+  return request({
+    url: '/archives/file/' + id,
+    method: 'delete'
+  })
+}
@@ -50,17 +50,17 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 1,
     },
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 20,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+      default: () => ["doc", "xls", "ppt", "txt", "pdf","jpg","png"],
     },
     // 是否显示提示
     isShowTip: {
@@ -78,6 +78,7 @@ export default {
         Authorization: "Bearer " + getToken(),
       },
       fileList: [],
+      size : 0,
     };
   },
   watch: {
@@ -124,13 +125,14 @@ export default {
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
         });
-        /*if (!isTypeOk) {
+        if (!isTypeOk) {
           this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
           return false;
-        }*/
+        }
       }
       // 校检文件大小
       if (this.fileSize) {
+        this.size = file.size / 1024;
         const isLt = file.size / 1024 / 1024 < this.fileSize;
         if (!isLt) {
           this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
@@ -159,8 +161,14 @@ export default {
         this.number = 0;
         this.$emit("input", this.listToString(this.fileList));
         this.$modal.closeLoading();
+        // 文件名称 和 文件大小
+        let val = {"originalFilename" :res.originalFilename,"size": this.size }
+        this.fileAll(val)
       }
     },
+    fileAll(val){
+      this.$emit("FileList",val)
+    },
     // 删除文件
     handleDelete(index) {
       this.fileList.splice(index, 1);
@@ -161,9 +161,8 @@
     <el-dialog :title="title" :visible.sync="boxOpen"   width="80%" append-to-body>
-      <preview :url="'/profile/upload/2022/08/03/20220121中途站用时分析表沪嘉专线 (1)_20220803161055A001.xlsx'" />
-<!--
-      <indexbox :statusPd="3" />-->
+
+      <indexbox :statusPd="2" />
     </el-dialog>
   </div>
 </template>
@@ -171,12 +170,11 @@
 <script>
 import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/box";
-import preview from "@/views/archives/preview/preview";
 import indexbox from "@/views/archives/collerctbox/index.vue";
 export default {
   name: "Box",
-  components: { preview,indexbox },
+  components: { indexbox },
   data() {
     return {
       // 遮罩层
@@ -43,6 +43,19 @@
     <el-row :gutter="10" class="mb8" v-if="titleshow">
+
+
+      <el-col :span="1.5">
+        <el-select v-model="approval_type">
+          <el-option
+            v-for="dict in dict.type.approval_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-col>
+
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -85,7 +98,7 @@
           v-hasPermi="['archives:collerctbox:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="lecommit">
         <el-button
           type="warning"
           plain
@@ -95,12 +108,33 @@
           v-hasPermi="['archives:collerctbox:commmit']"
         >提交</el-button>
       </el-col>
+
+      <el-col :span="1.5" v-if="inserBox">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleinserBox"
+          v-hasPermi="['archives:collerctbox:inserBox']"
+        >加入盒</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="操作" align="center" prop="year" >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleCheck(scope.row)"
+            v-hasPermi="['archives:box:check']"
+          >查看</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="全宗号" align="center" prop="general" />
       <el-table-column label="年度" align="center" prop="year" />
       <el-table-column label="题名" align="center" prop="title" />
@@ -162,38 +196,58 @@
     />
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="全宗号" prop="general">
-          <el-input v-model="form.general" placeholder="请输入全宗号" />
-        </el-form-item>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="全宗号" prop="general">
+              <el-input v-model="form.general" placeholder="请输入全宗号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
         <el-form-item label="年度" prop="year">
           <el-input v-model="form.year" placeholder="请输入年度" />
         </el-form-item>
+          </el-col>
+        <el-col :span="6">
         <el-form-item label="题名" prop="title">
           <el-input v-model="form.title" placeholder="请输入题名" />
         </el-form-item>
+        </el-col>
+          <el-col :span="6">
         <el-form-item label="分类号" prop="sort">
           <el-input v-model="form.sort" placeholder="请输入分类号" />
         </el-form-item>
-        <el-form-item label="保管期限" prop="safekeepingDate">
-          <el-date-picker clearable
-            v-model="form.safekeepingDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择保管期限">
-          </el-date-picker>
-        </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="保管期限" prop="safekeepingDate">
+              <el-date-picker clearable
+                v-model="form.safekeepingDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择保管期限">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
         <el-form-item label="密级" prop="secretLevel">
           <el-input v-model="form.secretLevel" placeholder="请输入密级" />
         </el-form-item>
+          </el-col>
+            <el-col :span="6">
         <el-form-item label="页数" prop="pages">
           <el-input v-model="form.pages" placeholder="请输入页数" />
         </el-form-item>
+            </el-col>
+          <el-col :span="6">
         <el-form-item label="归档份数" prop="filingNumber">
           <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
         </el-form-item>
-        <el-form-item label="在库份数" prop="zkNumber">
+          </el-col>
+        </el-row>
+<!--        <el-form-item label="在库份数" prop="zkNumber">
           <el-input v-model="form.zkNumber" placeholder="请输入在库份数" />
         </el-form-item>
         <el-form-item label="库位码" prop="locationCode">
@@ -238,9 +292,7 @@
         <el-form-item label="原文" prop="text">
           <el-input v-model="form.text" placeholder="请输入原文" />
         </el-form-item>
-        <el-form-item label="文件">
-          <file-upload v-model="form.file"/>
-        </el-form-item>
+
         <el-form-item label="1.待整理 2.待审批" prop="apprvoal">
           <el-input v-model="form.apprvoal" placeholder="请输入1.待整理 2.待审批" />
         </el-form-item>
@@ -249,25 +301,32 @@
         </el-form-item>
         <el-form-item label="盒号" prop="boxMark">
           <el-input v-model="form.boxMark" placeholder="请输入盒号" />
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
+    <el-dialog :title="title" :visible.sync="fileOpen"   width="80%" append-to-body>
+            <file  :collboxId=collboxId />
+    </el-dialog>
   </div>
 </template>
 <script>
 import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox";
-
+import file from "@/views/archives/file/index.vue";
 export default {
   name: "collerctbox",
-
+  dicts: ['approval_type'],
+  components: { file },
   props: {
     statusPd: {
-      type: String, // 这里你接收的值是什么类型就写什么类型
+      type: Number, // 这里你接收的值是什么类型就写什么类型
     }
   },
@@ -320,27 +379,30 @@ export default {
         page: null,
         documentMark: null,
         text: null,
-        file: null,
         status: null,
         apprvoal: null,
         belongRole: null,
         boxMark: null,
-
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
       },
-      statusPd : null, //页面传递参数  1.未整理 2.已整理 3.盒
-      titleshow : true //3.盒 不显示查询条件
+      approval_type : null,
+     // statusPd : null, //页面传递参数  1.未整理 2.已整理 3.盒
+      titleshow : true,//3.盒 不显示查询条件
+      fileOpen : false,
+      collboxId: null,//本次Id
+      lecommit: false
     };
   },
+  //statusPd  0未整理文件 1 已整理文件 2 盒
   created() {
     this.getList();
-    if (this.statusPd == 3){
-      this.titleshow = false
-    }
+    this.titleshow =this.statusPd == 2 ? false : true; //提交
+    this.lecommit = this.statusPd != "0" ? false :true;
+    this.inserBox = this.statusPd == 1 ? true : false; //加入盒
   },
   methods: {
     /** 查询【请填写功能名称】列表 */
@@ -387,7 +449,6 @@ export default {
         page: null,
         documentMark: null,
         text: null,
-        file: null,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -395,7 +456,8 @@ export default {
         status: "0",
         apprvoal: null,
         belongRole: null,
-        boxMark: null
+        boxMark: null,
+        inserBox: false,
       };
       this.resetForm("form");
     },
@@ -419,7 +481,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加【请填写功能名称】";
+      this.title = "添加【11】";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -428,7 +490,7 @@ export default {
       getBox(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改【请填写功能名称】";
+        this.title = "修改【22】";
       });
     },
     /** 提交按钮 */
@@ -471,7 +533,6 @@ export default {
     handleCommit(row){
       const id = row.id || this.ids
       getBox(id).then(response => {
-        debugger
         let from  = response.data;
         from.status = "1";
         updateBox(from).then(response => {
@@ -480,6 +541,13 @@ export default {
           this.getList();
         });
       });
+    },
+    handleinserBox(row){
+
+    },
+    handleCheck(row){
+      this.fileOpen = true;
+      this.collboxId = row.id;
     }
   }
 };
+<template>
+  <div class="app-container">
+
+
+    <el-row :gutter="20">
+      <el-col :span="16" :xs="24" >
+
+        <preview :fileurl= fileurl  v-if="fileOpen"/>
+      </el-col>
+      <el-col :span="8" :xs="24">
+<!--
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="所属文件id" prop="colletctId">
+            <el-input
+              v-model="queryParams.colletctId"
+              placeholder="请输入所属文件id"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="原文名称" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入原文名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="原文大小" prop="size">
+            <el-input
+              v-model="queryParams.size"
+              placeholder="请输入原文大小"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="原文密级" prop="secretLevel">
+            <el-input
+              v-model="queryParams.secretLevel"
+              placeholder="请输入原文密级"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="原文版本" prop="version">
+            <el-input
+              v-model="queryParams.version"
+              placeholder="请输入原文版本"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+-->
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['archives:file:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['archives:file:edit']"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['archives:file:remove']"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['archives:file:export']"
+            >导出</el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="fileList" @selection-change="handleSelectionChange" >
+
+          <el-table-column type="selection" width="55" align="center" />
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="clickFile(scope.row)"
+                v-hasPermi="['archives:file:edit']"
+              >查看文件</el-button>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="主键" align="center" prop="id" />
+          <el-table-column label="所属文件id" align="center" prop="colletctId" />-->
+          <el-table-column label="原文名称" align="center" prop="name" />
+          <el-table-column label="原文大小" align="center" prop="size" />
+          <el-table-column label="原文类型" align="center" prop="type">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.original_type" :value="scope.row.type"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="原文密级" align="center" prop="secretLevel">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.secret_level" :value="scope.row.secretLevel"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="原文版本" align="center" prop="version" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['archives:file:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['archives:file:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+
+    <!-- 添加或修改【请填写功能名称】对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="原文名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入原文名称" disabled/>
+        </el-form-item>
+        <el-form-item label="原文大小" prop="size">
+          <el-input v-model="form.size" placeholder="请输入原文大小" disabled/>
+        </el-form-item>
+        <el-form-item label="原文类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择原文类型">
+            <el-option
+              v-for="dict in dict.type.original_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="原文密级" prop="secretLevel">
+
+          <el-select v-model="form.secretLevel" placeholder="请输入原文密级">
+            <el-option
+              v-for="dict in dict.type.secret_level"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="原文版本" prop="version">
+          <el-input v-model="form.version" placeholder="请输入原文版本" />
+        </el-form-item>
+        <el-form-item label="文件" >
+          <file-upload v-model="form.file" @FileList="FileList"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFile, getFile, delFile, addFile, updateFile } from "@/api/archives/file";
+
+import preview from "@/views/archives/preview/preview";
+export default {
+  name: "File",
+  dicts: ['original_type','secret_level'],
+  components: { preview },
+
+  props: {
+    collboxId: {
+      type: Number, // 这里你接收的值是什么类型就写什么类型
+    },
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 文件表格数据
+      fileList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        colletctId: null,
+        name: null,
+        size: null,
+        type: null,
+        secretLevel: null,
+        version: null,
+        file: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      fileurl: null,
+      fileOpen: true
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询文件列表 */
+    getList() {
+      this.loading = true;
+      listFile(this.queryParams).then(response => {
+        this.fileList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        colletctId: null,
+        name: null,
+        size: null,
+        type: null,
+        secretLevel: null,
+        version: null,
+        file: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加文件";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFile(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改文件";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFile(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFile(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除文件编号为"' + ids + '"的数据项？').then(function() {
+        return delFile(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('archives/file/export', {
+        ...this.queryParams
+      }, `file_${new Date().getTime()}.xlsx`)
+    },
+    clickFile(row) {
+      this.fileurl = row.file;
+      this.title = "...";
+      this.reload()
+    },
+
+    reload(){
+      this.fileOpen = false;
+      this.$nextTick(function (){
+        this.fileOpen = true;
+      })
+    },
+    FileList(val){
+      this.form.name = val.originalFilename;
+      this.form.size = Math.round(val.size) + "kb";
+    }
+  }
+};
+</script>
@@ -35,15 +35,15 @@
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-if="stattwo">
-            <el-tab-pane label="未整理文件" name="first" > <indexbox :statusPd="0" v-if="isFirst"/></el-tab-pane>
+            <el-tab-pane label="未整理文件" name="first" > <indexbox :statusPd=0 v-if="isFirst"/></el-tab-pane>
             <el-tab-pane label="已整理文件" name="second" ><indexbox :statusPd="1"  v-if="isSecond" /></el-tab-pane>
             <el-tab-pane label="盒" name="third" ><box  v-if="isThird" /></el-tab-pane>
           </el-tabs>
           <el-tabs v-model="tactiveName" type="card" @tab-click="thandleClick" v-if="stat">
-            <el-tab-pane label="未整理案卷" name="tfirst" > <indexvolume :statusPd="0" v-if="itFirst"/></el-tab-pane>
-            <el-tab-pane label="已整理案卷" name="tsecond" ><indexvolume :statusPd="1"  v-if="itSecond" /></el-tab-pane>
-            <el-tab-pane label="组卷" name="tthird" ><indexvolume  v-if="itThird" /></el-tab-pane>
+            <el-tab-pane label="未整理文件" name="tfirst" > <indexvolume :statusPd=0 v-if="itFirst"/></el-tab-pane>
+            <el-tab-pane label="未整理案卷" name="tsecond" ><indexvolume :statusPd="1"  v-if="itSecond" /></el-tab-pane>
+            <el-tab-pane label="已整理案卷" name="tthird" ><indexvolume  v-if="itThird" /></el-tab-pane>
           </el-tabs>
@@ -55,9 +55,9 @@
 <script >
 import {treeselect} from "@/api/archives/dept";
-import indexbox from "@/views/archives/collerctbox";
-import box from "@/views/archives/box";
-import indexvolume from "@/views/archives/volume";
+import indexbox from "@/views/archives/collerctbox/index";
+import box from "@/views/archives/box/index";
+import indexvolume from "@/views/archives/volume/index";
 export default {
   components: { indexbox ,indexvolume,box},
   name: "archiveindex",
@@ -16,26 +16,24 @@ import {treeselect} from &quot;@/api/archives/dept&quot;;
 export default {
   props: {
-    url: {
+    fileurl: {
       type: String, // 这里你接收的值是什么类型就写什么类型
     }
   },
   name: "preview",
+/*  inject:['reload'],*/
   data() {
     return {
-
       reportUrl : null,
-      url:null
     };
   },
   created(){
-    debugger
+    if(this.fileurl != null && this.fileurl != undefined){
-    alert(process.env.npm_config_port);
-    let a = process.env.VUE_APP_BASE_API;
-    let urll = "http://localhost"+ process.env.VUE_APP_BASE_API +this.url; //要预览文件的访问地址
-    this.reportUrl = 'http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(bsbase64Encode.encode(urll));
+      let url = "http://localhost"+ process.env.VUE_APP_BASE_API +this.fileurl; //要预览文件的访问地址
+      this.reportUrl = 'http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(bsbase64Encode.encode(url));
+    }
   },
   methods: {
@@ -204,6 +204,12 @@ import { listVolume, getVolume, delVolume, addVolume, updateVolume } from &quot;@/api
 export default {
   name: "Volume",
+  props: {
+    statusPd: {
+      type: Number, // 这里你接收的值是什么类型就写什么类型
+    }
+  },
+
   data() {
     return {
       // 遮罩层
@@ -52,6 +52,7 @@ module.exports = {
     }
   },
   configureWebpack: {
+    devtool:'souce-map',
     name: name,
     resolve: {
       alias: {