Merge remote-tracking branch 'origin/main'

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

@@ -1,78 +1,46 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="投票活动id" prop="voteId">
+      <el-form-item label="考核任务" prop="pcName">
         <el-input
-          v-model="queryParams.voteId"
-          placeholder="请输入投票活动id"
+          v-model="queryParams.pcName"
+          placeholder="请输入考核任务"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投票人id" prop="tpEmpId">
-        <el-input
-          v-model="queryParams.tpEmpId"
-          placeholder="请输入投票人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="投票人" prop="tpEmpName">
-        <el-input
-          v-model="queryParams.tpEmpName"
-          placeholder="请输入投票人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="用户id" prop="userId">
+      <el-form-item label="考核主题" prop="voteTitle">
         <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户id"
+          v-model="queryParams.voteTitle"
+          placeholder="请输入考核主题"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="被投人id" prop="voteEmpId">
+      <el-form-item label="评分人" prop="userName">
         <el-input
-          v-model="queryParams.voteEmpId"
-          placeholder="请输入被投人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="被投人" prop="voteEmpName">
-        <el-input
-          v-model="queryParams.voteEmpName"
-          placeholder="请输入被投人"
+          v-model="queryParams.userName"
+          placeholder="请输入评分人"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投票分数" prop="voteScore">
+      <el-form-item label="评分详情" prop="voteDetails">
         <el-input
-          v-model="queryParams.voteScore"
-          placeholder="请输入投票分数"
+          v-model="queryParams.voteDetails"
+          placeholder="请输入评分详情"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投票时间" prop="voteTime">
+      <el-form-item label="评分时间" prop="voteTime">
         <el-date-picker clearable
           v-model="queryParams.voteTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择投票时间">
+          placeholder="请选择评分时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="IP地址" prop="ipAddress">
-        <el-input
-          v-model="queryParams.ipAddress"
-          placeholder="请输入IP地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -126,19 +94,14 @@
     </el-row>
 
 <!--    <el-table v-loading="loading" :data="vote_recardList" @selection-change="handleSelectionChange">-->
-    <el-table v-loading="loading" :data="vote_recardList">
+    <el-table border v-loading="loading" :data="vote_recardList">
 <!--      <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-column label="投票人id" align="center" prop="tpEmpId" />-->
-      <el-table-column label="投票人" align="center" prop="tpEmpName" />
-      <el-table-column label="用户Id" align="center" prop="userId" />
-<!--      <el-table-column label="被投人id" align="center" prop="voteEmpId" />-->
-      <el-table-column label="被投人" align="center" prop="voteEmpName" />
-      <el-table-column label="投票分数" align="center" prop="voteScore" />
-      <el-table-column label="投票时间" align="center" prop="voteTime" width="180"/>
-      <el-table-column label="IP地址" align="center" prop="ipAddress" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="考核任务" header-align="center" prop="pcName" />
+      <el-table-column label="考核主题" header-align="center" prop="voteTitle" />
+      <el-table-column label="评分人" header-align="center" prop="userName" />
+      <el-table-column label="评分详情" header-align="center" prop="voteDetailsStr" />
+      <el-table-column label="评分时间" align="center" prop="voteTime"/>
+<!--      <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
@@ -243,15 +206,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        voteId: null,
-        tpEmpId: null,
-        tpEmpName: null,
-        userId: null,
-        voteEmpId: null,
-        voteEmpName: null,
-        voteScore: null,
-        voteTime: null,
-        ipAddress: null,
+        pcName: null,
+        voteTitle: null,
+        userName: null,
+        voteDetails: null,
+        voteTime: null
       },
       // 表单参数
       form: {},
@@ -274,7 +233,11 @@ export default {
     getList() {
       this.loading = true
       listVote_recard(this.queryParams).then(response => {
-        this.vote_recardList = response.rows
+        this.vote_recardList = response.rows;
+        this.vote_recardList.forEach(item=>{
+          // item['voteDetailsStr'] = Object.entries(JSON.parse(item.voteDetails)).join('；').replace(/,/g,'：')
+          item['voteDetailsStr'] = item.voteDetails.replace(/[{}]/g,'')
+        })
         this.total = response.total
         this.loading = false
       })