fix:修改样式

src/enums/tc.js

@@ -123,18 +123,23 @@ const EnumsModelsTitle = {
 
 /**配置模型类型 */
 export const ModelsTypes = {
-  // 足球
+  /** 足球 */
   soccer: [
     { name: 'Finyx-AI模型', value: 'FINYX_F', title: EnumsModelsTitle['Finyx-AI'] },
     // { name: 'Uha模型', value: 'UHA_F', title: EnumsModelsTitle['Uha'] },  
     { name: 'D3-Index模型', value: 'D3_F', title: EnumsModelsTitle['D3-Index'] },
     { name: '红单专家', value: 'HONG_F', title: EnumsModelsTitle['HONG'] },
   ],
-  // 篮球
+  /** 篮球 */
   basketball: [
     { name: 'Finyx-AI模型', value: 'FINYX_B', title: EnumsModelsTitle['Finyx-AI'] },
     // { name: 'Uha模型', value: 'UHA_B', title: EnumsModelsTitle['Uha'] },  
     { name: 'D3-Index模型', value: 'D3_B', title: EnumsModelsTitle['D3-Index'] },
     { name: '红单专家', value: 'HONG_B', title: EnumsModelsTitle['HONG'] },
+  ],
+  /* 热门比赛 */
+  hot: [
+    { name: 'D3-Index模型', value: 'HOT_F', title: EnumsModelsTitle['D3-Index'] },
   ]
 }
+

src/views/operation/report/components/Prediction.vue

@@ -11,10 +11,10 @@
                 <div v-if="item.value === 'asianHandicapFlag'" :class="['had-content-table-item', {'is-active': isActiveClass(item, data, '0.5')}]" @click="handleClick(item, data, '0.5')">
                     红半
                 </div>
-                <div :class="['had-content-table-item', {'is-active': isActiveClass(item, data, '-1')}]" @click="handleClick(item, data, '-1')">
+                <div :class="['had-content-table-item', {'is-active-black': isActiveClass(item, data, '-1')}]" @click="handleClick(item, data, '-1')">
                     黑
                 </div>
-                <div v-if="item.value === 'asianHandicapFlag'"  :class="['had-content-table-item', {'is-active': isActiveClass(item, data, '-0.5')}]" @click="handleClick(item, data, '-0.5')">
+                <div v-if="item.value === 'asianHandicapFlag'"  :class="['had-content-table-item', {'is-active-black': isActiveClass(item, data, '-0.5')}]" @click="handleClick(item, data, '-0.5')">
                     黑半
                 </div>
             </div>
@@ -120,5 +120,9 @@ defineExpose({
     background-color: #f56c6c;
     color: #fff;
 }
+.is-active-black {
+    background-color: #333;
+    color: #fff;
+}
 
 </style>

src/views/operation/report/index.vue

@@ -87,8 +87,12 @@
 								<el-button link type="primary">查看</el-button>
 							</template>
 							<template #default> 
-								<el-tabs v-model="activeName">
+								<div style="padding: 8px;">
-									<el-tab-pane label="finyx-AI" name="FINYX_F">
+									<el-radio-group v-model="activeName" style="margin-bottom: 10px">
+										<el-radio-button value="FINYX_F">finyx-AI</el-radio-button>
+										<el-radio-button value="D3_F">D3-index</el-radio-button>
+									</el-radio-group>
+									<div v-if="activeName === 'FINYX_F'">
 										<el-table border :data="scope.row.farmatReportResults['FINYX_F']" :show-header="false">
 											<el-table-column>
 												<template #default="item">
@@ -101,8 +105,8 @@
 												</template>
 											</el-table-column>
 										</el-table>
-									</el-tab-pane>
+									</div>
-									<el-tab-pane label="D3-index" name="D3_F">
+									<div v-if="activeName === 'D3_F'">
 										<el-table border :data="scope.row.farmatReportResults['D3_F']" :show-header="false">
 											<el-table-column>
 												<template #default="item">
@@ -115,15 +119,9 @@
 												</template>
 											</el-table-column>
 										</el-table>
-									</el-tab-pane>
+									</div>
-								</el-tabs>
+								</div>
 							</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> -->
 						</el-popover>
 					</template>
 				</el-table-column>

src/views/tc/hotContestList/index.vue

@@ -61,32 +61,6 @@
 				<el-table-column label="赛果" prop="matchId">
 					<template #default="scope">
 						<el-button link type="primary" @click="handleJumpLink(scope.row)">查看</el-button>
-						<!-- <el-popover placement="bottom" :width="360">
-							<template #reference> 
-								<el-button link type="primary" @dblclick="handleJumpLink(scope.row)">查看</el-button>
-							</template>
-							<template #default> 
-								<div>
-									<el-table border :data="scope.row.matchResults">
-										<el-table-column label="游戏" prop="matchNumStr">
-											<template #default="item">
-												{{ item.row.codeName }}
-											</template>
-										</el-table-column>
-										<el-table-column label="开赛结果" prop="reportSatus">
-											<template #default="item"> 
-												<el-tag type="error">{{ item.row.combinationDesc }}</el-tag>
-											</template>
-										</el-table-column>
-										<el-table-column label="奖金" prop="matchNumStr">
-											<template #default="item">
-												{{ item.row.odds }}
-											</template>
-										</el-table-column>
-									</el-table>
-								</div>
-							</template>
-						</el-popover> -->
 					</template>
 				</el-table-column>
 				<el-table-column label="比赛开始时间" align="center" prop="matchDateTime">
@@ -94,15 +68,9 @@
 						<span>{{ parseTime(scope.row.matchDateTime) }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="报告状态" prop="reportSatus">
+				<el-table-column :label="item.name" align="center" class-name="small-padding fixed-width" v-for="item in ModelsTypes.hot" :key="item.value">
-					<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 label="D3-Index模型" align="center" class-name="small-padding fixed-width">
 					<template #header>
-						<span>D3-Index模型</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;">
@@ -111,19 +79,16 @@
 						</template>
 						<template #default>
 							<div>
-									<p>D3-Index是通过AI数据模型，在海量的联赛数据中通过交易规模、历史战绩、受注热度、指数波动、状态等维度，深度训练和学习，最终给出严正的分析结果来供用户参考。</p>
+								<p>{{ item.title }}</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>
@@ -149,7 +114,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()
@@ -178,6 +143,32 @@ 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) {
   // 当用户通过快捷选项选择星期时触发
@@ -222,15 +213,15 @@ function handleJumpLink(row) {
 }
 
 /** 查看详情 */
-function handleView(row) {
+function handleView(row, modelType) {
 	if (row.reportSatus != 1) {
 		return
 	}
-	// window.open(window.location.origin + '/#/tc/eventAnalysisReport/detail?id=' + row.matchId)
 	router.push({
 		path: '/tc/eventAnalysisReport/detail',
 		query: {
-			id: row.matchId
+			id: row.matchId,
+			modelType
 		}
 	})
 }