diff --git a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java index eecb508..9062a4b 100644 --- a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java +++ b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java @@ -1,6 +1,11 @@ package com.rwk.web.controller.ability; +import java.util.ArrayList; import java.util.List; + +import com.rwk.common.utils.StringUtils; +import com.rwk.system.domain.RwkFamilyMember; +import com.rwk.system.service.IRwkFamilyMemberService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,6 +39,9 @@ public class RwkStaffInformationController extends BaseController @Autowired private IRwkStaffInformationService rwkStaffInformationService; + @Autowired + private IRwkFamilyMemberService rwkFamilyMemberService; + @RequiresPermissions("system:information:view") @GetMapping() public String information() @@ -47,6 +55,24 @@ public class RwkStaffInformationController extends BaseController return prefix + "/addressBook"; } + /** + * 查看收文 + */ + @GetMapping("informationView/{id}") + public String receiveView(@PathVariable("id") Long id, ModelMap mmap) + { + RwkStaffInformation rwkStaffInformation = rwkStaffInformationService.selectRwkStaffInformationById(id); + List list = new ArrayList<>(); + if (StringUtils.isNotEmpty(rwkStaffInformation.getFamilyMemberCode())){ + RwkFamilyMember rwkFamilyMember = new RwkFamilyMember(); + rwkFamilyMember.setFamilyMemberCode(rwkStaffInformation.getFamilyMemberCode()); + list = rwkFamilyMemberService.selectRwkFamilyMemberList(rwkFamilyMember); + } + mmap.put("rwkStaffInformation",rwkStaffInformation); + mmap.put("familyList",list); + return prefix + "/informationView"; + } + /** * 查询人员信息列表 */ diff --git a/rwk-admin/src/main/resources/static/css/use/css1.css b/rwk-admin/src/main/resources/static/css/use/css1.css index 01afc54..8550d49 100644 --- a/rwk-admin/src/main/resources/static/css/use/css1.css +++ b/rwk-admin/src/main/resources/static/css/use/css1.css @@ -90,7 +90,6 @@ vertical-align: top; color: #ff0000; } - .float-left{ float: left; } @@ -120,11 +119,6 @@ font-size: 16px; color: #999999; } -.opinionTable { - display: flex; - flex-wrap: wrap; - width: 100%; -} .table-row { width: 25%; box-sizing: border-box; @@ -136,28 +130,6 @@ .input-container { position: relative; } -#departmentsContainer { - position: absolute; - top: 10px; - left: 0; - display: flex; - align-items: center; - overflow: hidden; - white-space: nowrap; - padding-left: 5px; - height: 22px; -} -.department-block { - color: #fff; - background: #1AB394; - border: 1px solid #1AB394; - border-radius: 4px; - margin-right: 5px; - padding: 2px 5px; - display: flex; - height: 100%; - align-items: center; -} .moveRadian{ border-radius: 0!important; } @@ -190,4 +162,66 @@ border: 2px solid #cad0d9; font-size: 16px; background: #fff url(../../img/sousuo.png) no-repeat 95% center; +} +/*-----百度百科样式-----*/ +dd,dl{ + margin: 0; +} + +.basicInfo_UxXSa { + background: url(../../img/use/basicInfo-bg.png); + margin: 10px 0 10px; +} + +.basicInfo_UxXSa:after { + clear: both; + content: ""; + display: block +} + +.basicInfo_UxXSa .basicInfoBlock_q4iJb { + float: left; + width: 33.33%; +} + +.basicInfo_UxXSa .basicInfoBlock_q4iJb .itemWrapper_yeNiB { + position: relative +} + +.basicInfo_UxXSa .basicInfoBlock_q4iJb .itemWrapper_yeNiB:after { + clear: both; + content: ""; + display: block +} + +.basicInfo_UxXSa .basicInfoBlock_q4iJb .basicInfoItem_aRc0i { + display: block; + float: left; + line-height: 26px; + margin: 0; + padding: 0 +} + +.basicInfo_UxXSa .basicInfoBlock_q4iJb .basicInfoItem_aRc0i.itemName_PqU2f { + color: #999; + font-weight: 700; + overflow: hidden; + padding: 0 5px 0 12px; + text-overflow: ellipsis; + white-space: nowrap; + min-width: 150px; +} + +.basicInfo_UxXSa .basicInfoBlock_q4iJb .basicInfoItem_aRc0i.itemName_PqU2f:before { + content: ""; + display: block +} + +.basicInfo_UxXSa .basicInfoBlock_q4iJb .basicInfoItem_aRc0i.itemValue_OfJ1R { + zoom: 1; + color: #333; + float: left; + position: relative; + min-width: 80px; + word-break: break-all } \ No newline at end of file diff --git a/rwk-admin/src/main/resources/static/img/use/basicInfo-bg.png b/rwk-admin/src/main/resources/static/img/use/basicInfo-bg.png new file mode 100644 index 0000000..775b9e8 Binary files /dev/null and b/rwk-admin/src/main/resources/static/img/use/basicInfo-bg.png differ diff --git a/rwk-admin/src/main/resources/templates/main.html b/rwk-admin/src/main/resources/templates/main.html index 33cce65..2413347 100644 --- a/rwk-admin/src/main/resources/templates/main.html +++ b/rwk-admin/src/main/resources/templates/main.html @@ -98,10 +98,10 @@ {name:'数据3',value:310}, {name:'数据4',value:335} ]; - // $(".cut").click(function () { - // $('.box').removeClass('active'); - // $(this).addClass('active'); - // }); + $(".cut").click(function () { + $('.cut').removeClass('active'); + $(this).addClass('active'); + }); var array2 = [2,4,6,8,10]; var grid = {left: '10%', right: '6%', bottom: '3%', top:'6%'} //饼图1 @@ -120,17 +120,23 @@ //柱状图 var yAxis = { type: 'category', - data: ['30岁以下', '31-40岁', '41-50岁', '51-60岁', '61岁以上'] + data: ['30岁以下', '31-40岁', '41-50岁', '51-60岁', '61岁以上'], + axisLine: { + show: false, + }, + axisTick: { + show: false, + } } var series = [{ - name: '男性', + name: '男', type: 'bar', data: [1200, 900, 600, 300, 200], emphasis: { focus: 'series' } }, { - name: '女性', + name: '女', type: 'bar', data: [1100, 950, 650, 350, 250], emphasis: { @@ -139,34 +145,64 @@ } ] //柱状图1 - var grid1 = {left: '15%', right: '6%', bottom: '12%', top:'3%'}; - barChartMethod("barChart1","",{data: ['男', '女']},{type: 'value', name: '人数'},yAxis,grid1,series); + var grid1 = {left: '15%', right: '6%', bottom: '12%', top:'12%'}; + barChartMethod("barChart1",{trigger: 'axis'},{data: ['男', '女'],left: '3%',},{type: 'value', name: '人数', + axisLine: {show: false,}, axisTick: {show: false,},splitLine: {show: false}},yAxis,grid1,series); + grid1.top = '3%'; + series = [{ + name: '数据', + type: 'bar', + data: [120, 200, 150, 80, 70, 110, 130,120], + itemStyle: { + normal: { + color: function(params) { + var colors = ['#34b3a0', '#ff6347']; + return colors[params.dataIndex % 2]; + } + } + } + }]; + yAxis = { + type: 'category', + data: ['研究生', '大学', '大专', '中专', '职高','中央党校研究生','中央党校大学','其他'] + } //柱状图2 - barChartMethod("barChart2","",{data: ['男', '女']},{type: 'value', name: '人数'},yAxis,grid1,series); + barChartMethod("barChart2",{trigger: 'axis'},"",{type: 'value', name: '人数'},yAxis,grid1,series); var itemStyle = {borderColor: '#fff',borderWidth: 2} //饼图3 pieChartMethod('pieChart3',array1,"饼图3",'60%',"",grid,"",true,itemStyle); //柱状图3 + var data1 = [120, 200, 150, 80, 70, 110, 130,120, 200, 150, 80, 70, 110, 130,120, 200, 150, 80, 70, 110, 130,120, 200, 150, 80, 70]; + var maxHeight = Math.max(...data1); var xAxis = { type: 'category', - data: ['类别A', '类别B', '类别C', '类别D', '类别E'] + data: ['A', 'B', 'C', 'D', 'E', 'F', 'G','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z'] } yAxis = { type: 'value' } var series1 = [{ - name: '数量', + name: '灰色背景', type: 'bar', - data: [120, 200, 150, 80, 70], + data: data1.map(value => maxHeight), // 使用最大高度填充 itemStyle: { - color: '#73C9C8' + color: '#ccc', // 灰色 + opacity: 0.5 // 可选:使灰色柱子稍微透明 + }, + barGap: '-100%', // 使灰色柱子与实际数据柱子重叠 + tooltip: { + show: false //禁用灰色柱子的 tooltip }, - showBackground: true, - backgroundStyle: { - color: '#000000' + silent: true //禁用柱子的悬停和点击事件 + }, { + name: '数据', + type: 'bar', + data: data1, + itemStyle: { + color: '#73C9C8' // 实际数据的颜色 } }]; - var grid3 = {left: '5%', right: '6%', bottom: '4%', top:'6%'} + var grid3 = {left: '5%', right: '6%', bottom: '12%', top:'6%'} barChartMethod("barChart3","","",xAxis,yAxis,grid3,series1); //饼图-id-数据-名称-弧度-位置-grid-legend-是否需要线 @@ -261,7 +297,7 @@ var barChart = echarts.init(document.getElementById(id)); var barOption = { tooltip: { - trigger: 'axis' + }, }; if (tooltip) barOption.tooltip = tooltip; diff --git a/rwk-admin/src/main/resources/templates/system/information/add.html b/rwk-admin/src/main/resources/templates/system/information/add.html index dae59da..47eb2b1 100644 --- a/rwk-admin/src/main/resources/templates/system/information/add.html +++ b/rwk-admin/src/main/resources/templates/system/information/add.html @@ -378,7 +378,7 @@
- +
@@ -386,7 +386,7 @@
- +
@@ -394,7 +394,7 @@
- +
diff --git a/rwk-admin/src/main/resources/templates/system/information/edit.html b/rwk-admin/src/main/resources/templates/system/information/edit.html index 45ca674..c134eb3 100644 --- a/rwk-admin/src/main/resources/templates/system/information/edit.html +++ b/rwk-admin/src/main/resources/templates/system/information/edit.html @@ -378,7 +378,7 @@
- +
@@ -386,7 +386,7 @@
- +
@@ -394,7 +394,7 @@
- +
diff --git a/rwk-admin/src/main/resources/templates/system/information/information.html b/rwk-admin/src/main/resources/templates/system/information/information.html index d302769..a61fb31 100644 --- a/rwk-admin/src/main/resources/templates/system/information/information.html +++ b/rwk-admin/src/main/resources/templates/system/information/information.html @@ -105,6 +105,7 @@ formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); + actions.push('查看 '); actions.push('删除'); return actions.join(''); } @@ -112,6 +113,24 @@ }; $.table.init(options); }); + + //查看个人信息 + function viewShow(id){ + top.layer.open({ + type: 2, + area: [window.innerWidth*0.8+"px", ($(window).height() - 20)+'px'], + fix: false, + maxmin: true, + shade: 0.3, + title: "信息查看", + content: prefix+'/informationView/'+id, + btn: ['关闭'], + shadeClose: true, + cancel: function(index) { + return true; + } + }); + } \ No newline at end of file diff --git a/rwk-admin/src/main/resources/templates/system/information/informationView.html b/rwk-admin/src/main/resources/templates/system/information/informationView.html new file mode 100644 index 0000000..c87409e --- /dev/null +++ b/rwk-admin/src/main/resources/templates/system/information/informationView.html @@ -0,0 +1,321 @@ + + + + + + + + +
+
+
+

姓名

+

职务

+
+
+
+
+
+
+
性    别
+
+ +
+
+
+
籍    贯
+
+ +
+
+
+
加入党派时间
+
+ +
+
+
+
单位属性
+
+ +
+
+
+
是否取得境外长期居留资格
+
+ +
+
+
+
+
+
出生年月
+
+ +
+
+
+
出 生 地
+
+ +
+
+
+
参加工作时间
+
+ +
+
+
+
单位职务级别
+
+ +
+
+
+
取得国家
+
+ +
+
+
+
+
+
民    族
+
+ +
+
+
+
政治面貌
+
+ +
+
+
+
党派职务
+
+ +
+
+
+
宗教信仰
+
+ +
+
+
+
证件号
+
+ +
+
+
+
+
+
+
+
+
其他补充材料
+
+
+
+
+
+

学历  学位

+
+
+

全日制教育

+
+
+
学    历
+
+
+
+
学    位
+
+
+
+
毕业院校系及专业
+
研究生
+
+
+
+
+

在职教育

+
+
+
学    历
+
+
+
+
学    位
+
+
+
+
毕业院校系及专业
+
+
+
+
+
+
+
+
+
+
+

简历

+
+
+
+
+
+

培训情况

+
+
+
+
+
+

主要成就

+
+
+
+
+
+

家庭成员

+
+
+ 这是内容。这里是一些示例文本,内容可以很长,测试内容测试内容测试内容
+ 测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试。 +
+
+
+ +
+
+
+
+ + + + \ No newline at end of file