diff --git a/ruoyi-ui/src/api/kaohe/pingce.js b/ruoyi-ui/src/api/kaohe/pingce.js
index 0e23b7f..0673e02 100644
--- a/ruoyi-ui/src/api/kaohe/pingce.js
+++ b/ruoyi-ui/src/api/kaohe/pingce.js
@@ -63,3 +63,13 @@ export function addsUser(data) {
     params: data
   })
 }
+
+
+// 新增考核评测
+export function generateResult(data) {
+  return request({
+    url: '/kaohe/kh_result/generateResult',
+    method: 'post',
+    params: data
+  })
+}
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index d0e9784..dd207e8 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -12,6 +12,8 @@ const user = {
     name: '',
     nickName: '',
     avatar: '',
+    pcId: null,
+    itemIds: null,
     roles: [],
     permissions: []
   },
@@ -32,6 +34,12 @@ const user = {
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
+    SET_PCID: (state, pcId) => {
+      state.pcId = pcId
+    },
+    SET_ITEMIDS: (state, itemIds) => {
+      state.itemIds = itemIds
+    },
     SET_ROLES: (state, roles) => {
       state.roles = roles
     },
@@ -77,6 +85,8 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_NICK_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
+          commit('SET_PCID', user.pcId)
+          commit('SET_ITEMIDS', user.itemIds)
           /* 初始密码提示 */
           /*if(res.isDefaultModifyPwd) {
             MessageBox.confirm('您的密码还是初始密码，请修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 4770ee4..a8f4e4e 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -1,30 +1,32 @@
 <template>
   <div class="app-container">
-    <div>
-      <div v-for="item in voteList" :key="item.id" class="voteitems">
-        <div class="left">
-          <div class="vote_title">{{ item.voteTitle }}</div>
-          <div class="vote_time">{{ item.sTime + ' - ' + item.eTime }}</div>
+    <el-row :gutter="10">
+      <el-col v-for="item in voteList" :key="item.id" :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+        <div class="voteitems">
+          <div class="_title">考核主题：{{ item.voteTitle }}</div>
+          <div class="_title">考核任务：{{ item.pingceName }}</div>
+          <div class="_time">{{ item.sTime + ' - ' + item.eTime }}</div>
+          <div>
+            <el-tag
+                type="success"
+                v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) > (new Date()))"
+                @click="goVotepage(item)"
+              >
+              <i class="el-icon-thumb"></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>
+          </div>
         </div>
-        <div class="right">
-          <el-button
-            v-if="(new Date(item.sTime) < (new Date())) && (new Date(item.eTime) > (new Date()))"
-            size="mini"
-            type="text"
-            icon="el-icon-thumb"
-            @click="goVotepage(item)"
-          >去评分</el-button>
-        </div>
-      </div>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
+      </el-col>
+    </el-row>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
@@ -38,7 +40,9 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        itemIds: null,
+        pingceId: null,
       },
       // 总条数
       total: 0,
@@ -46,6 +50,8 @@ export default {
     }
   },
   created() {
+    this.queryParams.pingceId = this.$store.state.user.pcId;
+    this.queryParams.itemIds = this.$store.state.user.itemIds;
     this.getList();
   },
   methods: {
@@ -64,40 +70,35 @@ export default {
 
 <style scoped lang="scss">
 .voteitems{
-  display: flex;
-  justify-content: space-between;
-  width: 800px;
   font-size: 14px;
   color: #333;
   border: 1px solid #eeeeee;
-  margin-top: 10px;
-  height: 60px;
-  line-height: 30px;
-  padding: 0 10px;
+  height: 115px;
+  margin-bottom: 10px;
+  padding: 10px;
+  min-width: 300px;
   box-sizing: border-box;
 
-  .left{
-    width: 700px;
-
-    .vote_title{
-      white-space: nowrap; /* 防止文本换行 */
-      overflow: hidden;    /* 隐藏溢出的文本 */
-      text-overflow: ellipsis; /* 显示省略号 */
-    }
-
-    .vote_time{
-      color: #af5e5e;
-    }
+  ._title{
+    width: 100%;
+    height: 24px;
+    white-space: nowrap; /* 防止文本换行 */
+    overflow: hidden; /* 隐藏溢出的内容 */
+    text-overflow: ellipsis; /* 溢出内容显示为省略号 */
+    color: #555555;
   }
 
-  .right{
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    height: 60px;
+  ._time{
+    font-size: 12px;
+    height: 20px;
+    color: #af5e5e;
   }
 }
 
+.el-tag{
+  cursor: pointer;
+}
+
 .pagination-container{
   margin-top: 30px;
   justify-content: flex-start;
diff --git a/ruoyi-ui/src/views/kaohe/kh_result/index.vue b/ruoyi-ui/src/views/kaohe/kh_result/index.vue
index eea0e3f..22a68e3 100644
--- a/ruoyi-ui/src/views/kaohe/kh_result/index.vue
+++ b/ruoyi-ui/src/views/kaohe/kh_result/index.vue
@@ -74,8 +74,8 @@
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="考核id" align="center" prop="pcId" />
       <el-table-column label="考核名称" align="center" prop="pcName" />
-      <el-table-column label="表头" align="center" prop="tableHeader" />
-      <el-table-column label="表数据" align="center" prop="tableData" />
+      <el-table-column label="表头" align="center" prop="tableHeader" :show-overflow-tooltip="true" min-width="180"/>
+      <el-table-column label="表数据" align="center" prop="tableData" :show-overflow-tooltip="true" min-width="180"/>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue
index f39f417..9d0c8f8 100644
--- a/ruoyi-ui/src/views/kaohe/pingce/index.vue
+++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue
@@ -111,6 +111,7 @@
             type="text"
             icon="el-icon-s-grid"
             @click="goTotalScore(scope.row)"
+            v-hasPermi="['kaohe:kh_result:generate']"
           >考核得分
           </el-button>
           <el-button
@@ -494,98 +495,12 @@
 
     <!--     考核得分-->
     <el-dialog title="考核得分" :visible.sync="khdf.open" width="90%">
-      <div v-show="khdf.idRw===1">
-        <el-table border :data="khdf.list1" >
-          <el-table-column label="党建与行政目标任务" header-align="center">
-            <el-table-column header-align="center" prop="bumen" label="部门" width="150px"></el-table-column>
-            <el-table-column align="center" prop="khx1" label="政治建设"></el-table-column>
-            <el-table-column align="center" prop="zb1" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx2" label="宣传与思想政治工作" width="140px"></el-table-column>
-            <el-table-column align="center" prop="zb2" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx3" label="作风纪律"></el-table-column>
-            <el-table-column align="center" prop="zb3" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx4" label="安全稳定"></el-table-column>
-            <el-table-column align="center" prop="zb4" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx5" label="师资队伍与师德师风" width="140px"></el-table-column>
-            <el-table-column align="center" prop="zb5" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx6" label="财务工作"></el-table-column>
-            <el-table-column align="center" prop="zb6" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx7" label="依法治校与综合治理" width="140px"></el-table-column>
-            <el-table-column align="center" prop="zb7" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx8" label="国有资产管理" width="120px"></el-table-column>
-            <el-table-column align="center" prop="zb8" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx9" label="实验室管理" width="120px"></el-table-column>
-            <el-table-column align="center" prop="zb9" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx10" label="招生就业与创新创业工作" width="170px"></el-table-column>
-            <el-table-column align="center" prop="zb10" label="占比" width="55px"></el-table-column>
-            <el-table-column align="center" prop="khx11" label="对外交流与合作" width="120px"></el-table-column>
-            <el-table-column align="center" prop="zb11" label="占比" width="55px"></el-table-column>
-          </el-table-column>
-          <el-table-column align="center" prop="zongfen" label="总分" width="70px"></el-table-column>
-        </el-table>
-      </div>
-      <div v-show="khdf.idRw===2">
-        <el-table border :data="khdf.list2">
-          <el-table-column label="事业发展" header-align="center">
-            <el-table-column header-align="center" prop="bumen" label="部门"></el-table-column>
-            <el-table-column align="center" prop="khx1" label="教学工作"></el-table-column>
-            <el-table-column align="center" prop="zb1" label="占比"></el-table-column>
-            <el-table-column align="center" prop="khx2" label="科研工作"></el-table-column>
-            <el-table-column align="center" prop="zb2" label="占比"></el-table-column>
-            <el-table-column align="center" prop="khx3" label="学生工作"></el-table-column>
-            <el-table-column align="center" prop="zb3" label="占比"></el-table-column>
-          </el-table-column>
-          <el-table-column align="center" prop="zongfen" label="总分"></el-table-column>
-        </el-table>
-      </div>
-      <div v-show="khdf.idRw===3">
-        <el-table border :data="khdf.list3">
-          <el-table-column label="民主测评" header-align="center">
-            <el-table-column header-align="center" prop="bumen" label="部门"></el-table-column>
-            <el-table-column header-align="center" label="师院领导班子">
-              <el-table-column align="center" prop="yx1" label="优秀"></el-table-column>
-              <el-table-column align="center" prop="hg1" label="合格"></el-table-column>
-              <el-table-column align="center" prop="jbhg1" label="基本合格"></el-table-column>
-              <el-table-column align="center" prop="bhg1" label="不合格"></el-table-column>
-            </el-table-column>
-            <el-table-column align="center" prop="khx1" label="得分"></el-table-column>
-            <el-table-column align="center" prop="zb1" label="占比"></el-table-column>
-            <el-table-column header-align="center" label="师院处级领导干部">
-              <el-table-column align="center" prop="yx2" label="优秀"></el-table-column>
-              <el-table-column align="center" prop="hg2" label="合格"></el-table-column>
-              <el-table-column align="center" prop="jbhg2" label="基本合格"></el-table-column>
-              <el-table-column align="center" prop="bhg2" label="不合格"></el-table-column>
-            </el-table-column>
-            <el-table-column align="center" prop="khx2" label="得分"></el-table-column>
-            <el-table-column align="center" prop="zb2" label="占比"></el-table-column>
-            <el-table-column header-align="center" label="服务对象代表">
-              <el-table-column align="center" prop="yx3" label="优秀"></el-table-column>
-              <el-table-column align="center" prop="hg3" label="合格"></el-table-column>
-              <el-table-column align="center" prop="jbhg3" label="基本合格"></el-table-column>
-              <el-table-column align="center" prop="bhg3" label="不合格"></el-table-column>
-            </el-table-column>
-            <el-table-column align="center" prop="khx3" label="得分"></el-table-column>
-            <el-table-column align="center" prop="zb3" label="占比"></el-table-column>
-          </el-table-column>
-          <el-table-column align="center" prop="zongfen" label="总分"></el-table-column>
-        </el-table>
-      </div>
-      <div v-show="khdf.idRw===4">
-        <el-table border :data="khdf.list4">
-          <el-table-column label="特色创新" header-align="center">
-            <el-table-column header-align="center" prop="bumen" label="部门"></el-table-column>
-            <el-table-column align="center" prop="df" label="分数（满分10分）"></el-table-column>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div v-show="khdf.idRw===5">
-        <el-table border :data="khdf.list5">
-          <el-table-column label="综合评价" header-align="center">
-            <el-table-column header-align="center" prop="bumen" label="部门"></el-table-column>
-            <el-table-column align="center" prop="df" label="分数（加减分项，值域可以为负）"></el-table-column>
-          </el-table-column>
-        </el-table>
-      </div>
+
+      <el-table border :data="khdf.list">
+        <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>
@@ -596,7 +511,8 @@
 </template>
 
 <script>
-import { listPingce, getPingce, delPingce, addPingce, updatePingce, getItemVote, addsUser } from "@/api/kaohe/pingce"
+import { listPingce, getPingce, delPingce, addPingce, updatePingce, getItemVote, addsUser, generateResult } from "@/api/kaohe/pingce"
+import { listKh_result } from "@/api/kaohe/kh_result"
 import { deptTreeSelect } from "@/api/system/user";
 import { listTemplate } from "@/api/kaohe/template"
 import { listEmployee } from "@/api/kaohe/employee"
@@ -604,92 +520,18 @@ 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";
+import TableColumn from '@/components/TableColumn'
 
 export default {
   name: "Pingce",
   dicts: ['kh_state', 'sys_user_sex', 'bkhdx_type'],
-  components: { Treeselect },
+  components: { Treeselect, TableColumn },
   data() {
     return {
       khdf:{
         open: false,
-        idRw: null,
-        list1: [
-          {
-            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'
-          }
-        ],
-        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'
-          }
-        ],
-        list4: [
-          {
-            bumen: '生命科学系',
-            df: '8',
-          }
-        ],
-        list5: [
-          {
-            bumen: '生命科学系',
-            df: '-3',
-          }
-        ]
+        list: [],
+        tableHeader: []
       },
       deptExpand: true,
       deptNodeAll: false,
@@ -1245,10 +1087,6 @@ export default {
     goVotepage(row){
       this.$router.push({ path: '/votepage', query: { id: row.vote.id }});
     },
-    goTotalScore(row){
-      this.khdf.open = true;
-      this.khdf.idRw = row.id;
-    },
     // 生成评分账号
     handleAddsUser(row){
       this.$prompt('请输入生成数量', '提示', {
@@ -1318,6 +1156,56 @@ export default {
       this.emp.queryParams.deptId = data.id;
       this.empQuery();
     },
+    goTotalScore(row){
+      this.khdf.list = [];
+      this.khdf.tableHeader = [];
+      this.khdf.open = true;
+      generateResult({
+        id: row.id,
+        pcTitle: row.pcTitle,
+        bkhdxType: row.bkhdxType,
+      }).then(response => {
+        this.getListKhResult(row.id)
+      }).catch(e=>{
+        this.getListKhResult(row.id)
+      })
+    },
+    getListKhResult(pcId){
+      listKh_result({
+        pageNum: 1,
+        pageSize: 10,
+        pcId: pcId,
+      }).then(response => {
+        this.khdf.list = JSON.parse(response.rows[0].tableData);
+
+        let btTabelTree = JSON.parse(response.rows[0].tableHeader);
+        btTabelTree.forEach(item => {
+          if(item.prop){
+            item.prop = item.name;
+          }
+          if(item.children && item.children.length>0){
+            this.setProp(item.children, item.prop)
+          }
+        })
+
+        this.khdf.tableHeader = btTabelTree;
+
+        console.log(this.khdf.list,8787);
+        console.log(this.khdf.tableHeader,9898);
+      })
+    },
+    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/totalScore/index.vue b/ruoyi-ui/src/views/kaohe/totalScore/index.vue
index fb876ca..314bbb4 100644
--- a/ruoyi-ui/src/views/kaohe/totalScore/index.vue
+++ b/ruoyi-ui/src/views/kaohe/totalScore/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-<!--    <div>
+    <div>
       <div style="display: flex;align-items: center;">
         <div class="btsz">标题</div><el-input v-model="setData.title" placeholder="请输入标题名称" style="width: 300px;" disabled/>
       </div>
@@ -147,7 +147,7 @@
         <el-button size="small" disabled>添加下级标题</el-button>
         <el-button size="small" disabled>添加考核任务</el-button>
       </div>
-    </div>-->
+    </div>
 
     <div style="padding: 50px 0;">
       <el-button type="primary" @click="khdf.open=true">生成汇总表格</el-button>