diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java index 9804522..2ffcff3 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java @@ -48,7 +48,7 @@ public class BigScreenController extends BaseController { } /** - * 党务意识形态 + * 党务及意识形态 * @param am * @return */ diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java index 5a13144..ecca480 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -36,7 +36,7 @@ public class TAmentPartyAffairsController extends BaseController private ITAmentPartyAffairsService tAmentPartyAffairsService; /** - * 党建及意识形态 + * 党务及意识形态 * @return */ @RequiresPermissions("base:affairs:view") diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html index a0c2a47..84dd3e8 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/add.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html @@ -7,40 +7,52 @@
+ + + + + +
- +
- -
-
-
- -
- +
- + +
+ +
+
+
+
- +
- +
- +
- +
- +
@@ -98,6 +110,45 @@ 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() { if ($.validate.form()) { $.operate.save(prefix + "/add", $('#form-affairs-add').serialize()); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/adddflzjs.html b/cyx-admin/src/main/resources/templates/base/affairs/adddflzjs.html new file mode 100644 index 0000000..15c651a --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/adddflzjs.html @@ -0,0 +1,120 @@ + + + + + + + +
+ + + + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/addndkhzb.html b/cyx-admin/src/main/resources/templates/base/affairs/addndkhzb.html new file mode 100644 index 0000000..15c651a --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/addndkhzb.html @@ -0,0 +1,120 @@ + + + + + + + +
+
+ + + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/addrckhzb.html b/cyx-admin/src/main/resources/templates/base/affairs/addrckhzb.html new file mode 100644 index 0000000..15c651a --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/addrckhzb.html @@ -0,0 +1,120 @@ + + + + + + + +
+
+ + + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html index 892a9a6..1638453 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -10,7 +10,7 @@
    - + @@ -88,7 +88,7 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "党务", + modalName: "指标", columns: [{ checkbox: true }, diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html index db9a3a1..0070d53 100644 --- a/cyx-admin/src/main/resources/templates/main.html +++ b/cyx-admin/src/main/resources/templates/main.html @@ -16,13 +16,13 @@
    - 党建及意识形态 + 党务及意识形态 | 党风廉政建设
    - 党建及意识形态 + 党务及意识形态
    diff --git a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml index dfb12e5..3774904 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - SELECT `dept`, `events` diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml index 67f8a80..0a0cb73 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM t_ament_party_affairs WHERE - type = '党建及意识形态' + type = '党务及意识形态' GROUP BY shot_name