diff --git a/index.html b/index.html index 558ac5e..b47a957 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,8 @@ - - + + 建设工程指南与预评估 diff --git a/index.html b/index.html index 558ac5e..b47a957 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,8 @@ - - + + 建设工程指南与预评估 diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..aec065c 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -24,6 +24,9 @@ msgWarning(content) { ElMessage.warning(content); }, + closeMessageAll() { + ElMessage.closeAll() + }, // 弹出提示 alert(content) { ElMessageBox.alert(content, "系统提示"); diff --git a/index.html b/index.html index 558ac5e..b47a957 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,8 @@ - - + + 建设工程指南与预评估 diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..aec065c 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -24,6 +24,9 @@ msgWarning(content) { ElMessage.warning(content); }, + closeMessageAll() { + ElMessage.closeAll() + }, // 弹出提示 alert(content) { ElMessageBox.alert(content, "系统提示"); diff --git a/src/views/preassess/noopReview/analysis.vue b/src/views/preassess/noopReview/analysis.vue index 586e540..2d6faef 100644 --- a/src/views/preassess/noopReview/analysis.vue +++ b/src/views/preassess/noopReview/analysis.vue @@ -485,6 +485,7 @@ const loading = ref(false) const getDetails = (data) => { + debugger if(data) { inheritAttr(data, form) console.log('form-----------', form) diff --git a/index.html b/index.html index 558ac5e..b47a957 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,8 @@ - - + + 建设工程指南与预评估 diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..aec065c 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -24,6 +24,9 @@ msgWarning(content) { ElMessage.warning(content); }, + closeMessageAll() { + ElMessage.closeAll() + }, // 弹出提示 alert(content) { ElMessageBox.alert(content, "系统提示"); diff --git a/src/views/preassess/noopReview/analysis.vue b/src/views/preassess/noopReview/analysis.vue index 586e540..2d6faef 100644 --- a/src/views/preassess/noopReview/analysis.vue +++ b/src/views/preassess/noopReview/analysis.vue @@ -485,6 +485,7 @@ const loading = ref(false) const getDetails = (data) => { + debugger if(data) { inheritAttr(data, form) console.log('form-----------', form) diff --git a/src/views/preassess/noopReview/operate.vue b/src/views/preassess/noopReview/operate.vue index 57fa7f7..57b782a 100644 --- a/src/views/preassess/noopReview/operate.vue +++ b/src/views/preassess/noopReview/operate.vue @@ -16,14 +16,21 @@ :opts="opts" :list="list" /> - +
+ +
+ 查看解析结果 + 查看图纸 +
+
- 查看解析结果 - 预览 + 查看解析结果 + 查看图纸 保存 计算 下一步 @@ -235,6 +242,7 @@ const active = ref(0) const fileInfo = ref(null) const uploadCallbackData = ref(null) +let cadParseStatus = '' const isLoadData = ref(false) const disabledSelect = ref(false) let analysisData = null @@ -304,8 +312,8 @@ overviewData.value = analysisData.reasonablenessOverview investigateData.value = analysisData.examineMap isComputed.value = status === '1' - uploadCallbackData.value = res.data.cadParseResult ? JSON.parse(res.data.cadParseResult) : null + cadParseStatus = res.data.cadParseStatus || '' getPerviewFile(res.data) nextTick(() => { proxy.$refs.recognitionImageRef.getList(res.data) @@ -336,6 +344,11 @@ } } +const viewParseResult = () => { + if(!fileInfo.value) return proxy.$modal.msgWarning('请先上传CAD文件！') + if(['', 'queue', 'process'].includes(cadParseStatus)) return proxy.$modal.msgWarning('CAD正在解析中，请耐心等待！') + visible.value = true +} const initMap = ()=>{ var nfmu = new NewFiberMapUtils('root-map'); @@ -343,6 +356,9 @@ } const previewblueprintBtn = () => { + if(!fileInfo.value) return proxy.$modal.msgWarning('请先上传CAD文件！') + if(['', 'queue', 'process'].includes(cadParseStatus)) return proxy.$modal.msgWarning('CAD正在解析中，请耐心等待！') + if(!perviewFile.value) return proxy.$modal.msgWarning('CAD解析异常！') visible1.value = true nextTick(() => { initMap() @@ -361,6 +377,7 @@ const params = getParams() try { const res = await updateIntelligentApprove(params) + proxy.$modal.closeMessageAll() if(res?.code !== 200) return disabledSelect.value = true form.rowId = res.data.id @@ -369,6 +386,7 @@ proxy.$refs.analysisRef.getList(null) }) } catch (error) { + proxy.$modal.closeMessageAll() loading.value = false isLoadData.value = true } @@ -676,5 +694,22 @@ } } } + + .detailRecognitionImageBox { + position: relative; + .detailBtns { + position: absolute; + right: 0; + top: 10px; + width: 35%; + display: flex; + justify-content: flex-end; + align-items: center; + z-index: 10; + .viewResult { + margin-left: 10px; + } + } + } }