From 40c9f37808a2fec6e9c5f38845cd5511ba218aa5 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Wed, 27 Sep 2023 09:03:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=92=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/templates/base/affairs/add.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 d564a89..4c7440a 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/add.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html
@@ -109,9 +109,9 @@
From 07d518fea95c98069683df3c16d156c46d96aea3 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Wed, 27 Sep 2023 11:39:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=92=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/templates/base/affairs/add.html | 4 +--
.../templates/base/affairs/edit.html | 4 +--
.../base/affairs/finishedstatic.html | 19 +++++++++++-
.../templates/base/affairs/warn.html | 29 +++++++++++++++++++
.../templates/base/affairs/year.html | 2 +-
.../mapper/base/TAmentPartyAffairsMapper.xml | 28 ++++++++++++++++--
6 files changed, 77 insertions(+), 9 deletions(-)
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 4c7440a..5a2c2d7 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/add.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html
@@ -241,7 +241,7 @@
target[0].innerHTML = '考核内容:'
demand[0].innerHTML = '考核目标:'
detailed[0].innerHTML = '工作任务:'
- score[0].innerHTML = '分值:'
+ score[0].innerHTML = '达标分:'
break;
case "季度考核指标":
$("#dw").hide()
@@ -249,7 +249,7 @@
target[0].innerHTML = '考核内容:'
demand[0].innerHTML = '考核目标:'
detailed[0].innerHTML = '评分办法:'
- score[0].innerHTML = '分值:'
+ score[0].innerHTML = '达标分:'
break;
}
});
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/edit.html b/cyx-admin/src/main/resources/templates/base/affairs/edit.html
index d792356..b14c3cc 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/edit.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/edit.html
@@ -214,7 +214,7 @@
target[0].innerHTML = '考核内容:'
demand[0].innerHTML = '考核目标:'
detailed[0].innerHTML = '工作任务:'
- score[0].innerHTML = '分值:'
+ score[0].innerHTML = '达标分:'
break;
case "季度考核指标":
$("#dw").hide()
@@ -222,7 +222,7 @@
target[0].innerHTML = '考核内容:'
demand[0].innerHTML = '考核目标:'
detailed[0].innerHTML = '评分办法:'
- score[0].innerHTML = '分值:'
+ score[0].innerHTML = '达标分:'
break;
}
});
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
index a1d81a8..36257ef 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -96,6 +96,8 @@
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "党务",
+ showFooter: false,
+ footerStyle: footerStyle,
columns: [{
checkbox: true
},
@@ -131,7 +133,14 @@
},
{
field: 'score',
- title: '总分值'
+ title: '达标分',
+ footerFormatter:function (value) {
+ var sumBalance = 0;
+ for (var i in value) {
+ sumBalance += parseFloat(value[i].score);
+ }
+ return "总分值:" + sumBalance;
+ }
},
{
field: 'nowScore',
@@ -191,6 +200,14 @@
};
$.table.init(options);
});
+
+ function footerStyle(column) {
+ return {
+ userBalance: {
+ css: { color: 'red', 'font-weight': 'normal' }
+ }
+ }[column.field]
+ }