From 3641e7908417bc22b903da35258d71e8e3fcb871 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 19 Jun 2025 17:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E8=AF=84=E6=B5=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/router/index.js            |  5 ++++
 ruoyi-ui/src/views/kaohe/vote/index.vue | 31 ++++++++++++++++++-------
 ruoyi-ui/src/views/votepage.vue         | 13 +++++++++++
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 ruoyi-ui/src/views/votepage.vue

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index bbfd237..ac94502 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -41,6 +41,11 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/votepage',
+    component: () => import('@/views/votepage'),
+    hidden: true
+  },
   {
     path: '/login',
     component: () => import('@/views/login'),
diff --git a/ruoyi-ui/src/views/kaohe/vote/index.vue b/ruoyi-ui/src/views/kaohe/vote/index.vue
index a862a76..2785515 100644
--- a/ruoyi-ui/src/views/kaohe/vote/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote/index.vue
@@ -79,22 +79,30 @@
 
     <el-table v-loading="loading" :data="voteList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="投票主题" align="center" prop="voteTitle" />
-      <el-table-column label="最大投票数" align="center" prop="maxNum" />
-      <el-table-column label="开始时间" align="center" prop="sTime" width="180">
+      <el-table-column label="主键" align="center" prop="id" width="55" />
+      <el-table-column label="评测名称" align="center" prop="pingceName" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核名称" align="center" prop="khitemName" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="投票主题" align="center" prop="voteTitle" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="最大投票数" align="center" prop="maxNum" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="评分占比" align="center" prop="percentage" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="开始时间" align="center" prop="sTime" min-width="120" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="eTime" width="180">
+      <el-table-column label="结束时间" align="center" prop="eTime" min-width="120" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.eTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="详情描述" align="center" prop="vDescription" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="评测状态" align="center" prop="state" min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.kh_state" :value="scope.row.state"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="详情描述" align="center" prop="vDescription" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remark" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -110,6 +118,12 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['kaohe:vote:remove']"
           >删除</el-button>
+          <el-button
+            v-if="scope.row.state === '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-thumb"
+          >去投票</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -167,6 +181,7 @@ import { listVote, getVote, delVote, addVote, updateVote } from "@/api/kaohe/vot
 
 export default {
   name: "Vote",
+  dicts: ['kh_state'],
   data() {
     return {
       // 遮罩层
diff --git a/ruoyi-ui/src/views/votepage.vue b/ruoyi-ui/src/views/votepage.vue
new file mode 100644
index 0000000..46d0b9e
--- /dev/null
+++ b/ruoyi-ui/src/views/votepage.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>投票</div>
+</template>
+
+<script>
+export default {
+  name: "votepage"
+}
+</script>
+
+<style scoped>
+
+</style>