Luyue123456
/
ZGC_PEOP
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

人物库首页大屏修改

master
zhaoyantao 1 year ago
parent
c34d20b14d
commit
75ac0c2c43
29 changed files with 612 additions and 554 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -0
      rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java
  2. +35
    -16
      rwk-admin/src/main/resources/static/css/main.css
  3. +10
    -10
      rwk-admin/src/main/resources/static/css/skins.css
  4. +14
    -1
      rwk-admin/src/main/resources/static/css/use/css1.css
  5. BIN
      rwk-admin/src/main/resources/static/img/badge.png
  6. BIN
      rwk-admin/src/main/resources/static/img/login-background.jpg
  7. BIN
      rwk-admin/src/main/resources/static/img/main/6.png
  8. BIN
      rwk-admin/src/main/resources/static/img/main/7.png
  9. BIN
      rwk-admin/src/main/resources/static/img/main/8.png
  10. BIN
      rwk-admin/src/main/resources/static/img/main/dwsw.png
  11. BIN
      rwk-admin/src/main/resources/static/img/main/gwcx.png
  12. BIN
      rwk-admin/src/main/resources/static/img/main/ldps.png
  13. BIN
      rwk-admin/src/main/resources/static/img/main/presidentOne.png
  14. BIN
      rwk-admin/src/main/resources/static/img/main/presidentTwo.png
  15. BIN
      rwk-admin/src/main/resources/static/img/main/xzsw.png
  16. BIN
      rwk-admin/src/main/resources/static/img/pay.png
  17. BIN
      rwk-admin/src/main/resources/static/img/sousuo.png
  18. +0
    -0
      rwk-admin/src/main/resources/static/img/use/delete.png
  19. +0
    -0
      rwk-admin/src/main/resources/static/img/use/filelook.png
  20. +0
    -0
      rwk-admin/src/main/resources/static/img/use/scfj.png
  21. +0
    -0
      rwk-admin/src/main/resources/static/img/use/xiazai.png
  22. +1
    -1
      rwk-admin/src/main/resources/static/ruoyi/css/ry-ui.css
  23. +4
    -32
      rwk-admin/src/main/resources/templates/index.html
  24. +229
    -74
      rwk-admin/src/main/resources/templates/main.html
  25. +14
    -1
      rwk-admin/src/main/resources/templates/system/information/add.html
  26. +240
    -0
      rwk-admin/src/main/resources/templates/system/information/addressBook.html
  27. +41
    -377
      rwk-admin/src/main/resources/templates/system/information/edit.html
  28. +18
    -15
      rwk-admin/src/main/resources/templates/system/information/information.html
  29. +0
    -27
      rwk-admin/src/main/test/TestDemo.java

+ 6
- 0
rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java View File

@@ -41,6 +41,12 @@ public class RwkStaffInformationController extends BaseController
return prefix + "/information"; return prefix + "/information";
} }


@GetMapping("/addressBook")
public String addressBook()
{
return prefix + "/addressBook";
}

/** /**
* 查询人员信息列表 * 查询人员信息列表
*/ */


+ 35
- 16
rwk-admin/src/main/resources/static/css/main.css View File

@@ -11,12 +11,11 @@ body, html {
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
width: 100%; width: 100%;
padding: 28px 36px;
padding: 50px 26px 20px 26px;
} }
.travel { .travel {
display: flex; display: flex;
width: 100%; width: 100%;
height: 50%;
} }
.travel:first-child{ .travel:first-child{
margin-bottom: 8px; margin-bottom: 8px;
@@ -28,23 +27,44 @@ body, html {
padding: 10px; padding: 10px;
margin: 10px; margin: 10px;
} }
.box-20 {
width: 30%;
.arrange{
display: flex;
height: 100px;
border-radius: 5px;
align-items: center;
margin: 0 10px;
}
.div1{
color: #ffffff;
flex-direction: column;
justify-content: center;
width: calc(30% - 20px);
background-color: #28619C;
}
.div2{
width: calc(34% - 20px);
padding-left: 20px;
background-color: #FFF7F2;
} }
.box-25 {
width: 25%;
.div3{
width: calc(36% - 20px);
padding-left: 20px;
background-color: #E9F2FD;
} }
.box-40 {
width: 40%;
.cut{
color: #000000;
background-color: #F7F7F7;
padding: 5px 10px 5px 10px;
} }
.box-50 {
width: 50%;
.cut:first-child{
border-radius: 5px 0 0 5px;
} }
.box-75 {
width: 75%;
.cut:last-child{
border-radius: 0 5px 5px 0;
} }
.box-100 {
width: 100%;
.cut.active{
color: #ffffff;
background-color: #1a7bb9;
} }
.tabs-container{ .tabs-container{
width: 100%; width: 100%;
@@ -99,8 +119,7 @@ body, html {
} }
.wddbrw_head { .wddbrw_head {
width: 100%; width: 100%;
padding-top: 16px;
padding-bottom: 12px;
padding-bottom: 10px;
padding-left: 10px; padding-left: 10px;
} }




+ 10
- 10
rwk-admin/src/main/resources/static/css/skins.css View File

@@ -19,7 +19,7 @@


.skin-blue .navbar-default .nav>li.selected>a, .skin-blue .navbar-default .nav>li.selected>a,
.skin-blue .navbar-default .nav>li.selected>a:focus { .skin-blue .navbar-default .nav>li.selected>a:focus {
background-color: #1890ff;
background-color: #185EFF;
color: rgba(255,255,255,1); color: rgba(255,255,255,1);
} }


@@ -68,13 +68,13 @@
} }


.skin-blue .logo { .skin-blue .logo {
background-color: #357ca5;
background-color: #0042A4;
color: #fff; color: #fff;
border-bottom: 0 solid transparent border-bottom: 0 solid transparent
} }


.skin-blue .logo:hover { .skin-blue .logo:hover {
background-color: #357ca5
background-color: #0042A4;
} }


.skin-blue li.user-header { .skin-blue li.user-header {
@@ -104,7 +104,7 @@
.skin-blue .nav:not(.navbar-toolbar)>li.active { .skin-blue .nav:not(.navbar-toolbar)>li.active {
color: #fff; color: #fff;
background: #293846; background: #293846;
border-left: 3px solid #3c8dbc;
border-left: 0 solid #185EFF;
} }


.skin-blue .nav>li.active>ul li.active { .skin-blue .nav>li.active>ul li.active {
@@ -873,7 +873,7 @@
} }


.theme-light.skin-blue .navbar-default .nav>li.active>a { .theme-light.skin-blue .navbar-default .nav>li.active>a {
color: #1890ff;
color: #185EFF;
} }


.theme-light.skin-blue .navbar-default .nav>li.selected>a, .theme-light.skin-blue .navbar-default .nav>li.selected>a,
@@ -947,16 +947,16 @@
} }


.theme-blue .nav:not(.navbar-toolbar)>li.active{ .theme-blue .nav:not(.navbar-toolbar)>li.active{
background-color: #0281ac;
background-color: #0042A4;
} }


.theme-blue .navbar-static-side { .theme-blue .navbar-static-side {
background-color: #0281ac;
background-color: #0042A4;
box-shadow: 2px 0 2px 0 rgba(29,35,41,.05); box-shadow: 2px 0 2px 0 rgba(29,35,41,.05);
} }


.theme-blue .user-panel { .theme-blue .user-panel {
background-color: #0281ac;
background-color: #0042A4;
} }


.theme-blue .navbar-default .nav>li>a { .theme-blue .navbar-default .nav>li>a {
@@ -1015,12 +1015,12 @@


.theme-blue .navbar-default .nav>li>a:hover, .theme-blue .navbar-default .nav>li>a:hover,
.theme-blue .navbar-default .nav>li>a:focus { .theme-blue .navbar-default .nav>li>a:focus {
background-color: #0281ac;
background-color: #0042A4;
box-shadow: 2px 0 2px 0 rgba(29,35,41,.05); box-shadow: 2px 0 2px 0 rgba(29,35,41,.05);
} }


.fixed-sidebar.theme-blue.mini-navbar .nav li:hover>a> span.nav-label { .fixed-sidebar.theme-blue.mini-navbar .nav li:hover>a> span.nav-label {
background-color: #0281ac;
background-color: #0042A4;
} }


.fixed-sidebar.theme-blue.mini-navbar .nav li:hover>.nav-second-level { .fixed-sidebar.theme-blue.mini-navbar .nav li:hover>.nav-second-level {


+ 14
- 1
rwk-admin/src/main/resources/static/css/use/css1.css View File

@@ -66,7 +66,7 @@
float: left; float: left;
margin-right: 8px; margin-right: 8px;
border: 1px solid #FFFFFF; border: 1px solid #FFFFFF;
background-image: url(../../img/receive/scfj.png)
background-image: url(../../img/use/scfj.png)
} }
.fj_box1{ .fj_box1{
height: 47px; height: 47px;
@@ -177,4 +177,17 @@
} }
.mainText{ .mainText{
padding: 3px 10px; padding: 3px 10px;
}
/*-----弹性居中对齐-----*/
.flexLayout{
display: flex;
justify-content: center;
align-items: center;
}
.select-list li .searchTag{
width:275px;
height: 36px;
border: 2px solid #cad0d9;
font-size: 16px;
background: #fff url(../../img/sousuo.png) no-repeat 95% center;
} }

BIN
rwk-admin/src/main/resources/static/img/badge.png View File

Before After
Width: 64  |  Height: 64  |  Size: 8.6 KiB

BIN
rwk-admin/src/main/resources/static/img/login-background.jpg View File

Before After
Width: 1200  |  Height: 642  |  Size: 102 KiB Width: 1200  |  Height: 674  |  Size: 146 KiB

BIN
rwk-admin/src/main/resources/static/img/main/6.png View File

Before After
Width: 146  |  Height: 146  |  Size: 17 KiB

BIN
rwk-admin/src/main/resources/static/img/main/7.png View File

Before After
Width: 144  |  Height: 147  |  Size: 19 KiB

BIN
rwk-admin/src/main/resources/static/img/main/8.png View File

Before After
Width: 144  |  Height: 147  |  Size: 18 KiB

BIN
rwk-admin/src/main/resources/static/img/main/dwsw.png View File

Before After
Width: 74  |  Height: 74  |  Size: 3.6 KiB

BIN
rwk-admin/src/main/resources/static/img/main/gwcx.png View File

Before After
Width: 74  |  Height: 74  |  Size: 2.7 KiB

BIN
rwk-admin/src/main/resources/static/img/main/ldps.png View File

Before After
Width: 74  |  Height: 74  |  Size: 3.2 KiB

BIN
rwk-admin/src/main/resources/static/img/main/presidentOne.png View File

Before After
Width: 85  |  Height: 85  |  Size: 8.7 KiB

BIN
rwk-admin/src/main/resources/static/img/main/presidentTwo.png View File

Before After
Width: 86  |  Height: 86  |  Size: 9.0 KiB

BIN
rwk-admin/src/main/resources/static/img/main/xzsw.png View File

Before After
Width: 74  |  Height: 74  |  Size: 3.6 KiB

BIN
rwk-admin/src/main/resources/static/img/pay.png View File

Before After
Width: 900  |  Height: 539  |  Size: 137 KiB

BIN
rwk-admin/src/main/resources/static/img/sousuo.png View File

Before After
Width: 26  |  Height: 26  |  Size: 1.7 KiB

rwk-admin/src/main/resources/static/img/receive/delete.png → rwk-admin/src/main/resources/static/img/use/delete.png View File


rwk-admin/src/main/resources/static/img/receive/filelook.png → rwk-admin/src/main/resources/static/img/use/filelook.png View File


rwk-admin/src/main/resources/static/img/receive/scfj.png → rwk-admin/src/main/resources/static/img/use/scfj.png View File


rwk-admin/src/main/resources/static/img/receive/xiazai.png → rwk-admin/src/main/resources/static/img/use/xiazai.png View File


+ 1
- 1
rwk-admin/src/main/resources/static/ruoyi/css/ry-ui.css View File

@@ -1218,7 +1218,7 @@ table.rc-table-resizing thead > th > a {
} }


.btn-unite{ .btn-unite{
margin-left: 7px;
margin-right: 7px;
font-size: 16px; font-size: 16px;
padding: 6px 20px; padding: 6px 20px;
border: 1px solid #406b9c; border: 1px solid #406b9c;


+ 4
- 32
rwk-admin/src/main/resources/templates/index.html View File

@@ -26,27 +26,13 @@
</div> </div>
<a th:href="@{/index}"> <a th:href="@{/index}">
<li class="logo hidden-xs" style="width: 280px;"> <li class="logo hidden-xs" style="width: 280px;">
<span class="logo-lg" style="line-height: 70px;">人物库</span><br/>
<!-- <div style="position: relative;bottom: 46px;font-size: 14px;line-height: 0">——公文管理系统<span style="color: red">(机密)</span>——</div>-->
<span class="logo-lg" style="line-height: 70px;">
<img style="width: 40px;height: 40px;margin-right: 10px;" src="/img/badge.png" />人物库管理系统
</span><br/>
</li> </li>
</a> </a>
<div class="sidebar-collapse"> <div class="sidebar-collapse">
<ul class="nav" id="side-menu"> <ul class="nav" id="side-menu">
<!-- <li>-->
<!-- <div class="user-panel">-->
<!-- <a class="menuItem noactive" title="个人中心" th:href="@{/system/user/profile}">-->
<!-- <div class="hide" th:text="个人中心"></div>-->
<!-- <div class="pull-left image">-->
<!-- <img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}" th:onerror="this.src='img/profile.jpg'" class="img-circle" alt="User Image">-->
<!-- </div>-->
<!-- </a>-->
<!-- <div class="pull-left info">-->
<!-- <p>[[${user.loginName}]]</p>-->
<!-- <a href="javascript:;"><i class="fa fa-circle text-success"></i> 在线</a>-->
<!-- <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>-->
<!-- </div>-->
<!-- </div>-->
<!-- </li>-->
<li> <li>
<a class="menuItem" th:href="@{/system/main}"><i class="fa fa-home"></i> <span class="nav-label">首页</span> </a> <a class="menuItem" th:href="@{/system/main}"><i class="fa fa-home"></i> <span class="nav-label">首页</span> </a>
</li> </li>
@@ -190,11 +176,8 @@
<!--右侧部分开始--> <!--右侧部分开始-->
<div id="page-wrapper" class="gray-bg dashbard-1"> <div id="page-wrapper" class="gray-bg dashbard-1">
<div class="row border-bottom"> <div class="row border-bottom">
<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0;background-color: #357ca5;min-height: 70px;">
<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0;background-color: #0042A4;min-height: 70px;">
<div class="navbar-header"> <div class="navbar-header">
<!-- <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="javascript:;" title="收起菜单">-->
<!-- <i class="fa fa-bars"></i>-->
<!-- </a>-->
</div> </div>
<ul class="nav navbar-top-links navbar-right welcome-message"> <ul class="nav navbar-top-links navbar-right welcome-message">
<li class="user-menu"> <li class="user-menu">
@@ -216,19 +199,8 @@
<a onclick="resetPwd()"> <a onclick="resetPwd()">
<i class="fa fa-key"></i> 修改密码</a> <i class="fa fa-key"></i> 修改密码</a>
</li> </li>
<!-- <li>-->
<!-- <a onclick="switchSkin()">-->
<!-- <i class="fa fa-dashboard"></i> 切换主题</a>-->
<!-- </li>-->
<!-- <li>-->
<!-- <a onclick="toggleMenu()">-->
<!-- <i class="fa fa-toggle-off"></i> 横向菜单</a>-->
<!-- </li>-->
<!-- <li class="divider"></li>-->
</ul> </ul>
</li> </li>
<!-- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
<!-- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>-->
<li><a data-toggle="tooltip" th:href="@{/logout}" data-trigger="hover" data-placement="bottom" href="javascript:;" id="logout"><i class="fa fa-power-off"></i></a></li> <li><a data-toggle="tooltip" th:href="@{/logout}" data-trigger="hover" data-placement="bottom" href="javascript:;" id="logout"><i class="fa fa-power-off"></i></a></li>
</ul> </ul>
</nav> </nav>


+ 229
- 74
rwk-admin/src/main/resources/templates/main.html View File

@@ -14,20 +14,74 @@


<body class="gray-bg"> <body class="gray-bg">
<div class="container"> <div class="container">
<div class="travel">
<div class="box box-50">
<div id="pieChart1" style="width: 100%; height: calc(100% - 30px);"></div>
<div class="travel" style="height: 68%;">
<div style="width: 30%;">
<div class="wddbrw_head">
<h1>职务层次情况</h1>
</div>
<div class="box" style="height: calc(50% - 50px);">
<div id="pieChart1" style="width: 100%; height: 100%;"></div>
</div>
<div class="wddbrw_head">
<h1>政治面貌情况</h1>
</div>
<div class="box" style="height: calc(50% - 50px);display: flex;margin: 0 10px;">
<div id="pieChart2" style="width: 50%; height: 100%;"></div>
<div id="plotChart3" style="width:50%; height: 100%;"></div>
</div>
</div> </div>
<div class="box box-50">
<div id="pieChart2" style="width: 100%; height: calc(100% - 30px);"></div>
<div style="width: 40%;">
<div style="width:100%;display: flex;">
<div class="arrange div1">
<div>知联会干部在库数</div>
<span>5321</span>
</div>
<div class="arrange div2">
<div><img style="width: 40px;height: 40px;" src="/img/main/presidentOne.png"/></div>
<div style="margin-left: 20px;">
<div>正会长</div>
<span><span style="margin-right: 20px;color: #FF620D;">1</span>人</span>
</div>
</div>
<div class="arrange div3">
<div><img style="width: 40px;height: 40px;" src="/img/main/presidentTwo.png"/></div>
<div style="margin-left: 20px;">
<div>副会长</div>
<span><span style="margin-right: 20px;color: #016BFF;">5</span>人</span>
</div>
</div>
</div>
</div>
<div style="width: 30%;">
<div class="wddbrw_head">
<h1>学历、学位情况</h1>
</div>
<div class="box" style="height: calc(100% - 20px);">
<div style="display: flex;justify-content: center;">
<div class="cut active" style="">全日制教育</div>
<div class="cut">在职教育</div>
</div>
<div id="barChart2" style="width: 100%; height: calc(50% - 10px);"></div>
<div id="pieChart3" style="width: 100%; height: calc(50% - 10px);"></div>
</div>
</div> </div>
</div> </div>
<div class="travel">
<div class="box box-50">
<div id="pieChart" style="width: 100%; height: calc(100% - 30px);"></div>
<div class="travel" style="height: 30%;">
<div style="width: 30%;">
<div class="wddbrw_head">
<h1>性别及年龄分布</h1>
</div>
<div class="box" style="height: calc(100% - 30px);">
<div id="barChart1" style="width: 100%; height: 100%;"></div>
</div>
</div> </div>
<div class="box box-50">
<div id="barLineChart" style="width: 100%; height: calc(100% - 20px);"></div>
<div style="width: 70%;">
<div class="wddbrw_head">
<h1>单位类别情况</h1>
</div>
<div class="box" style="height: calc(100% - 30px);">
<div id="barChart3" style="width: 100%; height: 100%;"></div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -38,49 +92,99 @@
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script> <script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>
<th:block th:include="include :: echarts-js" /> <th:block th:include="include :: echarts-js" />
<script type="text/javascript"> <script type="text/javascript">
var areaStyle ={
color: {type: 'linear',x: 0,y: 0,x2: 0,y2: 1,
colorStops: [{offset: 0, color: 'rgba(0, 136, 212, 0.5)'}, {
offset: 1, color: 'rgba(0, 136, 212, 0)'}],global: false
}
}
var array1 = [ var array1 = [
{name:'数据1',value:235}, {name:'数据1',value:235},
{name:'数据2',value:274}, {name:'数据2',value:274},
{name:'数据3',value:310}, {name:'数据3',value:310},
{name:'数据4',value:335} {name:'数据4',value:335}
]; ];
pieChartMethod('pieChart',array1);
pieChartMethod('pieChart1',array1);
pieChartMethod('pieChart2',array1);
barLineChartMethod();
//饼图
function pieChartMethod(id,array){
// $(".cut").click(function () {
// $('.box').removeClass('active');
// $(this).addClass('active');
// });
var array2 = [2,4,6,8,10];
var grid = {left: '10%', right: '6%', bottom: '3%', top:'6%'}
//饼图1
pieChartMethod('pieChart1',array1,"职务层次情况",'60%',"",grid,"",true);
//饼图2
pieChartMethod('pieChart2',array1,"饼图2",['50%', '80%'],"",grid,"",true);
//阶梯图
var data = [
{ value: 8, name: '副部级' },
{ value: 23, name: '正局级' },
{ value: 100, name: '副局级' },
{ value: 699, name: '正处级' },
{ value: 1640, name: '副处级' }
]
funnelPlot('plotChart3',data);
//柱状图
var yAxis = {
type: 'category',
data: ['30岁以下', '31-40岁', '41-50岁', '51-60岁', '61岁以上']
}
var series = [{
name: '男性',
type: 'bar',
data: [1200, 900, 600, 300, 200],
emphasis: {
focus: 'series'
}
}, {
name: '女性',
type: 'bar',
data: [1100, 950, 650, 350, 250],
emphasis: {
focus: 'series'
}
}
]
//柱状图1
var grid1 = {left: '15%', right: '6%', bottom: '12%', top:'3%'};
barChartMethod("barChart1","",{data: ['男', '女']},{type: 'value', name: '人数'},yAxis,grid1,series);
//柱状图2
barChartMethod("barChart2","",{data: ['男', '女']},{type: 'value', name: '人数'},yAxis,grid1,series);
var itemStyle = {borderColor: '#fff',borderWidth: 2}
//饼图3
pieChartMethod('pieChart3',array1,"饼图3",'60%',"",grid,"",true,itemStyle);
//柱状图3
var xAxis = {
type: 'category',
data: ['类别A', '类别B', '类别C', '类别D', '类别E']
}
yAxis = {
type: 'value'
}
var series1 = [{
name: '数量',
type: 'bar',
data: [120, 200, 150, 80, 70],
itemStyle: {
color: '#73C9C8'
},
showBackground: true,
backgroundStyle: {
color: '#000000'
}
}];
var grid3 = {left: '5%', right: '6%', bottom: '4%', top:'6%'}
barChartMethod("barChart3","","",xAxis,yAxis,grid3,series1);

//饼图-id-数据-名称-弧度-位置-grid-legend-是否需要线
function pieChartMethod(id,array,name,radius,center,grid,legend,isLabel,itemStyle){
var pieChart = echarts.init(document.getElementById(id)); var pieChart = echarts.init(document.getElementById(id));
// 扇形图配置
var pieOption = { var pieOption = {
legend: {
orient: 'vertical', // 保持图例垂直分布
right: '16%',// 图例距离容器右侧的距离
bottom: "center",
icon: 'circle',
formatter: function(name) {
var value = array.find(item => item.name === name).value;
return `{name|${name}}{value|${value}}`; // 显示名称和对应值
},
textStyle: {rich: {name: {padding: [0, 10, 0, 20],width: 100,fontSize: 16},value:{fontSize: 16}}}
},
grid: {
left: 10
tooltip: {
trigger: 'item'
}, },
legend: legend,
series: [{ series: [{
name: '人员数量',
name: name,
type: 'pie', type: 'pie',
radius: ['40%', '70%'],
center: ['25%', '50%'],
data:array,
label: {show: false},
labelLine: {show: false},
data: array,
labelLine: {
length: 4,
length2: 4
},
emphasis: { emphasis: {
itemStyle: { itemStyle: {
shadowBlur: 10, shadowBlur: 10,
@@ -88,44 +192,95 @@
shadowColor: 'rgba(0, 0, 0, 0.5)' shadowColor: 'rgba(0, 0, 0, 0.5)'
} }
} }
}
]
}]
}; };
if (grid) pieOption.grid = grid;
if (radius) pieOption.series[0].radius = radius;
if (center) pieOption.series[0].center = center;
if (!isLabel) {
pieOption.series[0].label = {show: false};
pieOption.series[0].labelLine = {show: false};
}
if (itemStyle) pieOption.series[0].itemStyle = itemStyle;
pieChart.setOption(pieOption); pieChart.setOption(pieOption);
} }


//柱状图和折线图配置
function barLineChartMethod(){
var barLineChart = echarts.init(document.getElementById('barLineChart'));
var barLineOption = {
tooltip: {},
legend: [{orient: 'horizontal', data: ["党员数量"], textStyle: {fontSize: 16},left:20},
{orient: 'horizontal', data: ["非党员数量"], textStyle: {fontSize: 16},right:20}],
xAxis: {
type: 'category',
data: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']
},
yAxis: {
type: 'value',
minInterval: 1
},
grid: {
top: 40
},
//漏斗图
function funnelPlot(id,data){
var myChart = echarts.init(document.getElementById(id));
var changeData = handleData(data);
console.log(changeData);
var option = {
// tooltip: {
// trigger: 'item',
// formatter: function(params) {
// return params.name + ': ' + data[params.dataIndex].value;
// }
// },
series: [{ series: [{
name: "党员数量",
type: 'bar',
barWidth: 20,
data: [10, 22, 16, 18, 23, 30, 25, 20, 15, 40, 35, 10]
}, {
name: "非党员数量",
type: 'line',
smooth:true,
areaStyle:areaStyle,
data: [20, 40, 30, 35, 20, 50, 45, 30, 25, 60, 55, 40]
}]
type: 'funnel',
left: '5%',
top: 10,
bottom: 10,
width: '90%',
min: 0,
max: 10,
minSize: '0%',
maxSize: '100%',
sort: 'ascending',
gap: 2,
label: {
show: true,
position: 'inside'
},
labelLine: {
length: 10,
lineStyle: {
width: 1,
type: 'solid'
}
},
itemStyle: {
borderColor: '#fff',
borderWidth: 1
},
emphasis: {
label: {
fontSize: 20
}
},
data: changeData
}
]
}; };
barLineChart.setOption(barLineOption);
myChart.setOption(option);
}

//柱状图-id--tooltip-legend-xAxis-yAxis-grid-series
function barChartMethod(id,tooltip,legend,xAxis,yAxis,grid,series){
var barChart = echarts.init(document.getElementById(id));
var barOption = {
tooltip: {
trigger: 'axis'
},
};
if (tooltip) barOption.tooltip = tooltip;
if (legend) barOption.legend = legend;
if (xAxis) barOption.xAxis = xAxis;
if (yAxis) barOption.yAxis = yAxis;
if (grid) barOption.grid = grid;
if (series) barOption.series = series;
barChart.setOption(barOption);
}

// 处理数据集合
function handleData(data){
return data.map((item,index) => {
return {
name: item.name+" "+item.value+" 人",
value: array2[index]
};
});
} }
</script> </script>
</body> </body>


+ 14
- 1
rwk-admin/src/main/resources/templates/system/information/add.html View File

@@ -8,7 +8,6 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<ul class="nav head_top" id="tab"> <ul class="nav head_top" id="tab">
<div class="text-right hidden-print" style="float: right"> <div class="text-right hidden-print" style="float: right">
<button class="btn btn-unite" onclick="submitDoc()">提交</button>
<button class="btn btn-unite" onclick="submitHandler()">保存</button> <button class="btn btn-unite" onclick="submitHandler()">保存</button>
</div> </div>
</ul> </ul>
@@ -413,15 +412,29 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/information" var prefix = ctx + "system/information"
var $("#familyMemberCode").val(generateCodeId());
$("#form-information-add").validate({ $("#form-information-add").validate({
focusCleanup: true focusCleanup: true
}); });
init();

//初始化
function init(){

}


function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.saveTab(prefix + "/add", $('#form-information-add').serialize()); $.operate.saveTab(prefix + "/add", $('#form-information-add').serialize());
} }
} }

//随机生成连表code
function generateCodeId() {
const timestamp = Date.now();
const randomNum = Math.floor(Math.random() * 10000);
return `code-${timestamp}-${randomNum}`;
}
</script> </script>
</body> </body>
</html> </html>

+ 240
- 0
rwk-admin/src/main/resources/templates/system/information/addressBook.html View File

@@ -0,0 +1,240 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('通讯录')" />
<link th:href="@{/css/use/css1.css}" rel="stylesheet"/>
<style>
.btn-style1{
padding: 6px 20px;
border-radius: 5px 5px 0 0;
background-color: #EAF9FD;
color: #000000;
}
.btn-style2{
padding: 6px 20px;
border-radius: 0;
color: #185EFF;
border-color: #185EFF;
}
.btn-style3{
color: #417EFA;
padding: 0 10px;
}
.btn-style1:hover,.btn-style2:hover{
background-color: #185EFF;
color: #ffffff;
}
.groupDiv{
width:calc(24% + 7px);
height: 70vh;
position: absolute;
top:192px;
z-index: 99;
border-right: 2px solid #E6E6E6;
}
/* 左侧分组栏 */
.left-panel {
width: 100%;
padding: 10px 0 10px 10px;
margin-top: 20px;
}
.group-list {
margin-bottom: 10px;
}
.group-list ul{
margin: 0;
padding: 0;
}
.group-list li{
list-style-type: none;
padding: 5px 0 5px 20px;
margin: 5px 0;
cursor: pointer;
}
.group-list li:hover{
background-color: #CECECE;
}
.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){
border: none;
}
</style>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="btn-group-sm" id="toolbar" role="group">
<div style="width: 97vw;border-bottom: 1px solid #F1F3F7;">
<a class="btn btn-style1">
我的联系人
</a>
<a class="btn btn-style1">
导入联系人
</a>
<a class="btn btn-style1">
导出联系人
</a>
<a class="btn btn-style1">
使用帮助
</a>
</div>
<div style="margin-top: 10px;">
<a class="btn btn-style2">
新建联系人
</a>
<a class="btn btn-style2 multiple disabled">
删除联系人
</a>
<a class="btn btn-style2">
创建组
</a>
<a class="btn btn-style2">
复制到组
</a>
<a class="btn btn-style2">
移动到组
</a>
<a class="btn btn-style2" onclick="$.table.search()">
刷新
</a>
</div>
</div>
<div class="col-md-12 select-table table-striped" style="min-height: 97%;width: 100%;">
<div class="col-md-12 search-collapse" style="border:none;box-shadow: 0 5px 3px -3px rgba(0,0,0,.1);padding-right: 0;padding-left: 0;margin-bottom: 10px;">
<form id="formId">
<div class="select-list">
<ul>
<li style="margin-left: 20px;">
<label>通讯录：</label>
</li>
<li class="flexLayout" style="float: right;">
<input type="text" class="form-control searchTag" placeholder="搜索姓名关键字"/>
<button class="btn btn-success" style="width:65px;margin-left: 10px;height: 36px;background-color: #185EFF;" onclick="$.table.search()">
搜索
</button>
</li>
</ul>
</div>
</form>
</div>
<div id="grouping" class="groupDiv">
<div class="left-panel">
<div style="margin-bottom: 10px;color: #A9B2C2;">联系人分组</div>
<div id="groups" class="group-list">
<ul>
<li><div>所有联系人(<span id="manTotal">11</span>)</div></li>
<li><div>分组1(<span>4</span>)</div></li>
<li><div>分组2(<span>7</span>)</div></li>
<li><div>分组3(<span>1</span>)</div></li>
<li><div>分组4(<span>0</span>)</div></li>
<li><div>未分组联系人(<span id="notDivide">1</span>)</div></li>
</ul>
</div>
</div>
</div>
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:information:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:information:remove')}]];
var prefix = ctx + "system/information";

$(function() {
queryUserList();
queryGroupTree();
});

function queryUserList() {
var options = {
// url: prefix + "/list",
// createUrl: prefix + "/add",
// updateUrl: prefix + "/edit/{id}",
// removeUrl: prefix + "/remove",
// exportUrl: prefix + "/export",
height: 200,
pagination:false,
sidePagination: "client",
showFooter: false,
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
virtualScroll: true,
data:[
{id:1,name:"姓名1",phone:"18756365787",email:"18756365787@163.c0m",subset:1},
{id:2,name:"姓名2",phone:"16754367898",email:"16754367898@163.c0m",subset:1},
{id:3,name:"姓名3",phone:"17865454565",email:"17865454565@163.c0m",subset:1},
{id:4,name:"姓名4",phone:"19877685789",email:"19877685789@163.c0m",subset:1},
{id:5,name:"姓名5",phone:"16758987656",email:"16758987656@163.c0m",subset:1},
{id:6,name:"姓名6",phone:"18988765676",email:"18988765676@163.c0m",subset:1},
{id:7,name:"姓名7",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:8,name:"姓名8",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:9,name:"姓名9",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:10,name:"姓名10",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:11,name:"姓名11",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:12,name:"姓名12",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:13,name:"姓名13",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:14,name:"姓名14",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:15,name:"姓名15",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:16,name:"姓名16",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:17,name:"姓名17",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:18,name:"姓名18",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:19,name:"姓名19",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:20,name:"姓名20",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:21,name:"姓名21",phone:"19876342223",email:"19876342223@163.c0m",subset:1},
{id:22,name:"姓名22",phone:"19876342223",email:"19876342223@163.c0m",subset:1}
],
modalName: "人员信息",
columns: [{
checkbox: true,
},
{
field: 'id',
title: '主键id',
visible: false
},
{
field: 'name',
title: '姓名',
align:"center",
width: 25,
widthUnit:"%"
},
{
field: 'phone',
title: '电话',
align:"center",
width: 25,
widthUnit:"%"
},
{
field: 'email',
title: '电子邮箱',
align:"center",
width: 25,
widthUnit:"%"
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn-style3 ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')">编辑</a> ');
actions.push('<a class="btn-style3" href="javascript:void(0)">|</a> ');
actions.push('<a class="btn-style3" href="javascript:void(0)">详情</a>');
return actions.join('');
}
}]
};
$.table.init(options);
$(".fixed-table-container.fixed-height").css({width: "calc(75% - 20px)",height:parseInt($("#grouping").css("height")),float: "right","margin-right": "20px"});
}

function queryGroupTree() {

}
</script>
</body>
</html>

+ 41
- 377
rwk-admin/src/main/resources/templates/system/information/edit.html View File

@@ -5,6 +5,11 @@
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<ul class="nav head_top" id="tab">
<div class="text-right hidden-print" style="float: right">
<button class="btn btn-unite" onclick="submitHandler()">保存</button>
</div>
</ul>
<form class="form-horizontal m" id="form-information-edit" th:object="${rwkStaffInformation}"> <form class="form-horizontal m" id="form-information-edit" th:object="${rwkStaffInformation}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<div class="col-md-12"> <div class="col-md-12">
@@ -120,7 +125,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">党派：</label> <label class="col-md-3 control-label">党派：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="party" class="form-control" type="text">
<input name="party" th:field="*{party}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -128,7 +133,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">党派职务：</label> <label class="col-md-3 control-label">党派职务：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="partyPositions" class="form-control" type="text">
<input name="partyPositions" th:field="*{partyPositions}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -136,7 +141,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">加入时间：</label> <label class="col-md-3 control-label">加入时间：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="joinTime" class="form-control" type="text">
<input name="joinTime" th:field="*{joinTime}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -146,7 +151,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">人才类别：</label> <label class="col-md-3 control-label">人才类别：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="talentCategory" class="form-control" type="text">
<input name="talentCategory" th:field="*{talentCategory}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -154,7 +159,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">宗教信仰：</label> <label class="col-md-3 control-label">宗教信仰：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="religion" class="form-control" type="text">
<input name="religion" th:field="*{religion}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -164,7 +169,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">现任社会职务(包括各级人大、政协等职务)：</label> <label class="col-md-3 control-label">现任社会职务(包括各级人大、政协等职务)：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="currentOccupation" class="form-control" type="text">
<input name="currentOccupation" th:field="*{currentOccupation}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -172,7 +177,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">知联会职务：</label> <label class="col-md-3 control-label">知联会职务：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="zlhJob" class="form-control" type="text">
<input name="zlhJob" th:field="*{zlhJob}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -183,7 +188,7 @@
<label class="col-md-3 control-label">全日制教育</label> <label class="col-md-3 control-label">全日制教育</label>
<label class="col-md-3 control-label">毕业院校及专业：</label> <label class="col-md-3 control-label">毕业院校及专业：</label>
<div class="col-md-6"> <div class="col-md-6">
<input name="qrzSchoolMajor" class="form-control" type="text">
<input name="qrzSchoolMajor" th:field="*{qrzSchoolMajor}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -191,7 +196,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">学历：</label> <label class="col-md-3 control-label">学历：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="qrzQualification" class="form-control" type="text">
<input name="qrzQualification" th:field="*{qrzQualification}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -199,7 +204,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">学位：</label> <label class="col-md-3 control-label">学位：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="qrzDegree" class="form-control" type="text">
<input name="qrzDegree" th:field="*{qrzDegree}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -210,7 +215,7 @@
<label class="col-md-3 control-label">在职教育</label> <label class="col-md-3 control-label">在职教育</label>
<label class="col-md-3 control-label">毕业院校及专业：</label> <label class="col-md-3 control-label">毕业院校及专业：</label>
<div class="col-md-6"> <div class="col-md-6">
<input name="zzSchoolMajor" class="form-control" type="text">
<input name="zzSchoolMajor" th:field="*{zzSchoolMajor}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -218,7 +223,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">学历：</label> <label class="col-md-3 control-label">学历：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="zzQualification" class="form-control" type="text">
<input name="zzQualification" th:field="*{zzQualification}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -226,7 +231,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">学位：</label> <label class="col-md-3 control-label">学位：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="zzDegree" class="form-control" type="text">
<input name="zzDegree" th:field="*{zzDegree}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -236,7 +241,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">工作单位及职务：</label> <label class="col-md-3 control-label">工作单位及职务：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="unitJob" class="form-control" type="text">
<input name="unitJob" th:field="*{unitJob}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -244,7 +249,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">技术职称：</label> <label class="col-md-3 control-label">技术职称：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="technicalTitle" class="form-control" type="text">
<input name="technicalTitle" th:field="*{technicalTitle}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -252,7 +257,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">专业特长：</label> <label class="col-md-3 control-label">专业特长：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="speciality" class="form-control" type="text">
<input name="speciality" th:field="*{speciality}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -262,7 +267,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">单位属性：</label> <label class="col-md-3 control-label">单位属性：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="unitAttribute" class="form-control" type="text">
<input name="unitAttribute" th:field="*{unitAttribute}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -270,7 +275,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">职务级别：</label> <label class="col-md-3 control-label">职务级别：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="jobLevel" class="form-control" type="text">
<input name="jobLevel" th:field="*{jobLevel}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -278,7 +283,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">任现职时间：</label> <label class="col-md-3 control-label">任现职时间：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="currentTenure" class="form-control" type="text">
<input name="currentTenure" th:field="*{currentTenure}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -288,7 +293,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">单位地址：</label> <label class="col-md-3 control-label">单位地址：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="unitAddress" class="form-control" type="text">
<input name="unitAddress" th:field="*{unitAddress}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -296,7 +301,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">电话：</label> <label class="col-md-3 control-label">电话：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="unitPhone" class="form-control" type="text">
<input name="unitPhone" th:field="*{unitPhone}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -304,7 +309,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">邮编：</label> <label class="col-md-3 control-label">邮编：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="unitZipCode" class="form-control" type="text">
<input name="unitZipCode" th:field="*{unitZipCode}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -314,7 +319,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">家庭地址：</label> <label class="col-md-3 control-label">家庭地址：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="homeAddress" class="form-control" type="text">
<input name="homeAddress" th:field="*{homeAddress}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -322,7 +327,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">电话：</label> <label class="col-md-3 control-label">电话：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="homePhone" class="form-control" type="text">
<input name="homePhone" th:field="*{homePhone}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -330,7 +335,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">邮编：</label> <label class="col-md-3 control-label">邮编：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="homeZipCode" class="form-control" type="text">
<input name="homeZipCode" th:field="*{homeZipCode}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -340,7 +345,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">电子邮箱：</label> <label class="col-md-3 control-label">电子邮箱：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="email" class="form-control" type="text">
<input name="email" th:field="*{email}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -348,7 +353,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">手机号：</label> <label class="col-md-3 control-label">手机号：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="mobilePhone" class="form-control" type="text">
<input name="mobilePhone" th:field="*{mobilePhone}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -356,7 +361,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">微信号：</label> <label class="col-md-3 control-label">微信号：</label>
<div class="col-md-9"> <div class="col-md-9">
<input name="wxCode" class="form-control" type="text">
<input name="wxCode" th:field="*{wxCode}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -365,7 +370,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-1 control-label">业余爱好：</label> <label class="col-md-1 control-label">业余爱好：</label>
<div class="col-md-11"> <div class="col-md-11">
<input name="hobby" class="form-control" type="text">
<input name="hobby" th:field="*{hobby}" class="form-control" type="text">
</div> </div>
</div> </div>
</div> </div>
@@ -373,7 +378,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-1 control-label">简历：</label> <label class="col-md-1 control-label">简历：</label>
<div class="col-md-11"> <div class="col-md-11">
<textarea name="resume" class="form-control"></textarea>
<textarea name="resume" class="form-control">[[*{resume}]]</textarea>
</div> </div>
</div> </div>
</div> </div>
@@ -381,7 +386,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-1 control-label">培训情况：</label> <label class="col-md-1 control-label">培训情况：</label>
<div class="col-md-11"> <div class="col-md-11">
<textarea name="training" class="form-control"></textarea>
<textarea name="training" class="form-control">[[*{training}]]</textarea>
</div> </div>
</div> </div>
</div> </div>
@@ -389,7 +394,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-1 control-label">主要成就：</label> <label class="col-md-1 control-label">主要成就：</label>
<div class="col-md-11"> <div class="col-md-11">
<textarea name="achievement" class="form-control"></textarea>
<textarea name="achievement" class="form-control">[[*{achievement}]]</textarea>
</div> </div>
</div> </div>
</div> </div>
@@ -397,354 +402,13 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-1 control-label">家庭情况：</label> <label class="col-md-1 control-label">家庭情况：</label>
<div class="col-md-11"> <div class="col-md-11">
<textarea name="jtqk" class="form-control"></textarea>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">姓名：</label>
<div class="col-sm-8">
<input name="name" th:field="*{name}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">民族：</label>
<div class="col-sm-8">
<input name="nation" th:field="*{nation}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">国籍：</label>
<div class="col-sm-8">
<input name="nationality" th:field="*{nationality}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">出生年月：</label>
<div class="col-sm-8">
<input name="birthday" th:field="*{birthday}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">出生地：</label>
<div class="col-sm-8">
<input name="birthplace" th:field="*{birthplace}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">籍贯：</label>
<div class="col-sm-8">
<input name="nativePlace" th:field="*{nativePlace}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">取得国家：</label>
<div class="col-sm-8">
<input name="acquiringCountry" th:field="*{acquiringCountry}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">证件号：</label>
<div class="col-sm-8">
<input name="idNumber" th:field="*{idNumber}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">参加工作时间：</label>
<div class="col-sm-8">
<input name="workTime" th:field="*{workTime}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">身份证号码：</label>
<div class="col-sm-8">
<input name="idCard" th:field="*{idCard}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">党派：</label>
<div class="col-sm-8">
<input name="party" th:field="*{party}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">党派职务：</label>
<div class="col-sm-8">
<input name="partyPositions" th:field="*{partyPositions}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">加入时间：</label>
<div class="col-sm-8">
<input name="joinTime" th:field="*{joinTime}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">人才类别：</label>
<div class="col-sm-8">
<input name="talentCategory" th:field="*{talentCategory}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">宗教信仰：</label>
<div class="col-sm-8">
<input name="religion" th:field="*{religion}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">现任社会职务(包括各级人大、政协等职务)：</label>
<div class="col-sm-8">
<input name="currentOccupation" th:field="*{currentOccupation}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">知联会职务：</label>
<div class="col-sm-8">
<input name="zlhJob" th:field="*{zlhJob}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">全日制教育毕业院校及专业：</label>
<div class="col-sm-8">
<input name="qrzSchoolMajor" th:field="*{qrzSchoolMajor}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">全日制学历：</label>
<div class="col-sm-8">
<input name="qrzQualification" th:field="*{qrzQualification}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">全日制学位：</label>
<div class="col-sm-8">
<input name="qrzDegree" th:field="*{qrzDegree}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">在职教育毕业院校及专业：</label>
<div class="col-sm-8">
<input name="zzSchoolMajor" th:field="*{zzSchoolMajor}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">在职教育学历：</label>
<div class="col-sm-8">
<input name="zzQualification" th:field="*{zzQualification}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">在职教育学位：</label>
<div class="col-sm-8">
<input name="zzDegree" th:field="*{zzDegree}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">工作单位及职务：</label>
<div class="col-sm-8">
<input name="unitJob" th:field="*{unitJob}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">技术职称：</label>
<div class="col-sm-8">
<input name="technicalTitle" th:field="*{technicalTitle}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">专业特长：</label>
<div class="col-sm-8">
<input name="speciality" th:field="*{speciality}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">单位属性：</label>
<div class="col-sm-8">
<input name="unitAttribute" th:field="*{unitAttribute}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">职务级别：</label>
<div class="col-sm-8">
<input name="jobLevel" th:field="*{jobLevel}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">现任职时间：</label>
<div class="col-sm-8">
<input name="currentTenure" th:field="*{currentTenure}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">单位地址：</label>
<div class="col-sm-8">
<input name="unitAddress" th:field="*{unitAddress}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">单位电话：</label>
<div class="col-sm-8">
<input name="unitPhone" th:field="*{unitPhone}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">单位邮编：</label>
<div class="col-sm-8">
<input name="unitZipCode" th:field="*{unitZipCode}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">家庭地址：</label>
<div class="col-sm-8">
<input name="homeAddress" th:field="*{homeAddress}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">家庭电话：</label>
<div class="col-sm-8">
<input name="homePhone" th:field="*{homePhone}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">家庭邮编：</label>
<div class="col-sm-8">
<input name="homeZipCode" th:field="*{homeZipCode}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">电子邮箱：</label>
<div class="col-sm-8">
<input name="email" th:field="*{email}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">手机号：</label>
<div class="col-sm-8">
<input name="mobilePhone" th:field="*{mobilePhone}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">微信号：</label>
<div class="col-sm-8">
<input name="wxCode" th:field="*{wxCode}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">业余爱好：</label>
<div class="col-sm-8">
<input name="hobby" th:field="*{hobby}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">简历：</label>
<div class="col-sm-8">
<input name="resume" th:field="*{resume}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">培训情况：</label>
<div class="col-sm-8">
<input name="training" th:field="*{training}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">主要成就：</label>
<div class="col-sm-8">
<input name="achievement" th:field="*{achievement}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">家庭成员code：</label>
<div class="col-sm-8">
<input name="familyMemberCode" th:field="*{familyMemberCode}" class="form-control" type="text">
<table id="jtqk">

</table>
</div> </div>
</div> </div>
</div> </div>
<input name="familyMemberCode" th:field="*{familyMemberCode}" type="hidden">
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />


+ 18
- 15
rwk-admin/src/main/resources/templates/system/information/information.html View File

@@ -31,26 +31,26 @@
<input type="text" name="wxCode"/> <input type="text" name="wxCode"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-unite btn-rounded btn-sm" onclick="$.table.search()">搜索</a>
<a class="btn btn-unite btn-rounded btn-sm" onclick="$.form.reset()">重置</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>


<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.addTab()" shiro:hasPermission="system:information:add">
<i class="fa fa-plus"></i> 添加
<div id="toolbar" role="group">
<a class="btn btn-unite" onclick="$.operate.addTab()" shiro:hasPermission="system:information:add">
添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="system:information:edit">
<i class="fa fa-edit"></i> 修改
<a class="btn btn-unite single disabled" onclick="$.operate.editTab()" shiro:hasPermission="system:information:edit">
修改
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:information:remove">
<i class="fa fa-remove"></i> 删除
<a class="btn btn-unite multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:information:remove">
删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:information:export">
<i class="fa fa-download"></i> 导出
<a class="btn btn-unite" onclick="$.table.exportExcel()" shiro:hasPermission="system:information:export">
导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
@@ -62,8 +62,8 @@
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:information:edit')}]]; var editFlag = [[${@permission.hasPermi('system:information:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:information:remove')}]]; var removeFlag = [[${@permission.hasPermi('system:information:remove')}]];
var sexDatas = [[${@dict.getType('sys_user_sex')}]];
var prefix = ctx + "system/information"; var prefix = ctx + "system/information";

$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
@@ -86,7 +86,10 @@
}, },
{ {
field: 'sex', field: 'sex',
title: '性别'
title: '性别',
formatter: function(value, row, index) {
return $.table.selectDictLabel(sexDatas, value);
}
}, },
{ {
field: 'birthday', field: 'birthday',
@@ -101,8 +104,8 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
actions.push('<a class="btn btn-unite btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')">编辑</a> ');
actions.push('<a class="btn btn-unite btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')">删除</a>');
return actions.join(''); return actions.join('');
} }
}] }]


+ 0
- 27
rwk-admin/src/main/test/TestDemo.java View File

@@ -1,27 +0,0 @@
import com.rwk.RuoYiApplication;
import com.rwk.common.core.domain.entity.SysDictType;
import com.rwk.system.service.ISysDictTypeService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;

import java.util.List;

@RunWith(SpringRunner.class)
@SpringBootTest(
webEnvironment = SpringBootTest.WebEnvironment.MOCK,
classes = RuoYiApplication.class)
public class TestDemo {
@Autowired
private ISysDictTypeService dictTypeService;

@Test
public void test(){
List<SysDictType> sysDictTypes = dictTypeService.selectDictTypeAll();
for (SysDictType sysDictType : sysDictTypes) {
System.out.println(sysDictType);
}
}
}

Write Preview
Loading…
Cancel
Save