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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
duxp 2023-10-08 17:07:36 +08:00
parent 8e8a494798 07d518fea9
commit 874c814188
6 changed files with 80 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,9 +109,9 @@
<div class="col-sm-6">
<select name="unit" id="unit" class="form-control m-b">
<option value="">请选择</option>
<option value="工程建设项目">周</option>
<option value="政府采购">月</option>
<option value="国有产权交易">季度</option>
<option value="1">周</option>
<option value="2">月</option>
<option value="3">季度</option>
</select>
</div>
</div>
@ -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;
}
});

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

@ -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;
}
});

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

@ -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]
}
</script>
</body>
</html>

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

@ -127,6 +127,35 @@
return $.table.tooltip(value);
}
},
{
field: 'demand',
title: '目标要求/考核目标',
width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'method',
title: '标准要求',
width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'detailed',
title: '工作任务',
width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
}
},
{
field: 'commitTime',
title: '提交时间',

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

@ -200,7 +200,7 @@
},
{
field: 'score',
title: '分值'
title: '达标分'
},
{
field: 'nowScore',

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

@ -342,10 +342,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="finishedstaticList" resultType="map">
SELECT
a.*,
ROUND( a.now_score / a.score *100) percent,
a.id,
d.mphone phone,
a.type,
a.examine_type,
a.files,
a.unit,
a.target,
a.`status`,
a.demand,
a.detailed,
a.degree,
SUM( a.score ) score,
SUM( a.now_score ) nowScore,
a.method,
a.head,
a.reviewed,
a.finish_date,
a.per_id,
a.dept_id,
a.branch_id,
a.create_by,
a.create_time,
a.update_by,
a.update_time,
ROUND( a.now_score / a.score * 100 ) percent,
a.shot_name shotName,
a.now_score nowScore,
b.`name` oprator,
c.`name` reviewer,
d.`name` header,