Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/api/kaohe/vote_emp.js

@@ -52,3 +52,12 @@ export function VoteEmpSubmit(data) {
     data: data
   })
 }
+
+
+// 结果统计接口
+export function resultVote_emp(id) {
+  return request({
+    url: '/kaohe/vote_emp/statisticalResults/' + id,
+    method: 'put'
+  })
+}

ruoyi-ui/src/views/kaohe/pingce/index.vue

@@ -195,7 +195,7 @@
           >查看评分账号
           </el-button>
 
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['kaohe:pingce:more']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="bkhdxAddFun" icon="el-icon-plus">被考核对象添加</el-dropdown-item>
@@ -1957,6 +1957,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.bkhdxDept.setCheckedKeys([]);
       })
+      this.clearDisabledByKeys()
       this.resetForm("bkhdxForm");
     },
     // 被考核对象添加

ruoyi-ui/src/views/kaohe/vote_emp/index.vue

@@ -98,20 +98,24 @@
           v-hasPermi="['kaohe:vote_emp:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-if="$route.query.id"
+          type="success"
+          plain
+          size="mini"
+          @click="handleResult"
+          v-hasPermi="['kaohe:vote_emp:edit']"
+        >结果统计</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
 <!--    <el-table v-loading="loading" :data="vote_empList" @selection-change="handleSelectionChange">-->
-    <el-table v-loading="loading" :data="vote_empList">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-<!--      <el-table-column label="主键" align="center" prop="id" />-->
-<!--      <el-table-column label="投票id" align="center" prop="voteId" />-->
+    <el-table border v-loading="loading" :data="vote_empList">
       <el-table-column label="评分主题" align="center" prop="voteTitle" />
-<!--      <el-table-column label="职工id" align="center" prop="empId" />-->
       <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="avgScore" />
       <el-table-column label="评分总分" align="center" prop="voteScore" >
         <template slot-scope="scope">
           <div v-if="scope.row.khitemTypeid!==1">
@@ -129,26 +133,11 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="120"/>
+      <el-table-column label="评分均值" align="center" prop="avgScore" />
+      <el-table-column label="评分占比" align="center" prop="percentage" />
+      <el-table-column label="最终得分" align="center" prop="endScore" />
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="备注" align="center" prop="remark" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['kaohe:vote_emp:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['kaohe:vote_emp:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -196,7 +185,7 @@
 </template>
 
 <script>
-import { listVote_emp, getVote_emp, delVote_emp, addVote_emp, updateVote_emp } from "@/api/kaohe/vote_emp"
+import { listVote_emp, getVote_emp, delVote_emp, addVote_emp, updateVote_emp, resultVote_emp } from "@/api/kaohe/vote_emp"
 
 export default {
   name: "Vote_emp",
@@ -215,152 +204,7 @@ export default {
       // 总条数
       total: 0,
       // 投票选项表格数据
-      vote_empList: [
-        {
-          bumen: '生命科学系',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '海洋学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '历史文化与法学系',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '物理科学与技术学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '教育学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '资源管理系',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '马克思主义学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '美术学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '计算机科学技术系',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '化学系',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '数学与计算科学学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '继续教育学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '外国语学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '体育系',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '文学院',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        },
-        {
-          bumen: '音乐系',
-          voteTitle: '政治建设评分',
-          content: '',
-          voteNum: '10',
-          votezz: '98',
-          remark: '',
-          voteScore: '980'
-        }
-      ],
+      vote_empList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -495,6 +339,15 @@ export default {
       this.download('kaohe/vote_emp/export', {
         ...this.queryParams
       }, `vote_emp_${new Date().getTime()}.xlsx`)
+    },
+    // 结果统计
+    handleResult(){
+      this.$modal.confirm('是否确认结果统计？').then(()=> {
+        return resultVote_emp(this.$route.query.id)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("成功")
+      }).catch(() => {})
     }
   }
 }