完善报告 pdf 取值

src/components/AnalysisComponent.vue

@@ -4,14 +4,10 @@ import type { AnalysisModel } from '@/request/model';
 type Props = AnalysisModel & { title?: string };
 
 const { table, exception, result = null, cover = [], title = '分析' } = defineProps<Props>();
-const attrs = useAttrs();
-watchEffect(() => {
-  console.log(result, '12-->', attrs);
-});
 </script>
 
 <template>
-  <van-skeleton class="analysis" :row="5" :loading="result == null">
+  <van-skeleton class="analysis" :row="5" :loading="result == null" v-if="result !== ''">
     <slot>
       <div class="card m-6 text-lg">
         <div class="card__title mb-3 text-primary text-2xl font-bold">{{ title }}</div>

src/modules/report/report.page.vue

@@ -29,6 +29,7 @@ const { data, loading } = useWatcher(() => getReportMethod(id.value), [ id ], {
 const { loading: uploading, send: upload } = useRequest(() => updateReportMethod(id.value, data.value), {
   immediate: false,
   middleware(_, next) {
+    if (data.value.reportURL) return;
     const hasConstitutionGroupImg = data.value.constitutionGroupImg;
     const hasFactorItemRadarImg = data.value[ '中医证素' ]?.length ? data.value.factorItemRadarImg : true;
     if ( hasConstitutionGroupImg && hasFactorItemRadarImg ) { next(); }
@@ -206,7 +207,7 @@ const scrollable = computed(() => !data.value.payLock &&
         </div>
       </van-skeleton>
       <div class="flex-none flex justify-between py-2 nav-wrapper" style="background-color: #12312c;">
-        <div class="m-auto min-w-16 text-center hover:text-primary" @click="toggle()">
+        <div class="m-auto min-w-16 text-center hover:text-primary" v-if="data.scheme" @click="toggle()">
           <img :src="NavScheme" alt="调理方案">
           <div class="mt-2">调理方案</div>
         </div>

src/request/model/analysis.model.ts

@@ -85,7 +85,7 @@ function fromAnalysisException(exception: AnalysisException[], $title = (label:
         let title: string = item?.actualValue ?? '';
         const suffix = item?.contrast ?? 's';
         if (suffix !== 's') {
-          title += ` (${suffix || ''}) `;
+          if (suffix !== 'r') title += ` (${suffix || ''}) `;
           is = true;
           exception.push({
             title: $title(label, title),

src/request/model/report.model.ts

@@ -31,29 +31,6 @@ export function fromReportData(data: Record<string, any>) {
     tongue: fromTongueAnalysisModel(data),
     face: fromFaceAnalysisModel(data),
 
-
-    tongueTable: {
-      column: [ '舌象维度', '检测结果', '标准值' ],
-      data: [
-        [ '舌色', fromTongueException(data?.tongueColor), data?.tongueColor?.standardValue ],
-        [ '苔色', fromTongueException(data?.tongueCoatingColor), data?.tongueCoatingColor?.standardValue ],
-        [ '舌形', fromTongueException(data?.tongueShape), data?.tongueShape?.standardValue ],
-        [ '苔质', fromTongueException(data?.tongueCoating), data?.tongueCoating?.standardValue ],
-        [ '津液', fromTongueException(data?.bodyFluid), data?.bodyFluid?.standardValue ],
-        [ '舌下', fromTongueException(data?.sublingualVein), data?.sublingualVein?.standardValue ],
-      ],
-    },
-    tongueException,
-    tongueAnalysis: {
-      [ '结果' ]: data?.tongueAnalysisResult,
-      [ '舌上' ]: data?.upImg,
-      [ '舌下' ]: data?.downImg,
-    },
-    faceAnalysis: {
-      [ '结果' ]: data?.faceAnalysisResult,
-      [ '面象' ]: data?.faceImg,
-    },
-
     [ '中医证素' ]: data?.factorItems?.map?.((item: Record<string, any>) => {
       return { label: item?.factorItemName, value: item?.factorItemDescription, score: +item?.score };
     }),
@@ -65,8 +42,7 @@ export function fromReportData(data: Record<string, any>) {
     factorItemRadarImg: data?.factorItemRadarImg,
     reportURL: data?.reportPdfUrl,
     miniProgramURL: data?.appletImg,
-
-    payLock: data?.payLock ?? false,
+    payLock: data?.payLock,
   };
 }