Merge remote-tracking branch 'origin/main'

ruoyi-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 职工考核管理系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 职工考核管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

ruoyi-ui/.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 职工考核管理系统
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# 职工考核管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

ruoyi-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 职工考核管理系统
 
 BABEL_ENV = production
 
@@ -8,5 +8,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 职工考核管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.9.0",
-  "description": "若依管理系统",
+  "description": "职工考核管理系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {

ruoyi-ui/src/layout/components/Navbar.vue

@@ -9,13 +9,13 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+<!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip>-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 

ruoyi-ui/src/views/index.vue

@@ -2,9 +2,9 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
+        <h2>职工考核后台管理框架</h2>
         <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
+          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了职工考核管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
         </p>
         <p>
           <b>当前版本:</b> <span>v{{ version }}</span>
@@ -92,14 +92,14 @@
             <p>
               <i class="el-icon-chat-dot-round"></i> 微信：<a
                 href="javascript:;"
-                >/ *若依</a
+                >/ *职工考核</a
               >
             </p>
             <p>
               <i class="el-icon-money"></i> 支付宝：<a
                 href="javascript:;"
                 class="支付宝信息"
-                >/ *若依</a
+                >/ *职工考核</a
               >
             </p>
           </div>
@@ -1026,7 +1026,7 @@
             </el-collapse-item>
             <el-collapse-item title="v1.0.0 - 2019-10-08">
               <ol>
-                <li>若依前后端分离系统正式发布</li>
+                <li>职工考核前后端分离系统正式发布</li>
               </ol>
             </el-collapse-item>
           </el-collapse>

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

@@ -123,7 +123,7 @@
       <el-table-column label="紧急联系人" align="center" prop="contact" :show-overflow-tooltip="true" min-width="120"/>
       <el-table-column label="紧急联系人电话" align="center" prop="contactPhone" :show-overflow-tooltip="true" min-width="120"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" min-width="120"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="140px">
         <template slot-scope="scope">
           <el-button
             size="mini"

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

@@ -82,7 +82,11 @@
       <el-table-column label="主键" align="center" prop="id" width="55" />
       <el-table-column label="评测名称" align="center" prop="pingceName" min-width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="考核名称" align="center" prop="khitemName" min-width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="投票主题" align="center" prop="voteTitle" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="投票主题" align="center" prop="voteTitle" min-width="120" :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="maxNum" min-width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="评分占比" align="center" prop="percentage" min-width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="开始时间" align="center" prop="sTime" min-width="120" :show-overflow-tooltip="true">
@@ -102,7 +106,7 @@
       </el-table-column>
       <el-table-column label="详情描述" align="center" prop="vDescription" min-width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remark" min-width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="200">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -341,6 +345,9 @@ export default {
     },
     goVotepage(row){
       this.$router.push({ path: '/votepage', query: { id: row.id }});
+    },
+    goVoteEmp(row){
+      this.$router.push({ path: '/toupiao/vote_emp', query: { id: row.id }});
     }
   }
 }

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

@@ -1,14 +1,14 @@
 <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="投票id" prop="voteId">
         <el-input
           v-model="queryParams.voteId"
           placeholder="请输入投票id"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="投票主题" prop="voteTitle">
         <el-input
           v-model="queryParams.voteTitle"
@@ -17,14 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="职工id" prop="empId">
+<!--      <el-form-item label="职工id" prop="empId">
         <el-input
           v-model="queryParams.empId"
           placeholder="请输入职工id"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="职工姓名" prop="empName">
         <el-input
           v-model="queryParams.empName"
@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="当前投票数" prop="voteNum">
+<!--      <el-form-item label="当前投票数" prop="voteNum">
         <el-input
           v-model="queryParams.voteNum"
           placeholder="请输入当前投票数"
@@ -48,7 +48,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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>
@@ -56,7 +56,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -87,7 +87,7 @@
           @click="handleDelete"
           v-hasPermi="['kaohe:vote_emp:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -101,18 +101,19 @@
       <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" @selection-change="handleSelectionChange">-->
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="vote_empList">
-      <el-table-column label="主键" align="center" prop="id" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="投票id" align="center" prop="voteId" />
+<!--      <el-table-column label="主键" align="center" prop="id" />-->
+<!--      <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="职工id" align="center" prop="empId" />-->
       <el-table-column label="职工姓名" align="center" prop="empName" />
       <el-table-column label="选项内容" align="center" prop="content" />
       <el-table-column label="当前投票数" align="center" prop="voteNum" />
       <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">
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -129,7 +130,7 @@
             v-hasPermi="['kaohe:vote_emp:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -227,7 +228,8 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.queryParams.voteId=this.$route.query.id
+    this.getList();
   },
   methods: {
     /** 查询投票选项列表 */

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

@@ -1,7 +1,7 @@
 <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="投票活动id" prop="voteId">
         <el-input
           v-model="queryParams.voteId"
           placeholder="请输入投票活动id"
@@ -16,7 +16,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="投票人" prop="tpEmpName">
         <el-input
           v-model="queryParams.tpEmpName"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户id" prop="userId">
+<!--      <el-form-item label="用户id" prop="userId">
         <el-input
           v-model="queryParams.userId"
           placeholder="请输入用户id"
@@ -40,7 +40,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="被投人" prop="voteEmpName">
         <el-input
           v-model="queryParams.voteEmpName"
@@ -80,7 +80,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -111,7 +111,7 @@
           @click="handleDelete"
           v-hasPermi="['kaohe:vote_recard:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -125,24 +125,21 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="vote_recardList" @selection-change="handleSelectionChange">
+<!--    <el-table v-loading="loading" :data="vote_recardList" @selection-change="handleSelectionChange">-->
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="vote_recardList">
-      <el-table-column label="主键" align="center" prop="id" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="投票活动id" align="center" prop="voteId" />
+<!--      <el-table-column label="主键" align="center" prop="id" />-->
-      <el-table-column label="投票人id" align="center" prop="tpEmpId" />
+      <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="userId" />
-      <el-table-column label="被投人id" align="center" prop="voteEmpId" />
+<!--      <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="投票时间" align="center" prop="voteTime" width="180"/>
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.voteTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="IP地址" align="center" prop="ipAddress" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -159,7 +156,7 @@
             v-hasPermi="['kaohe:vote_recard:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
 
     <pagination