public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改大屏接口

This commit is contained in:
liuwu 2023-08-24 16:25:17 +08:00
parent a630a8f533
commit debdb00470
10 changed files with 433 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java
View File

@ -48,7 +48,7 @@ public class BigScreenController extends BaseController {
} }
/** /**
* 党务意识形态 * 党务及意识形态
* @param am * @param am
* @return * @return
*/ */

2
cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
View File

@ -36,7 +36,7 @@ public class TAmentPartyAffairsController extends BaseController
private ITAmentPartyAffairsService tAmentPartyAffairsService; private ITAmentPartyAffairsService tAmentPartyAffairsService;
/** /**
* 党建及意识形态 * 党务及意识形态
* @return * @return
*/ */
@RequiresPermissions("base:affairs:view") @RequiresPermissions("base:affairs:view")

71
cyx-admin/src/main/resources/templates/base/affairs/add.html
View File

@ -7,40 +7,52 @@
<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">
<form class="form-horizontal m" id="form-affairs-add"> <form class="form-horizontal m" id="form-affairs-add">
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">单位名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="unit" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">单位名称：</label> <label class="col-sm-3 control-label">类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="unit" class="form-control" type="text"> <select name="type" id="type-selector" class="form-control m-b">
<option value="">请选择</option>
<option value="党务及意识形态">党务及意识形态</option>
<option value="党风廉政建设">党风廉政建设</option>
<option value="日常考核指标">日常考核指标</option>
<option value="年度考核指标">年度考核指标</option>
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">目标项及分值：</label> <label class="col-sm-3 control-label" id="target">目标项：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="target" class="form-control" type="text"> <textarea name="target" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">目标要求：</label> <label class="col-sm-3 control-label" id="demand">目标要求：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="demand" class="form-control"></textarea> <textarea name="demand" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">评分细则：</label> <label class="col-sm-3 control-label" id="detailed">评分细则：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="detailed" class="form-control"></textarea> <textarea name="detailed" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">达标分：</label> <label class="col-sm-3 control-label" id="score">达标分：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="score" class="form-control"></textarea> <input name="score" class="form-control" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">考核方式：</label> <label class="col-sm-3 control-label" id="method">考核方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="method" class="form-control" type="text"> <textarea name="method" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -98,6 +110,45 @@
focusCleanup: true focusCleanup: true
}); });
$("#type-selector").on("change", function() {
var type = $(this).val();
var target = $("#target");
var demand = $("#demand");
var detailed = $("#detailed");
var score = $("#score");
var method = $("#method");
switch (type) {
case "党务及意识形态":
target[0].innerHTML = '目标项：'
demand[0].innerHTML = '目标要求：'
detailed[0].innerHTML = '评分细则：'
score[0].innerHTML = '达标分：'
method[0].innerHTML = '考核方式：'
break;
case "党风廉政建设":
target[0].innerHTML = '责任类别：'
demand[0].innerHTML = '目标要求：'
detailed[0].innerHTML = '指标明细：'
score[0].innerHTML = '总分值：'
method[0].innerHTML = '考核要求：'
break;
case "日常考核指标":
target[0].innerHTML = '考核内容：'
demand[0].innerHTML = '考核目标：'
detailed[0].innerHTML = '评分办法：'
score[0].innerHTML = '分值：'
method[0].innerHTML = '标准要求：'
break;
case "年度考核指标":
target[0].innerHTML = '考核内容：'
demand[0].innerHTML = '考核目标：'
detailed[0].innerHTML = '评分办法：'
score[0].innerHTML = '分值：'
method[0].innerHTML = '标准要求：'
break;
}
});
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-affairs-add').serialize()); $.operate.save(prefix + "/add", $('#form-affairs-add').serialize());

120
cyx-admin/src/main/resources/templates/base/affairs/adddflzjs.html Normal file
View File

@ -0,0 +1,120 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增党务')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-affairs-add">
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">单位名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="unit" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">类型：</label>
<div class="col-sm-8">
<input name="type" class="form-control" type="text" value="党务及意识形态">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">目标项：</label>
<div class="col-sm-8">
<textarea name="target" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">目标要求：</label>
<div class="col-sm-8">
<textarea name="demand" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">评分细则：</label>
<div class="col-sm-8">
<textarea name="detailed" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">达标分：</label>
<div class="col-sm-8">
<textarea name="score" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">考核方式：</label>
<div class="col-sm-8">
<input name="method" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8">
<input name="head" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核人：</label>
<div class="col-sm-8">
<input name="reviewed" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">完成截止时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="finishDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">操作人员ID：</label>
<div class="col-sm-8">
<input name="perId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门ID：</label>
<div class="col-sm-8">
<input name="deptId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支部ID：</label>
<div class="col-sm-8">
<input name="branchId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "base/affairs"
$("#form-affairs-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-affairs-add').serialize());
}
}
$("input[name='finishDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

120
cyx-admin/src/main/resources/templates/base/affairs/addndkhzb.html Normal file
View File

@ -0,0 +1,120 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增党务')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-affairs-add">
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">单位名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="unit" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">类型：</label>
<div class="col-sm-8">
<input name="type" class="form-control" type="text" value="党务及意识形态">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">目标项：</label>
<div class="col-sm-8">
<textarea name="target" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">目标要求：</label>
<div class="col-sm-8">
<textarea name="demand" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">评分细则：</label>
<div class="col-sm-8">
<textarea name="detailed" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">达标分：</label>
<div class="col-sm-8">
<textarea name="score" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">考核方式：</label>
<div class="col-sm-8">
<input name="method" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8">
<input name="head" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核人：</label>
<div class="col-sm-8">
<input name="reviewed" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">完成截止时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="finishDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">操作人员ID：</label>
<div class="col-sm-8">
<input name="perId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门ID：</label>
<div class="col-sm-8">
<input name="deptId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支部ID：</label>
<div class="col-sm-8">
<input name="branchId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "base/affairs"
$("#form-affairs-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-affairs-add').serialize());
}
}
$("input[name='finishDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

120
cyx-admin/src/main/resources/templates/base/affairs/addrckhzb.html Normal file
View File

@ -0,0 +1,120 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增党务')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-affairs-add">
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">单位名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="unit" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">类型：</label>
<div class="col-sm-8">
<input name="type" class="form-control" type="text" value="党务及意识形态">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">目标项：</label>
<div class="col-sm-8">
<textarea name="target" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">目标要求：</label>
<div class="col-sm-8">
<textarea name="demand" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">评分细则：</label>
<div class="col-sm-8">
<textarea name="detailed" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">达标分：</label>
<div class="col-sm-8">
<textarea name="score" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">考核方式：</label>
<div class="col-sm-8">
<input name="method" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8">
<input name="head" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核人：</label>
<div class="col-sm-8">
<input name="reviewed" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">完成截止时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="finishDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">操作人员ID：</label>
<div class="col-sm-8">
<input name="perId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门ID：</label>
<div class="col-sm-8">
<input name="deptId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支部ID：</label>
<div class="col-sm-8">
<input name="branchId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "base/affairs"
$("#form-affairs-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-affairs-add').serialize());
}
}
$("input[name='finishDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

4
cyx-admin/src/main/resources/templates/base/affairs/affairs.html
View File

@ -10,7 +10,7 @@
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<input type="hidden" name="type" value="党建及意识形态"/> <input type="hidden" name="type" value="党务及意识形态"/>
<!-- <li>--> <!-- <li>-->
<!-- <label>单位名称：</label>--> <!-- <label>单位名称：</label>-->
<!-- <input type="text" name="unit"/>--> <!-- <input type="text" name="unit"/>-->
@ -88,7 +88,7 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "党务", modalName: "指标",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },

4
cyx-admin/src/main/resources/templates/main.html
View File

@ -16,13 +16,13 @@
<div class="main_left"> <div class="main_left">
<div class="main_left_item"> <div class="main_left_item">
<div class="left_switch_btn"> <div class="left_switch_btn">
<span class="btn_item">党建及意识形态</span> <span class="btn_item">党务及意识形态</span>
<span>|</span> <span>|</span>
<span class="btn_item">党风廉政建设</span> <span class="btn_item">党风廉政建设</span>
</div> </div>
<div class="echarts_title"> <div class="echarts_title">
<span></span> <span></span>
<span>党建及意识形态</span> <span>党务及意识形态</span>
</div> </div>
<div class="btn_echarts_wrap" id="top_left_echarts"></div> <div class="btn_echarts_wrap" id="top_left_echarts"></div>
</div> </div>

2
cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
View File

@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="advanceParity" resultType="map"> <select id="advanceDept" resultType="map">
SELECT SELECT
`dept`, `dept`,
`events` `events`

2
cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
View File

@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
t_ament_party_affairs t_ament_party_affairs
WHERE WHERE
type = '党建及意识形态' type = '党务及意识形态'
GROUP BY GROUP BY
shot_name shot_name
</select> </select>