我的、待办、已办项目名称、合同名称

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                String[] projectCars = project.getCars().split(",");
-                String[] cars = carString.split(",");
-                Collection union = CollectionUtils.union(Arrays.asList(projectCars), Arrays.asList(cars));
-                project.setCars(String.join(",",union));
+                if (project.getCars() != null) {
+                    String[] projectCars = project.getCars().split(",");
+                    String[] cars = carString.split(",");
+                    Collection union = CollectionUtils.union(Arrays.asList(projectCars), Arrays.asList(cars));
+                    project.setCars(String.join(",",union));
+                }
+                else
+                    project.setCars(carString);
                 cmcProjectService.updateCmcProject(project);
             }
             String[] cars = carString.split(",");
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                String[] projectDrivers = project.getDrivers().split(",");
-                String[] drivers = formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1).split(",");
-                Collection union = CollectionUtils.union(Arrays.asList(projectDrivers), Arrays.asList(drivers));
-                project.setDrivers(String.join(",",union));
+                String driverString = formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1);
+                if (project.getDrivers() != null) {
+                    String[] projectDrivers = project.getDrivers().split(",");
+                    String[] drivers = driverString.split(",");
+                    Collection union = CollectionUtils.union(Arrays.asList(projectDrivers), Arrays.asList(drivers));
+                    project.setDrivers(String.join(",", union));
+                }
+                else
+                    project.setDrivers(driverString);
                 cmcProjectService.updateCmcProject(project);
             }
         }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                String[] projectDevices = project.getDevices().split(",");
-                String[] devices = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1).split(",");
-                Collection union = CollectionUtils.union(Arrays.asList(projectDevices), Arrays.asList(devices));
-                project.setDevices(String.join(",",union));
+                if (project.getDevices() != null) {
+                    String[] projectDevices = project.getDevices().split(",");
+                    String[] devices = deviceString.split(",");
+                    Collection union = CollectionUtils.union(Arrays.asList(projectDevices), Arrays.asList(devices));
+                    project.setDevices(String.join(",", union));
+                }
+                else
+                    project.setDevices(deviceString);
                 cmcProjectService.updateCmcProject(project);
             }
             String[] devices = deviceString.split(",");

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectChangeController.java

      * 获取cmc项目变更详细信息
      */
     @GetMapping(value = "/{changeId}")
-    public AjaxResult getInfo(@PathVariable("changeId") Long changeId)
+    public AjaxResult getInfo(@PathVariable("changeId") String changeId)
     {
         return success(cmcProjectChangeService.selectCmcProjectChangeByChangeId(changeId));
     }
      */
     @Log(title = "cmc项目变更", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{changeIds}")
-    public AjaxResult remove(@PathVariable Long[] changeIds)
+    public AjaxResult remove(@PathVariable String[] changeIds)
     {
         return success(cmcProjectChangeService.deleteCmcProjectChangeByChangeIds(changeIds));
     }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/dto/FlowTaskDto.java

     @ApiModelProperty("流程发起人名称")
     private String startUserName;
 
+    @ApiModelProperty("流程关联项目Id")
+    private String projectId;
+
+    @ApiModelProperty("流程关联项目编号")
+    private String projectNumber;
+
+    @ApiModelProperty("流程关联项目名称")
+    private String projectName;
+
+    @ApiModelProperty("流程关联合同Id")
+    private String contractId;
+
+    @ApiModelProperty("流程关联合同名称")
+    private String contractName;
+
     @ApiModelProperty("流程类型")
     private String category;
 

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

 import com.ruoyi.flowable.service.IFlowTaskService;
 import com.ruoyi.flowable.service.ISysDeployFormService;
 import com.ruoyi.flowable.service.ISysFormService;
+import com.ruoyi.oa.service.*;
 import com.ruoyi.system.domain.FlowProcDefDto;
 import com.ruoyi.system.domain.FlowVarInst;
 import com.ruoyi.system.domain.SysForm;
     @Resource
     private ISysFormService sysFormService;
     @Resource
+    private ICmcContractService cmcContractService;
+    @Resource
+    private ICmcProjectContractService cmcProjectContractService;
+    @Resource
+    private ICmcProjectSubContractService cmcProjectSubContractService;
+    @Resource
+    private ICmcSubContractService cmcSubContractService;
+    @Resource
+    private ICmcBrandService cmcBrandService;
+    @Resource
+    private ICmcDepositService cmcDepositService;
+    @Resource
+    private ICmcArchiveService cmcArchiveService;
+    @Resource
+    private ICmcSettleService cmcSettleService;
+    @Resource
+    private ICmcProjectChangeService cmcProjectChangeService;
+    @Resource
+    private ICmcDeclareService cmcDeclareService;
+    @Resource
+    private ICmcBorrowService cmcBorrowService;
+    @Resource
+    private ICmcCarApprovalService cmcCarApprovalService;
+    @Resource
+    private ICmcDeviceApprovalService cmcDeviceApprovalService;
+    @Resource
+    private ICmcAssessService cmcAssessService;
+    @Resource
+    private ICmcProjectService cmcProjectService;
+    @Resource
+    private ICmcTenderService cmcTenderService;
+    @Resource
+    private ICmcSafeService cmcSafeService;
+    @Resource
+    private ICmcTechnicalService cmcTechnicalService;
+    @Resource
+    private ICmcTechnicalPlanService cmcTechnicalPlanService;
+    @Resource
+    private ICmcBudgetService cmcBudgetService;
+    @Resource
     private FlowVarInstMapper flowVarInstMapper;
     @Resource
     private FlowDeployMapper flowDeployMapper;
                     }
                 }
             }
+            if (flowTask.getProcDefName().contains("合同评审")) {
+                flowTask.setContractId(flowTask.getProcInsId());
+                if (flowTask.getProcDefName().contains("承接"))
+                    flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
+                if (flowTask.getProcDefName().contains("分包"))
+                    flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
+            }
+            else {
+                flowTask.setProjectId(getFlowProjectId(flowTask));
+                if (flowTask.getProjectId() != null) {
+                    if (!flowTask.getProcDefName().equals("保证金审批")) {
+                        flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
+                        flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
+                    } else
+                        flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
+                }
+            }
             flowList.add(flowTask);
         }
         page.setRecords(flowList);
             flowTask.setStartUserId(startUser.getUserId().toString());
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptName() : "");
+            if (flowTask.getProcDefName().contains("合同评审")) {
+                flowTask.setContractId(flowTask.getProcInsId());
+                if (flowTask.getProcDefName().contains("承接"))
+                    flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
+                if (flowTask.getProcDefName().contains("分包"))
+                    flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
+            }
+            else {
+                flowTask.setProjectId(getFlowProjectId(flowTask));
+                if (flowTask.getProjectId() != null) {
+                    if (!flowTask.getProcDefName().equals("保证金审批")) {
+                        flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
+                        flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
+                    } else
+                        flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
+                }
+            }
             flowList.add(flowTask);
         }
 
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(startUser.getDept().getDeptName());
             flowTask.setAssigneeId(Long.parseLong(histTask.getAssignee()));
+            if (flowTask.getProcDefName().contains("合同评审")) {
+                flowTask.setContractId(flowTask.getProcInsId());
+                if (flowTask.getProcDefName().contains("承接"))
+                    flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
+                if (flowTask.getProcDefName().contains("分包"))
+                    flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
+            }
+            else {
+                flowTask.setProjectId(getFlowProjectId(flowTask));
+                if (flowTask.getProjectId() != null) {
+                    if (!flowTask.getProcDefName().equals("保证金审批")) {
+                        flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
+                        flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
+                    } else
+                        flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
+                }
+            }
             hisTaskList.add(flowTask);
         }
         page.setTotal(taskInstanceQuery.count());
             return 0 + "秒";
         }
     }
+
+    /**
+     * 流程项目id
+     *
+     * @param flowTaskDto
+     * @return
+     */
+    private String getFlowProjectId(FlowTaskDto flowTaskDto) {
+        String projectId = "";
+        String formId = flowVarInstMapper.selectVarByProcInsId(flowTaskDto.getProcInsId()).getText();
+        if (flowTaskDto.getProcDefName().equals("品牌项目支付"))
+            projectId = cmcBrandService.selectCmcBrandByBrandId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("项目流转"))
+            projectId = formId;
+        if (flowTaskDto.getProcDefName().equals("项目预算"))
+            projectId = cmcBudgetService.selectCmcBudgetByBudgetId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("技术方案"))
+            projectId = formId;
+        if (flowTaskDto.getProcDefName().equals("安全交底"))
+            projectId = formId;
+        if (flowTaskDto.getProcDefName().equals("技术交底"))
+            projectId = cmcTechnicalService.selectCmcTechnicalByTechnicalId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("成果归档"))
+            projectId = cmcArchiveService.selectCmcArchiveByArchiveId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().contains("结算"))
+            projectId = cmcSettleService.selectCmcSettleBySettleId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("项目变更"))
+            projectId = cmcProjectChangeService.selectCmcProjectChangeByChangeId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("工作填报"))
+            projectId = cmcDeclareService.selectCmcDeclareByFormId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("借款审批"))
+            projectId = cmcBorrowService.selectCmcBorrowByBorrowId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("用车审批"))
+            projectId = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("设备审批"))
+            projectId = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().contains("考核"))
+            projectId = cmcAssessService.selectCmcAssessByAssessId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("保证金评审"))
+            projectId = cmcDepositService.selectCmcDepositByDepositId(formId).getTenderId().toString();
+        return projectId;
+    }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeclare.java

     private Long userId;
 
     /** 工作类别（内业、外业等） */
-    @Excel(name = "工作类别", readConverterExp = "内=业、外业等")
+    @Excel(name = "工作类别")
     private String workType;
 
     /** 工作项目 */
     private String workItem;
 
     /** 工作内容（每日工作日志） */
-    @Excel(name = "工作内容", readConverterExp = "每=日工作日志")
+    @Excel(name = "工作内容")
     private String workContent;
 
     /** 工天 */
     private String coefficient;
 
     /** 一审状态（0-未审核，1已审核） */
-    @Excel(name = "一审状态", readConverterExp = "0=-未审核，1已审核")
+    @Excel(name = "一审状态", readConverterExp = "0=未审核,1=已审核")
     private String checkStatus;
 
     /** 二审状态（0-未审核，1已审核） */
-    @Excel(name = "二审状态", readConverterExp = "0=-未审核，1已审核")
+    @Excel(name = "二审状态", readConverterExp = "0=未审核,1=已审核")
     private String auditStatus;
 
     /** 填报时间 */
     private Date submitTime;
 
     /** 确认状态 */
-    @Excel(name = "确认状态")
+    @Excel(name = "确认状态", readConverterExp = "0=未确认,1=已确认")
     private String confirmStatus;
 
     private SysUser user;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectChangeMapper.java

      * @param changeId cmc项目变更主键
      * @return cmc项目变更
      */
-    public CmcProjectChange selectCmcProjectChangeByChangeId(Long changeId);
+    public CmcProjectChange selectCmcProjectChangeByChangeId(String changeId);
 
     /**
      * 查询cmc项目变更列表
      * @param changeId cmc项目变更主键
      * @return 结果
      */
-    public int deleteCmcProjectChangeByChangeId(Long changeId);
+    public int deleteCmcProjectChangeByChangeId(String changeId);
 
     /**
      * 批量删除cmc项目变更
      * @param changeIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcProjectChangeByChangeIds(Long[] changeIds);
+    public int deleteCmcProjectChangeByChangeIds(String[] changeIds);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectChangeService.java

      * @param changeId cmc项目变更主键
      * @return cmc项目变更
      */
-    public CmcProjectChange selectCmcProjectChangeByChangeId(Long changeId);
+    public CmcProjectChange selectCmcProjectChangeByChangeId(String changeId);
 
     /**
      * 查询cmc项目变更列表
      * @param changeIds 需要删除的cmc项目变更主键集合
      * @return 结果
      */
-    public int deleteCmcProjectChangeByChangeIds(Long[] changeIds);
+    public int deleteCmcProjectChangeByChangeIds(String[] changeIds);
 
     /**
      * 删除cmc项目变更信息
      * @param changeId cmc项目变更主键
      * @return 结果
      */
-    public int deleteCmcProjectChangeByChangeId(Long changeId);
+    public int deleteCmcProjectChangeByChangeId(String changeId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectChangeServiceImpl.java

      * @return cmc项目变更
      */
     @Override
-    public CmcProjectChange selectCmcProjectChangeByChangeId(Long changeId)
+    public CmcProjectChange selectCmcProjectChangeByChangeId(String changeId)
     {
         return cmcProjectChangeMapper.selectCmcProjectChangeByChangeId(changeId);
     }
      * @return 结果
      */
     @Override
-    public int deleteCmcProjectChangeByChangeIds(Long[] changeIds)
+    public int deleteCmcProjectChangeByChangeIds(String[] changeIds)
     {
         return cmcProjectChangeMapper.deleteCmcProjectChangeByChangeIds(changeIds);
     }
      * @return 结果
      */
     @Override
-    public int deleteCmcProjectChangeByChangeId(Long changeId)
+    public int deleteCmcProjectChangeByChangeId(String changeId)
     {
         return cmcProjectChangeMapper.deleteCmcProjectChangeByChangeId(changeId);
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowVarInstMapper.java

      */
     public List<FlowVarInst> selectProcInstByVar(String formId);
 
+    /**
+     * 通过流程实例id查询表单id
+     *
+     * @param procInsId 流程实例id
+     * @return 流程变量
+     */
+    public FlowVarInst selectVarByProcInsId(String procInsId);
+
 }

oa-back/ruoyi-system/src/main/resources/mapper/flowable/FlowVarInstMapper.xml

         order by CREATE_TIME_ asc
     </select>
 
+    <select id="selectVarByProcInsId" parameterType="FlowVarInst" resultMap="FlowVarInstResult">
+        <include refid="selectFlowVarInstVo"/>
+        <where>
+            PROC_INST_ID_ = #{param} and LENGTH(TEXT_) = 19
+        </where>
+    </select>
+
 </mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectChangeMapper.xml

         order by pc.register_time desc
     </select>
     
-    <select id="selectCmcProjectChangeByChangeId" parameterType="Long" resultMap="CmcProjectChangeResult">
+    <select id="selectCmcProjectChangeByChangeId" parameterType="String" resultMap="CmcProjectChangeResult">
         <include refid="selectCmcProjectChangeVo"/>
         where pc.change_id = #{changeId}
     </select>
         where change_id = #{changeId}
     </update>
 
-    <delete id="deleteCmcProjectChangeByChangeId" parameterType="Long">
+    <delete id="deleteCmcProjectChangeByChangeId" parameterType="String">
         delete from cmc_project_change where change_id = #{changeId}
     </delete>
 

oa-ui/src/views/file/index.vue

 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-01 17:05:09
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-19 11:45:35
 -->
 <template>
   <div class="warpper-container">
     <div class="map-container" id="maps" tabindex="0"></div>
     <!-- 鼠标移动坐标 -->
     <div id="mouse-position"></div>
+    <!-- 项目信息弹出框 -->
+    <info-box :datas="datas" :maps="map" @closePopup="closePopup" @open="openAchiList"></info-box>
     <!-- 工具栏列表 -->
     <div class="tool-box">
       <div class="item">
           </el-descriptions-item>
           <el-descriptions-item label="存放地址" width="130px">
             {{ clickFeacture.storageAddress == '' || clickFeacture.storageAddress == null ? '暂无' :
-            clickFeacture.storageAddress }}
+              clickFeacture.storageAddress }}
           </el-descriptions-item>
         </el-descriptions>
 
                   <el-descriptions :column="2">
                     <el-descriptions-item label="存放地址：" class="desLabel" :span="2">
                       {{ props.row.storageAddress == '' || props.row.storageAddress == undefined ? '暂无' :
-            props.row.storageAddress
+                        props.row.storageAddress
                       }}
                     </el-descriptions-item>
                     <el-descriptions-item label="甲方单位：" class="desLabel" :span="2">{{ props.row.partyA.partyAName == ''
-            ? '暂无' :
-            props.row.partyA.partyAName
-                      }}</el-descriptions-item>
+                      ? '暂无' :
+                      props.row.partyA.partyAName
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="联系人：" class="desLabel">{{ props.row.contactPerson == '' ? '暂无' :
-            props.row.contactPerson
-                      }}</el-descriptions-item>
+                      props.row.contactPerson
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="联系电话：" class="desLabel">{{ props.row.telephone == '' ? '暂无' :
-            props.row.telephone
-                      }}</el-descriptions-item>
+                      props.row.telephone
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="项目类型：" class="desLabel">{{ props.row.projectType == '' ? '暂无' :
-            props.row.projectType
-                      }}</el-descriptions-item>
+                      props.row.projectType
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="技术负责人：" class="desLabel">{{ props.row.technicalDirector == '' ? '暂无'
-            :
-            getUserName(props.row.technicalDirector)
-                      }}</el-descriptions-item>
+                      :
+                      getUserName(props.row.technicalDirector)
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="技术设计人：" class="desLabel">{{ props.row.techinicalDesigner == '' ? '暂无'
-            :
-            getUserName(props.row.techinicalDesigner)
-                      }}</el-descriptions-item>
+                      :
+                      getUserName(props.row.techinicalDesigner)
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="承担部门：" class="desLabel">{{ props.row.undertakingSector == '' ? '暂无' :
-            props.row.undertakingSector
-                      }}</el-descriptions-item>
+                      props.row.undertakingSector
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="质量检察员：" class="desLabel">{{ props.row.qualityInspector == '' ? '暂无' :
-            getUserNames(props.row.qualityInspector)
-                      }}</el-descriptions-item>
+                      getUserNames(props.row.qualityInspector)
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="项目登记时间：" class="desLabel" :span="2">{{ props.row.registrationDate ==
-            '' ? '暂无' :
-            props.row.registrationDate
-                      }}</el-descriptions-item>
+                      '' ? '暂无' :
+                      props.row.registrationDate
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="项目登记人：" class="desLabel">{{ props.row.projectRegistrant == '' ? '暂无'
-            :
-            getUserName(props.row.projectRegistrant)
-                      }}</el-descriptions-item>
+                      :
+                      getUserName(props.row.projectRegistrant)
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="进场时间：" class="desLabel">{{ props.row.approachTime == '' ? '暂无' :
-            props.row.approachTime
-                      }}</el-descriptions-item>
+                      props.row.approachTime
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="撤场时间：" class="desLabel">{{ props.row.withdrawalTime == '' ? '暂无' :
-            props.row.withdrawalTime
-                      }}</el-descriptions-item>
+                      props.row.withdrawalTime
+                    }}</el-descriptions-item>
                     <el-descriptions-item label="项目要求完成时间：" class="desLabel">{{ props.row.requiredCompletionDate == ''
-            ? '暂无' :
-            props.row.requiredCompletionDate
-                      }}</el-descriptions-item>
+                      ? '暂无' :
+                      props.row.requiredCompletionDate
+                    }}</el-descriptions-item>
                   </el-descriptions>
                   <div class="look-achi" @click="lookThisAchi(props.row)">
                     查看成果>>
           <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize" @pagination="getProjectList" /> -->
         </div>
+
+        <!-- 成果目录 -->
+        <div class="achi-list dialog_wrap" v-if="dialogTableVisible">
+          <div class="achi-content">
+            <div class="achi-header">
+              成果目录
+              <el-icon class="close" @click="dialogTableVisible = false">
+                <CloseBold />
+              </el-icon>
+            </div>
+            <div class="achi-projectNumber">项目编号:{{ dialogTitle }}</div>
+            <el-table :data="achiDialogData" height="400px">
+              <el-table-column type="expand">
+                <template #default="props">
+                  <el-descriptions :column="2" size="small">
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="成果名称:">{{
+                        props.row.achiName
+                      }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="数据年份:">{{
+                        props.row.dataYear }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="成果类型:">{{
+                        props.row.resultType }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="文件类型:">{{
+                        props.row.fileType }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="工作量:">{{
+                        props.row.workLoad }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="单位:">{{
+                        props.row.unit }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="大地基准:">{{
+                        props.row.geodeticDatum }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="分辨率:">{{
+                        props.row.resolution }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="比例尺或等级:">{{ props.row.scaleOrder }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="数据类型:">{{
+                        props.row.dataType }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="存放地址:">{{
+                        props.row.storageAddress }}</el-descriptions-item>
+                    <el-descriptions-item min-width="195px" label-class-name="my-label" class-name="my-content"
+                      label="提交时间:">{{
+                        props.row.submitDate }}</el-descriptions-item>
+                  </el-descriptions>
+                </template>
+              </el-table-column>
+              <el-table-column type="index" label="序号" width="50px" align="center" />
+              <el-table-column prop="achiName" label="成果名称" align="center" show-overflow-tooltip />
+              <el-table-column prop="dataYear" label="数据年份" align="center" />
+            </el-table>
+          </div>
+        </div>
       </div>
     </div>
 
 import { toStringXY, createStringXY, toStringHDMS } from 'ol/coordinate';
 import { Circle, Fill, Stroke, Style, RegularShape, Icon, Text } from 'ol/style';
 import { MousePosition, ScaleLine, defaults as defaultControls } from 'ol/control';
+import { getAchievementByProject, listAchievement } from "@/api/file/achievement";
 export default {
   components: { infoBox },
   data() {
         selectProjectNumber: "",
         type: '',
       },
-      seletctedCluters: []
+      seletctedCluters: [],
+      dialogTitle: '',
+      dialogTableVisible: false,
+      datas: {
+        clickFeacture: {},
+        selectFeatures: null,
+        selectProjectNumber: "",
+        type: '',
+        infoData: {}
+      }
     }
   },
   mounted() {
       this.popup.setPosition(undefined);
     },
     openAchiList() {
-
+      this.dialogTableVisible = true;
+      // let projectId = datas.clickFeacture.id;
+      // this.dialogTitle = datas.clickFeacture.projectNumber
+      listAchievement({ projectId }).then(res => {
+        if (res.total == 0) {
+          this.$message.error('暂无成果，请添加');
+          this.achiDialogData = [];
+        } else {
+          this.dialogTableVisible = true;
+          this.achiDialogData = res.rows;
+        }
+      })
     },
     formatCoordinate(fractionDigits) {
       return (
     },
     handleRowClick() {
 
-    }
-  },
+    },
+    lookThisAchi(row) {
+      let projectId = row.projectId;
+      this.dialogTitle = row.projectNumber;
+      listAchievement({ projectId }).then(res => {
+        if (res.total == 0) {
+          this.$message.error('暂无成果，请添加');
+          this.achiDialogData = [];
+        } else {
+          this.dialogTableVisible = true;
+          this.achiDialogData = res.rows;
+        }
+      })
+    },
+    // 移动box
+    move(e) {
+      e.stopPropagation();
+      let odiv = e.target; //获取目标元素
+      if (odiv.className instanceof SVGAnimatedString) {
+        return
+      }
+      if (odiv.className.includes("dialog_wrap")) {
+        //算出鼠标相对元素的位置
+        let disX = e.clientX - odiv.offsetLeft;
+        let disY = e.clientY - odiv.offsetTop;
+        document.onmousemove = (e) => {
+          //鼠标按下并移动的事件
+          //用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
+          let left = e.clientX - disX;
+          let top = e.clientY - disY;
+
+          //绑定元素位置到positionX和positionY上面
+          // this.positionX = top;
+          // this.positionY = left;
+
+          //移动当前元素
+          odiv.style.left = left + "px";
+          odiv.style.top = top + "px";
+        };
+        document.body.onselectstart = document.body.ondrag = () => { return false }
+        document.onmouseup = (e) => {
+          document.onmousemove = null;
+          document.onmouseup = null;
+        };
+      } else {
+        document.onmousemove = null;
+        document.onmouseup = null;
+        document.body.onselectstart = document.body.ondrag = () => { return true }
+      }
+
+    },
+  }
 }
 </script>
 
   color: #fff;
 }
 
+.achi-list {
+  width: 425px;
+  min-height: 300px;
+  background-color: #fff;
+  position: absolute;
+  top: 55px;
+  right: 520px;
+  padding: 10px;
+  border-radius: 4px;
+  box-shadow: 0 0 10px rgba($color: #000000, $alpha: 0.5);
+  cursor: move;
+
+  .achi-content {
+    cursor: default;
+  }
+
+  .achi-projectNumber {
+    padding-left: 20px;
+    font-size: 14px;
+    font-family: '微软雅黑';
+  }
+
+  .achi-header {
+    text-align: center;
+    line-height: 40px;
+    font-weight: bold;
+    font-family: '黑体';
+    position: relative;
+
+    .close {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+    }
+
+    .close:hover {
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+
+}
+
 .tool-box {
   position: absolute;
   top: 60px;