From 65c1f38bffbc488337eae8e7e915aae992d438aa Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Tue, 24 Jun 2025 08:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=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/views/kaohe/pingce/index.vue | 17 ++++----
 ruoyi-ui/src/views/kaohe/vote/index.vue   | 48 +++++++++++++++++++----
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue
index afa6267..5d20075 100644
--- a/ruoyi-ui/src/views/kaohe/pingce/index.vue
+++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue
@@ -325,7 +325,9 @@
         </el-table-column>
         <el-table-column label="评分选项" align="center" prop="options" min-width="120" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.voteTitle }}</span>
+            <div v-if="scope.row.vote&&scope.row.vote.options.length>0">
+              <div v-for="item in scope.row.vote.options" :key="item.value">{{ item.label }}</div>
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="最大值" align="center" prop="vote" min-width="80" :show-overflow-tooltip="true">
@@ -468,8 +470,8 @@
             <el-table-column align="center" prop="zb10" label="占比" width="55px"></el-table-column>
             <el-table-column align="center" prop="khx11" label="对外交流与合作" width="120px"></el-table-column>
             <el-table-column align="center" prop="zb11" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="zongfen" label="总分" width="70px"></el-table-column>
           </el-table-column>
+          <el-table-column align="center" prop="zongfen" label="总分" width="70px"></el-table-column>
         </el-table>
       </div>
       <div v-show="khdf.idRw===2">
@@ -482,8 +484,8 @@
             <el-table-column align="center" prop="zb2" label="占比"></el-table-column>
             <el-table-column align="center" prop="khx3" label="学生工作"></el-table-column>
             <el-table-column align="center" prop="zb3" label="占比"></el-table-column>
-            <el-table-column align="center" prop="zongfen" label="总分"></el-table-column>
           </el-table-column>
+          <el-table-column align="center" prop="zongfen" label="总分"></el-table-column>
         </el-table>
       </div>
       <div v-show="khdf.idRw===3">
@@ -514,9 +516,8 @@
             </el-table-column>
             <el-table-column align="center" prop="khx3" label="得分"></el-table-column>
             <el-table-column align="center" prop="zb3" label="占比"></el-table-column>
-
-            <el-table-column align="center" prop="zongfen" label="总分"></el-table-column>
           </el-table-column>
+          <el-table-column align="center" prop="zongfen" label="总分"></el-table-column>
         </el-table>
       </div>
       <div v-show="khdf.idRw===4">
@@ -2076,7 +2077,7 @@ export default {
                     label: '不合格'
                   }
                 ],
-                maxNum: 100,
+                maxNum: null,
                 percentage: 0.2, //评分占比
                 state: '2', //状态
                 sTime: '2025-06-15', //开始时间
@@ -2110,7 +2111,7 @@ export default {
                     label: '不合格'
                   }
                 ],
-                maxNum: 100,
+                maxNum: null,
                 percentage: 0.1, //评分占比
                 state: '2', //状态
                 sTime: '2025-06-15', //开始时间
@@ -2144,7 +2145,7 @@ export default {
                     label: '不合格'
                   }
                 ],
-                maxNum: 100,
+                maxNum: null,
                 percentage: 0.1, //评分占比
                 state: '2', //状态
                 sTime: '2025-06-15', //开始时间
diff --git a/ruoyi-ui/src/views/kaohe/vote/index.vue b/ruoyi-ui/src/views/kaohe/vote/index.vue
index 7578bc1..5eac2d1 100644
--- a/ruoyi-ui/src/views/kaohe/vote/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote/index.vue
@@ -80,14 +80,21 @@
     <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" 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="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">
         <template slot-scope="scope">
           <el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="最大投票数" align="center" prop="maxNum" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="评分选项" align="center" prop="options" min-width="120" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div v-if="scope.row.vote&&scope.row.vote.options.length>0">
+            <div v-for="item in scope.row.vote.options" :key="item.value">{{ item.label }}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <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">
@@ -99,12 +106,12 @@
           <span>{{ parseTime(scope.row.eTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="评测状态" align="center" prop="state" min-width="100" :show-overflow-tooltip="true">
+      <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="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" width="220">
         <template slot-scope="scope">
@@ -248,7 +255,34 @@ export default {
     getList() {
       this.loading = true
       listVote(this.queryParams).then(response => {
-        this.voteList = response.rows
+        // this.voteList = response.rows
+        this.voteList = []
+        /*voteTitle: '师院领导班子评分',
+                options: [
+                  {
+                    value: 1,
+                    label: '优秀'
+                  },
+                  {
+                    value: 2,
+                    label: '合格'
+                  },
+                  {
+                    value: 3,
+                    label: '基本合格'
+                  },
+                  {
+                    value: 4,
+                    label: '不合格'
+                  }
+                ],
+                maxNum: null,
+                percentage: 0.2, //评分占比
+                state: '2', //状态
+                sTime: '2025-06-15', //开始时间
+                eTime: '2025-06-20', //结束时间
+                vDescription: '师院领导班子评分详情描述', //评分详情描述
+                remark: '师院领导班子备注', //备注*/
         this.total = response.total
         this.loading = false
       })