diff --git a/ruoyi-ui/src/views/kaohe/vote/index.vue b/ruoyi-ui/src/views/kaohe/vote/index.vue
index 362bef6..4edece5 100644
--- a/ruoyi-ui/src/views/kaohe/vote/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="投票主题" prop="voteTitle">
+      <el-form-item label="评分主题" prop="voteTitle">
         <el-input
           v-model="queryParams.voteTitle"
-          placeholder="请输入投票主题"
+          placeholder="请输入评分主题"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -82,6 +82,13 @@
       <el-table-column label="主键" align="center" prop="id" width="55" />
       <el-table-column label="考核任务名称" align="center" prop="pingceName" min-width="140" :show-overflow-tooltip="true"/>
       <el-table-column label="考核项名称" align="center" prop="khitemName" min-width="140" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核类型" align="center" prop="khitemName" min-width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type===1">选项评分</span>
+          <span v-if="scope.row.type===2">占比评分</span>
+          <span v-if="scope.row.type===5">单独评分</span>
+        </template>
+      </el-table-column>
       <el-table-column label="评分主题" align="center" prop="voteTitle" min-width="140" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link>
@@ -113,7 +120,7 @@
       </el-table-column>
       <el-table-column label="评分详情描述" align="center" prop="vDescription" min-width="140" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remark" min-width="140" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -122,13 +129,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['kaohe:vote:edit']"
           >修改</el-button>
-          <el-button
+<!--          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['kaohe:vote:remove']"
-          >删除</el-button>
+          >删除</el-button>-->
           <el-button
             v-if="scope.row.state !== '0'"
             size="mini"
@@ -151,17 +158,20 @@
     <!-- 添加或修改投票评测对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="投票主题" prop="voteTitle">
-          <el-input v-model="form.voteTitle" placeholder="请输入投票主题" />
+        <el-form-item label="评分主题" prop="voteTitle">
+          <el-input v-model="form.voteTitle" placeholder="请输入评分主题" :disabled="form.state!=='0'"/>
         </el-form-item>
-        <el-form-item label="最大投票数" prop="maxNum">
-          <el-input v-model="form.maxNum" placeholder="请输入最大投票数" />
+        <el-form-item label="评分选项" prop="options" v-if="form.type===1">
+          <el-tag v-for="item in form.options" :key="item.value" type="info" style="margin: 0 5px;">{{ item.label }}</el-tag>
         </el-form-item>
-        <el-form-item label="评分占比" prop="percentage">
-          <el-input v-model="form.percentage" placeholder="请输入评分占比" />
+        <el-form-item label="最大值" prop="maxNum" v-if="form.type!==1">
+          <el-input-number v-model="form.maxNum" controls-position="right" :min="0" :disabled="form.state!=='0'"></el-input-number>
+        </el-form-item>
+        <el-form-item label="评分占比" prop="percentage" v-if="form.type===2||form.type===1">
+          <el-input-number v-model="form.percentage" controls-position="right" :precision="2" :step="0.01" :max="1" :disabled="form.state!=='0'"></el-input-number>
         </el-form-item>
         <el-form-item label="开始时间" prop="sTime">
-          <el-date-picker clearable style="width: 100%;"
+          <el-date-picker clearable style="width: 100%;" :disabled="form.state!=='0'"
                           v-model="form.sTime"
                           type="date"
                           value-format="yyyy-MM-dd"
@@ -169,15 +179,15 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="eTime">
-          <el-date-picker clearable style="width: 100%;"
+          <el-date-picker clearable style="width: 100%;" :disabled="form.state!=='0'"
                           v-model="form.eTime"
                           type="date"
                           value-format="yyyy-MM-dd"
                           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-form-item label="状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择评测状态" clearable style="width: 100%" :disabled="form.state!=='0'">
             <el-option
               v-for="dict in dict.type.kh_state"
               :key="dict.value"
@@ -187,7 +197,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="详情描述" prop="vDescription">
-          <el-input v-model="form.vDescription" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.vDescription" type="textarea" placeholder="请输入内容" :disabled="form.state!=='0'"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -242,7 +252,7 @@ export default {
       // 表单校验
       rules: {
         voteTitle: [
-          { required: true, message: "投票主题不能为空", trigger: "blur" }
+          { required: true, message: "评分主题不能为空", trigger: "blur" }
         ],
       }
     }
@@ -260,6 +270,7 @@ export default {
           id:1,
           index: 0,
           index1: 0,
+          type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '政治建设',
           voteTitle: '政治建设评分',
@@ -272,10 +283,11 @@ export default {
           vDescription: '政治建设评分详情描述', //评分详情描述
           remark: '政治建设备注', //备注
         },
-          {
+        {
           id:2,
           index: 0,
           index1: 1,
+          type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '宣传与思想政治工作',
           voteTitle: '宣传与思想政治工作评分',
@@ -291,6 +303,7 @@ export default {
           id:3,
           index: 0,
           index1: 2,
+          type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '作风纪律',
           voteTitle: '作风纪律评分',
@@ -307,6 +320,7 @@ export default {
           id: 4,
           index: 0,
           index1: 3,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '安全稳定',
           voteTitle: '安全稳定评分',
@@ -322,6 +336,7 @@ export default {
           id: 5,
           index: 0,
           index1: 4,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '师资队伍与师德师风',
           voteTitle: '师资队伍与师德师风评分',
@@ -338,6 +353,7 @@ export default {
           id: 6,
           index: 0,
           index1: 5,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '财务工作',
           voteTitle: '财务工作评分',
@@ -353,6 +369,7 @@ export default {
           id: 7,
           index: 0,
           index1: 6,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '依法治校与综合治理',
           voteTitle: '依法治校与综合治理评分',
@@ -369,6 +386,7 @@ export default {
           id: 8,
           index: 0,
           index1: 7,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '国有资产管理',
           voteTitle: '国有资产管理评分',
@@ -384,6 +402,7 @@ export default {
           id: 9,
           index: 0,
           index1: 8,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '实验室管理',
           voteTitle: '实验室管理评分',
@@ -400,6 +419,7 @@ export default {
           id: 10,
           index: 0,
           index1: 9,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '招生就业与创新创业工作',
           voteTitle: '招生就业与创新创业工作评分',
@@ -415,6 +435,7 @@ export default {
           id: 11,
           index: 0,
           index1: 10,
+            type: 2,
           pingceName: '党建与行政目标任务',
           khitemName: '对外交流与合作',
           voteTitle: '对外交流与合作评分',
@@ -431,6 +452,7 @@ export default {
           id: 12,
           index: 1,
           index1: 0,
+            type: 2,
           pingceName: '事业发展',
           khitemName: '教学工作',
           voteTitle: '教学工作评分',
@@ -446,6 +468,7 @@ export default {
           id: 13,
           index: 1,
           index1: 1,
+            type: 2,
           pingceName: '事业发展',
           khitemName: '科研工作',
           voteTitle: '科研工作评分',
@@ -462,6 +485,7 @@ export default {
           id: 14,
           index: 1,
           index1: 2,
+            type: 2,
           pingceName: '事业发展',
           khitemName: '学生工作',
           voteTitle: '学生工作评分',
@@ -477,6 +501,7 @@ export default {
           id:15,
           index: 2,
           index1: 0,
+            type: 1,
           pingceName: '民主测评',
           khitemName: '师院领导班子',
           voteTitle: '师院领导班子评分',
@@ -510,6 +535,7 @@ export default {
             id: 16,
             index: 2,
             index1: 1,
+            type: 1,
             pingceName: '民主测评',
             khitemName: '师院处级领导干部',
             voteTitle: '师院处级领导干部评分',
@@ -543,6 +569,7 @@ export default {
             id: 17,
             index: 2,
             index1: 2,
+            type: 1,
             pingceName: '民主测评',
             khitemName: '服务对象代表',
             voteTitle: '服务对象代表评分',
@@ -576,6 +603,7 @@ export default {
             id: 18,
             index: 3,
             index1: 0,
+            type: 5,
             pingceName: '特色创新',
             khitemName: '分数（满分10分）',
             voteTitle: '特色创新分数（满分10分）评分',
@@ -592,6 +620,7 @@ export default {
             id: 19,
             index: 4,
             index1: 0,
+            type: 5,
             pingceName: '综合评价',
             khitemName: '分数（加减分项，值域可以为负）',
             voteTitle: '综合评价分数（加减分项，值域可以为负）',
@@ -655,17 +684,20 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const id = row.id || this.ids
+      this.form = row;
+      this.open = true
+      this.title = "修改投票评测"
+      /*const id = row.id || this.ids
       getVote(id).then(response => {
         this.form = response.data
         this.open = true
         this.title = "修改投票评测"
-      })
+      })*/
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        if (valid) {
+        /*if (valid) {
           if (this.form.id != null) {
             updateVote(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
@@ -679,24 +711,24 @@ export default {
               this.getList()
             })
           }
-        }
+        }*/
       })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids
+      /*const ids = row.id || this.ids
       this.$modal.confirm('是否确认删除投票评测编号为"' + ids + '"的数据项？').then(function() {
         return delVote(ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {})*/
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('kaohe/vote/export', {
+      /*this.download('kaohe/vote/export', {
         ...this.queryParams
-      }, `vote_${new Date().getTime()}.xlsx`)
+      }, `vote_${new Date().getTime()}.xlsx`)*/
     },
     goVotepage(row){
       this.$router.push({ path: '/votepage', query: { index: row.index, index1: row.index1 }});
diff --git a/ruoyi-ui/src/views/kaohe/vote_items/index.vue b/ruoyi-ui/src/views/kaohe/vote_items/index.vue
index 05f3e23..ee5abc1 100644
--- a/ruoyi-ui/src/views/kaohe/vote_items/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote_items/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="投票选项名称" prop="vitemName">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="评分选项名称" prop="vitemName">
         <el-input
           v-model="queryParams.vitemName"
-          placeholder="请输入投票选项名称"
+          placeholder="请输入评分选项名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -64,7 +64,7 @@
     <el-table v-loading="loading" :data="vote_itemsList" @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="vitemName" />
+      <el-table-column label="评分选项名称" align="center" prop="vitemName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -85,7 +85,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -94,11 +94,11 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改投票项对话框 -->
+    <!-- 添加或修改评分项对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="投票选项名称" prop="vitemName">
-          <el-input v-model="form.vitemName" placeholder="请输入投票选项名称" />
+        <el-form-item label="评分选项名称" prop="vitemName">
+          <el-input v-model="form.vitemName" placeholder="请输入评分选项名称" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -131,7 +131,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 投票项表格数据
+      // 评分项表格数据
       vote_itemsList: [],
       // 弹出层标题
       title: "",
@@ -154,7 +154,7 @@ export default {
     this.getList()
   },
   methods: {
-    /** 查询投票项列表 */
+    /** 查询评分项列表 */
     getList() {
       this.loading = true
       listVote_items(this.queryParams).then(response => {
@@ -201,7 +201,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加投票项"
+      this.title = "添加评分项"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -210,7 +210,7 @@ export default {
       getVote_items(id).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改投票项"
+        this.title = "修改评分项"
       })
     },
     /** 提交按钮 */
@@ -236,7 +236,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除投票项编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除评分项编号为"' + ids + '"的数据项？').then(function() {
         return delVote_items(ids)
       }).then(() => {
         this.getList()