diff --git a/ruoyi-ui/src/api/kaohe/gather.js b/ruoyi-ui/src/api/kaohe/gather.js
index a2b5f76..0b3189b 100644
--- a/ruoyi-ui/src/api/kaohe/gather.js
+++ b/ruoyi-ui/src/api/kaohe/gather.js
@@ -18,7 +18,7 @@ export function getGather(id) {
 }
 
 // 新增生成汇总
-export function addGather(data) {
+export function addGather1(data) {
   return request({
     url: '/kaohe/gather',
     method: 'post',
@@ -26,6 +26,15 @@ export function addGather(data) {
   })
 }
 
+// 新增生成汇总
+export function addGather(data) {
+  return request({
+    url: '/kaohe/gather/generateSum',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改生成汇总
 export function updateGather(data) {
   return request({
diff --git a/ruoyi-ui/src/api/kaohe/pingce.js b/ruoyi-ui/src/api/kaohe/pingce.js
index 92a4693..122ce4f 100644
--- a/ruoyi-ui/src/api/kaohe/pingce.js
+++ b/ruoyi-ui/src/api/kaohe/pingce.js
@@ -53,8 +53,6 @@ export function getItemVote(query) {
   })
 }
 
-
-
 // 批量添加账号接口
 export function addsUser(data) {
   return request({
diff --git a/ruoyi-ui/src/components/RecursiveTree/index.vue b/ruoyi-ui/src/components/RecursiveTree/index.vue
index 0ac7721..ed63293 100644
--- a/ruoyi-ui/src/components/RecursiveTree/index.vue
+++ b/ruoyi-ui/src/components/RecursiveTree/index.vue
@@ -2,23 +2,23 @@
   <div class="tree-node">
     <div class="node-content">
       <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/>
-      <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type===0"/>
+      <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type1==='0'"/>
 
-      <el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type===1||nodeData.type===2" style="width: 250px;"
+      <el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type1==='1'||nodeData.type1==='2'" style="width: 250px;"
                 v-model="nodeData.pcTitle" @focus.stop="changeKaohe">
         <i slot="suffix" class="el-input__icon el-icon-search" style="color: #1890ff; font-weight: bolder"></i>
       </el-input>
 
       <!--评分占比-->
       <el-input-number style="margin-left: 5px;" v-model="nodeData.zb" :precision="2" :step="0.01" :min="0.01"
-                       :max="1" v-if="nodeData.type===1||nodeData.type===0"></el-input-number>
+                       :max="1" v-if="nodeData.type1==='1'||nodeData.type1==='0'"></el-input-number>
 
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(0)"
-                 v-if="isRoot||nodeData.type===0">标题</el-button>
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(1)"
-                 v-if="isRoot||nodeData.type===0">占比引用</el-button>
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(2)"
-                 v-if="isRoot||nodeData.type===0">不占比引用</el-button>
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild('0')"
+                 v-if="isRoot||nodeData.type1==='0'">标题</el-button>
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild('1')"
+                 v-if="isRoot||nodeData.type1==='0'">占比引用</el-button>
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild('2')"
+                 v-if="isRoot||nodeData.type1==='0'">不占比引用</el-button>
       <el-button type="danger" icon="el-icon-delete" size="mini" @click.stop="removeNode" v-if="!isRoot"></el-button>
     </div>
     <div class="children" v-if="nodeData.data && nodeData.data.length">
@@ -57,14 +57,14 @@ export default {
     onChangeKaohe(parentNode){
       this.$emit('change-kaohe', parentNode)
     },
-    addChild(type) {
-      this.$emit('add-child', this.nodeData, type)
+    addChild(type1) {
+      this.$emit('add-child', this.nodeData, type1)
     },
     removeNode() {
       this.$emit('remove-node', this.nodeData)
     },
-    onAddChild(parentNode, type) {
-      this.$emit('add-child', parentNode, type)
+    onAddChild(parentNode, type1) {
+      this.$emit('add-child', parentNode, type1)
     },
     onRemoveNode(nodeToRemove) {
       this.$emit('remove-node', nodeToRemove)
diff --git a/ruoyi-ui/src/components/TableColumn/index.vue b/ruoyi-ui/src/components/TableColumn/index.vue
index 0eaa466..89f92a7 100644
--- a/ruoyi-ui/src/components/TableColumn/index.vue
+++ b/ruoyi-ui/src/components/TableColumn/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-table-column v-if="!isLeaf" :label="column.label" header-align="center">
     <template v-for="child in column.children">
-      <table-column :key="child.label" :column="child" />
+      <table-column :key="child.prop" :column="child" />
     </template>
   </el-table-column>
   <el-table-column v-else :label="column.label" :prop="column.prop" header-align="center"/>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index a8f4e4e..2461393 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -12,7 +12,7 @@
                 v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) > (new Date()))"
                 @click="goVotepage(item)"
               >
-              <i class="el-icon-thumb"></i> 去评分
+              <i class="el-icon-thumb" v-hasPermi="['kaohe:vote_emp:edit']"></i> 去评分
             </el-tag>
             <el-tag type="info" v-if="new Date(item.sTime) > (new Date())">未开始</el-tag>
             <el-tag type="info" v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) < (new Date()))">已结束</el-tag>
diff --git a/ruoyi-ui/src/views/kaohe/gather/index.vue b/ruoyi-ui/src/views/kaohe/gather/index.vue
index 142143e..efd045c 100644
--- a/ruoyi-ui/src/views/kaohe/gather/index.vue
+++ b/ruoyi-ui/src/views/kaohe/gather/index.vue
@@ -26,7 +26,7 @@
           v-hasPermi="['kaohe:gather:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -36,7 +36,7 @@
           @click="handleUpdate"
           v-hasPermi="['kaohe:gather:edit']"
         >修改</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -64,19 +64,27 @@
     <el-table v-loading="loading" :data="gatherList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="一级标题" align="center" prop="hzName" />
-      <el-table-column label="表头" align="center" prop="tableHeader" />
-      <el-table-column label="表数据" align="center" prop="tableData" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="一级标题" align="center" prop="hzName" min-width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="表头" align="center" prop="tableHeader" min-width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="表数据" align="center" prop="tableData" min-width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remark" min-width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
-          <el-button
+<!--          <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['kaohe:gather:edit']"
-          >修改</el-button>
+          >修改</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="viewKaoHeScore(scope.row)"
+            v-hasPermi="['kaohe:gather:query']"
+          >查看生成汇总
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -150,6 +158,20 @@
       </div>
     </el-dialog>
 
+    <!--查看生成汇总-->
+    <el-dialog title="查看生成汇总" :visible.sync="khdf.open" width="90%" top="20px !important">
+
+      <el-table border :data="khdf.list" height="650px">
+        <template v-for="column in khdf.tableHeader">
+          <table-column :key="column.label" :column="column" />
+        </template>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="khdf.open=false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -164,6 +186,12 @@ export default {
   components: { TableColumn, RecursiveTree },
   data() {
     return {
+      // 考核得分
+      khdf:{
+        open: false,
+        list: [],
+        tableHeader: []
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -271,7 +299,11 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.treeData);
+      addGather(JSON.stringify(this.treeData)).then(response => {
+        this.$modal.msgSuccess("新增成功")
+        this.open = false
+        this.getList();
+      })
       /*this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -306,18 +338,41 @@ export default {
         ...this.queryParams
       }, `gather_${new Date().getTime()}.xlsx`)
     },
-    handleAddChild(parentNode,type) {
+    handleAddChild(parentNode,type1) {
       if (!parentNode.data) {
         this.$set(parentNode, 'data', [])
       }
-      parentNode.data.push({
-        type: type,
-        title: null,
-        id: null,
-        zb: null,
-        pcTitle: null,
-        data: []
-      })
+      if(type1==='0'){
+        parentNode.data.push({
+          type1: type1,
+          type: '0',
+          title: null,
+          id: null,
+          zb: null,
+          pcTitle: null,
+          data: []
+        })
+      }
+      if(type1==='1'){
+        parentNode.data.push({
+          type1: type1,
+          type: '1',
+          title: null,
+          id: null,
+          zb: null,
+          pcTitle: null
+        })
+      }
+      if(type1==='2'){
+        parentNode.data.push({
+          type1: type1,
+          type: '1',
+          title: null,
+          id: null,
+          pcTitle: null
+        })
+      }
+
     },
     handleRemoveNode(nodeToRemove) {
       const removeNode = (parent, node) => {
@@ -354,9 +409,46 @@ export default {
     // 引用考核任务选择 选中数据
     khrwRowChange(row) {
       this.khrw.parentNode.id = row.id;
+      this.khrw.parentNode.title = row.pcTitle;
       this.khrw.parentNode.pcTitle = row.pcTitle;
       this.khrw.open = false;
     },
+    // 查看生成汇总
+    viewKaoHeScore(row){
+      this.khdf.list = [];
+      this.khdf.tableHeader = [];
+      this.khdf.open = true;
+      this.reset()
+      getGather(row.id).then(response => {
+        let khdfList = JSON.parse(response.data.tableData);
+        khdfList.forEach(item=> {
+          item.jxdwldbzkhzf['khdx'] = item.khdx;
+        })
+        this.khdf.list = khdfList;
+
+        let btTabelTree = JSON.parse(response.data.tableHeader);
+        btTabelTree.forEach(item => {
+          item.prop = item.name;
+          if(item.children && item.children.length>0){
+            this.setProp(item.children, item.prop)
+          }
+        })
+        this.khdf.tableHeader = btTabelTree;
+      })
+    },
+    // 递归函数 设置prop参数
+    setProp(list, prop){
+      list.forEach(item=>{
+        if(prop){
+          item.prop = prop+'.'+item.name;
+        }else {
+          item.prop = item.name;
+        }
+        if(item.children && item.children.length>0){
+          this.setProp(item.children, item.prop)
+        }
+      })
+    },
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue
index e548b0c..84d6f5f 100644
--- a/ruoyi-ui/src/views/kaohe/pingce/index.vue
+++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue
@@ -80,6 +80,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="pingceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" fixed/>
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="考核任务名称" align="center" prop="pcTitle" />
       <el-table-column label="考核任务描述" align="center" prop="pcDescription" />
@@ -90,7 +91,7 @@
         </template>
       </el-table-column>
       <el-table-column label="考核任务备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="320px" >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280px" >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -99,13 +100,6 @@
             @click="handleSetUp(scope.row, scope.$index)"
           >发布考核
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['kaohe:pingce:edit']"
-          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -119,7 +113,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewKaoHeScore(scope.row)"
-            v-hasPermi="['kaohe:kh_result:generate']"
+            v-hasPermi="['kaohe:kh_result:list']"
           >查看考核得分
           </el-button>
           <el-button
@@ -136,13 +130,6 @@
             @click="viewUser(scope.row)"
           >查看评分账号
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['kaohe:pingce:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -447,12 +434,12 @@
               <el-button v-if="!(scope.$index=== pcSetUp.xzhIndex)"
                 size="mini"
                 type="text"
-                icon="el-icon-s-tools"
+                icon="el-icon-s-tools" v-hasPermi="['kaohe:vote:add', 'kaohe:vote:edit']"
                 @click="setUpTouPiao(scope.row,scope.$index)"
               >编辑评分规则</el-button>
 
               <el-button v-if="scope.$index=== pcSetUp.xzhIndex"
-                size="mini"
+                size="mini" v-hasPermi="['kaohe:vote:add', 'kaohe:vote:edit']"
                 type="text"
                 @click="voteSubmitForm(scope.row)"
               >确认</el-button>
@@ -469,6 +456,7 @@
                 type="text"
                 icon="el-icon-thumb"
                 @click="goVotepage(scope.row)"
+                v-hasPermi="['kaohe:vote_emp:edit']"
               >去评分</el-button>
 
             </div>
diff --git a/ruoyi-ui/src/views/kaohe/vote/index.vue b/ruoyi-ui/src/views/kaohe/vote/index.vue
index c280ea5..d6c03d1 100644
--- a/ruoyi-ui/src/views/kaohe/vote/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote/index.vue
@@ -184,6 +184,7 @@
               type="text"
               icon="el-icon-thumb"
               @click="goVotepage(scope.row)"
+              v-hasPermi="['kaohe:vote_emp:edit']"
             >去评分</el-button>
           </div>
         </template>
diff --git a/ruoyi-ui/src/views/votepage.vue b/ruoyi-ui/src/views/votepage.vue
index eff9f75..7463efc 100644
--- a/ruoyi-ui/src/views/votepage.vue
+++ b/ruoyi-ui/src/views/votepage.vue
@@ -39,7 +39,7 @@
     </el-row>
 
     <div style="text-align: center; margin-top: 40px;">
-      <el-button type="primary" icon="el-icon-s-promotion" @click="VoteSubmit">提交评分</el-button>
+      <el-button type="primary" icon="el-icon-s-promotion" @click="VoteSubmit" v-hasPermi="['kaohe:vote_emp:edit']">提交评分</el-button>
     </div>
 
   </div>