diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue
index a743a1b..eea9c07 100644
--- a/ruoyi-ui/src/views/kaohe/pingce/index.vue
+++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue
@@ -156,7 +156,7 @@
           <el-input placeholder="请选择模板名称" v-if="form.state==='0'" readonly v-model="form.templateName" @focus="changeTemp">
             <i slot="suffix" class="el-input__icon el-icon-search" style="color: #1890ff; font-weight: bolder"></i>
           </el-input>
-          <el-input v-else v-model="form.pcTitle" placeholder="请选择模板" disabled/>
+          <el-input v-else v-model="form.templateName" placeholder="请选择模板" disabled/>
         </el-form-item>
         <el-form-item label="考核任务描述" prop="pcDescription" :disabled="form.state!=='0'">
           <el-input v-model="form.pcDescription" type="textarea" placeholder="请输入考核任务描述" :disabled="form.state==='2'"/>
@@ -341,83 +341,147 @@
     </el-dialog>
 
     <!--选择发布考核信息-->
-    <el-dialog title="发布考核" :visible.sync="pcSetUp.open" width="1200px">
+    <el-dialog title="发布考核" :visible.sync="pcSetUp.open" width="99%">
       <el-table border v-loading="pcSetUp.loading" :data="pcSetUp.list">
         <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="typeName" fixed/>
-        <el-table-column label="评分主题" align="center" prop="vote" min-width="120" :show-overflow-tooltip="true">
+        <el-table-column label="考核项类型" align="center" prop="type" fixed/>
+        <el-table-column label="评分主题" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.voteTitle }}</span>
+            <div v-if="scope.$index=== pcSetUp.xzhIndex">
+              <el-input v-model.trim="scope.row.vote.voteTitle" placeholder="请输入评分主题" :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))"/>
+            </div>
+            <div v-else>
+              <span>{{ scope.row.vote.voteTitle }}</span>
+            </div>
           </template>
         </el-table-column>
-        <el-table-column label="评分选项" align="center" prop="options" min-width="120" :show-overflow-tooltip="true">
+        <el-table-column label="评分选项" align="center" prop="options" min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <div v-if="scope.row.vote && scope.row.vote.voteItems && scope.row.vote.voteItems.length>0">
-              <div v-for="item in scope.row.vote.voteItems" :key="item.value">{{ item.label }}</div>
+            <div v-if="scope.$index=== pcSetUp.xzhIndex && scope.row.typeId===1">
+              <el-select :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))"
+                         v-model="scope.row.vote.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>
+            <div v-else>
+              <div v-if=" scope.row.vote.voteItems">
+                <div>{{ scope.row.vote.voteItemsName }}</div>
+              </div>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="最大值" align="center" prop="vote" min-width="80" :show-overflow-tooltip="true">
+        <el-table-column label="最大值" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.maxNum }}</span>
+            <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>
+            </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="80" :show-overflow-tooltip="true">
+        <el-table-column label="评分占比" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.percentage }}</span>
+            <div v-if="scope.$index=== pcSetUp.xzhIndex && scope.row.typeId!==5">
+              <el-input-number :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))"
+                               v-model="scope.row.vote.percentage" :precision="2" :step="0.01" :max="1" style="width: 150px;"></el-input-number>
+            </div>
+            <div v-else>
+              <span>{{ scope.row.vote.percentage }}</span>
+            </div>
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" prop="vote"  min-width="80" :show-overflow-tooltip="true">
+        <el-table-column label="状态" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <dict-tag v-if="scope.row.vote" :options="dict.type.kh_state" :value="scope.row.vote.state"/>
+            <dict-tag :options="dict.type.kh_state" :value="scope.row.vote.state"/>
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" prop="vote"  min-width="100" :show-overflow-tooltip="true">
+        <el-table-column label="开始时间" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.sTime }}</span>
+            <div v-if="scope.$index=== pcSetUp.xzhIndex">
+              <el-date-picker clearable style="width: 100%;" v-model="scope.row.vote.sTime"
+                              :disabled="scope.row.vote.id && !(new Date(scope.row.vote.sTime) > (new Date()))"
+                              type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开始时间">
+              </el-date-picker>
+            </div>
+            <div v-else>
+              <span>{{ scope.row.vote.sTime }}</span>
+            </div>
           </template>
         </el-table-column>
-        <el-table-column label="结束时间" align="center" prop="vote"  min-width="100" :show-overflow-tooltip="true">
+        <el-table-column label="结束时间" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.eTime }}</span>
+            <div v-if="scope.$index=== pcSetUp.xzhIndex">
+              <el-date-picker :disabled="scope.row.vote.id && !(new Date(scope.row.vote.eTime) > (new Date()))"
+                              clearable style="width: 100%;"   v-model="scope.row.vote.eTime"
+                              type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择结束时间">
+              </el-date-picker>
+            </div>
+            <div v-else>
+              <span>{{ scope.row.vote.eTime }}</span>
+            </div>
           </template>
         </el-table-column>
-        <el-table-column label="评分详情描述" align="center" prop="vote" min-width="120" :show-overflow-tooltip="true">
+        <el-table-column label="评分详情描述" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.vDescription }}</span>
+            <div v-if="scope.$index=== pcSetUp.xzhIndex">
+              <el-input :disabled="scope.row.vote.id && !(new Date(scope.row.vote.eTime) > (new Date()))"
+                        v-model="scope.row.vote.vDescription" type="textarea" placeholder="请输入评分详情描述"/>
+            </div>
+            <div v-else>
+              <span>{{ scope.row.vote.vDescription }}</span>
+            </div>
+
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="vote" min-width="120" :show-overflow-tooltip="true">
+        <el-table-column label="备注" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.vote">{{ scope.row.vote.remark }}</span>
+            <div v-if="scope.$index=== pcSetUp.xzhIndex">
+              <el-input :disabled="scope.row.vote.id && !(new Date(scope.row.vote.eTime) > (new Date()))"
+                        v-model="scope.row.vote.remark" type="textarea" placeholder="请输入备注"/>
+            </div>
+            <div v-else>
+              <span>{{ scope.row.vote.remark }}</span>
+            </div>
           </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 v-if="scope.row.vote">
-              <el-button
+            <div>
+              <el-button v-if="!(scope.$index=== pcSetUp.xzhIndex)"
                 size="mini"
                 type="text"
                 icon="el-icon-s-tools"
-                @click="setUpTouPiao(scope.row)"
-              >评分规则</el-button>
-              <el-button
-                v-if="scope.row.vote.state === '1' || scope.row.vote.state === '2' "
+                @click="setUpTouPiao(scope.row,scope.$index)"
+              >编辑评分规则</el-button>
+
+              <el-button v-if="scope.$index=== pcSetUp.xzhIndex"
                 size="mini"
                 type="text"
-                icon="el-icon-thumb"
-                @click="goVotepage(scope.row,scope.$index)"
-              >去评分</el-button>
-            </div>
+                @click="voteSubmitForm(scope.row)"
+              >确认</el-button>
+
+              <el-button v-if="scope.$index=== pcSetUp.xzhIndex"
+                         size="mini"
+                         type="text"
+                         @click="cancelVote"
+              >取消</el-button>
 
-            <div v-else>
               <el-button
+                v-if="scope.row.vote.id && (new Date(scope.row.vote.sTime) < (new Date())) && (new Date(scope.row.vote.eTime) > (new Date()))"
                 size="mini"
                 type="text"
-                icon="el-icon-s-tools"
-                @click="setUpTouPiao(scope.row)"
-              >评分规则</el-button>
+                icon="el-icon-thumb"
+                @click="goVotepage(scope.row)"
+              >去评分</el-button>
+
             </div>
 
           </template>
@@ -428,58 +492,6 @@
       </div>
     </el-dialog>
 
-    <!--评分规则弹出对话框-->
-    <el-dialog title="评分规则" :visible.sync="vote.open" width="600px" append-to-body>
-      <el-form ref="touPiaoForm" :model="vote.form" :rules="vote.rules" label-width="100px">
-        <el-form-item label="评分主题" prop="voteTitle">
-          <el-input v-model="vote.form.voteTitle" placeholder="请输入评分主题" :disabled="vote.form.state && vote.form.state!=='0'"/>
-        </el-form-item>
-        <el-form-item label="评分选项" prop="options" v-if="vote.form.type===1">
-          <el-select v-model="vote.form.options" multiple placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="最大值" prop="maxNum" v-if="vote.form.type!==1">
-          <el-input-number v-model="vote.form.maxNum" controls-position="right" :min="0" :disabled="vote.form.state && vote.form.state!=='0'"></el-input-number>
-        </el-form-item>
-        <el-form-item label="评分占比" prop="percentage" v-if="vote.form.type===2||vote.form.type===1">
-          <el-input-number v-model="vote.form.percentage" controls-position="right" :precision="2" :step="0.01" :max="1" :disabled="vote.form.state && vote.form.state!=='0'"></el-input-number>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="sTime">
-          <el-date-picker clearable style="width: 100%;" :disabled="vote.form.state && vote.form.state!=='0'"
-                          v-model="vote.form.sTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="eTime">
-          <el-date-picker clearable style="width: 100%;" :disabled="vote.form.state && vote.form.state!=='0'"
-                          v-model="vote.form.eTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="评分详情描述" prop="vDescription">
-          <el-input v-model="vote.form.vDescription" type="textarea" placeholder="请输入评分详情描述" :disabled="vote.form.state && vote.form.state!=='0'"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="vote.form.remark" type="textarea" placeholder="请输入备注" :disabled="vote.form.state && vote.form.state!=='0'"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="voteSubmitForm">确 定</el-button>
-        <el-button @click="voteCancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-
     <!--     考核得分-->
     <el-dialog title="考核得分" :visible.sync="khdf.open" width="90%">
       <div v-show="khdf.idRw===1">
@@ -589,6 +601,7 @@ import { deptTreeSelect } from "@/api/system/user";
 import { listTemplate } from "@/api/kaohe/template"
 import { listEmployee } from "@/api/kaohe/employee"
 import { addVote, updateVote } from "@/api/kaohe/vote"
+import { listVote_items } from "@/api/kaohe/vote_items"
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -628,892 +641,22 @@ export default {
             zb11: '0.1',
             zongfen: '93.06'
           },
+        ],
+        list2: [
           {
-            bumen: '海洋学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '历史文化与法学系',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '物理科学与技术学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '教育学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '资源管理系',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '马克思主义学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '美术学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '计算机科学技术系',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '化学系',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '数学与计算科学学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '继续教育学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '外国语学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '体育系',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '文学院',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          },
-          {
-            bumen: '音乐系',
-            khx1: '90',
-            zb1: '0.2',
-            khx2: '95',
-            zb2: '0.1',
-            khx3: '90',
-            zb3: '0.1',
-            khx4: '85',
-            zb4: '0.1',
-            khx5: '98',
-            zb5: '0.1',
-            khx6: '95',
-            zb6: '0.1',
-            khx7: '97',
-            zb7: '0.05',
-            khx8: '98',
-            zb8: '0.02',
-            khx9: '95',
-            zb9: '0.03',
-            khx10: '96',
-            zb10: '0.1',
-            khx11: '95',
-            zb11: '0.1',
-            zongfen: '93.06'
-          }
-        ],
-        list2: [
-          {
-            bumen: '生命科学系',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '海洋学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '历史文化与法学系',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '物理科学与技术学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '教育学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '资源管理系',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '马克思主义学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '美术学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '计算机科学技术系',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '化学系',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '数学与计算科学学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '继续教育学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '外国语学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '体育系',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '文学院',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          },
-          {
-            bumen: '音乐系',
-            khx1: '98',
-            zb1: '0.5',
-            khx2: '95',
-            zb2: '0.28',
-            khx3: '98',
-            zb3: '0.22',
-            zongfen: '97.16'
-          }
-        ],
-        list3: [
-          {
-            bumen: '生命科学系',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '海洋学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '历史文化与法学系',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '物理科学与技术学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '教育学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '资源管理系',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '马克思主义学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '美术学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '计算机科学技术系',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '化学系',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '数学与计算科学学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '继续教育学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '外国语学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '体育系',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
-          {
-            bumen: '文学院',
-            yx1: 5,
-            hg1: 1,
-            jbhg1: 0,
-            bhg1: 0,
-            khx1: '96.66666667',
-            zb1: '0.3',
-            yx2: 110,
-            hg2: 2,
-            jbhg2: 1,
-            bhg2: 1,
-            khx2: '98.77192982',
-            zb2: '0.3',
-            yx3: 30,
-            hg3: 5,
-            jbhg3: 5,
-            bhg3: 1,
-            khx3: '91.2195122',
-            zb3: '0.4',
-            zongfen: '95.12'
-          },
+            bumen: '继续教育学院',
+            khx1: '98',
+            zb1: '0.5',
+            khx2: '95',
+            zb2: '0.28',
+            khx3: '98',
+            zb3: '0.22',
+            zongfen: '97.16'
+          }
+        ],
+        list3: [
           {
-            bumen: '音乐系',
+            bumen: '生命科学系',
             yx1: 5,
             hg1: 1,
             jbhg1: 0,
@@ -1539,132 +682,12 @@ export default {
           {
             bumen: '生命科学系',
             df: '8',
-          },
-          {
-            bumen: '海洋学院',
-            df: '',
-          },
-          {
-            bumen: '历史文化与法学系',
-            df: '',
-          },
-          {
-            bumen: '物理科学与技术学院',
-            df: '',
-          },
-          {
-            bumen: '教育学院',
-            df: '',
-          },
-          {
-            bumen: '资源管理系',
-            df: '',
-          },
-          {
-            bumen: '马克思主义学院',
-            df: '',
-          },
-          {
-            bumen: '美术学院',
-            df: '',
-          },
-          {
-            bumen: '计算机科学技术系',
-            df: '',
-          },
-          {
-            bumen: '化学系',
-            df: '',
-          },
-          {
-            bumen: '数学与计算科学学院',
-            df: '',
-          },
-          {
-            bumen: '继续教育学院',
-            df: '',
-          },
-          {
-            bumen: '外国语学院',
-            df: '',
-          },
-          {
-            bumen: '体育系',
-            df: '',
-          },
-          {
-            bumen: '文学院',
-            df: '',
-          },
-          {
-            bumen: '音乐系',
-            df: '',
           }
         ],
         list5: [
           {
             bumen: '生命科学系',
             df: '-3',
-          },
-          {
-            bumen: '海洋学院',
-            df: '',
-          },
-          {
-            bumen: '历史文化与法学系',
-            df: '',
-          },
-          {
-            bumen: '物理科学与技术学院',
-            df: '',
-          },
-          {
-            bumen: '教育学院',
-            df: '',
-          },
-          {
-            bumen: '资源管理系',
-            df: '',
-          },
-          {
-            bumen: '马克思主义学院',
-            df: '',
-          },
-          {
-            bumen: '美术学院',
-            df: '',
-          },
-          {
-            bumen: '计算机科学技术系',
-            df: '',
-          },
-          {
-            bumen: '化学系',
-            df: '',
-          },
-          {
-            bumen: '数学与计算科学学院',
-            df: '',
-          },
-          {
-            bumen: '继续教育学院',
-            df: '',
-          },
-          {
-            bumen: '外国语学院',
-            df: '',
-          },
-          {
-            bumen: '体育系',
-            df: '',
-          },
-          {
-            bumen: '文学院',
-            df: '',
-          },
-          {
-            bumen: '音乐系',
-            df: '',
           }
         ]
       },
@@ -1721,10 +744,10 @@ export default {
       // 表单校验
       rules: {
         pcTitle: [
-          { required: true, message: "考核名称不能为空", trigger: "blur" }
+          { required: true, message: "考核名称不能为空", trigger: "change" }
         ],
         templateName: [
-          { required: true, message: "模板名称不能为空", trigger: "blur" }
+          { required: true, message: "模板名称不能为空", trigger: "change" }
         ],
       },
       /** 选择模板*/
@@ -1740,221 +763,7 @@ export default {
           pageSize: 10
         },
         // 表格数据
-        list: [
-          {
-            "remark": null,
-            "id": 2,
-            "temName": "党建与行政目标任务",
-            "khitemId": null,
-            "itemName": null,
-            "items": [
-              {
-                "remark": null,
-                "id": 6,
-                "itemName": "政治建设",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 7,
-                "itemName": "宣传与思想政治工作",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 8,
-                "itemName": "作风纪律",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 9,
-                "itemName": "安全稳定",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 10,
-                "itemName": "师资队伍与师德师风",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 11,
-                "itemName": "财务工作",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 12,
-                "itemName": "依法治校与综合治理",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 13,
-                "itemName": "国有资产管理",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 14,
-                "itemName": "实验室管理",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 15,
-                "itemName": "招生就业与创新创业工作",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 16,
-                "itemName": "对外交流与合作",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              }
-            ]
-          },
-          {
-            "createBy": null,
-            "createTime": null,
-            "updateBy": null,
-            "updateTime": null,
-            "remark": null,
-            "id": 3,
-            "temName": "事业发展",
-            "khitemId": null,
-            "itemName": null,
-            "items": [
-              {
-                "createBy": null,
-                "createTime": null,
-                "updateBy": null,
-                "updateTime": null,
-                "remark": null,
-                "id": 17,
-                "itemName": "教学工作",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "createBy": null,
-                "createTime": null,
-                "updateBy": null,
-                "updateTime": null,
-                "remark": null,
-                "id": 18,
-                "itemName": "科研工作",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "createBy": null,
-                "createTime": null,
-                "updateBy": null,
-                "updateTime": null,
-                "remark": null,
-                "id": 19,
-                "itemName": "学生工作",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              }
-            ]
-          },
-          {
-            "remark": null,
-            "id": 4,
-            "temName": "民主测评",
-            "khitemId": null,
-            "itemName": null,
-            "items": [
-              {
-                "remark": null,
-                "id": 20,
-                "itemName": "师院领导班子",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 21,
-                "itemName": "师院处级领导干部",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              },
-              {
-                "remark": null,
-                "id": 22,
-                "itemName": "服务对象代表",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              }
-            ]
-          },
-          {
-            "remark": null,
-            "id": 5,
-            "temName": "特色创新",
-            "khitemId": null,
-            "itemName": null,
-            "items": [
-              {
-                "remark": null,
-                "id": 23,
-                "itemName": "特色创新",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              }
-            ]
-          },
-          {
-            "remark": null,
-            "id": 6,
-            "temName": "综合评价",
-            "khitemId": null,
-            "itemName": null,
-            "items": [
-              {
-                "remark": null,
-                "id": 24,
-                "itemName": "综合评价",
-                "typeId": null,
-                "type": null,
-                "vote": null
-              }
-            ]
-          }
-        ],
+        list: [],
         // 总条数
         total: 0,
       },
@@ -1974,86 +783,48 @@ export default {
           deptId: undefined,
         },
         // 表格数据
-        list: [
-          {
-            id: 1,
-            deptId: 2,
-            deptName: "生命科学系",
-            empName: "赵",
-            age: 22
-          },
-          {
-            id: 2,
-            deptId: 2,
-            deptName: "生命科学系",
-            empName: "钱",
-            age: 28
-          },
-          {
-            id: 3,
-            deptId: 2,
-            deptName: "生命科学系",
-            empName: "孙",
-            age: 24
-          },
-          {
-            id: 4,
-            deptId: 3,
-            deptName: "海洋学院",
-            empName: "李",
-            age: 24
-          }
-        ],
+        list: [],
         // 选中表格数据
         selectList: [],
         // 总条数
         total: 0,
       },
+      // 考核发布
       pcSetUp: {
-        index: null,
+        // 选中行Index
+        xzhIndex: null,
+        isRowEdit: false,
         open: false,
         pingceId:undefined,
         pingceName:undefined,
         templateId:undefined,
         list: []
       },
-      vote:{
-        open: false,
-        // 表单参数
-        form: {
-          id: null,
-          voteTitle: null,
-          vDescription: null,
-          khitemId: null,
-          khitemName: null,
-          percentage: null,
-          pingceId: null,
-          pingceName: null,
-          sTime: null,
-          eTime: null,
-          maxNum: null,
-          state: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
-          remark: null,
-          type: null,
-          options: [],
-        },
-        // 表单校验
-        rules: {
-          voteTitle: [
-            { required: true, message: "评分主题不能为空", trigger: "blur" }
-          ],
-          state: [
-            { required: true, message: "评测状态不能为空", trigger: "blur" }
-          ],
-          percentage:[
-            { required: true, message: "评分占比不能为空", trigger: "blur" }
-          ]
-        },
-      }
+      // 评分规则初始数据
+      voteInitData:{
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        id: null,
+        pingceId: null,
+        pingceName: null,
+        khitemId: null,
+        khitemName: null,
+        khitemTypeid: null,
+        voteItems: null,
+        voteTitle: null,
+        vDescription: null,
+        sTime: null,
+        eTime: null,
+        maxNum: null,
+        percentage: null,
+        state: null,
+        itemIds: null
+      },
+      // 评分选项类型数据
+      vote_options: []
     }
   },
   watch: {
@@ -2065,45 +836,9 @@ export default {
   created() {
     this.getList();
     this.getDeptTree();
+    this.getVoteItemsList();
   },
   methods: {
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'dept') {
-        let treeList = this.deptOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value
-        }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: [])
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false
-      }
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 筛选节点
-    empfilterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    empNodeClick(data) {
-      this.emp.queryParams.deptId = data.id;
-      this.empQuery();
-    },
     /** 查询考核评测列表 */
     getList() {
       this.loading = true
@@ -2194,9 +929,6 @@ export default {
         this.open = true;
         this.title = "修改考核评测";
       })
-      // this.$nextTick(() => {
-      //   this.$refs.dept.setCheckedKeys(row.checkedKeys)
-      // })
     },
     /** 提交按钮 */
     submitForm() {
@@ -2205,8 +937,8 @@ export default {
           let flag = true;
           // 被考核对象 - 职工
           if(this.form.bkhdxType==='0'){
-            flag = false;
             if( this.form_bkh_zg && this.form_bkh_zg.length <1 ){
+              flag = false;
               this.$alert(`还没有选择被考核对象，请选择被考核对象！`, `提示`, {
                 type: 'warning'
               })
@@ -2385,73 +1117,147 @@ export default {
       this.pcSetUp.open = true;
       this.getItemVote();
     },
+    // 获取评测规则数据
     getItemVote(){
       getItemVote({
         id: this.pcSetUp.templateId,
         pingceId: this.pcSetUp.pingceId,
       }).then(response => {
-        this.pcSetUp.list = response.data.items;
+        let pcSetUpList = [];
+        response.data.items.forEach(item=>{
+          if (item.vote===null){
+            item.vote={...this.voteInitData}
+            item.vote.khitemId = item.id;
+            item.vote.khitemName = item.itemName;
+            item.vote.khitemTypeid = item.typeId;
+            item.vote.pingceId = this.pcSetUp.pingceId;
+            item.vote.pingceName = this.pcSetUp.pingceName;
+          }
+          if(item.vote.voteItems){
+            item.vote.voteItems = item.vote.voteItems.split(',');
+            let VoteItemsName = []
+            item.vote.voteItems.forEach(e => {
+              this.vote_options.forEach(e1 => {
+                if(e === e1.id){
+                  VoteItemsName.push(e1.vitemName)
+                }
+              })
+            })
+            item.vote['voteItemsName'] = VoteItemsName.join(',');
+          }
+          pcSetUpList.push(item);
+        })
+        this.pcSetUp.list = pcSetUpList;
       })
     },
-    // 投票评测设置
-    setUpTouPiao(row){
-      this.vote.open = true;
-      if(row.vote){
-        this.vote.form = row.vote;
-      }else {
-        this.vote.form = {
-          id: null,
-          voteTitle: null,
-          vDescription: null,
-          khitemId: null,
-          khitemName: null,
-          percentage: null,
-          pingceId: null,
-          pingceName: null,
-          sTime: null,
-          eTime: null,
-          maxNum: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
-          remark: null
-        }
-      }
-      this.vote.form.khitemId = row.id;
-      this.vote.form.khitemName = row.itemName;
-      this.vote.form.pingceId = this.pcSetUp.pingceId;
-      this.vote.form.pingceName = this.pcSetUp.pingceName;
-      this.vote.form['type'] = row.type;
+    // 评测规则设置
+    setUpTouPiao(row,index){
+      this.pcSetUp.xzhIndex = index;
+      this.getItemVote();
     },
-    voteSubmitForm(){
-      this.$refs["touPiaoForm"].validate(valid => {
-        if (valid) {
-          console.log(this.vote.form);
-          if (this.vote.form.id != null) {
-            updateVote(this.vote.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.vote.open = false
-              this.getItemVote()
-            })
-          } else {
-            addVote(this.vote.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.vote.open = false
-              this.getItemVote()
-            })
-          }
+    voteSubmitForm(row){
+      let flag = true;
+      let Vote = {...row.vote}
+      if(!Vote.voteTitle){
+        flag = false;
+        this.$alert(`评分主题不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.state){
+        flag = false;
+        this.$alert(`状态不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.sTime){
+        flag = false;
+        this.$alert(`开始时间不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.eTime){
+        flag = false;
+        this.$alert(`结束时间不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.id && !(new Date(Vote.sTime) > (new Date()))){
+        flag = false;
+        this.$alert(`开始时间需大于当前时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!(new Date(Vote.eTime) > (new Date()))){
+        flag = false;
+        this.$alert(`结束时间需大于当前时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!(new Date(Vote.eTime) > (new Date(Vote.sTime)))){
+        flag = false;
+        this.$alert(`结束时间需大于开始时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.typeId===1 && (!Vote.voteItems)){
+        flag = false;
+        this.$alert(`评分选项不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.typeId!==1 && (!Vote.maxNum)){
+        flag = false;
+        this.$alert(`最大值不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.typeId!==5 && (!Vote.percentage)){
+        flag = false;
+        this.$alert(`评分占比不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.voteTitle){
+        flag = false;
+        this.$alert(`评分主题不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.vDescription){
+        flag = false;
+        this.$alert(`评分详情描述不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      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(',')
+        }
+        addVote(Vote).then(response => {
+          this.$modal.msgSuccess("新增成功")
+          this.cancelVote()
+        })
+      }
     },
-    voteCancel(){
-      this.vote.open = false;
+    cancelVote(){
+      this.pcSetUp.xzhIndex = null;
+      this.getItemVote();
     },
     goVotepage(row){
       this.$router.push({ path: '/votepage', query: { id: row.vote.id }});
     },
-    goTotalScore(){
-      this.$router.push({ path: '/totalScore'});
+    goTotalScore(row){
+      this.khdf.open = true;
+      this.khdf.idRw = row.id;
     },
     // 生成评分账号
     handleAddsUser(row){
@@ -2473,7 +1279,55 @@ export default {
     },
     viewUser(){
       this.$router.push({ path: '/system/user', query: { pcId: 1}});
-    }
+    },
+    getVoteItemsList() {
+      listVote_items({
+        pageSize: 1000000,
+        pageNum: 1
+      }).then(response => {
+        this.vote_options = response.rows;
+        this.vote_options.forEach(e1 => {
+          e1.id = String(e1.id)
+        })
+      })
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type == 'dept') {
+        let treeList = this.deptOptions
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value
+        }
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type == 'dept') {
+        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: [])
+      }
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type == 'dept') {
+        this.form.deptCheckStrictly = value ? true: false
+      }
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    empfilterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    empNodeClick(data) {
+      this.emp.queryParams.deptId = data.id;
+      this.empQuery();
+    },
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/kaohe/vote/index.vue b/ruoyi-ui/src/views/kaohe/vote/index.vue
index 4edece5..80ad6e1 100644
--- a/ruoyi-ui/src/views/kaohe/vote/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote/index.vue
@@ -10,19 +10,13 @@
         />
       </el-form-item>
       <el-form-item label="开始时间" prop="sTime">
-        <el-date-picker clearable
-          v-model="queryParams.sTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
+        <el-date-picker clearable v-model="queryParams.sTime" type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开始时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结束时间" prop="eTime">
-        <el-date-picker clearable
-          v-model="queryParams.eTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
+        <el-date-picker clearable v-model="queryParams.eTime" type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -32,27 +26,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['kaohe:vote:add']"
-        >新增</el-button>
-      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['kaohe:vote:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -78,141 +51,166 @@
     </el-row>
 
     <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="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">
+      <el-table-column type="selection" width="55" align="center" fixed/>
+      <el-table-column label="主键" align="center" prop="id" width="55" fixed/>
+      <el-table-column label="考核任务名称" align="center" prop="pingceName" min-width="200" :show-overflow-tooltip="true" fixed/>
+      <el-table-column label="考核项名称" align="center" prop="khitemName" min-width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核项类型" align="center" prop="khitemTypeid" 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>
+          <span v-if="scope.row.khitemTypeid===1">选项评分</span>
+          <span v-if="scope.row.khitemTypeid===2">占比评分</span>
+          <span v-if="scope.row.khitemTypeid===5">单独评分</span>
         </template>
       </el-table-column>
-      <el-table-column label="评分主题" align="center" prop="voteTitle" min-width="140" :show-overflow-tooltip="true">
+      <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="120" :show-overflow-tooltip="true">
+      <el-table-column label="评分选项" align="center" prop="options" min-width="200" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <div v-if="scope.row.options.length>0">
-            <div v-for="item in scope.row.options" :key="item.value">{{ item.label }}</div>
+          <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>
+          <div v-else>
+            <div v-if=" scope.row.voteItems">
+              <div>{{ scope.row.voteItemsName }}</div>
+            </div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="最大值" align="center" prop="maxNum" min-width="60" :show-overflow-tooltip="true"/>
-      <el-table-column label="评分占比" align="center" prop="percentage" min-width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="开始时间" align="center" prop="sTime" min-width="100" :show-overflow-tooltip="true">
+      <el-table-column label="最大值" align="center" prop="maxNum" min-width="220" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sTime, '{y}-{m}-{d}') }}</span>
+          <div v-if="scope.$index===xzhIndex && scope.row.khitemTypeid!==1">
+            <el-input-number :disabled="!(new Date(scope.row.sTime) > (new Date()))"
+                             v-model="scope.row.maxNum" :min="0" style="width: 150px;"></el-input-number>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.maxNum }}</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="eTime" min-width="100" :show-overflow-tooltip="true">
+      <el-table-column label="评分占比" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.eTime, '{y}-{m}-{d}') }}</span>
+          <div v-if="scope.$index===xzhIndex && scope.row.khitemTypeid!==5">
+            <el-input-number :disabled="!(new Date(scope.row.sTime) > (new Date()))"
+                             v-model="scope.row.percentage" :precision="2" :step="0.01" :max="1" style="width: 150px;"></el-input-number>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.percentage }}</span>
+          </div>
         </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="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="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" prop="vote"  min-width="220" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div v-if="scope.$index===xzhIndex">
+            <el-date-picker clearable style="width: 100%;" v-model="scope.row.sTime"
+                            :disabled="!(new Date(scope.row.sTime) > (new Date()))"
+                            type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开始时间">
+            </el-date-picker>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.sTime }}</span>
+          </div>
+        </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">
+            <el-date-picker :disabled="!(new Date(scope.row.eTime) > (new Date()))"
+                            clearable style="width: 100%;"   v-model="scope.row.eTime"
+                            type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择结束时间">
+            </el-date-picker>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.eTime }}</span>
+          </div>
+        </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">
+            <el-input :disabled="!(new Date(scope.row.eTime) > (new Date()))"
+                      v-model="scope.row.vDescription" type="textarea" placeholder="请输入评分详情描述"/>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.vDescription }}</span>
+          </div>
+
+        </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">
+            <el-input :disabled="!(new Date(scope.row.eTime) > (new Date()))"
+                      v-model="scope.row.remark" type="textarea" placeholder="请输入备注"/>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.remark }}</span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['kaohe:vote:edit']"
-          >修改</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
-            v-if="scope.row.state !== '0'"
-            size="mini"
-            type="text"
-            icon="el-icon-thumb"
-            @click="goVotepage(scope.row)"
-          >去评分</el-button>
+          <div>
+            <el-button v-if="!(scope.$index=== xzhIndex)"
+                       size="mini"
+                       type="text"
+                       icon="el-icon-s-tools"
+                       v-hasPermi="['kaohe:vote:edit']"
+                       @click="handleUpdate(scope.$index)"
+            >修改</el-button>
+            <el-button v-if="scope.$index=== xzhIndex"
+                       size="mini"
+                       type="text"
+                       v-hasPermi="['kaohe:vote:edit']"
+                       @click="voteSubmit(scope.row)"
+            >确认</el-button>
+            <el-button v-if="scope.$index=== xzhIndex"
+                       size="mini"
+                       type="text"
+                       v-hasPermi="['kaohe:vote:edit']"
+                       @click="cancelVote"
+            >取消</el-button>
+            <el-button
+              v-if="(new Date(scope.row.sTime) < (new Date())) && (new Date(scope.row.eTime) > (new Date()))"
+              size="mini"
+              type="text"
+              icon="el-icon-thumb"
+              @click="goVotepage(scope.row)"
+            >去评分</el-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>
 
-<!--    <pagination
+    <pagination
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
-    />-->
+    />
 
-    <!-- 添加或修改投票评测对话框 -->
-    <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="请输入评分主题" :disabled="form.state!=='0'"/>
-        </el-form-item>
-        <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="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%;" :disabled="form.state!=='0'"
-                          v-model="form.sTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="eTime">
-          <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%" :disabled="form.state!=='0'">
-            <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="请输入内容" :disabled="form.state!=='0'"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listVote, getVote, delVote, addVote, updateVote } from "@/api/kaohe/vote"
+import { listVote_items } from "@/api/kaohe/vote_items"
 
 export default {
   name: "Vote",
@@ -233,13 +231,9 @@ export default {
       total: 0,
       // 投票评测表格数据
       voteList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
+        pageNum: 2,
         pageSize: 10,
         voteTitle: null,
         vDescription: null,
@@ -247,418 +241,41 @@ export default {
         eTime: null,
         maxNum: null,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        voteTitle: [
-          { required: true, message: "评分主题不能为空", trigger: "blur" }
-        ],
-      }
+      // 选中行Index
+      xzhIndex: null,
+      // 评分选项类型数据
+      vote_options: []
     }
   },
   created() {
-    this.getList()
+    this.getVoteItemsList();
   },
   methods: {
     /** 查询投票评测列表 */
     getList() {
       this.loading = true
       listVote(this.queryParams).then(response => {
-        // this.voteList = response.rows
-        this.voteList = [{
-          id:1,
-          index: 0,
-          index1: 0,
-          type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '政治建设',
-          voteTitle: '政治建设评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.2, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '政治建设评分详情描述', //评分详情描述
-          remark: '政治建设备注', //备注
-        },
-        {
-          id:2,
-          index: 0,
-          index1: 1,
-          type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '宣传与思想政治工作',
-          voteTitle: '宣传与思想政治工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '宣传与思想政治工作评分详情描述', //评分详情描述
-          remark: '宣传与思想政治工作备注', //备注
-        },{
-          id:3,
-          index: 0,
-          index1: 2,
-          type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '作风纪律',
-          voteTitle: '作风纪律评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '作风纪律评分详情描述', //评分详情描述
-          remark: '作风纪律备注', //备注
-        },
-          {
-          id: 4,
-          index: 0,
-          index1: 3,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '安全稳定',
-          voteTitle: '安全稳定评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '安全稳定评分详情描述', //评分详情描述
-          remark: '安全稳定备注', //备注
-        },{
-          id: 5,
-          index: 0,
-          index1: 4,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '师资队伍与师德师风',
-          voteTitle: '师资队伍与师德师风评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '师资队伍与师德师风评分详情描述', //评分详情描述
-          remark: '师资队伍与师德师风备注', //备注
-        },
-          {
-          id: 6,
-          index: 0,
-          index1: 5,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '财务工作',
-          voteTitle: '财务工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '财务工作评分详情描述', //评分详情描述
-          remark: '财务工作备注', //备注
-        },{
-          id: 7,
-          index: 0,
-          index1: 6,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '依法治校与综合治理',
-          voteTitle: '依法治校与综合治理评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.05, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '依法治校与综合治理评分详情描述', //评分详情描述
-          remark: '依法治校与综合治理备注', //备注
-        },
-          {
-          id: 8,
-          index: 0,
-          index1: 7,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '国有资产管理',
-          voteTitle: '国有资产管理评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.02, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '国有资产管理评分详情描述', //评分详情描述
-          remark: '国有资产管理备注', //备注
-        },{
-          id: 9,
-          index: 0,
-          index1: 8,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '实验室管理',
-          voteTitle: '实验室管理评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.03, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '实验室管理评分详情描述', //评分详情描述
-          remark: '实验室管理备注', //备注
-        },
-          {
-          id: 10,
-          index: 0,
-          index1: 9,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '招生就业与创新创业工作',
-          voteTitle: '招生就业与创新创业工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '招生就业与创新创业工作评分详情描述', //评分详情描述
-          remark: '招生就业与创新创业工作备注', //备注
-        },{
-          id: 11,
-          index: 0,
-          index1: 10,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '对外交流与合作',
-          voteTitle: '对外交流与合作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '对外交流与合作评分详情描述', //评分详情描述
-          remark: '对外交流与合作备注', //备注
-        },
-          {
-          id: 12,
-          index: 1,
-          index1: 0,
-            type: 2,
-          pingceName: '事业发展',
-          khitemName: '教学工作',
-          voteTitle: '教学工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.2, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '教学工作评分详情描述', //评分详情描述
-          remark: '教学工作备注', //备注
-        },{
-          id: 13,
-          index: 1,
-          index1: 1,
-            type: 2,
-          pingceName: '事业发展',
-          khitemName: '科研工作',
-          voteTitle: '科研工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '科研工作评分详情描述', //评分详情描述
-          remark: '科研工作备注', //备注
-        },
-          {
-          id: 14,
-          index: 1,
-          index1: 2,
-            type: 2,
-          pingceName: '事业发展',
-          khitemName: '学生工作',
-          voteTitle: '学生工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '学生工作评分详情描述', //评分详情描述
-          remark: '学生工作备注', //备注
-        },{
-          id:15,
-          index: 2,
-          index1: 0,
-            type: 1,
-          pingceName: '民主测评',
-          khitemName: '师院领导班子',
-          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: '师院领导班子备注', //备注
-        },
-          {
-            id: 16,
-            index: 2,
-            index1: 1,
-            type: 1,
-            pingceName: '民主测评',
-            khitemName: '师院处级领导干部',
-            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: '师院处级领导干部备注', //备注
-          },
-          {
-            id: 17,
-            index: 2,
-            index1: 2,
-            type: 1,
-            pingceName: '民主测评',
-            khitemName: '服务对象代表',
-            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: '服务对象代表备注', //备注
-          },
-          {
-            id: 18,
-            index: 3,
-            index1: 0,
-            type: 5,
-            pingceName: '特色创新',
-            khitemName: '分数（满分10分）',
-            voteTitle: '特色创新分数（满分10分）评分',
-            options: [],
-            maxNum: 10,
-            percentage: null, //评分占比
-            state: '2', //状态
-            sTime: '2025-06-15', //开始时间
-            eTime: '2025-06-20', //结束时间
-            vDescription: '特色创新分数（满分10分）评分详情描述', //评分详情描述
-            remark: '特色创新分数（满分10分）备注', //备注
-          },
-          {
-            id: 19,
-            index: 4,
-            index1: 0,
-            type: 5,
-            pingceName: '综合评价',
-            khitemName: '分数（加减分项，值域可以为负）',
-            voteTitle: '综合评价分数（加减分项，值域可以为负）',
-            options: [],
-            maxNum: 10,
-            percentage: null, //评分占比
-            state: '2', //状态
-            sTime: '2025-06-15', //开始时间
-            eTime: '2025-06-20', //结束时间
-            vDescription: '综合评价分数（加减分项，值域可以为负）评分详情描述', //评分详情描述
-            remark: '综合评价分数（加减分项，值域可以为负）备注', //备注
-          }];
-        this.total = 3
-        this.loading = false
+        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;
+        this.total = response.total;
+        this.loading = false;
       })
     },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        voteTitle: null,
-        vDescription: null,
-        sTime: null,
-        eTime: null,
-        maxNum: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      }
-      this.resetForm("form")
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -675,54 +292,118 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加投票评测"
-    },
     /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      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 = "修改投票评测"
-      })*/
+    handleUpdate(index) {
+      this.xzhIndex = index;
+      this.getList();
+    },
+    cancelVote(){
+      this.xzhIndex = null;
+      this.getList();
     },
     /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        /*if (valid) {
-          if (this.form.id != null) {
-            updateVote(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addVote(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
-          }
-        }*/
-      })
+    voteSubmit(row) {
+      let flag = true;
+      let Vote = {...row}
+      if(!Vote.voteTitle){
+        flag = false;
+        this.$alert(`评分主题不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.state){
+        flag = false;
+        this.$alert(`状态不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.sTime){
+        flag = false;
+        this.$alert(`开始时间不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.eTime){
+        flag = false;
+        this.$alert(`结束时间不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.id && !(new Date(Vote.sTime) > (new Date()))){
+        flag = false;
+        this.$alert(`开始时间需大于当前时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!(new Date(Vote.eTime) > (new Date()))){
+        flag = false;
+        this.$alert(`结束时间需大于当前时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!(new Date(Vote.eTime) > (new Date(Vote.sTime)))){
+        flag = false;
+        this.$alert(`结束时间需大于开始时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.khitemTypeid===1 && (!Vote.voteItems)){
+        flag = false;
+        this.$alert(`评分选项不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.khitemTypeid!==1 && (!Vote.maxNum)){
+        flag = false;
+        this.$alert(`最大值不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.khitemTypeid!==5 && (!Vote.percentage)){
+        flag = false;
+        this.$alert(`评分占比不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.voteTitle){
+        flag = false;
+        this.$alert(`评分主题不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.vDescription){
+        flag = false;
+        this.$alert(`评分详情描述不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      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(',')
+        }
+        addVote(Vote).then(response => {
+          this.$modal.msgSuccess("新增成功")
+          this.cancelVote()
+        })
+      }
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      /*const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除投票评测编号为"' + ids + '"的数据项？').then(function() {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除评分任务编号为"' + ids + '"的数据项？').then(function() {
         return delVote(ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})*/
+      }).catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -731,11 +412,23 @@ export default {
       }, `vote_${new Date().getTime()}.xlsx`)*/
     },
     goVotepage(row){
-      this.$router.push({ path: '/votepage', query: { index: row.index, index1: row.index1 }});
+      this.$router.push({ path: '/votepage', query: { id: row.id }});
     },
     goVoteEmp(row){
       this.$router.push({ path: '/toupiao/vote_emp', query: { id: row.id }});
-    }
+    },
+    getVoteItemsList() {
+      listVote_items({
+        pageSize: 1000000,
+        pageNum: 1
+      }).then(response => {
+        this.vote_options = response.rows;
+        this.vote_options.forEach(e1 => {
+          e1.id = String(e1.id)
+        });
+        this.getList();
+      })
+    },
   }
 }
 </script>