diff --git a/ruoyi-ui/src/components/RecursiveTree/index.vue b/ruoyi-ui/src/components/RecursiveTree/index.vue
new file mode 100644
index 0000000..ed525b3
--- /dev/null
+++ b/ruoyi-ui/src/components/RecursiveTree/index.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="tree-node">
+    <div class="node-content">
+      <el-input v-model="nodeData.hz_name" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/>
+      <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type===0"/>
+
+      <el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type===1" 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||nodeData.type===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="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">
+      <recursive-tree
+        v-for="(child, index) in nodeData.data"
+        :key="index"
+        :node-data="child"
+        @add-child="onAddChild"
+        @remove-node="onRemoveNode"
+        @change-kaohe="onChangeKaohe"
+      ></recursive-tree>
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RecursiveTree',
+  props: {
+    nodeData: {
+      type: Object,
+      required: true
+    },
+    isRoot: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    // 选择引用考核任务
+    changeKaohe(){
+      this.$emit('change-kaohe', this.nodeData)
+    },
+    // 选择引用考核任务
+    onChangeKaohe(parentNode){
+      this.$emit('change-kaohe', parentNode)
+    },
+    addChild(type) {
+      this.$emit('add-child', this.nodeData, type)
+    },
+    removeNode() {
+      this.$emit('remove-node', this.nodeData)
+    },
+    onAddChild(parentNode, type) {
+      this.$emit('add-child', parentNode, type)
+    },
+    onRemoveNode(nodeToRemove) {
+      this.$emit('remove-node', nodeToRemove)
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.tree-node {
+  margin-left: 35px;
+  padding: 5px 0px 5px 5px;
+  border-left: 1px solid #ccc;
+}
+.node-content {
+  padding: 5px;
+  background: #f5f5f5;
+  margin-bottom: 5px;
+}
+button {
+  margin-left: 10px;
+}
+
+.el-radio{
+  margin-right: 10px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/kaohe/gather/index.vue b/ruoyi-ui/src/views/kaohe/gather/index.vue
index 4d48573..69cff13 100644
--- a/ruoyi-ui/src/views/kaohe/gather/index.vue
+++ b/ruoyi-ui/src/views/kaohe/gather/index.vue
@@ -48,7 +48,7 @@
           v-hasPermi="['kaohe:gather:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -57,7 +57,7 @@
           @click="handleExport"
           v-hasPermi="['kaohe:gather:export']"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -87,7 +87,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -97,34 +97,71 @@
     />
 
     <!-- 添加或修改生成汇总对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="一级标题" prop="hzName">
-          <el-input v-model="form.hzName" placeholder="请输入一级标题" />
-        </el-form-item>
-        <el-form-item label="表头" prop="tableHeader">
-          <el-input v-model="form.tableHeader" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="表数据" prop="tableData">
-          <el-input v-model="form.tableData" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
+    <el-dialog :title="title" :visible.sync="open" width="99%" append-to-body>
+      <div style="min-height: 400px">
+        <recursive-tree
+          style="margin-left: 0px"
+          :node-data="treeData"
+          :is-root="true"
+          @add-child="handleAddChild"
+          @remove-node="handleRemoveNode"
+          @change-kaohe="changeKaoHe"
+        ></recursive-tree>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 选择引用考核任务信息 -->
+    <el-dialog title="引用考核任务选择" :visible.sync="khrw.open" width="900px">
+      <div>
+        <el-form :model="khrw.queryParams" :inline="true" label-width="100px">
+          <el-form-item label="考核任务名称" prop="pcTitle" style="margin-bottom: 10px">
+            <el-input
+              v-model="khrw.queryParams.pcTitle"
+              placeholder="请输入考核任务名称"
+              clearable
+              @keyup.enter.native="khrwQuery"
+            />
+          </el-form-item>
+          <el-form-item style="margin-bottom: 10px">
+            <el-button type="primary" icon="el-icon-search" size="small" @click="khrwQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table border v-loading="khrw.loading" :data="khrw.list" @row-dblclick="khrwRowChange">
+          <el-table-column label="主键" align="center" prop="id" width="60px"/>
+          <el-table-column label="考核任务名称" align="center" prop="pcTitle" min-width="150" :show-overflow-tooltip="true"/>
+          <el-table-column label="考核任务描述" align="center" prop="pcDescription" min-width="150" :show-overflow-tooltip="true"/>
+          <el-table-column label="模板名称" align="center" prop="templateName" min-width="120" :show-overflow-tooltip="true"/>
+          <el-table-column label="考核任务备注" align="center" prop="remark" min-width="150" :show-overflow-tooltip="true"/>
+        </el-table>
+        <pagination
+          v-show="khrw.total>0"
+          :total="khrw.total"
+          :page.sync="khrw.queryParams.pageNum"
+          :limit.sync="khrw.queryParams.pageSize"
+          @pagination="khrwQuery"
+        />
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="khrwCancel">取 消</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listGather, getGather, delGather, addGather, updateGather } from "@/api/kaohe/gather"
+import { listPingce } from "@/api/kaohe/pingce"
+import TableColumn from '@/components/TableColumn'
+import RecursiveTree from '@/components/RecursiveTree'
 
 export default {
   name: "Gather",
+  components: { TableColumn, RecursiveTree },
   data() {
     return {
       // 遮罩层
@@ -145,19 +182,34 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      treeData: {
+        hz_name: '',
+        data: []
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        hzName: null,
-        tableHeader: null,
-        tableData: null,
+        hzName: null
+      },
+      /** 选择引用考核任务*/
+      khrw: {
+        parentNode: null,
+        // 是否显示弹出层
+        open: false,
+        // 列表遮罩层
+        loading: false,
+        // 列表查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          pcTitle: null,
+        },
+        // 表格数据
+        list: [],
+        // 总条数
+        total: 0,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
     }
   },
   created() {
@@ -180,18 +232,10 @@ export default {
     },
     // 表单重置
     reset() {
-      this.form = {
-        id: null,
-        hzName: null,
-        tableHeader: null,
-        tableData: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
+      this.treeData = {
+        hz_name: '',
+        data: []
       }
-      this.resetForm("form")
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -211,7 +255,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
+      this.reset();
       this.open = true
       this.title = "添加生成汇总"
     },
@@ -227,7 +271,8 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      console.log(this.treeData);
+      /*this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateGather(this.form).then(response => {
@@ -243,7 +288,7 @@ export default {
             })
           }
         }
-      })
+      })*/
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -260,7 +305,58 @@ export default {
       this.download('kaohe/gather/export', {
         ...this.queryParams
       }, `gather_${new Date().getTime()}.xlsx`)
-    }
+    },
+    handleAddChild(parentNode,type) {
+      if (!parentNode.data) {
+        this.$set(parentNode, 'data', [])
+      }
+      parentNode.data.push({
+        type: type,
+        title: null,
+        id: null,
+        zb: null,
+        pcTitle: null,
+        data: []
+      })
+    },
+    handleRemoveNode(nodeToRemove) {
+      const removeNode = (parent, node) => {
+        if (parent.data) {
+          const index = parent.data.indexOf(node)
+          if (index !== -1) {
+            parent.data.splice(index, 1)
+          } else {
+            parent.data.forEach(child => removeNode(child, node))
+          }
+        }
+      }
+      removeNode(this.treeData, nodeToRemove)
+    },
+    changeKaoHe(parentNode){
+      this.khrw.parentNode = parentNode;
+      this.khrw.open = true;
+      this.khrw.queryParams.pageNum = 1;
+      this.khrwQuery();
+    },
+    /** 引用考核任务信息列表查询 */
+    khrwQuery() {
+      this.khrw.loading = true;
+      listPingce(this.khrw.queryParams).then(response => {
+        this.khrw.list = response.rows;
+        this.khrw.total = response.total;
+        this.khrw.loading = false;
+      });
+    },
+    /** 引用考核任务信息选择弹出框关闭*/
+    khrwCancel() {
+      this.khrw.open = false
+    },
+    // 引用考核任务选择 选中数据
+    khrwRowChange(row) {
+      this.khrw.parentNode.id = row.id;
+      this.khrw.parentNode.pcTitle = row.pcTitle;
+      this.khrw.open = false;
+    },
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue
index 333c513..e548b0c 100644
--- a/ruoyi-ui/src/views/kaohe/pingce/index.vue
+++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue
@@ -482,9 +482,9 @@
     </el-dialog>
 
     <!--查看考核得分-->
-    <el-dialog title="查看考核得分" :visible.sync="khdf.open" width="90%">
+    <el-dialog title="查看考核得分" :visible.sync="khdf.open" width="90%" top="20px !important">
 
-      <el-table border :data="khdf.list">
+      <el-table border :data="khdf.list" height="650px">
         <template v-for="column in khdf.tableHeader">
           <table-column :key="column.label" :column="column" />
         </template>
@@ -978,6 +978,7 @@ export default {
       this.pcSetUp.pingceId = row.id;
       this.pcSetUp.pingceName = row.pcTitle;
       this.pcSetUp.templateId = row.templateId;
+      this.pcSetUp.xzhIndex = null;
       this.pcSetUp.open = true;
       this.getItemVote();
     },
diff --git a/ruoyi-ui/src/views/kaohe/totalScore/index.vue b/ruoyi-ui/src/views/kaohe/totalScore/index.vue
index e235f21..db21b8a 100644
--- a/ruoyi-ui/src/views/kaohe/totalScore/index.vue
+++ b/ruoyi-ui/src/views/kaohe/totalScore/index.vue
@@ -168,9 +168,9 @@
           <el-table-column header-align="center" prop="pm" label="排名"></el-table-column>
           <el-table-column header-align="center" prop="bumen" label="部门"></el-table-column>
 
-          <el-table-column header-align="center" prop="ejdw" label="二级单位目标管理与绩效考核成绩">
+          <el-table-column header-align="center" label="二级单位目标管理与绩效考核成绩">
 
-            <el-table-column label="党建与行政目标任务" prop="ejdw.djyxz" header-align="center">
+            <el-table-column label="党建与行政目标任务" header-align="center">
               <el-table-column align="center" prop="ejdw.djyxz.khx1" label="政治建设"></el-table-column>
               <el-table-column align="center" prop="ejdw.djyxz.zb1" label="占比" width="55px"></el-table-column>
               <el-table-column align="center" prop="ejdw.djyxz.khx2" label="宣传与思想政治工作" width="140px"></el-table-column>
@@ -194,11 +194,11 @@
               <el-table-column align="center" prop="ejdw.djyxz.khx11" label="对外交流与合作" width="120px"></el-table-column>
               <el-table-column align="center" prop="ejdw.djyxz.zb11" label="占比" width="55px"></el-table-column>
             </el-table-column>
-            <el-table-column align="center" prop="ejdw.djyxzdf" label="得分" ></el-table-column>
-            <el-table-column align="center" prop="ejdw.djyxzzb" label="占比" ></el-table-column>
-            <el-table-column align="center" prop="ejdw.djyxzzsfs" label="折算分数" ></el-table-column>
+            <el-table-column align="center" prop="ejdw.djyxz.df" label="得分" ></el-table-column>
+            <el-table-column align="center" prop="ejdw.djyxz.zb" label="占比" ></el-table-column>
+            <el-table-column align="center" prop="ejdw.djyxz.zsfs" label="折算分数" ></el-table-column>
 
-            <el-table-column label="事业发展" prop="ejdw.syfz" header-align="center">
+            <el-table-column label="事业发展" header-align="center">
               <el-table-column align="center" prop="ejdw.syfz.khx1" label="教学工作"></el-table-column>
               <el-table-column align="center" prop="ejdw.syfz.zb1" label="占比"></el-table-column>
               <el-table-column align="center" prop="ejdw.syfz.khx2" label="科研工作"></el-table-column>
@@ -206,57 +206,51 @@
               <el-table-column align="center" prop="ejdw.syfz.khx3" label="学生工作"></el-table-column>
               <el-table-column align="center" prop="ejdw.syfz.zb3" label="占比"></el-table-column>
             </el-table-column>
-            <el-table-column align="center" prop="ejdw.syfzdf" label="得分" ></el-table-column>
-            <el-table-column align="center" prop="ejdw.syfzzb" label="占比" ></el-table-column>
-            <el-table-column align="center" prop="ejdw.syfzzsfs" label="折算分数" ></el-table-column>
+            <el-table-column align="center" prop="ejdw.syfz.df" label="得分" ></el-table-column>
+            <el-table-column align="center" prop="ejdw.syfz.zb" label="占比" ></el-table-column>
+            <el-table-column align="center" prop="ejdw.syfz.zsfs" label="折算分数" ></el-table-column>
 
           </el-table-column>
-          <el-table-column align="center" prop="ejdwdf" label="得分" ></el-table-column>
-          <el-table-column align="center" prop="ejdwzb" label="占比" ></el-table-column>
-          <el-table-column align="center" prop="ejdwzsfs" label="折算分数" ></el-table-column>
+          <el-table-column align="center" prop="ejdw.df" label="得分" ></el-table-column>
+          <el-table-column align="center" prop="ejdw.zb" label="占比" ></el-table-column>
+          <el-table-column align="center" prop="ejdw.zsfs" label="折算分数" ></el-table-column>
 
-          <el-table-column label="民主测评" prop="mzcp" header-align="center">
-
-
-            <el-table-column header-align="center" prop="mzcp.syldbz" label="师院领导班子">
-              <el-table-column align="center" prop="mzcp.syldbz.yx" label="优秀"></el-table-column>
-              <el-table-column align="center" prop="mzcp.syldbz.hg" label="合格"></el-table-column>
-              <el-table-column align="center" prop="mzcp.syldbz.jbhg" label="基本合格"></el-table-column>
-              <el-table-column align="center" prop="mzcp.syldbz.bhg" label="不合格"></el-table-column>
+          <el-table-column label="民主测评" header-align="center">
+            <el-table-column header-align="center" label="师院领导班子">
+              <el-table-column align="center" prop="mzcp.yx1" label="优秀"></el-table-column>
+              <el-table-column align="center" prop="mzcp.hg1" label="合格"></el-table-column>
+              <el-table-column align="center" prop="mzcp.jbhg1" label="基本合格"></el-table-column>
+              <el-table-column align="center" prop="mzcp.bhg1" label="不合格"></el-table-column>
             </el-table-column>
-            <el-table-column align="center" prop="mzcp.syldbzdf" label="得分"></el-table-column>
-            <el-table-column align="center" prop="mzcp.syldbzzb" label="占比"></el-table-column>
-
-
-            <el-table-column header-align="center" prop="mzcp.sycjldgb" label="师院处级领导干部">
-              <el-table-column align="center" prop="mzcp.sycjldgb.yx" label="优秀"></el-table-column>
-              <el-table-column align="center" prop="mzcp.sycjldgb.hg" label="合格"></el-table-column>
-              <el-table-column align="center" prop="mzcp.sycjldgb.jbhg" label="基本合格"></el-table-column>
-              <el-table-column align="center" prop="mzcp.sycjldgb.bhg" label="不合格"></el-table-column>
+            <el-table-column align="center" prop="mzcp.khx1" label="得分"></el-table-column>
+            <el-table-column align="center" prop="mzcp.zb1" label="占比"></el-table-column>
+            <el-table-column header-align="center" label="师院处级领导干部">
+              <el-table-column align="center" prop="mzcp.yx2" label="优秀"></el-table-column>
+              <el-table-column align="center" prop="mzcp.hg2" label="合格"></el-table-column>
+              <el-table-column align="center" prop="mzcp.jbhg2" label="基本合格"></el-table-column>
+              <el-table-column align="center" prop="mzcp.bhg2" label="不合格"></el-table-column>
             </el-table-column>
-            <el-table-column align="center" prop="mzcp.sycjldgbdf" label="得分"></el-table-column>
-            <el-table-column align="center" prop="mzcp.sycjldgbzd" label="占比"></el-table-column>
-
-
+            <el-table-column align="center" prop="mzcp.khx2" label="得分"></el-table-column>
+            <el-table-column align="center" prop="mzcp.zb2" label="占比"></el-table-column>
             <el-table-column header-align="center" label="服务对象代表">
-              <el-table-column align="center" prop="mzcp.fwdxdb.yx" label="优秀"></el-table-column>
-              <el-table-column align="center" prop="mzcp.fwdxdb.hg" label="合格"></el-table-column>
-              <el-table-column align="center" prop="mzcp.fwdxdb.jbhg" label="基本合格"></el-table-column>
-              <el-table-column align="center" prop="mzcp.fwdxdb.bhg" label="不合格"></el-table-column>
+              <el-table-column align="center" prop="mzcp.yx3" label="优秀"></el-table-column>
+              <el-table-column align="center" prop="mzcp.hg3" label="合格"></el-table-column>
+              <el-table-column align="center" prop="mzcp.jbhg3" label="基本合格"></el-table-column>
+              <el-table-column align="center" prop="mzcp.bhg3" label="不合格"></el-table-column>
             </el-table-column>
-            <el-table-column align="center" prop="mzcp.fwdxdbdf" label="得分"></el-table-column>
-            <el-table-column align="center" prop="mzcp.fwdxdbzb" label="占比"></el-table-column>
+            <el-table-column align="center" prop="mzcp.khx3" label="得分"></el-table-column>
+            <el-table-column align="center" prop="mzcp.zb3" label="占比"></el-table-column>
           </el-table-column>
-          <el-table-column align="center" prop="mzcpdf" label="得分"></el-table-column>
-          <el-table-column align="center" prop="mzcpzb" label="占比" ></el-table-column>
-          <el-table-column align="center" prop="mzcpzsfs" label="折算分数" ></el-table-column>
+          <el-table-column align="center" prop="mzcp.df" label="得分"></el-table-column>
+          <el-table-column align="center" prop="mzcp.zb" label="占比" ></el-table-column>
+          <el-table-column align="center" prop="mzcp.zsfs" label="折算分数" ></el-table-column>
 
-          <el-table-column label="特色创新" prop="tscx" header-align="center">
-            <el-table-column align="center" prop="tscx.ddx" label="分数（满分10分）"></el-table-column>
+          <el-table-column label="特色创新" header-align="center">
+            <el-table-column align="center" prop="tscx" label="分数（满分10分）"></el-table-column>
           </el-table-column>
 
-          <el-table-column label="综合评价" prop="zhpj" header-align="center">
-            <el-table-column align="center" prop="zhpj.ddx" label="分数（加减分项，值域可以为负）"></el-table-column>
+          <el-table-column label="综合评价" header-align="center">
+            <el-table-column align="center" prop="zhpj" label="分数（加减分项，值域可以为负）"></el-table-column>
           </el-table-column>
 
           <el-table-column align="center" prop="zf" label="总分" ></el-table-column>
@@ -269,90 +263,1063 @@
       </div>
     </el-dialog>
 
-
-    <el-table border :data="list1">
-      <template v-for="column in btTabel">
-        <table-column :key="column.label" :column="column" />
-      </template>
-    </el-table>
-
   </div>
 </template>
 
 <script>
-import TableColumn from '@/components/TableColumn'
-
 export default {
   name: "index",
-  components: { TableColumn },
   data() {
     return {
-      btTabel:[
-        {
-          "name": "khdx",
-          "label": "单位"
-        },
-        {
-          "name": "wlcskhrwmc001",
-          "label": "wl测试考核任务名称001",
-          "children": [
-            {
-              "name": "khx1",
-              "label": "wl测试占比评分评分主题001"
-            },
-            {
-              "name": "khx1_zb",
-              "label": "占比"
-            },
-            {
-              "name": "khx2",
-              "label": "wl测试单独评分评分主题002"
-            },
-            {
-              "name": "khx3",
-              "label": "wl测试单独评分评分主题003",
-              "children": [
-                {
-                  "name": "optionA",
-                  "label": "优秀"
-                },
-                {
-                  "name": "optionB",
-                  "label": "合格"
-                },
-                {
-                  "name": "optionC",
-                  "label": "基本合格"
-                },
-                {
-                  "name": "optionD",
-                  "label": "不合格"
-                },
-                {
-                  "name": "avgScore",
-                  "label": "得分"
-                },
-                {
-                  "name": "percentage",
-                  "label": "占比"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "df",
-          "label": "得分"
-        }
-      ],
-      list1:[{"khdx":"生命科学系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx2":0.0000,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"海洋学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"历史文化与法学系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"物理科学与技术学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"教育学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"资源管理系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"马克思主义学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"美术学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"计算机科学技术系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"化学系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"数学与计算科学学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"继续教育学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"外国语学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"体育系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"文学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"音乐系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000}],
       khdf:{
         open: false,
         idRw: null,
         list:[
           {
-            pm: 1,
-            bumen: '生命科学系',
+            pm: 1,
+            bumen: '生命科学系',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          }
+        ],
+        list4: [
+          {
+            bumen: '生命科学系',
+            df: '8',
+          },
+          {
+            pm: 2,
+            bumen: '海洋学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 3,
+            bumen: '历史文化与法学系',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 4,
+            bumen: '物理科学与技术学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 5,
+            bumen: '教育学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 6,
+            bumen: '资源管理系',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 7,
+            bumen: '马克思主义学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 8,
+            bumen: '美术学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 9,
+            bumen: '计算机科学技术系',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 10,
+            bumen: '化学系',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 11,
+            bumen: '数学与计算科学学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 12,
+            bumen: '继续教育学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 13,
+            bumen: '外国语学院',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 14,
+            bumen: '体育系',
+            df: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          },
+          {
+            pm: 15,
+            bumen: '文学院',
+            df: '',
             ejdw:{
               djyxz:{
                 khx1: '90',
@@ -377,10 +1344,10 @@ export default {
                 zb10: '0.1',
                 khx11: '95',
                 zb11: '0.1',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
               },
-              djyxzdf: '93.06',
-              djyxzzb: '0.1',
-              djyxzzsfs: '9.306',
               syfz:{
                 khx1: '98',
                 zb1: '0.5',
@@ -388,51 +1355,181 @@ export default {
                 zb2: '0.28',
                 khx3: '98',
                 zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
               },
-              syfzdf: '97.16',
-              syfzzb: '0.9',
-              syfzzsfs: '87.444',
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
             },
-            ejdwdf: '96.75',
-            ejdwzb: '0.7',
-            ejdwzsfs: '67.73',
             mzcp:{
-              syldbz:{
-                yx: 5,
-                hg: 1,
-                jbhg: 0,
-                bhg: 0,
-              },
-              syldbzdf: '96.66666667',
-              syldbzzb: '0.3',
-              sycjldgb:{
-                yx: 110,
-                hg: 2,
-                jbhg: 1,
-                bhg: 1,
-              },
-              sycjldgbdf: '98.77192982',
-              sycjldgbzb: '0.3',
-              fwdxdb:{
-                yx: 30,
-                hg: 5,
-                jbhg: 5,
-                bhg: 1,
-              },
-              fwdxdbdf: '91.2195122',
-              fwdxdbzb: '0.4',
-            },
-            mzcpdf: '95.12',
-            mzcpzb: '0.3',
-            mzcpzsfs: '28.53581515',
-            tscx: {
-              ddx: '8',
-            },
-            zhpj: {
-              ddx: '-3',
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
             },
+            tscx: '8',
+            zhpj: '-3',
             zf: '101.2608151'
           },
+          {
+            pm: 16,
+            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: '',
+            ejdw:{
+              djyxz:{
+                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',
+                df: '93.06',
+                zb: '0.1',
+                zsfs: '9.306',
+              },
+              syfz:{
+                khx1: '98',
+                zb1: '0.5',
+                khx2: '95',
+                zb2: '0.28',
+                khx3: '98',
+                zb3: '0.22',
+                df: '97.16',
+                zb: '0.9',
+                zsfs: '87.444',
+              },
+              df: '96.75',
+              zb: '0.7',
+              zsfs: '67.73',
+            },
+            mzcp:{
+              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',
+              df: '95.12',
+              zb: '0.3',
+              zsfs: '28.53581515',
+            },
+            tscx: '8',
+            zhpj: '-3',
+            zf: '101.2608151'
+          }
         ]
       },
       setData: {
@@ -473,37 +1570,6 @@ export default {
         label: '综合评价'
       }],
     }
-  },
-  created() {
-    this.setTreeData();
-  },
-  methods:{
-    setTreeData(){
-      let btTabelTree = this.btTabel;
-      btTabelTree.forEach(item => {
-        item.prop = item.name;
-        if(item.children && item.children.length>0){
-          this.setProp(item.children, item.prop)
-        }
-      })
-
-      this.btTabel = btTabelTree;
-
-      console.log(btTabelTree,999999999999);
-    },
-    setProp(list, prop){
-      console.log(list,88888);
-      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>
@@ -515,3 +1581,4 @@ export default {
   font-size: 14px;
 }
 </style>
+
diff --git a/ruoyi-ui/src/views/kaohe/type/index.vue b/ruoyi-ui/src/views/kaohe/type/index.vue
index b29c849..c3d397b 100644
--- a/ruoyi-ui/src/views/kaohe/type/index.vue
+++ b/ruoyi-ui/src/views/kaohe/type/index.vue
@@ -16,7 +16,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -25,7 +25,7 @@
           @click="handleAdd"
           v-hasPermi="['kaohe:type:add']"
         >新增</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -85,7 +85,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
diff --git a/ruoyi-ui/src/views/kaohe/uid/index.vue b/ruoyi-ui/src/views/kaohe/uid/index.vue
index bf9689d..bbf5fed 100644
--- a/ruoyi-ui/src/views/kaohe/uid/index.vue
+++ b/ruoyi-ui/src/views/kaohe/uid/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="手机标识符" prop="uid">
         <el-input
           v-model="queryParams.uid"
@@ -24,7 +24,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -33,7 +33,7 @@
           @click="handleAdd"
           v-hasPermi="['kaohe:uid:add']"
         >新增</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -94,7 +94,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
diff --git a/ruoyi-ui/src/views/kaohe/vote/index.vue b/ruoyi-ui/src/views/kaohe/vote/index.vue
index 2cc237f..22fcdc7 100644
--- a/ruoyi-ui/src/views/kaohe/vote/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote/index.vue
@@ -64,26 +64,11 @@
       </el-table-column>
       <el-table-column label="评分主题" align="center" prop="voteTitle" min-width="200" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link>
-        </template>
-      </el-table-column>
-      <el-table-column label="评分选项" align="center" prop="options" min-width="200" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <div v-if="scope.$index=== xzhIndex && scope.row.khitemTypeid===1">
-            <el-select :disabled="!(new Date(scope.row.sTime) > (new Date()))"
-                       v-model="scope.row.voteItems" multiple placeholder="请选择评分选项">
-              <el-option
-                v-for="item in vote_options"
-                :key="item.id"
-                :label="item.vitemName"
-                :value="item.id">
-              </el-option>
-            </el-select>
+          <div v-if="scope.$index=== xzhIndex">
+            <el-input v-model.trim="scope.row.voteTitle" placeholder="请输入评分主题" :disabled="scope.row.id && !(new Date(scope.row.sTime) > (new Date()))"/>
           </div>
           <div v-else>
-            <div v-if=" scope.row.voteItems">
-              <div>{{ scope.row.voteItemsName }}</div>
-            </div>
+            <el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link>
           </div>
         </template>
       </el-table-column>
@@ -109,11 +94,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="vote"  min-width="100" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.kh_state" :value="scope.row.state"/>
-        </template>
-      </el-table-column>
       <el-table-column label="开始时间" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <div v-if="scope.$index===xzhIndex">
@@ -163,6 +143,11 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center" prop="vote"  min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.kh_state" :value="scope.row.state"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
         <template slot-scope="scope">
           <div>
@@ -257,18 +242,6 @@ export default {
       listVote(this.queryParams).then(response => {
         let pcSetUpList = [];
         response.rows.forEach(item=>{
-          if(item.voteItems){
-            item.voteItems = item.voteItems.split(',');
-            let VoteItemsName = []
-            item.voteItems.forEach(e => {
-              this.vote_options.forEach(e1 => {
-                if(e === e1.id){
-                  VoteItemsName.push(e1.vitemName)
-                }
-              })
-            })
-            item['voteItemsName'] = VoteItemsName.join(',');
-          }
           pcSetUpList.push(item);
         })
         this.voteList = pcSetUpList;
@@ -341,12 +314,6 @@ export default {
           type: 'Danger'
         })
       }
-      if(row.khitemTypeid===1 && (!Vote.voteItems)){
-        flag = false;
-        this.$alert(`评分选项不能为空！`, `提示`, {
-          type: 'Danger'
-        })
-      }
       if(row.khitemTypeid!==1 && (!Vote.maxNum)){
         flag = false;
         this.$alert(`最大值不能为空！`, `提示`, {
@@ -365,24 +332,16 @@ export default {
           type: 'Danger'
         })
       }
-      if(!Vote.vDescription){
-        flag = false;
-        this.$alert(`评分详情描述不能为空！`, `提示`, {
-          type: 'Danger'
-        })
+      if(row.khitemTypeid===1){
+        Vote.voteItems = '1,2,3,4'
       }
       if (Vote.id != null && flag ) {
-        if(Vote.voteItems){
-          Vote.voteItems = Vote.voteItems.join(',')
-        }
         updateVote(Vote).then(response => {
           this.$modal.msgSuccess("修改成功")
           this.cancelVote()
         })
       } else if(Vote.id === null && flag){
-        if(Vote.voteItems){
-          Vote.voteItems = Vote.voteItems.join(',')
-        }
+        Vote.state = '0'
         addVote(Vote).then(response => {
           this.$modal.msgSuccess("新增成功")
           this.cancelVote()
diff --git a/ruoyi-ui/src/views/kaohe/vote_emp/index.vue b/ruoyi-ui/src/views/kaohe/vote_emp/index.vue
index e610567..4ca6908 100644
--- a/ruoyi-ui/src/views/kaohe/vote_emp/index.vue
+++ b/ruoyi-ui/src/views/kaohe/vote_emp/index.vue
@@ -108,10 +108,10 @@
 <!--      <el-table-column label="投票id" align="center" prop="voteId" />-->
       <el-table-column label="评分主题" align="center" prop="voteTitle" />
 <!--      <el-table-column label="职工id" align="center" prop="empId" />-->
-      <el-table-column label="被考核对象" align="center" prop="bumen" />
-      <el-table-column label="选项内容" align="center" prop="content" />
+      <el-table-column label="被考核对象" align="center" prop="bkhdxName" />
+<!--      <el-table-column label="选项内容" align="center" prop="content" />-->
       <el-table-column label="评分人数" align="center" prop="voteNum" />
-      <el-table-column label="评分均值" align="center" prop="votezz" />
+      <el-table-column label="评分均值" align="center" prop="avgScore" />
       <el-table-column label="评分总分" align="center" prop="voteScore" />
       <el-table-column label="备注" align="center" prop="remark" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -374,8 +374,8 @@ export default {
     }
   },
   created() {
-    // this.queryParams.voteId=this.$route.query.id
-    // this.getList();
+    this.queryParams.voteId=this.$route.query.id
+    this.getList();
   },
   methods: {
     /** 查询投票选项列表 */