fix:修改优化

src/api/tc/eventAnalysisReport.js

@@ -20,13 +20,23 @@ export function Info(data) {
 
 
 // 报告详情
-export function reportDetail(id) {
+export function reportDetail(id, modelType) {
   return request({
-    url: `/tc/report/${id}`,
+    url: `/tc/report/${id}?modelType=${modelType}`,
     method: 'get'
   })
 }
 
+// 详情
+export function detail(data) {
+  return request({
+    url: '/tc/report/detail',
+    method: 'post',
+    data: data
+  })
+}
+
+
 // 联赛类型-足球
 export function infoSelectDistinctLeagueAbbNames(data) {
   return request({

src/assets/styles/reset.scss

@@ -110,7 +110,9 @@
 .mr-8{
     margin-right: 8px;
 }
-
+.mt-20{
+    margin-top: 20px;
+}
 .mb-20{
     margin-bottom: 20px;
 }

src/components/Markdown/MdEditorPreview.vue

@@ -0,0 +1,31 @@
+<template>
+  <MdEditor v-model="content" />
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import { MdEditor } from 'md-editor-v3';
+import 'md-editor-v3/lib/style.css';
+// 定义接收的属性
+const props = defineProps({
+  modelValue: {
+    type: String,
+    default: ''
+  }
+});
+
+// 定义触发的事件
+const emit = defineEmits(['update:modelValue']);
+
+// 创建计算属性，实现双向绑定
+const content = computed({
+  get() {
+    return props.modelValue;
+  },
+  set(value) {
+    emit('update:modelValue', value);
+  }
+});
+
+defineOptions({ name: 'MdEditorPreview' })
+</script>

src/enums/tc.js

@@ -38,7 +38,7 @@ export const PickerOptions = reactive([
   },
 ]);
 
-/* 模型 */
+/* 模型-废弃 */
 export const EnumsModels = [
   {
     id: "26",
@@ -113,3 +113,17 @@ export const EnumsModels = [
     icon: '<svg width="100%" height="100%" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n\t<path id="path" d="M48.8354 10.0479C48.3232 9.79199 48.1025 10.2798 47.8032 10.5278C47.7007 10.6079 47.6143 10.7119 47.5273 10.8076C46.7793 11.624 45.9048 12.1597 44.7622 12.0957C43.0923 12 41.666 12.5356 40.4058 13.8398C40.1377 12.2319 39.2476 11.272 37.8926 10.6558C37.1836 10.3359 36.4668 10.0156 35.9702 9.31982C35.6235 8.82373 35.5293 8.27197 35.356 7.72754C35.2456 7.3999 35.1353 7.06396 34.7651 7.00781C34.3633 6.94385 34.2056 7.2876 34.0479 7.57568C33.418 8.75195 33.1733 10.0479 33.1973 11.3599C33.2524 14.312 34.4736 16.6641 36.8999 18.3359C37.1758 18.5278 37.2466 18.7197 37.1597 19C36.9946 19.5757 36.7974 20.1357 36.624 20.7119C36.5137 21.0801 36.3486 21.1597 35.9624 21C34.6309 20.4321 33.481 19.5918 32.4644 18.5757C30.7393 16.8721 29.1792 14.9917 27.2334 13.52C26.7764 13.1758 26.3193 12.856 25.8467 12.5518C23.8618 10.584 26.1069 8.96777 26.627 8.77588C27.1704 8.57568 26.8159 7.8877 25.0591 7.896C23.3022 7.90381 21.6953 8.50391 19.647 9.30371C19.3477 9.42383 19.0322 9.51172 18.7095 9.58398C16.8501 9.22363 14.9199 9.14355 12.9033 9.37598C9.10596 9.80762 6.07275 11.6396 3.84326 14.7681C1.16455 18.5278 0.53418 22.7998 1.30664 27.2559C2.11768 31.9521 4.46582 35.8398 8.07373 38.8799C11.8159 42.0322 16.1255 43.5762 21.041 43.2803C24.0269 43.104 27.3516 42.6963 31.1016 39.4561C32.0469 39.936 33.0396 40.1279 34.686 40.272C35.9546 40.3921 37.1758 40.208 38.1211 40.0078C39.6021 39.688 39.4995 38.2881 38.9639 38.0322C34.623 35.9678 35.5762 36.8081 34.71 36.1279C36.9155 33.4639 40.2402 30.6958 41.54 21.728C41.6426 21.0161 41.5557 20.5679 41.54 19.9917C41.5322 19.6396 41.6108 19.5039 42.0049 19.4639C43.0923 19.3359 44.1479 19.0317 45.1167 18.4878C47.9292 16.9199 49.064 14.3438 49.3315 11.2559C49.3711 10.7837 49.3237 10.2959 48.8354 10.0479ZM24.3262 37.8398C20.1196 34.4639 18.0791 33.3521 17.2358 33.3999C16.4482 33.4482 16.5898 34.3682 16.7632 34.9678C16.9443 35.5601 17.1812 35.9683 17.5117 36.4878C17.7402 36.832 17.8979 37.3442 17.2832 37.728C15.9282 38.584 13.5728 37.4399 13.4624 37.3838C10.7207 35.7358 8.42822 33.5601 6.81348 30.584C5.25342 27.7197 4.34766 24.6479 4.19775 21.3677C4.1582 20.5757 4.38672 20.2959 5.15869 20.1519C6.17529 19.96 7.22314 19.9199 8.23926 20.0718C12.5327 20.7119 16.1885 22.6719 19.2529 25.7759C21.002 27.5439 22.3252 29.6558 23.6885 31.7202C25.1377 33.9121 26.6978 36 28.6831 37.7119C29.3843 38.312 29.9434 38.7681 30.479 39.104C28.8643 39.2881 26.1699 39.3281 24.3262 37.8398ZM26.3433 24.6001C26.3433 24.248 26.6191 23.9678 26.9658 23.9678C27.0444 23.9678 27.1152 23.9839 27.1782 24.0078C27.2651 24.04 27.3438 24.0879 27.4067 24.1602C27.5171 24.272 27.5801 24.4321 27.5801 24.6001C27.5801 24.9521 27.3042 25.2319 26.9575 25.2319C26.6108 25.2319 26.3433 24.9521 26.3433 24.6001ZM32.6064 27.8799C32.2046 28.0479 31.8027 28.1919 31.4165 28.208C30.8179 28.2397 30.1641 27.9922 29.8096 27.688C29.2583 27.2158 28.8643 26.9521 28.6987 26.1279C28.6279 25.7759 28.6675 25.2319 28.7305 24.9199C28.8721 24.248 28.7144 23.8159 28.2495 23.4238C27.8716 23.104 27.3911 23.0161 26.8633 23.0161C26.666 23.0161 26.4849 22.9277 26.3511 22.856C26.1304 22.7441 25.9492 22.4639 26.1226 22.1201C26.1777 22.0078 26.4458 21.7358 26.5088 21.688C27.2256 21.272 28.0527 21.4077 28.8169 21.7197C29.5259 22.0161 30.0615 22.5601 30.834 23.3281C31.6216 24.2559 31.7632 24.5117 32.2124 25.208C32.5669 25.752 32.8901 26.312 33.1104 26.9521C33.2446 27.3521 33.0713 27.6802 32.6064 27.8799Z" fill="#4D6BFE" fill-opacity="1.000000" fill-rule="nonzero"></path>\n</svg>',
   },
 ];
+
+/**配置模型类型 */
+export const ModelsTypes = {
+  // 足球
+  soccer: [
+    { name: 'finyx足球', value: 'FINYX_F' },
+    { name: 'uha足球', value: 'UHA_F' },
+  ],
+  // 篮球
+  basketball: [
+    { name: 'finyx篮球', value: 'FINYX_B' },
+    { name: 'uha篮球', value: 'UHA_B' },  
+  ]
+}

src/views/operation/configModels/index.vue

@@ -41,8 +41,8 @@
 		</lz-page-empty>
 
 
-		<!-- 添加或修改对话框 -->
+		<!-- 修改对话框 -->
-		<el-dialog :title="dialogTitle" v-model="dialogOpen" width="600px" append-to-body :close-on-click-modal="false"
+		<el-dialog :title="dialogTitle" v-model="dialogOpen" width="980px" append-to-body :close-on-click-modal="false"
 			@close="cancel">
 			<el-form :model="dialogForm" :rules="dialogRules" ref="configModelsRef" label-width="80px">
 				<el-row>
@@ -72,8 +72,9 @@
 				<el-row>
 					<el-col :span="24">
 						<el-form-item label="提示词" prop="modelPrompt">
-							<el-input v-model="dialogForm.modelPrompt" type="textarea" placeholder="请输入内容"
+							<MdEditorPreview v-model="dialogForm.modelPrompt" />
-								:rows="12"></el-input>
+							<!-- <el-input v-model="dialogForm.modelPrompt" type="textarea" placeholder="请输入内容"
+								:rows="12"></el-input> -->
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -90,6 +91,7 @@
 
 <script setup name="configModels">
 import { modelList, modelConfigList, modelConfigUpdate } from "@/api/tc/model"
+import MdEditorPreview from "@/components/Markdown/MdEditorPreview"
 import { ref } from "vue"
 
 const { proxy } = getCurrentInstance()

src/views/tc/eventAnalysisReport/components/basketball.vue

@@ -101,7 +101,7 @@
 						<el-tag v-else>未生成</el-tag>	
 					</template>
 				</el-table-column>
-				<el-table-column label="finyx模型" align="center" class-name="small-padding fixed-width">
+				<!-- <el-table-column label="finyx模型" align="center" class-name="small-padding fixed-width">
 					<template #header>
 						<span>finyx模型</span>
 						<el-popover placement="top" width="300" trigger="click">
@@ -122,9 +122,30 @@
 							分析结果<br/>
 							{{ scope.row.reportSatus === 1? timerToStr(scope.row.reportTime, 'HH:mm') : '待' }}更新
 						</span>
-						<!-- <el-tooltip content="查看" placement="top" v-if="scope.row.roleId !== 1">
+					</template>
-							<el-button link type="primary" icon="view" @click="handleView(scope.row)"></el-button>
+				</el-table-column> -->
-						</el-tooltip> -->
+
+				<el-table-column :label="item.name" align="center" class-name="small-padding fixed-width" v-for="item in ModelsTypes.basketball" :key="item.value">
+					<template #header>
+						<span>{{ item.name }}</span>
+						<el-popover placement="top" width="300" trigger="click">
+						<template #reference>
+							<el-icon class="ml-1 cursor-pointer" style="vertical-align: middle;">
+							<QuestionFilled />
+							</el-icon>
+						</template>
+						<template #default>
+							<div>
+								<p>{{ item.name }}是机构保证稳定盈利的模型之一，根据模型的波动走向、同赔倾向等特点，再加上百万赛事信息的数据整理，及独有情报信息，绘制出赛事趋势走向，推演赛果走向</p>
+							</div>
+						</template>
+						</el-popover>
+					</template>
+					<template #default="scope">
+						<span :class="['flex-row cursor-pointer tc-view-time', isBtnDisabled(scope.row, item.value) && 'tc-view-time-disabled']"   @click="handleView(scope.row, item.value)">
+							分析结果<br/>
+							{{ isBtnTimer(scope.row, item.value) }}
+						</span>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -143,8 +164,7 @@
 import { bbInfo, bbInfoSelectDistinctLeagueAbbNames } from "@/api/tc/eventAnalysisReport"
 import { jumpLink } from "@/utils/tc"
 import { timerToStr } from "@/utils/timer"
-import { PickerOptions } from "@/enums/tc"
+import { PickerOptions, ModelsTypes } from "@/enums/tc"
-
 
 const router = useRouter()
 const { proxy } = getCurrentInstance()
@@ -172,6 +192,31 @@ const data = reactive({
 
 const { queryParams } = toRefs(data)
 
+/** 检查按钮是否禁用 */
+function isBtnDisabled(row, modelType) {
+	let disabled = true
+	if(row.reportDetails && row.reportDetails.length) {
+		row.reportDetails.forEach(item => {
+			if(item.modelType == modelType && item.reportStatus == 1) {
+				disabled = false
+			}
+		})
+	}
+	return disabled
+}
+
+function isBtnTimer(row, modelType){
+	let res = '待更新'
+	if(row.reportDetails && row.reportDetails.length) {
+		row.reportDetails.forEach(item => {
+			if(item.modelType == modelType && item.reportStatus == 1) {
+				res = timerToStr(item.reportTime, 'HH:mm') + '更新'
+			}
+		})
+	}
+	return res
+}
+
 
 /** 获取联赛类型 */
 function getLeagueAbbNames() {
@@ -186,7 +231,7 @@ function handleJumpLink(row) {
 }
 
 /** 查看详情 */
-function handleView(row) {
+function handleView(row, modelType) {
 	if (row.reportSatus != 1) {
 		return
 	}
@@ -194,7 +239,8 @@ function handleView(row) {
 	router.push({
 		path: '/tc/eventAnalysisReport/detail',
 		query: {
-			id: row.matchId
+			id: row.matchId,
+			modelType
 		}
 	})
 }

src/views/tc/eventAnalysisReport/components/soccer.vue

@@ -99,9 +99,9 @@
 						<el-tag v-else>未生成</el-tag>	
 					</template>
 				</el-table-column>
-				<el-table-column label="finyx模型" align="center" class-name="small-padding fixed-width">
+				<el-table-column :label="item.name" align="center" class-name="small-padding fixed-width" v-for="item in ModelsTypes.soccer" :key="item.value">
 					<template #header>
-						<span>finyx模型</span>
+						<span>{{ item.name }}</span>
 						<el-popover placement="top" width="300" trigger="click">
 						<template #reference>
 							<el-icon class="ml-1 cursor-pointer" style="vertical-align: middle;">
@@ -110,19 +110,16 @@
 						</template>
 						<template #default>
 							<div>
-								<p>finyx模型是机构保证稳定盈利的模型之一，根据模型的波动走向、同赔倾向等特点，再加上百万赛事信息的数据整理，及独有情报信息，绘制出赛事趋势走向，推演赛果走向</p>
+								<p>{{ item.name }}是机构保证稳定盈利的模型之一，根据模型的波动走向、同赔倾向等特点，再加上百万赛事信息的数据整理，及独有情报信息，绘制出赛事趋势走向，推演赛果走向</p>
 							</div>
 						</template>
 						</el-popover>
 					</template>
 					<template #default="scope">
-						<span :class="['flex-row cursor-pointer tc-view-time', scope.row.reportSatus != 1 && 'tc-view-time-disabled']"   @click="handleView(scope.row)">
+						<span :class="['flex-row cursor-pointer tc-view-time', isBtnDisabled(scope.row, item.value) && 'tc-view-time-disabled']"   @click="handleView(scope.row, item.value)">
 							分析结果<br/>
-							{{ scope.row.reportSatus === 1? timerToStr(scope.row.reportTime, 'HH:mm') : '待' }}更新
+							{{ isBtnTimer(scope.row, item.value) }}
 						</span>
-						<!-- <el-tooltip content="查看" placement="top" v-if="scope.row.roleId !== 1">
-							<el-button link type="primary" icon="view" @click="handleView(scope.row)"></el-button>
-						</el-tooltip> -->
 					</template>
 				</el-table-column>
 			</el-table>
@@ -147,7 +144,7 @@ import { jumpLink } from "@/utils/tc"
 import { timerToStr } from "@/utils/timer"
 import { processMatchResults } from "@/utils/tc"
 import { onActivated } from "vue"
-import { PickerOptions } from "@/enums/tc"
+import { PickerOptions, ModelsTypes } from "@/enums/tc"
 
 const router = useRouter()
 const { proxy } = getCurrentInstance()
@@ -176,6 +173,31 @@ const data = reactive({
 
 const { queryParams } = toRefs(data)
 
+/** 检查按钮是否禁用 */
+function isBtnDisabled(row, modelType) {
+	let disabled = true
+	if(row.reportDetails && row.reportDetails.length) {
+		row.reportDetails.forEach(item => {
+			if(item.modelType == modelType && item.reportStatus == 1) {
+				disabled = false
+			}
+		})
+	}
+	return disabled
+}
+
+function isBtnTimer(row, modelType){
+	let res = '待更新'
+	if(row.reportDetails && row.reportDetails.length) {
+		row.reportDetails.forEach(item => {
+			if(item.modelType == modelType && item.reportStatus == 1) {
+				res = timerToStr(item.reportTime, 'HH:mm') + '更新'
+			}
+		})
+	}
+	return res
+}
+
 // 处理星期选择变化
 function handleWeekdayChange(value) {
   // 当用户通过快捷选项选择星期时触发
@@ -186,13 +208,6 @@ function handleWeekdayChange(value) {
 function getList() {
     loading.value = true
 	const data = { ...queryParams.value }
-	// if (dateRange.value && dateRange.value[0] && dateRange.value[1]) {
-	// 	data.beginTime = dateRange.value[0]
-	// 	data.endTime = dateRange.value[1]
-	// } else {
-	// 	data.beginTime = undefined
-	// 	data.endTime = undefined
-	// }
 	Info(data).then(response => {
 		const res = response.rows.map(item => ({ 
 			...item, 
@@ -219,7 +234,7 @@ function handleJumpLink(row) {
 }
 
 /** 查看详情 */
-function handleView(row) {
+function handleView(row, modelType) {
 	if (row.reportSatus != 1) {
 		return
 	}
@@ -227,7 +242,8 @@ function handleView(row) {
 	router.push({
 		path: '/tc/eventAnalysisReport/detail',
 		query: {
-			id: row.matchId
+			id: row.matchId,
+			modelType
 		}
 	})
 }

src/views/tc/eventAnalysisReport/detail.vue

@@ -5,7 +5,7 @@
 			<el-icon @click="proxy.$router.go(-1)" class="mr-6 cursor">
 				<ArrowLeftBold />
 			</el-icon>
-			{{ data && data.reportTime }}
+			{{ data && timerToStr(data.reportTime, 'YYYY-MM-DD HH:mm:ss') }}
 		</div>
 		
 		<el-row :gutter="20" v-if="!loading && data && data.report" >
@@ -17,12 +17,35 @@
 						</div>
 					</template>
 					<div class="body">
-						<MdPreview 
+						<!-- <MdPreview 
 							ref="editorRef" 
 							editorId="preview-only" 
 							:modelValue="data.report"
 							class="maxkb-md" 
-						/>
+						/> -->
+
+						<h3>1.比赛基础信息</h3>
+						<el-table v-loading="loading" :data="basicList" :show-header="false" border>
+							<el-table-column label="比赛编号" prop="name" :show-overflow-tooltip="true" />
+							<el-table-column label="联赛" prop="value" :show-overflow-tooltip="true" />
+						</el-table>
+
+						<h3 class="mt-20">2.关键影响因素</h3>
+						<el-table v-loading="loading" :data="influencingList" :show-header="false" border>
+							<el-table-column :show-overflow-tooltip="true" >
+								<template v-slot="{row}">
+									{{ row }}
+								</template>
+							</el-table-column>
+						</el-table>
+
+						<h3 class="mt-20">3.核心预测结果</h3>
+						<el-table class="mb-20" v-loading="loading" :data="coreList" border>
+							<el-table-column label="预测类型" prop="name" :show-overflow-tooltip="true" />
+							<el-table-column label="预测结果" prop="prediction" :show-overflow-tooltip="true" />
+							<el-table-column label="分析依据" prop="analysis" :show-overflow-tooltip="true" />
+						</el-table>
+						
 					</div>
 				</el-card>
 			</el-col>
@@ -40,19 +63,83 @@
 </template>
 
 <script setup name="EventAnalysisReportDetail">
-import { reportDetail } from '@/api/tc/eventAnalysisReport'
+import { detail } from '@/api/tc/eventAnalysisReport'
 import MdPreview from '@/components/Markdown/MdPreview'
+import { timerToStr } from '@/utils/timer'
 const route = useRoute()
 
 let { proxy } = getCurrentInstance()
 const editorRef = ref(null)
 const id = ref(0)
+const modelType = ref('')
 const data = ref({})
 const loading = ref(false)
+const basicList = ref([
+	{
+		name: "比赛编号",
+		value: "周三001"
+	},
+	{
+		name: "主队",
+		value: "北马其顿"
+	},
+	{
+		name: "客队",
+		value: "哈萨克斯坦"
+	},
+	{
+		name: "时间",
+		value: "2022-03-01 19:00"
+	}
+])
+const influencingList = ref([
+	"北马其顿联赛排名领先且状态稳定，防守坚固（近10场仅1负，同主客胜率60%）",
+    "历史交锋北马其顿占优（近2场全胜），心理优势明显",
+    "哈萨克斯坦客场表现差（同主客负率60%，失球多）"
+])
+const coreList = ref([
+	{
+	  "name": "最终赛果",
+	  "key": "result_final",
+      "prediction": "北马其顿胜",
+      "analysis": "北马其顿积分排名第一，近10场胜率60%且不败率高，哈萨克斯坦客场负率60%，历史交锋北马其顿全胜，优势明显。"
+    },
+    {
+	  "name": "让球结果",
+	  "key": "result_handicap",
+      "prediction": "北马其顿让球胜",
+      "analysis": "北马其顿实力占优，历史交锋让盘时均赢盘，哈萨克斯坦客场赢盘率仅28.5%，支持北马其顿覆盖盘口。"
+    },
+    {
+	  "name": "比分预测",
+	  "key": "score_prediction",
+      "prediction": "2-0",
+      "analysis": "北马其顿场均进1.6球且防守稳固（场均失0.4球），哈萨克斯坦客场场均失球多，可能零封小胜。"
+    },
+    {
+	  "name": "总进球数",
+	  "key": "total_goals",
+      "prediction": "小于2.5球",
+      "analysis": "北马其顿近10场大球率仅30%，防守强；哈萨克斯坦客场进攻乏力，总进球倾向小球。"
+    },
+    {
+	  "name": "半全场赛果",
+	  "key": "half_full_time",
+      "prediction": "胜胜",
+      "analysis": "北马其顿近场半全场多领先（如对列支敦士登半场1-0全场5-0），哈萨克斯坦客场半场易落后。"
+    },
+    {
+	  "name": "亚洲盘口",
+	  "key": "asian_handicap",
+      "prediction": "北马其顿-0.75",
+      "analysis": "基于实力差距和历史盘口（如上次交锋北马其顿受让半球赢盘），北马其顿有望让球获胜。"
+    },
+
+])
 
 function getDetail() {
 	loading.value = true
-	reportDetail(id.value).then(res => {
+	detail({id: id.value, modelType: modelType.value}).then(res => {
 		data.value = res.data
 	}).finally(() => {
 		loading.value = false
@@ -60,8 +147,9 @@ function getDetail() {
 }
 
 onMounted(() => {
-	if (route.query.id) {
+	if (route.query.id && route.query.modelType) {
 		id.value = route.query.id
+		modelType.value = route.query.modelType
 		getDetail()
 	}
 })