From 423b46c74179cf58cdd68e022d11b991f80d7bd7 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 8 Apr 2024 17:21:45 +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 --- .../mingsoft/cms/action/ContentAction.java | 10 + .../cms/action/DutyStandbyAction.java | 124 +++++ .../cms/action/PhoneContactsAction.java | 15 + .../cms/action/web/DutyStandbyAction.java | 86 ++++ .../net/mingsoft/cms/biz/IDutyStandbyBiz.java | 40 ++ .../cms/biz/impl/DutyStandbyBizImpl.java | 66 +++ .../net/mingsoft/cms/dao/IDutyStandbyDao.java | 40 ++ .../net/mingsoft/cms/dao/IDutyStandbyDao.xml | 106 +++++ .../cms/entity/DutyStandbyEntity.java | 135 ++++++ .../mingsoft/cms/excel/DutyStandbyExcel.java | 124 +++++ .../cms/excel/PhoneContactsExcel.java | 67 +++ .../statistics/action/PasZhAction.java | 2 +- .../statistics/action/web/PasZhAction.java | 171 +++++++ .../manager/statistics/pas-zh/form.ftl | 12 +- .../template/1/default/chuhuijiyao-list.htm | 4 +- .../webapp/template/1/default/css/header.css | 7 + .../webapp/template/1/default/css/index.css | 26 +- .../webapp/template/1/default/css/public.css | 2 +- .../webapp/template/1/default/css/style.css | 9 +- src/main/webapp/template/1/default/header.htm | 440 +++++++++--------- .../webapp/template/1/default/images/line.png | Bin 0 -> 12257 bytes src/main/webapp/template/1/default/index.htm | 61 ++- .../webapp/template/1/default/tongxunlu.htm | 8 +- .../1/default/zhibanbeiqing-detail.htm | 33 +- .../template/1/default/zhibanbeiqing-list.htm | 57 ++- 25 files changed, 1347 insertions(+), 298 deletions(-) create mode 100644 src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java create mode 100644 src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java create mode 100644 src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java create mode 100644 src/main/java/net/mingsoft/cms/biz/impl/DutyStandbyBizImpl.java create mode 100644 src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java create mode 100644 src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml create mode 100644 src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java create mode 100644 src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java create mode 100644 src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java create mode 100644 src/main/java/net/mingsoft/statistics/action/web/PasZhAction.java create mode 100644 src/main/webapp/template/1/default/images/line.png diff --git a/src/main/java/net/mingsoft/cms/action/ContentAction.java b/src/main/java/net/mingsoft/cms/action/ContentAction.java index 890b3569..68f8a7b5 100755 --- a/src/main/java/net/mingsoft/cms/action/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/ContentAction.java @@ -305,4 +305,14 @@ public class ContentAction extends BaseAction { contentBiz.saveOrUpdate(content); return ResultData.build().success(content); } + + @PostMapping("/pass") + @ResponseBody + public ResultData pass(@RequestBody List contents) { + for(ContentEntity entity :contents){ + entity.setContentDisplay("0"); + } + contentBiz.updateBatchById(contents); + return ResultData.build().success(); + } } diff --git a/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java b/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java new file mode 100644 index 00000000..661d5e76 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java @@ -0,0 +1,124 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +package net.mingsoft.cms.action; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import net.mingsoft.base.entity.ResultData; +import net.mingsoft.basic.bean.EUListBean; +import net.mingsoft.basic.util.BasicUtil; +import net.mingsoft.cms.biz.IDutyStandbyBiz; +import net.mingsoft.cms.biz.IPhoneContactsBiz; +import net.mingsoft.cms.entity.DutyStandbyEntity; +import net.mingsoft.cms.entity.PhoneContactsEntity; +import net.mingsoft.cms.excel.DutyStandbyExcel; +import net.mingsoft.excel.util.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 分类管理控制层 + * @author 铭飞开发团队 + * 创建日期：2019-11-28 15:12:32
+ * 历史修订：
+ */ +@Api(tags={"后端-值班备勤接口"}) +@Controller("dutyStandbyAction") +@RequestMapping("/${ms.manager.path}/cms/dutyStandby") +public class DutyStandbyAction extends BaseAction{ + + + /** + * 注入分类业务层 + */ + @Autowired + private IDutyStandbyBiz dutyStandbyBiz; + + /** + * 查询分类列表 + * @param entity 分类实体 + */ + @ApiOperation(value = "查询分类列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"), + @ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"), + @ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"), + @ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"), + @ApiImplicitParam(name = "operator", value = "守机员", required =false,paramType="query"), + @ApiImplicitParam(name = "dutyPerson", value = "值班人员", required =false,paramType="query"), + @ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"), + }) + @RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST}) + @ResponseBody + public ResultData list(@ModelAttribute @ApiIgnore DutyStandbyEntity entity) { + BasicUtil.startPage(); + entity.setSqlWhere(""); + List list = dutyStandbyBiz.query(entity); + return ResultData.build().success(new EUListBean(list,(int)BasicUtil.endPage(list).getTotal())); + } + + /** + * 导入接口 + * @param + */ + @ApiOperation(value = "导入接口") + @PostMapping("/import") + @ResponseBody + public ResultData importData(MultipartFile file){ + List excelList = ExcelUtil.read(file, DutyStandbyEntity.class); + if(excelList!=null){ + for(DutyStandbyEntity entity : excelList){ + //删除相同日期数据 + dutyStandbyBiz.deleteByEntity(entity); + //导入数据 + entity.setCreateDate(new Date()); + entity.setCreateBy(BasicUtil.getManager().getId()); + dutyStandbyBiz.save(entity); + } + + } + return ResultData.build().success("导入成功！"); + } + + /** + * 导出模板 + */ + @GetMapping("importTmplate") + @ApiOperation(value = "导入模板") + public void importTmplate(HttpServletResponse response) throws IOException { + List list = new ArrayList<>(); + ExcelUtil.export(response, "值班备勤导入模板", "值班备勤", list, DutyStandbyExcel.class); + } + +} diff --git a/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java b/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java index dd7fa261..94ca4059 100644 --- a/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java +++ b/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java @@ -30,7 +30,9 @@ import net.mingsoft.base.entity.ResultData; import net.mingsoft.basic.bean.EUListBean; import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.cms.biz.IPhoneContactsBiz; +import net.mingsoft.cms.entity.DutyStandbyEntity; import net.mingsoft.cms.entity.PhoneContactsEntity; +import net.mingsoft.cms.excel.PhoneContactsExcel; import net.mingsoft.excel.util.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -38,6 +40,9 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -99,4 +104,14 @@ public class PhoneContactsAction extends BaseAction{ return ResultData.build().success("导入成功！"); } + /** + * 导出模板 + */ + @GetMapping("importTmplate") + @ApiOperation(value = "导入模板") + public void importTmplate(HttpServletResponse response) throws IOException { + List list = new ArrayList<>(); + ExcelUtil.export(response, "通讯录导入模板", "通讯录", list, PhoneContactsExcel.class); + } + } diff --git a/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java b/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java new file mode 100644 index 00000000..d010606e --- /dev/null +++ b/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java @@ -0,0 +1,86 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +package net.mingsoft.cms.action.web; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import net.mingsoft.base.entity.ResultData; +import net.mingsoft.basic.bean.EUListBean; +import net.mingsoft.basic.util.BasicUtil; +import net.mingsoft.cms.action.BaseAction; +import net.mingsoft.cms.biz.IDutyStandbyBiz; +import net.mingsoft.cms.entity.DutyStandbyEntity; +import net.mingsoft.excel.util.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.List; + +/** + * 分类管理控制层 + * @author 铭飞开发团队 + * 创建日期：2019-11-28 15:12:32
+ * 历史修订：
+ */ +@Api(tags={"前端-值班备勤接口"}) +@Controller("WebdutyStandbyAction") +@RequestMapping("/cms/dutyStandby") +public class DutyStandbyAction extends BaseAction { + + + /** + * 注入分类业务层 + */ + @Autowired + private IDutyStandbyBiz dutyStandbyBiz; + + /** + * 查询分类列表 + * @param entity 分类实体 + */ + @ApiOperation(value = "查询分类列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"), + @ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"), + @ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"), + @ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"), + @ApiImplicitParam(name = "operator", value = "守机员", required =false,paramType="query"), + @ApiImplicitParam(name = "dutyPerson", value = "值班人员", required =false,paramType="query"), + @ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"), + }) + @RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST}) + @ResponseBody + public ResultData list(@ModelAttribute @ApiIgnore DutyStandbyEntity entity) { + BasicUtil.startPage(); + entity.setSqlWhere(""); + List list = dutyStandbyBiz.query(entity); + return ResultData.build().success(new EUListBean(list,(int)BasicUtil.endPage(list).getTotal())); + } + +} diff --git a/src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java b/src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java new file mode 100644 index 00000000..68c3b720 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/biz/IDutyStandbyBiz.java @@ -0,0 +1,40 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +package net.mingsoft.cms.biz; + +import net.mingsoft.base.biz.IBaseBiz; +import net.mingsoft.cms.entity.DutyStandbyEntity; +import net.mingsoft.cms.entity.PhoneContactsEntity; + + +/** + * 分类业务 + * @author 铭飞开发团队 + * 创建日期：2019-11-28 15:12:32
+ * 历史修订：
+ */ +public interface IDutyStandbyBiz extends IBaseBiz { + + void deleteByEntity(DutyStandbyEntity entity); + +} diff --git a/src/main/java/net/mingsoft/cms/biz/impl/DutyStandbyBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/DutyStandbyBizImpl.java new file mode 100644 index 00000000..29589986 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/biz/impl/DutyStandbyBizImpl.java @@ -0,0 +1,66 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + + + +package net.mingsoft.cms.biz.impl; + +import net.mingsoft.base.biz.impl.BaseBizImpl; +import net.mingsoft.base.dao.IBaseDao; +import net.mingsoft.cms.biz.IDutyStandbyBiz; +import net.mingsoft.cms.biz.IPhoneContactsBiz; +import net.mingsoft.cms.dao.IDutyStandbyDao; +import net.mingsoft.cms.dao.IPhoneContactsDao; +import net.mingsoft.cms.entity.DutyStandbyEntity; +import net.mingsoft.cms.entity.PhoneContactsEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 分类管理持久化层 + * @author 铭飞开发团队 + * 创建日期：2019-11-28 15:12:32
+ * 历史修订：
+ */ +@Service("dutyStandbyBizImpl") +@Transactional(rollbackFor = RuntimeException.class) +public class DutyStandbyBizImpl extends BaseBizImpl implements IDutyStandbyBiz { + + + @Autowired + private IDutyStandbyDao dutyStandbyDao; + + + + @Override + protected IBaseDao getDao() { + return dutyStandbyDao; + } + + + @Override + @Transactional + public void deleteByEntity(DutyStandbyEntity entity) { + dutyStandbyDao.deleteByEntity(entity); + } +} diff --git a/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java new file mode 100644 index 00000000..29ae3d82 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.java @@ -0,0 +1,40 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +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.springframework.stereotype.Component; + +/** + * 分类持久层 + * @author 铭飞开发团队 + * 创建日期：2024-03-20 15:12:32
+ * 历史修订：
+ */ +@Component("dutyStandbyDao") +public interface IDutyStandbyDao extends IBaseDao { + + void deleteByEntity(DutyStandbyEntity entity); +} diff --git a/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml new file mode 100644 index 00000000..a2364604 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + update duty_standby + + duty_date=#{dutyDate}, + monitor=#{monitor}, + deputy_monitor=#{deputyMonitor}, + operator=#{operator}, + duty_person=#{dutyPerson}, + bl_duty_person=#{blDutyPerson}, + create_by=#{createBy}, + create_date=#{createDate}, + update_by=#{updateBy}, + update_date=#{updateDate}, + del=#{del}, + + where id = #{id} + + + + + + + + + + + delete from duty_standby where id=#{id} + + + + delete from duty_standby + + and duty_date=#{dutyDate} + + + + + + delete from duty_standby + + id in #{item} + + + + + + + + diff --git a/src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java b/src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java new file mode 100644 index 00000000..7b6f85c4 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java @@ -0,0 +1,135 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +package net.mingsoft.cms.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableName; +import net.mingsoft.base.entity.BaseEntity; + +/** +* 值班备勤表 +* @author 铭飞开发团队 +* 创建日期：2024-03-20 15:12:32
+* 历史修订：
+*/ +@TableName("duty_standby") +public class DutyStandbyEntity extends BaseEntity { + + + private static final long serialVersionUID = -202180033093209501L; + private String id; + + /** + * 值班日期 + */ + @ExcelProperty("值班日期") + private String dutyDate; + + /** + * 带班长 + */ + @ExcelProperty("带班长") + private String monitor; + + /** + * 副带班长 + */ + @ExcelProperty("副带班长") + private String deputyMonitor; + + /** + * 守机员 + */ + @ExcelProperty("守机员") + private String operator; + + /** + * 值班人员 + */ + @ExcelProperty("值班人员") + private String dutyPerson; + + /** + * 北岭值班人员 + */ + @ExcelProperty("北岭值班人员") + private String blDutyPerson; + + @Override + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + public String getDutyDate() { + return dutyDate; + } + + public void setDutyDate(String dutyDate) { + this.dutyDate = dutyDate; + } + + public String getMonitor() { + return monitor; + } + + public void setMonitor(String monitor) { + this.monitor = monitor; + } + + public String getDeputyMonitor() { + return deputyMonitor; + } + + public void setDeputyMonitor(String deputyMonitor) { + this.deputyMonitor = deputyMonitor; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getDutyPerson() { + return dutyPerson; + } + + public void setDutyPerson(String dutyPerson) { + this.dutyPerson = dutyPerson; + } + + public String getBlDutyPerson() { + return blDutyPerson; + } + + public void setBlDutyPerson(String blDutyPerson) { + this.blDutyPerson = blDutyPerson; + } +} diff --git a/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java b/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java new file mode 100644 index 00000000..a002556b --- /dev/null +++ b/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java @@ -0,0 +1,124 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +package net.mingsoft.cms.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableName; +import net.mingsoft.base.entity.BaseEntity; + +import java.io.Serializable; + +/** +* 值班备勤表 +* @author 铭飞开发团队 +* 创建日期：2024-03-20 15:12:32
+* 历史修订：
+*/ +public class DutyStandbyExcel implements Serializable { + + + private static final long serialVersionUID = -8204345859257208121L; + /** + * 值班日期 + */ + @ExcelProperty("值班日期") + private String dutyDate; + + /** + * 带班长 + */ + @ExcelProperty("带班长") + private String monitor; + + /** + * 副带班长 + */ + @ExcelProperty("副带班长") + private String deputyMonitor; + + /** + * 守机员 + */ + @ExcelProperty("守机员") + private String operator; + + /** + * 值班人员 + */ + @ExcelProperty("值班人员") + private String dutyPerson; + + /** + * 北岭值班人员 + */ + @ExcelProperty("北岭值班人员") + private String blDutyPerson; + + public String getDutyDate() { + return dutyDate; + } + + public void setDutyDate(String dutyDate) { + this.dutyDate = dutyDate; + } + + public String getMonitor() { + return monitor; + } + + public void setMonitor(String monitor) { + this.monitor = monitor; + } + + public String getDeputyMonitor() { + return deputyMonitor; + } + + public void setDeputyMonitor(String deputyMonitor) { + this.deputyMonitor = deputyMonitor; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getDutyPerson() { + return dutyPerson; + } + + public void setDutyPerson(String dutyPerson) { + this.dutyPerson = dutyPerson; + } + + public String getBlDutyPerson() { + return blDutyPerson; + } + + public void setBlDutyPerson(String blDutyPerson) { + this.blDutyPerson = blDutyPerson; + } +} diff --git a/src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java b/src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java new file mode 100644 index 00000000..6dbcd375 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/excel/PhoneContactsExcel.java @@ -0,0 +1,67 @@ +/** + * The MIT License (MIT) + * Copyright (c) 2012-present 铭软科技(mingsoft.net) + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +package net.mingsoft.cms.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableName; +import net.mingsoft.base.entity.BaseEntity; + +import java.io.Serializable; + +/** +* 通讯录表 +* @author 铭飞开发团队 +* 创建日期：2024-03-20 15:12:32
+* 历史修订：
+*/ +public class PhoneContactsExcel implements Serializable { + + private static final long serialVersionUID = 4727044013578081435L; + /** + * 姓名 + */ + @ExcelProperty("姓名") + private String name; + + /** + * 手机号 + */ + @ExcelProperty("手机号") + private String phone; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } +} diff --git a/src/main/java/net/mingsoft/statistics/action/PasZhAction.java b/src/main/java/net/mingsoft/statistics/action/PasZhAction.java index 92750b61..af28f487 100644 --- a/src/main/java/net/mingsoft/statistics/action/PasZhAction.java +++ b/src/main/java/net/mingsoft/statistics/action/PasZhAction.java @@ -53,7 +53,7 @@ import springfox.documentation.annotations.ApiIgnore; * 历史修订：
*/ @Api(tags = "后台-置灰接口") -@Controller("statisticsPasZhAction") +@Controller("pasZhAction") @RequestMapping("/${ms.manager.path}/statistics/pasZh") public class PasZhAction extends BaseAction{ diff --git a/src/main/java/net/mingsoft/statistics/action/web/PasZhAction.java b/src/main/java/net/mingsoft/statistics/action/web/PasZhAction.java new file mode 100644 index 00000000..dcb179a2 --- /dev/null +++ b/src/main/java/net/mingsoft/statistics/action/web/PasZhAction.java @@ -0,0 +1,171 @@ +package net.mingsoft.statistics.action.web; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import net.mingsoft.base.entity.ResultData; +import net.mingsoft.basic.annotation.LogAnn; +import net.mingsoft.basic.bean.EUListBean; +import net.mingsoft.basic.constant.e.BusinessTypeEnum; +import net.mingsoft.basic.util.BasicUtil; +import net.mingsoft.statistics.action.BaseAction; +import net.mingsoft.statistics.biz.IPasZhBiz; +import net.mingsoft.statistics.entity.PasZhEntity; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.stream.Collectors; + +/** +* 置灰管理控制层 +* @author D +* 创建日期：2024-3-28 16:50:04
+* 历史修订：
+*/ +@Api(tags = "前台-置灰接口") +@Controller("webPasZhAction") +@RequestMapping("/statistics/pasZh") +public class PasZhAction extends BaseAction { + + + /** + * 注入置灰业务层 + */ + @Autowired + private IPasZhBiz pasZhBiz; + + /** + * 返回主界面index + */ + @GetMapping("/index") + public String index(HttpServletResponse response,HttpServletRequest request) { + return "/statistics/pas-zh/index"; + } + + /** + * 查询置灰列表 + * @param pasZh 置灰实体 + */ + @ApiOperation(value = "查询置灰列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "yjzh", value = "一键置灰", paramType = "query"), + @ApiImplicitParam(name = "zhEndtime", value = "结束日期", paramType = "query"), + }) + @RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST}) + @ResponseBody + public ResultData list(@ModelAttribute @ApiIgnore PasZhEntity pasZh, HttpServletResponse response, HttpServletRequest request, @ApiIgnore ModelMap model, BindingResult result) { + BasicUtil.startPage(); + List pasZhList = null; + if ( pasZh.getSqlWhere() != null){ + pasZhList = pasZhBiz.query(pasZh); + } else { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(pasZh).orderByDesc(PasZhEntity::getCreateDate); + pasZhList = pasZhBiz.list(wrapper); + } + return ResultData.build().success(new EUListBean(pasZhList,(int)BasicUtil.endPage(pasZhList).getTotal())); + } + + /** + * 返回编辑界面pasZh的form + */ + @GetMapping("/form") + public String form(@ModelAttribute PasZhEntity pasZh,HttpServletResponse response,HttpServletRequest request,ModelMap model) { + return "/statistics/pas-zh/form"; + } + + + /** + * 获取置灰 + * @param pasZh 置灰实体 + */ + @ApiOperation(value = "获取置灰列表接口") + @ApiImplicitParam(name = "id", value = "主键ID", required =true,paramType="query") + @GetMapping("/get") + @ResponseBody + public ResultData get(@ModelAttribute @ApiIgnore PasZhEntity pasZh,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model) { + if (pasZh.getId()==null) { + return ResultData.build().error(); + } + PasZhEntity _pasZh = (PasZhEntity)pasZhBiz.getById(pasZh.getId()); + return ResultData.build().success(_pasZh); + } + + + /** + * 保存置灰 + * @param pasZh 置灰实体 + */ + @ApiOperation(value = "保存置灰列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "yjzh", value = "一键置灰", required =true, paramType = "query"), + @ApiImplicitParam(name = "zhEndtime", value = "结束日期", required =true, paramType = "query"), + }) + @PostMapping("/save") + @ResponseBody + @LogAnn(title = "保存置灰", businessType = BusinessTypeEnum.INSERT) + @RequiresPermissions("statistics:pasZh:save") + public ResultData save(@ModelAttribute @ApiIgnore PasZhEntity pasZh, HttpServletResponse response, HttpServletRequest request) { + //验证结束日期的值是否合法 + if (pasZh.getZhEndtime()==null) { + return ResultData.build().error(getResString("err.empty", this.getResString("zh.endtime"))); + } + pasZhBiz.save(pasZh); + return ResultData.build().success(pasZh); + } + + /** + * 删除置灰 + * + * @param pasZhs 置灰实体 + */ + @ApiOperation(value = "批量删除置灰列表接口") + @PostMapping("/delete") + @ResponseBody + @LogAnn(title = "删除置灰", businessType = BusinessTypeEnum.DELETE) + @RequiresPermissions("statistics:pasZh:del") + public ResultData delete(@RequestBody List pasZhs,HttpServletResponse response, HttpServletRequest request) { + List ids = (List)pasZhs.stream().map((p) -> {return p.getId();}).collect(Collectors.toList()); + return this.pasZhBiz.removeByIds(ids) ? ResultData.build().success() : ResultData.build().error(this.getResString("err.error", new String[]{this.getResString("id")})); + } + + /** + * 更新置灰列表 + * + * @param pasZh 置灰实体 + */ + @ApiOperation(value = "更新置灰列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "yjzh", value = "一键置灰", required =true, paramType = "query"), + @ApiImplicitParam(name = "zhEndtime", value = "结束日期", required =true, paramType = "query"), + }) + @PostMapping("/update") + @ResponseBody + @LogAnn(title = "更新置灰", businessType = BusinessTypeEnum.UPDATE) + @RequiresPermissions("statistics:pasZh:update") + public ResultData update(@ModelAttribute @ApiIgnore PasZhEntity pasZh, HttpServletResponse response, + HttpServletRequest request) { + //先查询数据是否存在 + PasZhEntity _pasZh = (PasZhEntity)pasZhBiz.getById(pasZh.getId()); + if(_pasZh == null) { + return ResultData.build().error(getResString("err.not.exist",pasZh.getId() )); + } + //验证结束日期的值是否合法 + if (pasZh.getZhEndtime()==null) { + return ResultData.build().error(getResString("err.empty", this.getResString("zh.endtime"))); + } + pasZhBiz.updateById(pasZh); + return ResultData.build().success(pasZh); + } + + +} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/statistics/pas-zh/form.ftl b/src/main/webapp/WEB-INF/manager/statistics/pas-zh/form.ftl index 3d5c8d41..afd3ecbe 100644 --- a/src/main/webapp/WEB-INF/manager/statistics/pas-zh/form.ftl +++ b/src/main/webapp/WEB-INF/manager/statistics/pas-zh/form.ftl @@ -79,15 +79,16 @@ placeholder="请选择结束日期" :readonly="false" save:function() { var that = this; - var url = ms.manager + "/cms/pasZh/save.do" + var url = ms.manager + "/statistics/pasZh/save.do" if (that.form.id > 0) { - url = ms.manager + "/cms/pasZh/update.do"; + url = ms.manager + "/statistics/pasZh/update.do"; } this.$refs.form.validate(function(valid) { if (valid) { that.saveDisabled = true; var form = JSON.parse(JSON.stringify(that.form)); + form.yjzh = form.yjzh ? 1 : 0 ms.http.post(url, form).then(function (res) { if (res.result) { that.$notify({ @@ -95,7 +96,7 @@ placeholder="请选择结束日期" :readonly="false" message: "保存成功", type: 'success' }); - // ms.util.openSystemUrl("/cms/pasZh/index.do"); + // ms.util.openSystemUrl("/statistics/pasZh/index.do"); } else { that.$notify({ title: "错误", @@ -119,17 +120,18 @@ placeholder="请选择结束日期" :readonly="false" get:function(id) { var that = this; this.loading = true - ms.http.get(ms.manager + "/cms/pasZh/get.do", {"id":id}).then(function (res) { + ms.http.get(ms.manager + "/statistics/pasZh/get.do", {"id":id}).then(function (res) { that.loading = false if(res.result&&res.data) { that.form = res.data; + that.form.yjzh = !!res.data.yjzh } }); }, update: function (row) { var that = this; - ms.http.post(ms.manager+"/cms/pasZh/update.do", row).then(function (data) { + ms.http.post(ms.manager+"/statistics/pasZh/update.do", row).then(function (data) { if (data.result) { that.$notify({ title: '成功', diff --git a/src/main/webapp/template/1/default/chuhuijiyao-list.htm b/src/main/webapp/template/1/default/chuhuijiyao-list.htm index 01a5b254..8c787d36 100644 --- a/src/main/webapp/template/1/default/chuhuijiyao-list.htm +++ b/src/main/webapp/template/1/default/chuhuijiyao-list.htm @@ -29,8 +29,8 @@
- 首页>${field.typetitle} + 首页>${field.typetitle}

${field.typetitle}

    diff --git a/src/main/webapp/template/1/default/css/header.css b/src/main/webapp/template/1/default/css/header.css index 5eedabc9..e5f3f144 100644 --- a/src/main/webapp/template/1/default/css/header.css +++ b/src/main/webapp/template/1/default/css/header.css @@ -120,6 +120,11 @@ box-sizing: border-box; } +.hurl div a{ + cursor:pointer; + color:#1F3464 +} + .hurl div:last-child { border: 0; } @@ -237,6 +242,8 @@ cursor: pointer; outline: none; border:0; + font-size: 18px; + color: #999999; } .footer-bg .f-b-box { diff --git a/src/main/webapp/template/1/default/css/index.css b/src/main/webapp/template/1/default/css/index.css index 03fbeae8..dca4a658 100644 --- a/src/main/webapp/template/1/default/css/index.css +++ b/src/main/webapp/template/1/default/css/index.css @@ -568,6 +568,7 @@ html body { .slider_news .swiper-slide img { width: 100%; height: 100%; + object-fit: cover; } .slider_news .swiper-pagination { @@ -674,6 +675,7 @@ html body { align-items: center; justify-content: space-between; margin-bottom: 36px; + white-space:nowrap } .cg_news .center_news .right_news .right_ul_news li:hover .nwest { @@ -798,7 +800,7 @@ html body { width: 32%; height: 365px; margin-bottom: 30px; - background-color: rgba(255, 255, 255, 0.7); + background-color: rgba(255, 255, 255, 1); padding: 0 30px; box-sizing: border-box; } @@ -931,6 +933,7 @@ html body { .dt_search .dt_left .dt_con ul li img { width: 100%; height: 234px; + object-fit: cover; } .dt_search .dt_left .dt_con ul li .img_txt { @@ -1093,6 +1096,7 @@ html body { width: 172.6px; height: 110px; text-align: center; + flex:1 } .right_top_bottom_td_t { @@ -1197,9 +1201,12 @@ html body { font-size: 22px; display: flex; align-items: center; - justify-content: space-around; + // justify-content: space-around; + text-align: center; +} +.star_mask div { +width:50%; } - /*车管风采*/ .cgfc_box { width: 100%; @@ -1319,19 +1326,20 @@ html body { margin-left: 40px; } - .dateCard span { + .dateCard li { background: #004ebd; - padding: 0 3px; color: #fff; - margin-right: 1px; + margin-right: 2px; width: 28px; height: 28px; - line-height: 28px; - + line-height: 28px; text-align: center; font-weight: bold; } - + .dateCard div { + font-size:16px; + margin-right:2px; + } .qgs { font-size: 20px; diff --git a/src/main/webapp/template/1/default/css/public.css b/src/main/webapp/template/1/default/css/public.css index c1889ba9..ff141e9f 100644 --- a/src/main/webapp/template/1/default/css/public.css +++ b/src/main/webapp/template/1/default/css/public.css @@ -101,7 +101,7 @@ -webkit-line-clamp: 2; } .index-contentbox { - width: 1440px; + width: 1400px; margin: 0 auto; } diff --git a/src/main/webapp/template/1/default/css/style.css b/src/main/webapp/template/1/default/css/style.css index 0862b0b4..96f3e24b 100644 --- a/src/main/webapp/template/1/default/css/style.css +++ b/src/main/webapp/template/1/default/css/style.css @@ -36,7 +36,7 @@ em, cite, th { .wrap { clear: both; width: 96%; - max-width: 1300px; + max-width: 1400px; margin: 0 auto; text-align: left; zoom: 1; @@ -1498,5 +1498,12 @@ body .baidu_ditu { cursor:pointer; margin-top:50px } +.breadcrumb{ + font-size:20px; + margin-top:50px +} +.breadcrumb span:hover{ + color:#000 +} diff --git a/src/main/webapp/template/1/default/header.htm b/src/main/webapp/template/1/default/header.htm index 64f359be..0ac04d78 100644 --- a/src/main/webapp/template/1/default/header.htm +++ b/src/main/webapp/template/1/default/header.htm @@ -1,76 +1,77 @@ - - + + - +
- - - - + + \ No newline at end of file diff --git a/src/main/webapp/template/1/default/images/line.png b/src/main/webapp/template/1/default/images/line.png new file mode 100644 index 0000000000000000000000000000000000000000..5510bc97bd03e7cb290d31424fa449e0f0fc0ec7 GIT binary patch literal 12257 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/template/1/default/index.htm b/src/main/webapp/template/1/default/index.htm index 333a9501..269472ae 100644 --- a/src/main/webapp/template/1/default/index.htm +++ b/src/main/webapp/template/1/default/index.htm @@ -34,6 +34,7 @@
+ aaaaa 车管要闻
@@ -69,7 +70,6 @@
国家档案局2019年度部门决算
--> - - +
@@ -381,11 +381,12 @@ {ms:arclist typeid=1773193652723265537}
- +
-
${field.title}
${field.shorttitle}
+
${field.title}
{/ms:arclist} @@ -404,11 +405,12 @@ {ms:arclist typeid=1773193652723265538}
- +
-
${field.title}
${field.shorttitle}
+
${field.title}
{/ms:arclist} @@ -554,16 +556,16 @@
今日值班
- - - - +
  • +
  • +
  • +
  • 年
    - - +
  • +
  • 月
    - - +
  • +
  • 日
    @@ -580,11 +582,11 @@
    北岭值班员
    -
    带班长
    -
    副带班长
    -
    守机员
    -
    值班人员
    -
    马魁15612345678
    +
    +
    +
    +
    +
    @@ -668,7 +670,7 @@
    - +
    @@ -703,7 +705,7 @@ {ms:data dataid=1773227655471837185}
    -
    - 首页>通讯录 +
    + 首页 + >通讯录

    通讯录

    @@ -94,6 +94,7 @@ .title { font-size: 30px; margin: 50px 0; + color:#333333 } .dateCard { @@ -117,6 +118,7 @@ display: flex; border-top: 6px solid #004EBD; margin-bottom: 50px; + color:#333333 } .table { diff --git a/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm b/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm index 67c8358f..ffadff31 100644 --- a/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm +++ b/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm @@ -35,18 +35,18 @@

    ${field.typetitle}

    - - - - -
    年
    - - -
    月
    - - -
    日
    -
    +
  • +
  • +
  • +
  • +
    年
    +
  • +
  • +
    月
    +
  • +
  • +
    日
    +
    日期
    带班长
    @@ -125,16 +125,19 @@ font-size: 22px; } - .dateCard span { + .dateCard li { background: #004ebd; - padding: 0 3px; color: #fff; - margin-right: 1px; + margin-right: 2px; width: 28px; height: 28px; text-align: center; font-weight: bold; } + .dateCard div { + font-size:16px; + margin-right:2px + } .tableHeader { display: flex; diff --git a/src/main/webapp/template/1/default/zhibanbeiqing-list.htm b/src/main/webapp/template/1/default/zhibanbeiqing-list.htm index 7a5a0d96..9039397d 100644 --- a/src/main/webapp/template/1/default/zhibanbeiqing-list.htm +++ b/src/main/webapp/template/1/default/zhibanbeiqing-list.htm @@ -19,6 +19,7 @@ + @@ -30,17 +31,17 @@

    ${field.typetitle}

    - - - - -
    年
    - - -
    月
    - - -
    日
    +
  • +
  • +
  • +
  • +
    年
    +
  • +
  • +
    月
    +
  • +
  • +
    日
    带班长
    @@ -50,11 +51,11 @@
    北岭值班员
    -
    汪新
    -
    蔡小年
    -
    杨大力
    -
    贾金龙
    -
    马魁156 1234 5678
    +
    +
    +
    +
    +
      {ms:arclist size=7 ispaging=true} @@ -100,6 +101,21 @@ } document.getElementById('z_day1').innerText = day[0]; document.getElementById('z_day2').innerText = day[1]; + + + //今日值班人员查询 + 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) + } + })