diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue
index 333c513..973bfa6 100644
--- a/ruoyi-ui/src/views/kaohe/pingce/index.vue
+++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue
@@ -978,6 +978,7 @@ export default {
       this.pcSetUp.pingceId = row.id;
       this.pcSetUp.pingceName = row.pcTitle;
       this.pcSetUp.templateId = row.templateId;
+      this.pcSetUp.xzhIndex = null;
       this.pcSetUp.open = true;
       this.getItemVote();
     },
diff --git a/ruoyi-ui/src/views/kaohe/vote/index.vue b/ruoyi-ui/src/views/kaohe/vote/index.vue
index 2cc237f..22fcdc7 100644
--- a/ruoyi-ui/src/views/kaohe/vote/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote/index.vue
@@ -64,26 +64,11 @@
       </el-table-column>
       <el-table-column label="评分主题" align="center" prop="voteTitle" min-width="200" :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="options" min-width="200" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <div v-if="scope.$index=== xzhIndex && scope.row.khitemTypeid===1">
-            <el-select :disabled="!(new Date(scope.row.sTime) > (new Date()))"
-                       v-model="scope.row.voteItems" multiple placeholder="请选择评分选项">
-              <el-option
-                v-for="item in vote_options"
-                :key="item.id"
-                :label="item.vitemName"
-                :value="item.id">
-              </el-option>
-            </el-select>
+          <div v-if="scope.$index=== xzhIndex">
+            <el-input v-model.trim="scope.row.voteTitle" placeholder="请输入评分主题" :disabled="scope.row.id && !(new Date(scope.row.sTime) > (new Date()))"/>
           </div>
           <div v-else>
-            <div v-if=" scope.row.voteItems">
-              <div>{{ scope.row.voteItemsName }}</div>
-            </div>
+            <el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link>
           </div>
         </template>
       </el-table-column>
@@ -109,11 +94,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="vote"  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="vote"  min-width="220" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <div v-if="scope.$index===xzhIndex">
@@ -163,6 +143,11 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center" prop="vote"  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" class-name="small-padding fixed-width" fixed="right" width="180">
         <template slot-scope="scope">
           <div>
@@ -257,18 +242,6 @@ export default {
       listVote(this.queryParams).then(response => {
         let pcSetUpList = [];
         response.rows.forEach(item=>{
-          if(item.voteItems){
-            item.voteItems = item.voteItems.split(',');
-            let VoteItemsName = []
-            item.voteItems.forEach(e => {
-              this.vote_options.forEach(e1 => {
-                if(e === e1.id){
-                  VoteItemsName.push(e1.vitemName)
-                }
-              })
-            })
-            item['voteItemsName'] = VoteItemsName.join(',');
-          }
           pcSetUpList.push(item);
         })
         this.voteList = pcSetUpList;
@@ -341,12 +314,6 @@ export default {
           type: 'Danger'
         })
       }
-      if(row.khitemTypeid===1 && (!Vote.voteItems)){
-        flag = false;
-        this.$alert(`评分选项不能为空！`, `提示`, {
-          type: 'Danger'
-        })
-      }
       if(row.khitemTypeid!==1 && (!Vote.maxNum)){
         flag = false;
         this.$alert(`最大值不能为空！`, `提示`, {
@@ -365,24 +332,16 @@ export default {
           type: 'Danger'
         })
       }
-      if(!Vote.vDescription){
-        flag = false;
-        this.$alert(`评分详情描述不能为空！`, `提示`, {
-          type: 'Danger'
-        })
+      if(row.khitemTypeid===1){
+        Vote.voteItems = '1,2,3,4'
       }
       if (Vote.id != null && flag ) {
-        if(Vote.voteItems){
-          Vote.voteItems = Vote.voteItems.join(',')
-        }
         updateVote(Vote).then(response => {
           this.$modal.msgSuccess("修改成功")
           this.cancelVote()
         })
       } else if(Vote.id === null && flag){
-        if(Vote.voteItems){
-          Vote.voteItems = Vote.voteItems.join(',')
-        }
+        Vote.state = '0'
         addVote(Vote).then(response => {
           this.$modal.msgSuccess("新增成功")
           this.cancelVote()
diff --git a/ruoyi-ui/src/views/kaohe/vote_emp/index.vue b/ruoyi-ui/src/views/kaohe/vote_emp/index.vue
index e610567..4ca6908 100644
--- a/ruoyi-ui/src/views/kaohe/vote_emp/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote_emp/index.vue
@@ -108,10 +108,10 @@
 <!--      <el-table-column label="投票id" align="center" prop="voteId" />-->
       <el-table-column label="评分主题" align="center" prop="voteTitle" />
 <!--      <el-table-column label="职工id" align="center" prop="empId" />-->
-      <el-table-column label="被考核对象" align="center" prop="bumen" />
-      <el-table-column label="选项内容" align="center" prop="content" />
+      <el-table-column label="被考核对象" align="center" prop="bkhdxName" />
+<!--      <el-table-column label="选项内容" align="center" prop="content" />-->
       <el-table-column label="评分人数" align="center" prop="voteNum" />
-      <el-table-column label="评分均值" align="center" prop="votezz" />
+      <el-table-column label="评分均值" align="center" prop="avgScore" />
       <el-table-column label="评分总分" align="center" prop="voteScore" />
       <el-table-column label="备注" align="center" prop="remark" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -374,8 +374,8 @@ export default {
     }
   },
   created() {
-    // this.queryParams.voteId=this.$route.query.id
-    // this.getList();
+    this.queryParams.voteId=this.$route.query.id
+    this.getList();
   },
   methods: {
     /** 查询投票选项列表 */