From 0924402695b0f947b3b4d670f8314bf29eaa05e0 Mon Sep 17 00:00:00 2001
From: lz-ui <lz-ui@jczxw.cn>
Date: Tue, 21 Oct 2025 17:17:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/operation/report/index.vue          | 84 ++++++++++++++++++-
 src/views/tc/eventAnalysisReport/detail.vue   | 23 +++--
 .../tc/videoScript/components/soccer.vue      | 12 +--
 src/views/tc/videoScript/detail.vue           |  3 +-
 4 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/src/views/operation/report/index.vue b/src/views/operation/report/index.vue
index 7d0b033..67cfedf 100644
--- a/src/views/operation/report/index.vue
+++ b/src/views/operation/report/index.vue
@@ -87,11 +87,43 @@
 								<el-button link type="primary">查看</el-button>
 							</template>
 							<template #default> 
+								<el-tabs v-model="activeName">
+									<el-tab-pane label="finyx-AI" name="FINYX_F">
+										<el-table border :data="scope.row.farmatReportResults['FINYX_F']" :show-header="false">
+											<el-table-column>
+												<template #default="item">
+													{{ item.row.lable }}
+												</template>
+											</el-table-column>
+											<el-table-column>
+												<template #default="item"> 
+													{{ item.row.value || '-' }}
+												</template>
+											</el-table-column>
+										</el-table>
+									</el-tab-pane>
+									<el-tab-pane label="D3-index" name="D3_F">
+										<el-table border :data="scope.row.farmatReportResults['D3_F']" :show-header="false">
+											<el-table-column>
+												<template #default="item">
+													{{ item.row.lable }}
+												</template>
+											</el-table-column>
+											<el-table-column>
+												<template #default="item"> 
+													{{ item.value || '-' }}
+												</template>
+											</el-table-column>
+										</el-table>
+									</el-tab-pane>
+								</el-tabs>
+							</template>
+							<!-- <template #default> 
 								<el-tabs v-model="activeName">
 									<el-tab-pane label="finyx-AI" name="FINYX_F"><Prediction :data="rowPrediction(scope.row, 'FINYX_F')" /></el-tab-pane>
 									<el-tab-pane label="D3-index" name="D3_F"><Prediction :data="rowPrediction(scope.row, 'D3_F')"  /></el-tab-pane>
 								</el-tabs>
-							</template>
+							</template> -->
 						</el-popover>
 					</template>
 				</el-table-column>
@@ -229,6 +261,52 @@ function handleJumpLink(row) {
 	jumpLink(row.matchId, 1)
 }
 
+function reportResultsModelType(arr){
+	const res = {}
+	arr.forEach(item => {
+		res[item.modelType] = [
+			{
+				lable: '胜平负',
+				value: item.result,
+				key: 'result'	
+			},
+			{
+				lable: '让分胜平负',
+				value: item.hhadResult,
+				key: 'hhadResult'	
+			},
+			{
+				lable: '比分',
+				value: item.scoreResult,
+				key: 'scoreResult'
+			},
+			{
+				lable: '进球数',
+				value: item.goalsResult,
+				key: 'goalsResult'
+			},
+			{
+				lable: '半全场',
+				value: item.halfFullResult,
+				key: 'halfFullResult'
+			},
+			{
+				lable: '亚盘',
+				value: item.asianHandicap,
+				key: 'asianHandicap'
+			}
+		]
+	})
+	return res;
+}
+function farmatReportResults(list) {
+	const res = list.map(item => ({ 
+		...item, 
+		farmatReportResults: item.reportResults ? reportResultsModelType(item.reportResults): {} 
+	}));
+	return res;
+}
+
 /** 查询列表 */
 function getList() {
 	loading.value = true
@@ -245,7 +323,9 @@ function getList() {
 			...item, 
 			matchResults: item.matchResults ? processMatchResults(item.matchResults): null 
 		}));
-		pageList.value = res	
+		// 格式化reportResults
+		pageList.value = farmatReportResults(res)
+		console.log(pageList.value)	
 		total.value = response.total
 	}).finally(() => {
 		loading.value = false
diff --git a/src/views/tc/eventAnalysisReport/detail.vue b/src/views/tc/eventAnalysisReport/detail.vue
index 76c389d..99722a8 100644
--- a/src/views/tc/eventAnalysisReport/detail.vue
+++ b/src/views/tc/eventAnalysisReport/detail.vue
@@ -7,8 +7,8 @@
 			</el-icon>
 			{{ data && data.reportTime && timerToStr(data.reportTime, 'YYYY-MM-DD HH:mm:ss') }}
 		</div>
-
-		<el-row :gutter="20" v-if="!loading && data && data.report && isJson">
+		<!-- 自定义表格渲染 -->
+		<el-row :gutter="20" v-if="!loading && data && data.report && isJson && isCustom">
 			<el-col :xs="24" :sm="24" :md="24" :lg="24">
 				<el-card class="update-log">
 					<template v-slot:header>
@@ -16,7 +16,7 @@
 							<span>赛事分析 {{ data && data.matchCode }}</span>
 						</div>
 					</template>
-					<div class="body" v-if="isCustom">
+					<div class="body">
 						<h3>1.比赛基础信息</h3>
 						<el-table v-loading="loading" :data="basicList" :show-header="false" border>
 							<el-table-column label="比赛编号" prop="name" :show-overflow-tooltip="true" />
@@ -39,7 +39,19 @@
 							<el-table-column label="分析依据" prop="analysis" :show-overflow-tooltip="true" />
 						</el-table>
 					</div>
-					<div v-else class="body">
+				</el-card>
+			</el-col>
+		</el-row>
+		<!-- md 预览-->
+		<el-row :gutter="20" v-else-if="!loading && data && data.report && !isCustom">
+			<el-col :xs="24" :sm="24" :md="24" :lg="24">
+				<el-card class="update-log">
+					<template v-slot:header>
+						<div class="clearfix">
+							<span>赛事分析 {{ data && data.matchCode }}</span>
+						</div>
+					</template>
+					<div class="body">
 						<MdPreview 
 							ref="editorRef" 
 							editorId="preview-only" 
@@ -155,10 +167,7 @@ function getDetail() {
 							"analysis": predictions.asian_handicap.analysis
 						},
 					]
-				} else {
-					// md渲染
 				}
-				
 			} catch (error) {
 				console.log(error)
 			}
diff --git a/src/views/tc/videoScript/components/soccer.vue b/src/views/tc/videoScript/components/soccer.vue
index 7a5fc13..a0132fe 100644
--- a/src/views/tc/videoScript/components/soccer.vue
+++ b/src/views/tc/videoScript/components/soccer.vue
@@ -51,21 +51,21 @@
 						<span>{{ parseTime(scope.row.matchDateTime) }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="报告状态" prop="reportSatus">
+				<!-- <el-table-column label="报告状态" prop="reportSatus">
 					<template #default="scope">
 						<el-tag v-if="scope.row.reportSatus === 1" type="success">已生成</el-tag>
 						<el-tag v-else>未生成</el-tag>	
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 				<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 					<template #default="scope">
-						<span :class="['flex-row cursor-pointer tc-view-time  mr-8', scope.row.reportSatus != 1 && 'tc-view-time-disabled']"  @click="handleView(scope.row, 'video')">
+						<span :class="['flex-row cursor-pointer tc-view-time  mr-8', scope.row.scriptDetail.sciptStatus != 1 && 'tc-view-time-disabled']"  @click="handleView(scope.row, 'video')">
 							脚本结果<br/>
-							{{ scope.row.reportSatus === 1? timerToStr(scope.row.reportTime, 'HH:mm') : '待' }}更新
+							{{ scope.row.scriptDetail.sciptStatus === 1? timerToStr(scope.row.scriptDetail.scriptTime, 'HH:mm') : '待' }}更新
 						</span>
-						<span :class="['flex-row cursor-pointer tc-view-time', scope.row.reportSatus != 1 && 'tc-view-time-disabled']"  @click="handleView(scope.row, 'market')">
+						<span :class="['flex-row cursor-pointer tc-view-time', scope.row.scriptDetail.sciptStatus != 1 && 'tc-view-time-disabled']"  @click="handleView(scope.row, 'market')">
 							营销文案<br/>
-							{{ scope.row.reportSatus === 1? timerToStr(scope.row.reportTime, 'HH:mm') : '待' }}更新
+							{{ scope.row.scriptDetail.sciptStatus === 1? timerToStr(scope.row.scriptDetail.scriptTime, 'HH:mm') : '待' }}更新
 						</span>
 
 						<!-- <el-tooltip content="查看" placement="top" v-if="scope.row.roleId !== 1">
diff --git a/src/views/tc/videoScript/detail.vue b/src/views/tc/videoScript/detail.vue
index 8277e8c..2704d24 100644
--- a/src/views/tc/videoScript/detail.vue
+++ b/src/views/tc/videoScript/detail.vue
@@ -5,7 +5,7 @@
 			<el-icon @click="proxy.$router.go(-1)" class="mr-6 cursor">
 				<ArrowLeftBold />
 			</el-icon>
-			{{ data && data.scriptTime }}
+			{{ data && data.scriptTime ? timerToStr(data.scriptTime, 'YYYY-MM-DD HH:mm:ss') : '' }}
 		</div>
 		<el-row :gutter="20" v-if="!loading && data && (type === 'video' ? data.videoScript : data.marketScript)" >
 			<el-col :xs="24" :sm="24" :md="24" :lg="24">
@@ -40,6 +40,7 @@
 <script setup name="videoScriptDetail">
 import { scriptDetail } from '@/api/tc/videoScript'
 import MdPreview from '@/components/Markdown/MdPreview'
+import { timerToStr } from "@/utils/timer"
 const route = useRoute()
 
 let { proxy } = getCurrentInstance()