From b9a969ef123a594ef2ec5b1bcd4a8c05d69c8852 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 22 Apr 2024 11:08:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mingsoft/cms/biz/IDutyStandbyBiz.java | 4 + .../mingsoft/cms/biz/IPhoneContactsBiz.java | 2 +- .../net/mingsoft/cms/dao/IDutyStandbyDao.java | 6 + .../net/mingsoft/cms/dao/IDutyStandbyDao.xml | 30 +- .../mingsoft/cms/dao/IPhoneContactsDao.java | 2 +- .../mingsoft/cms/dao/IPhoneContactsDao.xml | 28 +- .../mingsoft/cms/excel/DutyStandbyExcel.java | 41 +- .../statistics/dao/IPublishListDao.xml | 3 +- src/main/webapp/WEB-INF/manager/index.ftl | 849 ++++++++++++++++++ .../manager/statistics/publish-list/index.ftl | 4 +- .../webapp/template/1/default/css/index.css | 40 +- src/main/webapp/template/1/default/index.htm | 271 ++++-- 12 files changed, 1113 insertions(+), 167 deletions(-) create mode 100644 src/main/webapp/WEB-INF/manager/index.ftl diff --git a/src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java b/src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java index 68c3b720..88571033 100644 --- a/src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java @@ -26,6 +26,8 @@ import net.mingsoft.base.biz.IBaseBiz; import net.mingsoft.cms.entity.DutyStandbyEntity; import net.mingsoft.cms.entity.PhoneContactsEntity; +import java.util.List; + /** * 分类业务 @@ -37,4 +39,6 @@ public interface IDutyStandbyBiz extends IBaseBiz { void deleteByEntity(DutyStandbyEntity entity); + void deleteByContentIds(List contentIds); + } diff --git a/src/main/java/net/mingsoft/cms/biz/IPhoneContactsBiz.java b/src/main/java/net/mingsoft/cms/biz/IPhoneContactsBiz.java index 093fb1c9..0b56cf5a 100644 --- a/src/main/java/net/mingsoft/cms/biz/IPhoneContactsBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IPhoneContactsBiz.java @@ -37,5 +37,5 @@ import java.util.List; */ public interface IPhoneContactsBiz extends IBaseBiz { - + List getDept(); } diff --git a/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java index 29ae3d82..8df88e10 100644 --- a/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java +++ b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java @@ -25,8 +25,11 @@ package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; import net.mingsoft.cms.entity.DutyStandbyEntity; import net.mingsoft.cms.entity.PhoneContactsEntity; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; +import java.util.List; + /** * 分类持久层 * @author 铭飞开发团队 @@ -37,4 +40,7 @@ import org.springframework.stereotype.Component; public interface IDutyStandbyDao extends IBaseDao { void deleteByEntity(DutyStandbyEntity entity); + + + void deleteByContentIds(@Param("contentIds") List contentIds); } diff --git a/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml index a2364604..c64e88c3 100644 --- a/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml @@ -6,9 +6,8 @@ - - - + + @@ -24,9 +23,8 @@ duty_date=#{dutyDate}, monitor=#{monitor}, - deputy_monitor=#{deputyMonitor}, - operator=#{operator}, - duty_person=#{dutyPerson}, + police_duty=#{policeDuty}, + auxiliary_police_duty=#{auxiliaryPoliceDuty}, bl_duty_person=#{blDutyPerson}, create_by=#{createBy}, create_date=#{createDate}, @@ -48,9 +46,8 @@ and duty_date=#{dutyDate} and monitor=#{monitor} - and deputy_monitor=#{deputyMonitor} - and operator=#{operator} - and duty_person=#{dutyPerson} + and police_duty=#{policeDuty} + and auxiliary_police_duty=#{auxiliaryPoliceDuty} and bl_duty_person=#{blDutyPerson} and create_by=#{createBy} and create_date=#{createDate} @@ -90,10 +87,11 @@ and duty_date=#{dutyDate} and monitor=#{monitor} - and deputy_monitor=#{deputyMonitor} - and operator=#{operator} - and duty_person=#{dutyPerson} + and police_duty=#{policeDuty} + and auxiliary_police_duty=#{auxiliaryPoliceDuty} and bl_duty_person=#{blDutyPerson} + and content_id=#{contentId} + and file_path=#{filePath} and create_by=#{createBy} and create_date=#{createDate} and update_by=#{updateBy} @@ -103,4 +101,12 @@ + + delete from duty_standby + + content_id in #{item} + + + diff --git a/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.java b/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.java index 7ada721e..a07f5812 100644 --- a/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.java +++ b/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.java @@ -38,5 +38,5 @@ import java.util.List; @Component("phoneContactsDao") public interface IPhoneContactsDao extends IBaseDao { - + List getDept(); } diff --git a/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.xml b/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.xml index 987df02c..4c3576ff 100644 --- a/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/IPhoneContactsDao.xml @@ -5,7 +5,11 @@ - + + + + + @@ -19,7 +23,11 @@ update phone_contacts name=#{name}, - phone=#{phone}, + post_name=#{postName}, + office_phone=#{officePhone}, + mobile_phone=#{mobilePhone}, + room_num=#{roomNum}, + dept_name=#{deptName}, create_by=#{createBy}, create_date=#{createDate}, update_by=#{updateBy}, @@ -39,7 +47,11 @@ select * from phone_contacts and name=#{name} - and phone=#{phone} + and post_name=#{postName} + and office_phone=#{officePhone} + and mobile_phone=#{mobilePhone} + and room_num=#{roomNum} + and dept_name=#{deptName} and create_by=#{createBy} and create_date=#{createDate} and update_by=#{updateBy} @@ -70,7 +82,11 @@ select * from phone_contacts and name=#{name} - and phone=#{phone} + and post_name=#{postName} + and office_phone=#{officePhone} + and mobile_phone=#{mobilePhone} + and room_num=#{roomNum} + and dept_name=#{deptName} and create_by=#{createBy} and create_date=#{createDate} and update_by=#{updateBy} @@ -80,4 +96,8 @@ + + diff --git a/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java b/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java index a002556b..d5ef02b4 100644 --- a/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java +++ b/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java @@ -51,22 +51,17 @@ public class DutyStandbyExcel implements Serializable { private String monitor; /** - * 副带班长 + * 民警值班员 */ - @ExcelProperty("副带班长") - private String deputyMonitor; + @ExcelProperty("民警值班员") + private String policeDuty; /** - * 守机员 + * 辅警值班员 */ - @ExcelProperty("守机员") - private String operator; + @ExcelProperty("辅警值班员") + private String auxiliaryPoliceDuty; - /** - * 值班人员 - */ - @ExcelProperty("值班人员") - private String dutyPerson; /** * 北岭值班人员 @@ -90,28 +85,20 @@ public class DutyStandbyExcel implements Serializable { this.monitor = monitor; } - public String getDeputyMonitor() { - return deputyMonitor; - } - - public void setDeputyMonitor(String deputyMonitor) { - this.deputyMonitor = deputyMonitor; - } - - public String getOperator() { - return operator; + public String getPoliceDuty() { + return policeDuty; } - public void setOperator(String operator) { - this.operator = operator; + public void setPoliceDuty(String policeDuty) { + this.policeDuty = policeDuty; } - public String getDutyPerson() { - return dutyPerson; + public String getAuxiliaryPoliceDuty() { + return auxiliaryPoliceDuty; } - public void setDutyPerson(String dutyPerson) { - this.dutyPerson = dutyPerson; + public void setAuxiliaryPoliceDuty(String auxiliaryPoliceDuty) { + this.auxiliaryPoliceDuty = auxiliaryPoliceDuty; } public String getBlDutyPerson() { diff --git a/src/main/java/net/mingsoft/statistics/dao/IPublishListDao.xml b/src/main/java/net/mingsoft/statistics/dao/IPublishListDao.xml index 8a9e9024..e37b1985 100644 --- a/src/main/java/net/mingsoft/statistics/dao/IPublishListDao.xml +++ b/src/main/java/net/mingsoft/statistics/dao/IPublishListDao.xml @@ -17,7 +17,7 @@ FROM cms_content - + AND YEAR(create_date) = #{year} @@ -31,6 +31,7 @@ CREATE_BY ) b ON a.id = b.create_by + a.manager_name != 'msopen' AND a.type = #{type} diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl new file mode 100644 index 00000000..f98979b8 --- /dev/null +++ b/src/main/webapp/WEB-INF/manager/index.ftl @@ -0,0 +1,849 @@ + + + + + ${app.appName} + <#include '/include/head-file.ftl'/> + + + + + <#----> + + + +<#include 'reset-password.ftl'/> +
+ + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
  • +
    + +
    {{item.modelTitle}}
    +
    +
    + +
    + +
    • +
    +     +     + +
    + + + + + + + + +
    + +     + + + + + + + + + + + +     +     +
    + + + + + diff --git a/src/main/webapp/WEB-INF/manager/statistics/publish-list/index.ftl b/src/main/webapp/WEB-INF/manager/statistics/publish-list/index.ftl index 10e9b4d9..fe251b93 100644 --- a/src/main/webapp/WEB-INF/manager/statistics/publish-list/index.ftl +++ b/src/main/webapp/WEB-INF/manager/statistics/publish-list/index.ftl @@ -77,8 +77,8 @@ handleClick(){ this.form = {} this.timeRange = [] - this.pageSize = 1 - this.currentPage = 10 + this.pageSize = 10 + this.currentPage = 1 this.list() }, list() { diff --git a/src/main/webapp/template/1/default/css/index.css b/src/main/webapp/template/1/default/css/index.css index dca4a658..b3389f10 100644 --- a/src/main/webapp/template/1/default/css/index.css +++ b/src/main/webapp/template/1/default/css/index.css @@ -949,7 +949,7 @@ html body { } .dt_search .left_star { - width: 24%; + width: 329px; } .dt_search .left_star .left_top_star { @@ -976,19 +976,20 @@ html body { .dt_search .left_star .left_bot_star { width: 100%; height: 356px; - background: green; } .swiper-star { - position: relative; + width: 100%; height: 100%; overflow: hidden; - display: none; + position: absolute; + left:9999px } .dt_search .left_star .left_bot_star .dis { - display: block; + position: relative; + left:0px } .dt_search .swiper-button-prev { @@ -1093,13 +1094,14 @@ html body { } .right_top_bottom_td { - width: 172.6px; + min-width: 172.6px; height: 110px; text-align: center; flex:1 } .right_top_bottom_td_t { + margin-bottom:4px; width: 100%; height: 60px; font-size: 18px; @@ -1154,32 +1156,6 @@ html body { line-height: 82px; text-align: center; cursor: pointer; - color: #2C5A9E; -} - -.search_bot_div_img1 { - background: url(../images/333.png); - color: #2C5A9E; -} - -.search_bot_div_img2 { - background: url(../images/444.png); - color: #1E74E5; -} - -.search_bot_div_img3 { - background: url(../images/555.png); - color: #2941BE; -} - -.search_bot_div_img4 { - background: url(../images/666.png); - color: #1657B9; -} - -.search_bot_div_img5 { - background: url(../images/777.png); - color: #1064AE; } .slider_star { diff --git a/src/main/webapp/template/1/default/index.htm b/src/main/webapp/template/1/default/index.htm index 269472ae..36ac84b3 100644 --- a/src/main/webapp/template/1/default/index.htm +++ b/src/main/webapp/template/1/default/index.htm @@ -29,12 +29,11 @@
    - aaaaa 车管要闻
    @@ -46,7 +45,6 @@
    - {ms:arclist typeid=1765306882908344322 flag="h"}
    +
    + {ms:arclist typeid=1779824029474848769 } +
    + +
    + +
    +     +
    + {/ms:arclist} +
    + + +
    +
    @@ -359,7 +395,7 @@
  • -
    ${field.title}
    +
    ${field.title}
    ${field.date?string("yyyy-MM-dd")}
    • @@ -416,10 +452,10 @@ {/ms:arclist}
    -
    +
    -
    +
    @@ -448,8 +484,7 @@
  • -
    NEW
    -
    +
    ${field.title}
    @@ -460,24 +495,23 @@
    • -
  • +
  • 政工通告
    - +
    更多>>
    -
    +
    信息查询与应用
    {ms:arclist typeid=1773246465625042946 orderby="sort" order="asc"} - +
    ${field.title}
     {/ms:arclist} @@ -635,31 +665,56 @@ .addClass('dis') .siblings() .removeClass('dis'); + + swiper.autoplay.start() + swiper2.autoplay.start() }); }); var swiper = new Swiper('.swiperOne', { - autoplay: true, loop: true, - observer: true, observeParents: true, + autoplay: { + delay: 3000, + disableOnInteraction: false, + }, + observer: true, + observeParents: true, navigation: { nextEl: '.pre-btn', prevEl: '.next-btn', }, + }); var swiper2 = new Swiper('.swiperTwo', { - autoplay: true, loop: true, - observer: true, observeParents: true, + autoplay: { + delay: 3000, + disableOnInteraction: false, + }, + observer: true, + observeParents: true, navigation: { - nextEl: '.pre-btn-two', - prevEl: '.next-btn-two', + nextEl: '.pre-btn-jdgw', + prevEl: '.next-btn-jdgw', }, }) - + $('.switchColor').each(function (i, p) { + if(i == 0){ + $(p).css('color','#2C5A9E') + }else if(i == 1){ + $(p).css('color','#1E74E5 ') + }else if(i == 2){ + $(p).css('color','#2941BE ') + }else if(i == 3){ + $(p).css('color','#1657B9 ') + }else { + $(p).css('color','#1064AE ') + } + }); +
    -
    车管所风采
    +
    车管风采
    @@ -670,9 +725,6 @@
    - - -
    @@ -702,9 +754,8 @@
    - {ms:data dataid=1773227655471837185} + {ms:arclist size=1 typeid="1779682837839847426"} - {/ms:data} + {/ms:arclist} + <#include "footer.htm" /> @@ -775,11 +827,35 @@ start(); } var currentTime = window.moment().format('YYYY-MM-DD'); + + $('.newe').each(function (i, p) { + if ($(p).data('time') == currentTime) { + $(p).show() + }else{ + $(p).hide() + } + }); $('.newb').each(function (i, p) { if ($(p).data('time') == currentTime) { $(p).show() } }); + + $('.newc').each(function (i, p) { + if ($(p).data('time') == currentTime) { + $(p).hide() + } + }); + $('.titlelong').each(function (i, p) { + if ($(p).data('time') == currentTime) { + $(p).hide() + } + }); + $('.titleshort').each(function (i, p) { + if ($(p).data('time') != currentTime) { + $(p).hide() + } + }); var fbl = '数据统计截止' + currentTime $(".fbl").text(fbl); //年 @@ -856,28 +932,49 @@ axios.get('/ms/checkLogin.do').then(res=>{ if(res.data.code == 200 && res.data.result){ $('.login_dl').hide() - $('.login_grzx').show() - $('.zgtg').show() -} - }) - axios.get('/cms/phoneContacts/list.do').then(res=>{ + + }else{ - }) - //值班备勤 - let dutyDate = moment().format('yyyy/M/D') + $('.logCheck').each(function (i, p) { + $(p).on('click', function(event) { + event.preventDefault(); // 阻止默认行为，例如导航到href指定的链接 + // 你的代码逻辑 + alert('请登录后查看'); + }); + }) + } + }) + + //值班备勤 + let dutyDate = moment().format('yyyy/M/D') - axios.get(`/ms/cms/dutyStandby/list.do -`,{params:{dutyDate}}).then(res=>{ - const { rows } = res.data.data - if(rows.length){ - $('.right_top_con_tr_monitor').text(rows[0].monitor) - $('.right_top_con_tr_deputyMonitor').text(rows[0].deputyMonitor) - $('.right_top_con_tr_operator').text(rows[0].operator) - $('.right_top_con_tr_dutyPerson').text(rows[0].dutyPerson) - $('.right_top_con_tr_blDutyPerson').text(rows[0].blDutyPerson) - } - }) - + axios.get(`/cms/dutyStandby/list.do`,{params:{dutyDate}}).then(res=>{ + const { rows } = res.data.data + if(rows.length){ + $('.right_top_con_tr_monitor').text(rows[0].monitor) + $('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty) + $('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty) + $('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson) + } + + if($('.right_top_con_tr_monitor').text() == ''){ + $('.right_top_con_tr_monitor').text('/') + $('.right_top_con_tr_monitor').css("color", "#999999") + } + if($('.right_top_con_tr_deputyMonitor').text() == ''){ + $('.right_top_con_tr_deputyMonitor').text('/') + $('.right_top_con_tr_deputyMonitor').css("color", "#999999") + } + if($('.right_top_con_tr_operator').text() == ''){ + $('.right_top_con_tr_operator').text('/') + $('.right_top_con_tr_operator').css("color", "#999999") + } + if($('.right_top_con_tr_dutyPerson').text() == ''){ + $('.right_top_con_tr_dutyPerson').text('/') + $('.right_top_con_tr_dutyPerson').css("color", "#999999") + } + }) +