From 5d4872954e58b06a8e2f25ad06968d090ca84c78 Mon Sep 17 00:00:00 2001 From: think <1787994136@qq.com> Date: Fri, 17 Jan 2025 10:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96app=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processdesign/vo/ProcessDesignRespVO.java | 3 +++ .../processdesign/ProcessDesignDO.java | 4 ++++ .../processdesign/ProcessDesignMapper.java | 4 ++-- .../moJuSheJiReport/components/dataItem.vue | 9 +++++-- .../moJuSheJiReport/components/popup.vue | 24 ++++++++++++++----- .../pages/pgMaster/components/dataItem.vue | 2 +- .../src/pages/pgMaster/pgMaster-detail.vue | 3 ++- 7 files changed, 37 insertions(+), 12 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java index edf9fe0..203b4ec 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java @@ -126,4 +126,7 @@ public class ProcessDesignRespVO { @Schema(description = "项目状态") private Integer planStatus; + @Schema(description = "图纸链接") + private String blueprintLink; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java index 493bbfb..8491924 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java @@ -132,4 +132,8 @@ public class ProcessDesignDO extends BaseDO { @TableField(exist = false) private Integer planStatus; + @TableField(exist = false) + private String blueprintLink; + + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java index 298ae71..926b6f6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -33,7 +33,7 @@ public interface ProcessDesignMapper extends BaseMapperX { .select("b.blank_date as blankDate", "b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate") .select("u3.nickname as blankOwnerName", "u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName") .select("c.name as projectSubName", "b.project_sub_code as projectSubCode") - .select("z.progress") + .select("z.progress,z.blueprint_link as blueprintLink ") .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId) .leftJoin("project_plan_sub b on b.project_plan_id = t.plan_id and b.project_sub_id = t.project_sub_id") .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId) @@ -44,7 +44,7 @@ public interface ProcessDesignMapper extends BaseMapperX { .leftJoin("system_users u3 on u3.id = b.blank_owner") .leftJoin("system_users u4 on u4.id = b.two_dim_owner") .leftJoin("system_users u5 on u5.id = b.three_dim_owner") - .leftJoin("(select progress,process_design_id FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id") + .leftJoin("(select progress,process_design_id,blueprint_link FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id") .orderByDesc(ProcessDesignDO::getId) .disableSubLogicDel(); query.like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue index 7c88004..10c7148 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue @@ -5,6 +5,7 @@ import { getListAPI, getDictAPI,postOperateAPIZF,updateBaoGong } from '@/service import { useLoginStore } from '@/stores/modules/login' import { formatDate } from '@/utils/index' import popup from './popup.vue'; +import { nextTick } from 'vue'; const userStore = useLoginStore() @@ -15,6 +16,8 @@ const isFinish = ref(false) // 是否触发下拉刷新 const isTriggered = ref(false) const progress = ref(0) +const imageLink = ref(0) + const selectedId = ref(null); // 定义 selectedId 变量 // 定义 porps @@ -126,8 +129,10 @@ onShow(async () => { -const handleDetail = (item) => { +const handleDetail =async (item) => { progress.value = 0; + imageLink.value = item.blueprintLink; + await nextTick(); // 等待数据更新和DOM渲染 showPopup.value = true; selectedId.value = item.id; // 为 selectedId 赋值 /* const url = `/pages/zjPgMaster/zjPgMaster-detail?id=${item.id}` @@ -216,7 +221,7 @@ const onRefresherrefresh = async () => { - + diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue index e8fe4e4..7da5175 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue @@ -2,8 +2,10 @@ - - + 进度百分比%: + + 图纸链接 + @@ -16,15 +18,19 @@ const props = defineProps({ showPopup: { type: Boolean, default: false - } + }, + imageLink:{ + type:String, + default:'123' + } }); const progress = ref(0); -const imageLink = ref(''); + const imageLink = ref(0); const emit = defineEmits(['close']); -const onMaskClick = () => { +const onMaskClick = () => { onClose(); }; @@ -36,6 +42,10 @@ const onClose = () => {