Skip to content

D
dd_school
Commit cc2fb513 by jsy672
Options

Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

parents 4bacc8a1 de57b1f9
Showing with 108 additions and 123 deletions
ruoyi-ui/.env.development
# 页面标题
VUE_APP_TITLE = 网络数字信息化校园管理系统
VUE_APP_TITLE = 智慧校园管理系统
# 开发环境配置
ENV = 'development'
......
ruoyi-ui/.env.production
# 页面标题
VUE_APP_TITLE = 网络数字信息化校园管理系统
VUE_APP_TITLE = 智慧校园管理系统
# 生产环境配置
ENV = 'production'
......
ruoyi-ui/.env.staging
# 页面标题
VUE_APP_TITLE = 网络数字信息化校园管理系统
VUE_APP_TITLE = 智慧校园管理系统
NODE_ENV = production
......
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
......@@ -42,7 +42,7 @@ export default {
data() {
return {
// title: process.env.VUE_APP_TITLE,
title:'信息化校园管理系统',
title:'智慧校园管理系统',
logo: logoImg
}
}
......
ruoyi-ui/src/views/index.vue
......@@ -188,7 +188,7 @@
<!-- {{ user.userName }}, 欢迎登录智慧校园管理系统!-->
<!-- </div>-->
<div style="font-family: PingFang SC; color: #ffffff; font-size: 16px; margin-top: 20px; margin-left: 20px">
{{ user.userName }}, 欢迎登录网络数字信息化校园管理系统!
{{ user.userName }}, 欢迎登录智慧校园管理系统!
</div>
<div style="font-size: small; margin-top: 8px; color: #96c4f5; margin-left: 20px">
上次登录时间：{{ user.loginDate }}
......
ruoyi-ui/src/views/login copy.vue
......@@ -30,7 +30,7 @@
<div class="login-card-right">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <h3 class="title">智慧校园管理系统</h3>-->
<h3 class="title">网络数字信息化校园管理系统</h3>
<h3 class="title">智慧校园管理系统</h3>
<el-form-item prop="phonenumber">
<el-input
......
ruoyi-ui/src/views/login.vue
......@@ -26,7 +26,7 @@
<div class="login-card-right">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <h3 class="title">智慧校园管理系统</h3>-->
<h3 class="title">网络数字信息化校园管理系统</h3>
<h3 class="title">智慧校园管理系统</h3>
<el-form-item prop="phonenumber">
<el-input v-model="loginForm.phonenumber" type="text" auto-complete="off" placeholder="手机号码">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
......
ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/InfoReview.vue
......@@ -39,9 +39,9 @@
<el-button type="danger" plain icon="el-icon-back" size="mini" v-if="status == '1'" @click="handleBack"
:disabled="multiple">退回修改
</el-button>
<el-button type="danger" icon="el-icon-s-release" size="mini" v-if="status == '1'" @click="handleReject"
<!-- <el-button type="danger" icon="el-icon-s-release" size="mini" v-if="status == '1'" @click="handleReject"
:disabled="multiple">驳回
</el-button>
</el-button>-->
<el-button type="info" icon="el-icon-finished" size="mini" v-if="status == '1'" @click="handleFinished">结束
</el-button>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -76,14 +76,13 @@
<ListImage :image-url="isEmptyAvatar(scope.row.photo, scope.row.sex)"></ListImage>
</template>
</el-table-column>
<el-table-column label="身份证号码" align="center" min-width="180" prop="infoIdCard"/>
<el-table-column label="匹配状态" min-width="110" align="center" prop="matchStatus">
<template slot-scope="scope">
<dict-tag v-if="scope.row.matchStatus == '1'" style="color:#47bb02; font-weight: bold"
:options="dict.type.match_status"
:value="scope.row.matchStatus"/>
<dict-tag v-else style="color:red; font-weight: bold" :options="dict.type.match_status"
:value="scope.row.matchStatus"/>
<dict-tag
:class="scope.row.matchStatus === '1' ? '_status_success' : '_status_error'"
:options="dict.type.match_status"
:value="scope.row.matchStatus"
/>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" min-width="80" max-width="100" prop="auditStatus">
......@@ -91,46 +90,60 @@
<dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="studentName"/>
<el-table-column label="学籍号" align="center" prop="studentNumber"/>
<el-table-column label="初中学校" align="center" prop="schoolName"/>
<el-table-column label="测试项目" align="center" prop="project" min-width="100" max-width="120"/>
<el-table-column label="姓名" align="center" width="100" prop="studentName"/>
<el-table-column label="身份证号码" align="center" min-width="180" prop="infoIdCard"/>
<!-- 教育局信息 -->
<el-table-column label="姓名" align="center" width="100" prop="eduStudentName"/>
<el-table-column label="身份证号码" align="center" min-width="180" prop="eduIdCard"/>
<el-table-column label="性别" align="center" prop="sex">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
</template>
</el-table-column>
<!-- 教育局信息 -->
<el-table-column label="姓名" align="center" width="120px" prop="eduStudentName"/>
<el-table-column label="学籍号" align="center" prop="eduStudentNumber"/>
<el-table-column label="初中学校" width="100" align="center" prop="eduSchoolName"/>
<el-table-column label="测试项目" align="type" prop="eduProject" width="100"/>
<!-- <el-table-column label="身份证号" align="type" prop="eduIdCard" width="80" v-if="0" /> -->
<el-table-column label="性别" align="center" prop="eduSex">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.eduSex"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="230"
max-width="300">
<el-table-column label="测试项目" align="center" prop="project" min-width="100" max-width="120"/>
<el-table-column label="联系方式1" prop="eduSchoolName" width="120" align="center"/>
<el-table-column label="联系方式2" prop="eduProject" align="center" width="120"/>
<el-table-column label="民族" prop="eduProject" width="100"/>
<el-table-column label="政治面貌" prop="eduProject" width="100"/>
<el-table-column label="出生日期" prop="eduProject" width="100"/>
<el-table-column label="婚姻状况" prop="eduProject" width="100"/>
<el-table-column label="户籍所在地" prop="eduProject" width="100"/>
<el-table-column label="生源地" prop="eduProject" width="100"/>
<el-table-column label="考生身份" prop="eduProject" width="100"/>
<el-table-column label="参加工作时间" prop="eduProject" width="100"/>
<el-table-column label="现工作单位职务" prop="eduProject" width="120"/>
<el-table-column label="报考学历是否全日制" prop="eduProject" width="140"/>
<el-table-column label="学历" prop="eduProject" width="100"/>
<el-table-column label="学位" prop="eduProject" width="100"/>
<el-table-column label="毕业院校" prop="eduProject" width="100"/>
<el-table-column label="所学专业" prop="eduProject" width="100"/>
<el-table-column label="最后毕业时间" prop="eduProject" width="100"/>
<el-table-column label="个人简历" prop="eduProject" width="100"/>
<el-table-column label="家庭成员情况" prop="eduProject" width="100"/>
<el-table-column label="资料" prop="eduProject" width="100"/>
<el-table-column
label="操作" align="center"
class-name="small-padding fixed-width"
min-width="230" max-width="300"
>
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit"
v-if="scope.row.auditStatus == '3' && status == '1' &&scope.row.matchStatus != '2' "
@click="handleUpdate(scope.row)" v-hasPermi="['system:relation:edit']">修改
</el-button>
<el-button size="mini" type="text" icon="el-icon-success"
v-if="scope.row.auditStatus == '3'&&scope.row.matchStatus != '0'&&scope.row.matchStatus != '2' && status == '1'"
v-if="scope.row.auditStatus == '3'&&scope.row.matchStatus != '0' && scope.row.matchStatus != '2' && status == '1'"
@click="handlePassOne(scope.row)" v-hasPermi="['system:relation:remove']">通过
</el-button>
<el-button size="mini" type="text" icon="el-icon-back" v-if="scope.row.auditStatus == '3' && status == '1'"
@click="handleBackOne(scope.row)" v-hasPermi="['system:relation:edit']">退回修改
</el-button>
<el-button size="mini" type="text" icon="el-icon-s-release"
<!-- <el-button size="mini" type="text" icon="el-icon-s-release"
v-if="scope.row.auditStatus == '3' && status == '1'"
@click="handleRejectOne(scope.row)" v-hasPermi="['system:relation:remove']">驳回
</el-button>
</el-button>-->
<el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
v-if="scope.row.auditStatus != '3' && scope.row.auditStatus != null"
v-if="scope.row.auditStatus === '3' && scope.row.auditStatus != null"
v-hasPermi="['system:relation:edit']">查看
</el-button>
</template>
......@@ -155,20 +168,6 @@
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" @change="searchInfo" readOnly/>
</el-form-item>
<el-form-item label="学籍号" prop="studentNumber">
<el-input v-model="form.studentNumber" placeholder="请输入学籍号" :readOnly="isHandle"/>
</el-form-item>
<el-form-item label="初中学校" prop="schoolName" v-show="!isHandle">
<el-input v-model="form.schoolName" placeholder="请输入初中学校"
@click.native="selectSchool(a = false)"/>
</el-form-item>
<el-form-item label="测试项目" prop="project" v-show="!isHandle">
<el-input v-model="form.project" placeholder="请选择测试项目" readonly
@click.native="selectProjectList(a = false)"/>
</el-form-item>
<el-form-item label="初中学校" prop="schoolName" v-show="isHandle">
<el-input v-model="form.schoolName" placeholder="请输入初中学校" readOnly/>
</el-form-item>
<el-form-item label="测试项目" prop="project" v-show="isHandle">
<el-input v-model="form.project" placeholder="请选择测试项目" readOnly/>
</el-form-item>
......@@ -200,12 +199,6 @@
style="width: 178px; height: 178px; border-radius: 50%" alt="">
</div>
</el-form-item>
<el-form-item label="身高" prop="height">
<el-input v-model="form.height" placeholder="请输入身高" :readOnly="isHandle"/>
</el-form-item>
<el-form-item label="体重" prop="weight">
<el-input v-model="form.weight" placeholder="请输入体重" :readOnly="isHandle"/>
</el-form-item>
<el-form-item label="联系方式2" prop="telephone2">
<el-input v-model="form.telephone2" placeholder="请输入联系方式" :readOnly="isHandle"/>
</el-form-item>
......@@ -231,20 +224,6 @@
<el-form-item label="身份证号" prop="eduIdCard">
<el-input v-model="form.eduIdCard" readOnly placeholder="请输入身份证号"/>
</el-form-item>
<el-form-item label="学籍号" prop="eduStudentNumber">
<el-input v-model="form.eduStudentNumber" placeholder="请输入学籍号"/>
</el-form-item>
<el-form-item label="初中学校" prop="eduSchoolName" v-show="!isHandle">
<el-input v-model="form.eduSchoolName" placeholder="请输入初中学校"
@click.native="selectSchool(a = true)"/>
</el-form-item>
<el-form-item label="测试项目" prop="eduProject" v-show="!isHandle">
<el-input v-model="form.eduProject" placeholder="请选择测试项目" readonly
@click.native="selectProjectList(a = true)"/>
</el-form-item>
<el-form-item label="初中学校" prop="eduSchoolName" v-show="isHandle">
<el-input v-model="form.eduSchoolName" placeholder="请输入初中学校" readOnly/>
</el-form-item>
<el-form-item label="测试项目" prop="eduProject" v-show="isHandle">
<el-input v-model="form.eduProject" placeholder="请选择测试项目" readOnly/>
</el-form-item>
......@@ -904,67 +883,22 @@ export default {
},
// 设置单元格样式
setRowStyle(row, column, rowIndex, columnIndex) {
if (row.columnIndex == "6") {
if (row.columnIndex == "5") {
if (row.row.studentName != row.row.eduStudentName) {
return 'color: red;background-color: #D9EDF7'
}
}
if (row.columnIndex == "7") {
if (row.row.studentNumber != row.row.eduStudentNumber) {
return 'color: red;background-color: #D9EDF7'
}
}
if (row.columnIndex == "8") {
if (row.row.schoolName != row.row.eduSchoolName) {
return 'color: red;background-color: #D9EDF7'
}
}
if (row.columnIndex == "9") {
if (row.row.project != row.row.eduProject) {
return 'color: red;background-color: #D9EDF7'
}
}
if (row.columnIndex == "10") {
if (row.row.sex != row.row.eduSex) {
if (row.columnIndex == "6") {
if (row.row.infoIdCard != row.row.eduIdCard) {
return 'color: red;background-color: #D9EDF7'
}
}
if (row.columnIndex == "11") {
if (row.row.studentName != row.row.eduStudentName) {
return 'color: red;background-color: #F4CE98'
}
}
if (row.columnIndex == "12") {
if (row.row.studentNumber != row.row.eduStudentNumber) {
return 'color: red;background-color: #F4CE98'
}
}
if (row.columnIndex == "13") {
if (row.row.schoolName != row.row.eduSchoolName) {
return 'color: red;background-color: #F4CE98'
}
}
if (row.columnIndex == "14") {
if (row.row.project != row.row.eduProject) {
return 'color: red;background-color: #F4CE98'
}
}
if (row.columnIndex == "15") {
if (row.row.sex != row.row.eduSex) {
return 'color: red;background-color: #F4CE98'
}
}
if (row.columnIndex == "6" || row.columnIndex == "7" || row.columnIndex == "8" || row.columnIndex == "9" || row.columnIndex == "10") {
if (row.columnIndex == "5" || row.columnIndex == "6") {
return 'background-color: #D9EDF7'
}
if (row.columnIndex == "11" || row.columnIndex == "12" || row.columnIndex == "13" || row.columnIndex == "14" || row.columnIndex == "15") {
if (row.columnIndex == "7" || row.columnIndex == "8") {
return 'background-color: #F4CE98'
}
// } else {
// return 'color: red'
// }
},
// 关闭弹窗
close() {
......@@ -1087,6 +1021,17 @@ export default {
</script>
<style scoped>
._status_success{
color: #47bb02;
font-weight: bold;
}
._status_error{
color: red;
font-weight: bold;
}
.fullbg {
background-color: rgb(201, 201, 201);
left: 0;
......
ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/examRoomAllocate.vue
......@@ -58,7 +58,7 @@
<el-table-column label="姓名" align="center" min-width="88" prop="studentName"/>
<el-table-column label="学籍号" align="center" min-width="180" prop="studentNumber"/>
<el-table-column label="初中学校" key="juniorSchool" min-width="130" align="center" prop="schoolName"/>
<el-table-column label="测试项目" align="type" prop="project" min-width="100">
<el-table-column label="测试项目" prop="project" min-width="100">
</el-table-column>
<el-table-column label="性别" align="center" prop="sex" min-width="80">
<template slot-scope="scope">
......
ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/scoreManage.vue
......@@ -63,7 +63,7 @@
<el-table-column label="姓名" align="center" prop="studentName" min-width="80" max-width="120"/>
<el-table-column label="学籍号" align="center" prop="studentNumber" width="100"/>
<el-table-column key="juniorSchool" width="130" align="center" prop="schoolName" label="初中学校"/>
<el-table-column label="测试项目" align="type" prop="project" width="80">
<el-table-column label="测试项目" prop="project" width="80">
<!-- <template slot-scope="scope">
<dict-tag :options="dict.type.professional_category" :value="scope.row.sex" />
</template> -->
......
ruoyi-ui/vue.config.js
......@@ -48,7 +48,7 @@ module.exports = {
//学校内网
// target: `http://10.20.100.201:57321`,
// target: `http://47.105.176.202:5115`,
target: `http://192.168.1.110:8848`,
target: `http://172.16.100.96:5131`,
// target: `http://172.18.6.157:8848`,
changeOrigin: true,
pathRewrite: {
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/SchoolRecruitStudentServiceImpl.java
......@@ -211,6 +211,12 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
List<SchoolRecruitStudentFamily> familyList = recruitStudentFamilyMapper.selectList(lqw2);
s.setRemeberData(familyList);
LambdaQueryWrapper<SchoolRecruitStudentFjb> lqw3 = new LambdaQueryWrapper<>();
lqw3.eq(SchoolRecruitStudentFjb::getStudentId, s.getId());
lqw3.eq(SchoolRecruitStudentFjb::getDelFlag, "0");
List<SchoolRecruitStudentFjb> fList = recruitStudentFjbMapper.selectList(lqw3);
s.setFileList(fList);
return s;
}
......@@ -379,7 +385,16 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
recruitStudentFamilyMapper.insert(j);
}
//附件
LambdaQueryWrapper<SchoolRecruitStudentFjb> lqw3 = new LambdaQueryWrapper<>();
lqw3.eq(SchoolRecruitStudentFjb::getStudentId, s.getId());
recruitStudentFjbMapper.delete(lqw3);
List<SchoolRecruitStudentFjb> fileList = student.getFileList();
for(SchoolRecruitStudentFjb j:fileList){
j.setId(null);
j.setStudentId(student.getId());
recruitStudentFjbMapper.insert(j);
}
......@@ -431,6 +446,22 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
s.setTelephone2(student.getTelephone2());
s.setPhoto(student.getPhoto());
s.setUpdateTime(DateUtils.getNowDate());
s.setMz(student.getMz());
s.setZzmm(student.getZzmm());
s.setCsrq(student.getCsrq());
s.setHyzk(student.getHyzk());
s.setHjszd(student.getHjszd());
s.setSyd(student.getSyd());
s.setKssf(student.getKssf());
s.setCjgzsj(student.getCjgzsj());
s.setXgzdwzw(student.getXgzdwzw());
s.setBkxlsfqrz(student.getBkxlsfqrz());
s.setXl(student.getXl());
s.setXw(student.getXw());
s.setByxx(student.getByxx());
s.setSxzz(student.getSxzz());
s.setZhbysj(student.getZhbysj());
recruitStudentMapper.updateById(s);
......@@ -457,7 +488,16 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
recruitStudentFamilyMapper.insert(j);
}
//附件
LambdaQueryWrapper<SchoolRecruitStudentFjb> lqw3 = new LambdaQueryWrapper<>();
lqw3.eq(SchoolRecruitStudentFjb::getStudentId, s.getId());
recruitStudentFjbMapper.delete(lqw3);
List<SchoolRecruitStudentFjb> fileList = student.getFileList();
for(SchoolRecruitStudentFjb j:fileList){
j.setId(null);
j.setStudentId(student.getId());
recruitStudentFjbMapper.insert(j);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment