diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue
index 07ac209..e9c2483 100644
--- a/ruoyi-ui/src/views/kaohe/pingce/index.vue
+++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue
@@ -357,10 +357,10 @@
     <!--选择发布考核信息-->
     <el-dialog title="发布考核" :visible.sync="pcSetUp.open" width="99%">
       <el-alert title="评分占比请输入小于 1 的小数，评分占比合计需为 1 " style="font-weight: bold" type="info" :closable="false"></el-alert>
-      <el-table border v-loading="pcSetUp.loading" :data="pcSetUp.list" style="margin-top: 10px;">
+      <el-table border v-loading="pcSetUp.loading" :data="pcSetUpList" style="margin-top: 10px;">
         <el-table-column label="考核项主键" align="center" prop="id" width="90" fixed/>
         <el-table-column label="考核项名称" align="center" prop="itemName" min-width="120" :show-overflow-tooltip="true" fixed/>
-        <el-table-column label="考核项类型" align="center" prop="type" min-width="110" fixed/>
+        <el-table-column label="考核项类型" align="center" prop="type" min-width="100" fixed/>
         <el-table-column label="评分主题" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex">
@@ -372,34 +372,34 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="最大值" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
+        <el-table-column label="最大值" align="center" prop="vote" min-width="140" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex && scope.row.typeId!==1">
-              <el-input-number :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))"
-                v-model="scope.row.vote.maxNum" :min="0" style="width: 150px;"></el-input-number>
+              <el-input-number :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))" controls-position="right"
+                v-model="scope.row.vote.maxNum" :min="0" style="width: 120px;"></el-input-number>
             </div>
             <div v-else>
               <span>{{ scope.row.vote.maxNum }}</span>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="评分占比" align="center" prop="vote"  min-width="280" :show-overflow-tooltip="true">
+        <el-table-column label="评分占比" align="center" prop="vote"  min-width="300" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex && scope.row.typeId!==3">
               <div>
-                <el-input-number :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))" style="width: 150px;"
-                                 v-model="scope.row.vote.percentage" :precision="2" :step="0.01" :max="1"></el-input-number>
-              </div>
-              <div>
+                <el-input-number :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))" style="width: 120px;margin-right: 10px;"
+                                 v-model="scope.row.vote.percentage" :precision="2" :step="0.01" :max="1" controls-position="right"></el-input-number>
                 <el-switch
-                  v-model="scope.row.vote.samePercent" active-text="不一致" inactive-text="一致" active-value="1"
-                  inactive-value="0" @change="samePercentChange(scope.row)">
+                  v-model="scope.row.vote.samePercent" active-text="不一致" inactive-text="一致" active-value="1" inactive-value="0"
+                  v-hasPermi="['kaohe:vote_emp:list']" @change="samePercentChange(scope.row)">
                 </el-switch>
               </div>
               <div v-if="scope.row.vote.samePercent=='1'&&scope.row.vote.voteEmps" style="padding: 5px;">
-                <div v-for="item in scope.row.vote.voteEmps" :key="item.bkhdxId" style="margin-bottom: 5px;">
+                <div v-for="item in scope.row.vote.voteEmps" :key="item.bkhdxId"
+                     style="margin-bottom: 5px; display: flex; justify-content: space-between;align-items: center">
                   <span>{{ item.bkhdxName }}</span>
-                  <el-input-number v-model="item.percentage" :precision="2" :step="0.01" :max="1" style="width: 120px;"></el-input-number>
+                  <el-input-number v-model="item.percentage" :precision="2" :step="0.01" :max="1" :controls="false"
+                                   style="width: 120px;"></el-input-number>
                 </div>
               </div>
 
@@ -409,7 +409,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
+        <el-table-column label="开始时间" align="center" prop="vote"  min-width="200" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex">
               <el-date-picker clearable style="width: 100%;" v-model="scope.row.vote.sTime"
@@ -422,7 +422,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="结束时间" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
+        <el-table-column label="结束时间" align="center" prop="vote"  min-width="200" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex">
               <el-date-picker :disabled="scope.row.vote.id && !(new Date(scope.row.vote.eTime) > (new Date()))"
@@ -435,7 +435,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="评分详情描述" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
+        <el-table-column label="评分详情描述" align="center" prop="vote" min-width="200" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex">
               <el-input :disabled="scope.row.vote.id && !(new Date(scope.row.vote.eTime) > (new Date()))"
@@ -447,7 +447,7 @@
 
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
+        <el-table-column label="备注" align="center" prop="vote" min-width="200" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <div v-if="scope.$index=== pcSetUp.xzhIndex">
               <el-input :disabled="scope.row.vote.id && !(new Date(scope.row.vote.eTime) > (new Date()))"
@@ -681,9 +681,9 @@ export default {
         open: false,
         pingceId:undefined,
         pingceName:undefined,
-        templateId:undefined,
-        list: []
+        templateId:undefined
       },
+      pcSetUpList:[],
       // 评分规则初始数据
       voteInitData:{
         createBy: null,
@@ -1060,7 +1060,7 @@ export default {
           }
           pcSetUpList.push(item);
         })
-        this.pcSetUp.list = pcSetUpList;
+        this.pcSetUpList = pcSetUpList;
       })
     },
     // 评测规则设置
@@ -1084,15 +1084,15 @@ export default {
           getItemVote({
             id: this.pcSetUp.templateId,
             pingceId: this.pcSetUp.pingceId,
-          }).then(response => {
+          }).then(response2 => {
             let pcSetUpList = [];
-            response.data.items.forEach((item,index) => {
+            response2.data.items.forEach((item,index) => {
               if(index=== this.pcSetUp.xzhIndex ){
                 item.vote['voteEmps'] = voteEmps;
               }
               pcSetUpList.push(item);
             })
-            this.pcSetUp.list = pcSetUpList;
+            this.pcSetUpList = pcSetUpList;
           })
         })
       }else {
@@ -1153,7 +1153,7 @@ export default {
       if(row.typeId!==3 && Vote.percentage){
         let allFlag = true;
         let sumPercentage = 0;
-        this.pcSetUp.list.forEach(item=>{
+        this.pcSetUpList.forEach(item=>{
           if(item.typeId!==3){
             if(!item.vote || !item.vote.percentage){
               allFlag=false;