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-09-05 17:12:06 +08:00
parent cb671ac6fc
commit 873911878a
6 changed files with 22 additions and 20 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

@ -93,7 +93,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

@ -189,7 +189,7 @@ public class TAmentPartyAffairsController extends BaseController
} }
/** /**
* 年度考核指标 * 季度考核指标
* @return * @return
*/ */
@RequiresPermissions("base:affairs:view") @RequiresPermissions("base:affairs:view")

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

@ -16,7 +16,7 @@
<option value="党务及意识形态">党务及意识形态</option> <option value="党务及意识形态">党务及意识形态</option>
<option value="党风廉政建设">党风廉政建设</option> <option value="党风廉政建设">党风廉政建设</option>
<option value="日常考核指标">日常考核指标</option> <option value="日常考核指标">日常考核指标</option>
<option value="年度考核指标">年度考核指标</option> <option value="季度考核指标">季度考核指标</option>
</select> </select>
</div> </div>
</div> </div>
@ -202,7 +202,7 @@
detailed[0].innerHTML = '工作任务：' detailed[0].innerHTML = '工作任务：'
score[0].innerHTML = '分值：' score[0].innerHTML = '分值：'
break; break;
case "年度考核指标": case "季度考核指标":
$("#dw").hide() $("#dw").hide()
$(".dy").show() $(".dy").show()
target[0].innerHTML = '考核内容：' target[0].innerHTML = '考核内容：'
@ -228,7 +228,7 @@
case "日常考核指标": case "日常考核指标":
method.val(method1.val()) method.val(method1.val())
break; break;
case "年度考核指标": case "季度考核指标":
method.val(method1.val()) method.val(method1.val())
break; break;
} }

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

@ -44,8 +44,8 @@
</div> </div>
<div class="main_center"> <div class="main_center">
<div class="main_center_item"> <div class="main_center_item">
<div class="data1" onclick="openTab(5,'年度考核完成情况')"> <div class="data1" onclick="openTab(5,'季度考核指标')">
<span style="font-weight:900;font-size: 18px" >年度考核完成情况</span> <span style="font-weight:900;font-size: 18px" >季度考核完成情况</span>
<p class="all_num">日常考核总分：0分</p> <p class="all_num">日常考核总分：0分</p>
<p class="curr_num">当前分数：0分</p> <p class="curr_num">当前分数：0分</p>
</div> </div>
@ -59,7 +59,7 @@
<p class="all_num">日常考核总分：0分</p> <p class="all_num">日常考核总分：0分</p>
<p class="curr_num">当前分数：0分</p> <p class="curr_num">当前分数：0分</p>
</div> </div>
<div class="data4" onclick="openTab(5,'日常考核完成情况')"> <div class="data4" onclick="openTab(5,'日常考核指标')">
<span style="font-weight:900;font-size: 18px" >日常考核完成情况</span> <span style="font-weight:900;font-size: 18px" >日常考核完成情况</span>
<p class="all_num">日常考核总分：0分</p> <p class="all_num">日常考核总分：0分</p>
<p class="curr_num">当前分数：0分</p> <p class="curr_num">当前分数：0分</p>
@ -76,7 +76,7 @@
<div class="cicle7"></div> <div class="cicle7"></div>
<div class="cicle8"> <div class="cicle8">
<span class="circle_num">0%</span> <span class="circle_num">0%</span>
<p>年度考核完成情况</p> <p>季度考核完成情况</p>
</div> </div>
<div class="cicle9"> <div class="cicle9">
<span class="circle_num">0%</span> <span class="circle_num">0%</span>
@ -117,7 +117,7 @@
<div class="right_switch_btn"> <div class="right_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>
@ -128,7 +128,7 @@
<div class="main_footer"> <div class="main_footer">
<div class="echarts_title"> <div class="echarts_title">
<span></span> <span></span>
<span onclick="openTab(4)">年度考核指标</span> <span onclick="openTab(4)">季度考核指标</span>
</div> </div>
<div class="echarts_footer_wrap" id="bottom_right_echarts"></div> <div class="echarts_footer_wrap" id="bottom_right_echarts"></div>
</div> </div>
@ -158,7 +158,7 @@
$.modal.openTab("日常考核指标", prefix + '/day',true); $.modal.openTab("日常考核指标", prefix + '/day',true);
break; break;
case 4: case 4:
$.modal.openTab("年度考核指标", prefix + '/year',true); $.modal.openTab("季度考核指标", prefix + '/year',true);
break; break;
case 5: case 5:
window.parent._tab_name = name; window.parent._tab_name = name;
@ -344,7 +344,7 @@
} }
}, },
legend: { legend: {
data: ['日常考核指标', '年度考核指标'], data: ['日常考核指标', '季度考核指标'],
textStyle: { textStyle: {
color: "#ffffff" color: "#ffffff"
}, },
@ -386,7 +386,7 @@
data: sData1 data: sData1
}, },
{ {
name: '年度考核指标', name: '季度考核指标',
type: 'bar', type: 'bar',
tooltip: { tooltip: {
valueFormatter: function (value) { valueFormatter: function (value) {
@ -511,7 +511,7 @@
data: [ data: [
{ {
value: _sData, value: _sData,
name: '年度考核指标' name: '季度考核指标'
}, },
], ],
symbol: 'none', symbol: 'none',
@ -650,7 +650,7 @@
let _data = res.data; let _data = res.data;
_data.forEach(item => { _data.forEach(item => {
switch (item.type) { switch (item.type) {
case "年度考核指标": case "季度考核指标":
$(".data1").find('.all_num').text("日常考核总分："+item.score+"分"); $(".data1").find('.all_num').text("日常考核总分："+item.score+"分");
$(".data1").find('.curr_num').text("当前分数："+item.nowScore+"分"); $(".data1").find('.curr_num').text("当前分数："+item.nowScore+"分");
$(".cicle8").find('.circle_num').text(item.percent+"%"); $(".cicle8").find('.circle_num').text(item.percent+"%");
@ -714,7 +714,7 @@
let _json = JSON.parse(item.json); let _json = JSON.parse(item.json);
_strHtml += '<div class="item_inline">' + _strHtml += '<div class="item_inline">' +
'<p>党建及意识形态：'+_json['日常考核指标']+'</p>' + '<p>党建及意识形态：'+_json['日常考核指标']+'</p>' +
'<p>目前完成度：'+_json['年度考核指标']+'</p>' + '<p>目前完成度：'+_json['季度考核指标']+'</p>' +
'</div>'; '</div>';
}); });
$('#center_footer_two').append(_strHtml); $('#center_footer_two').append(_strHtml);

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

@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dept b ON a.dept = b.dept_id LEFT JOIN sys_dept b ON a.dept = b.dept_id
LEFT JOIN t_ament_party_affairs c ON a.dept = c.dept_id LEFT JOIN t_ament_party_affairs c ON a.dept = c.dept_id
WHERE WHERE
c.type IN ( '日常考核指标', '年度考核指标' ) c.type IN ( '日常考核指标', '季度考核指标' )
GROUP BY GROUP BY
c.type c.type
) f ) f

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

@ -146,6 +146,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
t_ament_party_affairs a t_ament_party_affairs a
LEFT JOIN sys_dept b ON a.dept_id = b.dept_id LEFT JOIN sys_dept b ON a.dept_id = b.dept_id
where 1=1
<if test="type != null and type != ''"> and a.type = #{type}</if>
GROUP BY GROUP BY
a.type, a.type,
a.dept_id a.dept_id
@ -243,7 +245,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>
@ -257,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
t_ament_party_affairs a LEFT JOIN sys_dept d on a.dept_id = d.dept_id t_ament_party_affairs a LEFT JOIN sys_dept d on a.dept_id = d.dept_id
WHERE WHERE
a.type IN ( '日常考核指标', '年度考核指标' ) a.type IN ( '日常考核指标', '季度考核指标' )
GROUP BY GROUP BY
a.dept_id, a.dept_id,
a.type a.type