考核得分汇总页面修改

ruoyi-ui/src/views/kaohe/pingce/index.vue

@@ -107,12 +107,18 @@
             v-hasPermi="['kaohe:pingce:edit']"
           >修改</el-button>
           <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-grid"
+            @click="goTotalScore(scope.row)"
+          >考核得分汇总</el-button>
+<!--          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['kaohe:pingce:remove']"
-          >删除</el-button>
+          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -139,6 +145,16 @@
         <el-form-item label="考核描述" prop="pcDescription">
           <el-input v-model="form.pcDescription" type="textarea" placeholder="请输入内容" />
         </el-form-item>
+        <el-form-item label="评测状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择评测状态" clearable style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.kh_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="职工">
           <el-button type="primary" @click="selectEmp" size="mini">选择职工</el-button>
           <el-table :data="form.pcEmps" style="width: 100%; margin-top: 10px" border max-height="500">
@@ -858,6 +874,9 @@ export default {
     },
     goVotepage(row){
       this.$router.push({ path: '/votepage', query: { id: row.vote.id }});
+    },
+    goTotalScore(){
+      this.$router.push({ path: '/totalScore'});
     }
   }
 }

ruoyi-ui/src/views/kaohe/totalScore/index.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="app-container">
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column label="考核得分汇总" header-align="center">
+        <el-table-column header-align="center" prop="paiming" label="排名" width="120"></el-table-column>
+        <el-table-column header-align="center" prop="xingming" label="姓名" width="120"></el-table-column>
+        <el-table-column header-align="center" label="投票评测标题1">
+          <el-table-column header-align="center" prop="zhanbi1" label="占比" width="120"></el-table-column>
+          <el-table-column header-align="center" prop="df1" label="得分" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" label="投票评测标题2">
+          <el-table-column header-align="center" prop="zhanbi2" label="占比" width="120"></el-table-column>
+          <el-table-column header-align="center" prop="df2" label="得分" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" label="投票评测标题3">
+          <el-table-column header-align="center" prop="zhanbi3" label="占比" width="120"></el-table-column>
+          <el-table-column header-align="center" prop="df3" label="得分" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" label="投票评测标题4">
+          <el-table-column header-align="center" prop="zhanbi4" label="占比" width="120"></el-table-column>
+          <el-table-column header-align="center" prop="df4" label="得分" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" prop="zongfen" label="总分" width="120"></el-table-column>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data() {
+    return {
+      tableData: [{
+        paiming: '1',
+        xingming: '姓名1',
+        df1: '100',
+        zhanbi1: '0.3',
+        df2: '100',
+        zhanbi2: '0.2',
+        df3: '100',
+        zhanbi3: '0.25',
+        df4: '100',
+        zhanbi4: '0.25',
+        zongfen: 100
+      },
+        {
+          paiming: '2',
+          xingming: '姓名2',
+          df1: '100',
+          zhanbi1: '0.4',
+          df2: '100',
+          zhanbi2: '0.1',
+          df3: '90',
+          zhanbi3: '0.1',
+          df4: '100',
+          zhanbi4: '0.4',
+          zongfen: 99
+        }]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

ruoyi-ui/src/views/kaohe/vote/index.vue

@@ -146,6 +146,9 @@
         <el-form-item label="最大投票数" prop="maxNum">
           <el-input v-model="form.maxNum" placeholder="请输入最大投票数" />
         </el-form-item>
+        <el-form-item label="评分占比" prop="percentage">
+          <el-input v-model="form.percentage" placeholder="请输入评分占比" />
+        </el-form-item>
         <el-form-item label="开始时间" prop="sTime">
           <el-date-picker clearable style="width: 100%;"
                           v-model="form.sTime"
@@ -162,6 +165,16 @@
                           placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="评测状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择评测状态" clearable style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.kh_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="详情描述" prop="vDescription">
           <el-input v-model="form.vDescription" type="textarea" placeholder="请输入内容" />
         </el-form-item>