代码提交

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<ContentEntity> contents) {
+		for(ContentEntity entity :contents){
+			entity.setContentDisplay("0");
+		}
+		contentBiz.updateBatchById(contents);
+		return ResultData.build().success();
+	}
 }

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<br/>
+ * 历史修订：<br/>
+ */
+@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<DutyStandbyEntity> 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<DutyStandbyExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "值班备勤导入模板", "值班备勤", list, DutyStandbyExcel.class);
+	}
+
+}

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<PhoneContactsExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "通讯录导入模板", "通讯录", list, PhoneContactsExcel.class);
+	}
+
 }

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<br/>
+ * 历史修订：<br/>
+ */
+@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()));
+	}
+
+}

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<br/>
+ * 历史修订：<br/>
+ */
+public interface IDutyStandbyBiz extends IBaseBiz<DutyStandbyEntity> {
+
+    void deleteByEntity(DutyStandbyEntity entity);
+
+}

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<br/>
+ * 历史修订：<br/>
+ */
+@Service("dutyStandbyBizImpl")
+@Transactional(rollbackFor = RuntimeException.class)
+public class DutyStandbyBizImpl extends BaseBizImpl<IDutyStandbyDao, DutyStandbyEntity> implements IDutyStandbyBiz {
+
+
+    @Autowired
+    private IDutyStandbyDao dutyStandbyDao;
+
+
+
+    @Override
+    protected IBaseDao getDao() {
+        return dutyStandbyDao;
+    }
+
+
+    @Override
+    @Transactional
+    public void deleteByEntity(DutyStandbyEntity entity) {
+        dutyStandbyDao.deleteByEntity(entity);
+    }
+}

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<br/>
+ * 历史修订：<br/>
+ */
+@Component("dutyStandbyDao")
+public interface IDutyStandbyDao extends IBaseDao<DutyStandbyEntity> {
+
+    void deleteByEntity(DutyStandbyEntity entity);
+}

src/main/java/net/mingsoft/cms/dao/IDutyStandbyDao.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="net.mingsoft.cms.dao.IDutyStandbyDao">
+
+	<resultMap id="resultMap" type="net.mingsoft.cms.entity.DutyStandbyEntity">
+		<id column="id" property="id" /><!--编号 -->
+		<result column="duty_date" property="dutyDate" /><!--值班日期 -->
+		<result column="monitor" property="monitor" /><!--带班长 -->
+		<result column="deputy_monitor" property="deputyMonitor" /><!--副带班长 -->
+		<result column="operator" property="operator" /><!--守机员 -->
+		<result column="duty_person" property="dutyPerson" /><!--值班人员 -->
+		<result column="bl_duty_person" property="blDutyPerson" /><!--北岭值班人员 -->
+		<result column="create_by" property="createBy" /><!--创建人 -->
+		<result column="create_date" property="createDate" /><!--创建时间 -->
+		<result column="update_by" property="updateBy" /><!--修改人 -->
+		<result column="update_date" property="updateDate" /><!--修改时间 -->
+		<result column="del" property="del" /><!--删除标记 -->
+	</resultMap>
+
+
+	<!--更新-->
+	<update id="updateEntity" parameterType="net.mingsoft.cms.entity.DutyStandbyEntity">
+		update duty_standby
+		<set>
+			<if test="dutyDate != null and dutyDate != ''">duty_date=#{dutyDate},</if>
+			<if test="monitor != null and monitor != ''">monitor=#{monitor},</if>
+			<if test="deputyMonitor != null and deputyMonitor != ''">deputy_monitor=#{deputyMonitor},</if>
+			<if test="operator != null and operator != ''">operator=#{operator},</if>
+			<if test="dutyPerson != null and dutyPerson != ''">duty_person=#{dutyPerson},</if>
+			<if test="blDutyPerson != null and blDutyPerson != ''">bl_duty_person=#{blDutyPerson},</if>
+			<if test="createBy &gt; 0">create_by=#{createBy},</if>
+			<if test="createDate != null">create_date=#{createDate},</if>
+			<if test="updateBy &gt; 0">update_by=#{updateBy},</if>
+			<if test="updateDate != null">update_date=#{updateDate},</if>
+			<if test="del != null">del=#{del},</if>
+		</set>
+		where id = #{id}
+	</update>
+
+	<!--根据id获取-->
+	<select id="getEntity" resultMap="resultMap" parameterType="int">
+		select * from duty_standby where id=#{id}
+	</select>
+
+	<!--根据实体获取-->
+	<select id="getByEntity" resultMap="resultMap" parameterType="net.mingsoft.cms.entity.DutyStandbyEntity">
+		select * from duty_standby
+		<where>
+			<if test="dutyDate != null and dutyDate != ''">and duty_date=#{dutyDate}</if>
+			<if test="monitor != null and monitor != ''">and monitor=#{monitor}</if>
+			<if test="deputyMonitor != null and deputyMonitor != ''">and deputy_monitor=#{deputyMonitor}</if>
+			<if test="operator != null and operator != ''">and operator=#{operator}</if>
+			<if test="dutyPerson != null and dutyPerson != ''">and duty_person=#{dutyPerson}</if>
+			<if test="blDutyPerson != null and blDutyPerson != ''">and bl_duty_person=#{blDutyPerson}</if>
+			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
+			<if test="createDate != null"> and create_date=#{createDate} </if>
+			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
+			<if test="updateDate != null"> and update_date=#{updateDate} </if>
+			<if test="del != null"> and del=#{del} </if>
+		</where>
+	</select>
+
+	<!--删除-->
+	<delete id="deleteEntity" parameterType="int">
+		delete from duty_standby  where id=#{id}
+	</delete>
+
+	<delete id="deleteByEntity" parameterType="int">
+		delete from duty_standby
+		<where>
+			<if test="dutyDate != null and dutyDate != ''">and duty_date=#{dutyDate}</if>
+		</where>
+	</delete>
+
+	<!--批量删除-->
+	<delete id="delete" >
+		delete from duty_standby
+		<where>
+			id  in <foreach collection="ids" item="item" index="index"
+							open="(" separator="," close=")">#{item}</foreach>
+		</where>
+	</delete>
+	<!--查询全部-->
+	<select id="queryAll" resultMap="resultMap">
+		select * from duty_standby order by id desc
+	</select>
+	<!--条件查询-->
+	<select id="query" resultMap="resultMap">
+		select * from duty_standby
+		<where>
+			<if test="dutyDate != null and dutyDate != ''">and duty_date=#{dutyDate}</if>
+			<if test="monitor != null and monitor != ''">and monitor=#{monitor}</if>
+			<if test="deputyMonitor != null and deputyMonitor != ''">and deputy_monitor=#{deputyMonitor}</if>
+			<if test="operator != null and operator != ''">and operator=#{operator}</if>
+			<if test="dutyPerson != null and dutyPerson != ''">and duty_person=#{dutyPerson}</if>
+			<if test="blDutyPerson != null and blDutyPerson != ''">and bl_duty_person=#{blDutyPerson}</if>
+			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
+			<if test="createDate != null"> and create_date=#{createDate} </if>
+			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
+			<if test="updateDate != null"> and update_date=#{updateDate} </if>
+			<if test="del != null"> and del=#{del} </if>
+			<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>
+		</where>
+	</select>
+
+</mapper>

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<br/>
+* 历史修订：<br/>
+*/
+@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;
+	}
+}

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<br/>
+* 历史修订：<br/>
+*/
+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;
+	}
+}

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<br/>
+* 历史修订：<br/>
+*/
+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;
+	}
+}

src/main/java/net/mingsoft/statistics/action/PasZhAction.java

@@ -53,7 +53,7 @@ import springfox.documentation.annotations.ApiIgnore;
 * 历史修订：<br/>
 */
 @Api(tags = "后台-置灰接口")
-@Controller("statisticsPasZhAction")
+@Controller("pasZhAction")
 @RequestMapping("/${ms.manager.path}/statistics/pasZh")
 public class PasZhAction extends BaseAction{
 

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<br/>
+* 历史修订：<br/>
+*/
+@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<PasZhEntity> 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<PasZhEntity> pasZhs,HttpServletResponse response, HttpServletRequest request) {
+        List<String> 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);
+    }
+
+
+}

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: '成功',

src/main/webapp/template/1/default/chuhuijiyao-list.htm

@@ -29,8 +29,8 @@
    
     <div class="index-contentbox">
        <div class="pagebreadcrumb">
-            <a href='http://192.168.1.104:8080/html/web/index.html'>首页<a>><a
-                        href=`http://192.168.1.104:8080/html/web/field.typelink`>${field.typetitle}</a>
+            <a href='/html/web/index.html'>首页<a>><a
+                        href=`/html/web/field.typelink`>${field.typetitle}</a>
         </div>
         <h1 class="chuhuijiyao_title">${field.typetitle}</h1>
         <ul>

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 {

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;

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

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
+}
 

src/main/webapp/template/1/default/header.htm

@@ -1,76 +1,77 @@
 <!--头部begin-->
 <script src="/{ms:global.style/}js/vue.js"></script>
-    <script src="/{ms:global.style/}js/moment.js"></script>
-    <link rel="stylesheet" href="/{ms:global.style/}css/header.css">
+<script src="/{ms:global.style/}js/moment.js"></script>
+<link rel="stylesheet" href="/{ms:global.style/}css/header.css">
 <script src="/{ms:global.style/}/js/axios.min.js"></script>
-    <link href="/{ms:global.style/}css/style.css" rel="stylesheet"/>
+<link href="/{ms:global.style/}css/style.css" rel="stylesheet" />
 <link rel="stylesheet" href="/{ms:global.style/}css/public.css">
 <div id="header" class="header_box">
-            <div class="top_header">
-              <div class="top_header_box">
-                <div class="left_top">
-                    <p>欢迎来到青岛市公安局交通警察支队车辆管理所!</p>
+    <div class="top_header">
+        <div class="top_header_box">
+            <div class="left_top">
+                <p>欢迎来到青岛市公安局交通警察支队车辆管理所!</p>
+            </div>
+            <div class="left_top right">
+                <div class="wea_box">
+                    <div>{{time}}</div>
+                    <div style="margin:0 5px 0 5px;">{{weather}}</div>
+                    <div>{{temp}}℃</div>
                 </div>
-                <div class="left_top right">
-                    <div class="wea_box">
-                        <div>{{time}}</div>
-                        <div style="margin:0 5px 0 5px;">{{weather}}</div>
-                        <div>{{temp}}℃</div>
-                    </div>
-                    <div class="login_box">
-                      <span class="login_dl">登录</span>
-                      <span class="login_grzx">个人中心</span>
-                      <div class="login_model">
+                <div class="login_box">
+                    <span class="login_dl">登录</span>
+                    <span class="login_grzx">个人中心</span>
+                    <div class="login_model">
                         <div class="triangle"></div>
                         <div class="l_label">用户名/账号：</div>
                         <div>
-                          <input type="text" class="username"/>
+                            <input type="text" class="username" placeholder="请输入" />
                         </div>
                         <div class="l_label">密码：</div>
-                       <div style="position: relative;">
-                <input type="password" class="password" id="myInput" style="padding-right: 26px;" />
-                <img src="/{ms:global.style/}images/y.png" class="login_y" style="position: absolute;
+                        <div style="position: relative;">
+                            <input type="password" class="password" id="myInput" placeholder="请输入"
+                                style="padding-right: 26px;" />
+                            <img src="/{ms:global.style/}images/y.png" class="login_y" style="position: absolute;
                 width: 15px;
                 height: 12px;
                 top: 10px;
                 right: 10px;">
-              </div>
+                        </div>
                         <div class="login_btn">
-                          登录
+                            登录
                         </div>
-                      </div>
                     </div>
                 </div>
-              </div>
-                
             </div>
-        <div class="hurl hurld">
-        <div>公安部</div>
-        <div>部交管局</div>
-        <div>省公安厅</div>
-        <div>省交警总队</div>
-        <div>省厅车管所</div>
-        <div>市公安局</div>
-      </div>    
-       
-                      
         </div>
 
- 
-  <div class="bottom_header">
+    </div>
+    <div class="hurl hurld">
+        <div><a href='https://www.mps.gov.cn/'>公安部</a></div>
+        <div><a href='https://sd.122.gov.cn/'>部交管局</a></div>
+        <div><a href='http://gat.shandong.gov.cn/'>省公安厅</a></div>
+        <div><a href='https://sd.122.gov.cn/'>省交警总队</a></div>
+        <div><a href='https://sd.122.gov.cn/'>省厅车管所</a></div>
+        <div><a href='http://gat.shandong.gov.cn/'>市公安局</a></div>
+    </div>
+
+
+</div>
+
+
+<div class="bottom_header">
     <div class="header-nav">
-      <ul>
-        <li>
-          <a href="/html/web/index.html" title="首页">
-            <!-- <span class="b r">首页</span> -->
-            首页
-          </a>
-        </li>
-        <!--定义变量typeid、ids，通过这两个变量判断是否选中-->
-        <li>
-          <a href="/html/web/intro/index.html">
-            <span data-title="单位简介" class="b ">单位简介</span>
-            <!-- <div class="son-none ">
+        <ul>
+            <li>
+                <a href="/html/web/index.html" title="首页">
+                    <!-- <span class="b r">首页</span> -->
+                    首页
+                </a>
+            </li>
+            <!--定义变量typeid、ids，通过这两个变量判断是否选中-->
+            <li>
+                <a href="/html/web/intro/index.html">
+                    <span data-title="单位简介" class="b ">单位简介</span>
+                    <!-- <div class="son-none ">
               <div>
                 <a class="nav-a" href="index1.html">
                   平台产品
@@ -84,202 +85,203 @@
               </div>
             </div> -->
 
-          </a>
-        </li>
-        <li>
-          <a href="/html/web/zhibanbeiqin/index.html">
-            <span data-title="值班备勤" class="b ">值班备勤</span>
-            <div class="son-noneson-cont ">
-              <div>
-              </div>
-            </div>
+                </a>
+            </li>
+            <li>
+                <a href="/html/web/zhibanbeiqin/index.html">
+                    <span data-title="值班备勤" class="b ">值班备勤</span>
+                    <div class="son-noneson-cont ">
+                        <div>
+                        </div>
+                    </div>
 
-          </a>
-        </li>
-        <li>
-          <a href="/html/web/tongxunlu/index.html">
-            <span data-title="通讯录" class="b ">通讯录</span>
-            <div class="son-noneson-cont ">
-              <div>
-              </div>
-            </div>
+                </a>
+            </li>
+            <li>
+                <a href="/html/web/tongxunlu/index.html">
+                    <span data-title="通讯录" class="b ">通讯录</span>
+                    <div class="son-noneson-cont ">
+                        <div>
+                        </div>
+                    </div>
 
-          </a>
-        </li>
-        <li>
-          <a href="/html/web/conference/index.html">
-            <span data-title="会议通知" class="b ">会议通知</span>
+                </a>
+            </li>
+            <li>
+                <a href="/html/web/conference/index.html">
+                    <span data-title="会议通知" class="b ">会议通知</span>
 
-          </a>
-        </li>
-        <li>
-          <a href="/html/web/tongzhigonggao/index.html">
-            <span data-title="通知公告" class="b ">通知公告</span>
-            <div class="son-noneson-cont ">
-              <div>
-              </div>
-            </div>
-          </a>
-        </li>
-        <li>
-          <a href="index7.html">
-            <span data-title="办公自动化" class="b ">办公自动化</span>
-            <div class="son-noneson-cont ">
-              <div>
-              </div>
-            </div>
+                </a>
+            </li>
+            <li>
+                <a href="/html/web/tongzhigonggao/index.html">
+                    <span data-title="通知公告" class="b ">通知公告</span>
+                    <div class="son-noneson-cont ">
+                        <div>
+                        </div>
+                    </div>
+                </a>
+            </li>
+            <li>
+                <a href="javascript: void(0)">
+                    <span data-title="办公自动化" class="b ">办公自动化</span>
+                    <div class="son-noneson-cont ">
+                        <div>
+                        </div>
+                    </div>
 
-          </a>
-        </li>
-        <li>
-          <a href="">
-            <span data-title="新版办公自动化" class="b ">新版办公自动化</span>
+                </a>
+            </li>
+            <li>
+                <a href="javascript: void(0)">
+                    <span data-title="新版办公自动化" class="b ">新版办公自动化</span>
+
+
+                </a>
+            </li>
+            <li>
+                <div class="search_cen">
+                    <form action="/mcms/search.do" method="post">
+                        <select class="search_select" name="categoryIds">
 
+                            <option value="" selected="selected">全部</option>
 
-          </a>
-        </li>
-        <li>
-          <div class="search_cen">
-           <form action="/mcms/search.do" method="post">
-              <select class="search_select"  name="categoryIds" >
-    
-                <option value="" selected="selected">全部</option>
-               
-                
-                <option value="1765306882908344322">车管要闻</option>
-                <option value="1767079741717553153">车管动态</option>
-                <option value="1767087429860007938">通知公告</option>
-                <option value="1767091286732251138">会议通知</option>
-                <option value="1767126154677657602">警苑文化</option>
-               <!--  <option value="1772433260107251713">处会纪要</option>-->
-                <option value="1772809304160997378">领导批示</option>
-                <option value="1772809992177848321">上级文件</option>
-                <option value="1772810629200351233">工作交流</option>
-                <option value="1772811323781287938">法律法规</option>
-                <option value="1772814349241815042">党建队建</option>
-                <option value="1772815555934687234">政工通告</option>
-                <option value="1772815810168229890">综合监管</option>
-                
-              </select>
-              <input class="input1" type="text" name="content_title" id="p" placeholder="搜索" />
-              <!-- <input type="text" name="categoryIds" placeholder="请输入栏目id,多个以,分隔"> -->
-              <!-- <input type="submit" class="bnts"> -->
-              <div class="btn ">
-                <input type="submit" value="" style="    width: 22px;cursor: pointer;
+
+                            <option value="1765306882908344322">车管要闻</option>
+                            <option value="1767079741717553153">车管动态</option>
+                            <option value="1767087429860007938">通知公告</option>
+                            <option value="1767091286732251138">会议通知</option>
+                            <option value="1767126154677657602">警苑文化</option>
+                            <!--  <option value="1772433260107251713">处会纪要</option>-->
+                            <option value="1772809304160997378">领导批示</option>
+                            <option value="1772809992177848321">上级文件</option>
+                            <option value="1772810629200351233">工作交流</option>
+                            <option value="1772811323781287938">法律法规</option>
+                            <option value="1772814349241815042">党建队建</option>
+                            <option value="1772815555934687234">政工通告</option>
+                            <option value="1772815810168229890">综合监管</option>
+
+                        </select>
+                        <input class="input1" type="text" name="content_title" id="p" placeholder="搜索" />
+                        <!-- <input type="text" name="categoryIds" placeholder="请输入栏目id,多个以,分隔"> -->
+                        <!-- <input type="submit" class="bnts"> -->
+                        <div class="btn ">
+                            <input type="submit" value="" style="    width: 22px;cursor: pointer;
     height: 22px;
     position: absolute;
     top: 12px;
     background: none;">
-                <img src="/{ms:global.style/}images/fdj.png" alt="" srcset="">
-              </div>
-           </form>
-          </div>
-        </li>
-      </ul>
+                            <img src="/{ms:global.style/}images/fdj.png" alt="" srcset="">
+                        </div>
+                    </form>
+                </div>
+            </li>
+        </ul>
     </div>
-  </div>
-        
-                   <script>
-        new Vue({
-            el:"#header",
-            data() {
-                return {
-                    time:"",
-                    weather:'',
-                    temp:''
-                }
-            },
-            created() {
-                this.time=  moment().format('yyyy-MM-DD')
-                this.getWeather()
-            },
-            methods: {
-                getWeather(){
-                    axios.get('https://devapi.qweather.com/v7/weather/now?location=101120201&key=da5448d7e24e42659c86656047911980').then(res =>{
-                        console.log('res ====>',res)
-                        this.weather = res.data.now.text
-                        this.temp = res.data.now.temp
-                    })
-                }
-            },
-        })
-    window.onload = function() {
-                     
+</div>
+
+<script>
+    new Vue({
+        el: "#header",
+        data() {
+            return {
+                time: "",
+                weather: '',
+                temp: ''
+            }
+        },
+        created() {
+            this.time = moment().format('yyyy-MM-DD')
+            this.getWeather()
+        },
+        methods: {
+            getWeather() {
+                axios.get('https://devapi.qweather.com/v7/weather/now?location=101120201&key=da5448d7e24e42659c86656047911980').then(res => {
+                    console.log('res ====>', res)
+                    this.weather = res.data.now.text
+                    this.temp = res.data.now.temp
+                })
+            }
+        },
+    })
+    window.onload = function () {
+
         var pathname = window.location.pathname
-    if (pathname == '/html/web/index.html') {
-     
-      $('.hurl').removeClass('hurld')
-    }
-                 
-         
-  axios.get('/ms/statistics/pasZh/get.do?id=1').then(res =>{
-                        console.log('res ====>',res)
-                       if(res.data.code == 200 && res.data.result){
-                     if(res.data.data.yjzh){
-                           $('html').addClass('zhhtmls');
-                     }
-                     }
-                    })
+        if (pathname == '/html/web/index.html') {
+
+            $('.hurl').removeClass('hurld')
+        }
+
+
+        // axios.get('/statistics/pasZh/get.do').then(res => {
+        //     console.log('res ====>', res)
+        //     if (res.data.code == 200 && res.data.result) {
+        //         if (res.data.data.yjzh) {
+        //             $('html').addClass('zhhtmls');
+        //         }
+        //     }
+        // })
     };
 
-     $('.searchbtn').click(() => {
-      var content = $('.input1').val();
-      var type = $('.search_select').val();
-                     console.log(content,type)
-      window.location.href = '/mcms/search.do?type=' + type + '&content' + content
+    $('.searchbtn').click(() => {
+        var content = $('.input1').val();
+        var type = $('.search_select').val();
+        console.log(content, type)
+        window.location.href = '/mcms/search.do?type=' + type + '&content' + content
     })
     $('.login_dl').click(() => {
-      $('.login_model').css('display', 'block')
+        $('.login_model').css('display', 'block')
     })
 
     $(document).on('click', function (e) {
-      var $target = e.target._prevClass;
-      var target = $(event.target);
-      var $myElement = $('.login_model'); 
-      if ($target != 'login_dl' && $myElement.closest(target).length) { 
-        $myElement.hide(); 
-      }
+        var $target = e.target._prevClass;
+        var target = $(event.target);
+        var $myElement = $('.login_model');
+        if ($target != 'login_dl' && $myElement.closest(target).length) {
+            $myElement.hide();
+        }
     });
-   $('.login_btn').click(() => {
+    $('.login_btn').click(() => {
         var username = $('.username').val();
         var password = $('.password').val();
         console.log(username, password)
         var userlogin = {
-          managerName: username,
-          managerPassword: password
+            managerName: username,
+            managerPassword: password
         }
         axios.post("{ms:global.host/}ms/login.do", userlogin, {
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-          }
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded'
+            }
         }).then(r => {
-          if(r.data.code == 200 && r.data.result){
-          // window.open('{ms:global.host/}ms/index.do')
-                     alert('登录成功')
-                    location.reload();
-         }else{
-                     alert(r.data.msg)}
+            if (r.data.code == 200 && r.data.result) {
+                // window.open('{ms:global.host/}ms/index.do')
+                alert('登录成功')
+                location.reload();
+            } else {
+                alert(r.data.msg)
+            }
         })
-      })
-         axios.get('/ms/checkLogin.do').then(res=>{
-                     if(res.data.code == 200 && res.data.result){
-                     $('.login_dl').hide()
-                     $('.login_grzx').show()
-                       $('.zgtg').show()
-}
-              })     
-                     $('.login_grzx').click(()=>{
-                     window.location.href = '{ms:global.host/}ms/index.do';  
-                     })
-                     
-              var types = true
+    })
+    axios.get('/ms/checkLogin.do').then(res => {
+        if (res.data.code == 200 && res.data.result) {
+            $('.login_dl').hide()
+            $('.login_grzx').show()
+            $('.zgtg').show()
+        }
+    })
+    $('.login_grzx').click(() => {
+        window.location.href = '{ms:global.host/}ms/index.do';
+    })
+
+    var types = true
     $('.login_y').off().click(() => {
-      types = !types 
-      if (types) {
-        document.getElementById("myInput").setAttribute('type', 'password')
-      } else {
-        document.getElementById("myInput").setAttribute('type', 'text')
-      }
+        types = !types
+        if (types) {
+            document.getElementById("myInput").setAttribute('type', 'password')
+        } else {
+            document.getElementById("myInput").setAttribute('type', 'text')
+        }
     })
-   </script>
-<!--头部end-->
+</script>
+<!--头部end-->

src/main/webapp/template/1/default/index.htm

@@ -34,6 +34,7 @@
     </div>
 
     <div class="cgtitbox titfont">
+                <a href="/ms/cms/dutyStandby/importTmplate.do" download="">aaaaa</a>
       车管要闻
     </div>
     <div class="cg_news">
@@ -69,7 +70,6 @@
               <div class="new_tit">国家档案局2019年度部门决算</div>
             </div> -->
           </div>
-
         </div>
         <script>
           var newswiper = new Swiper('.swiper-news', {
@@ -83,7 +83,7 @@
           });
         </script>
       </div>
-
+        <img src="/{ms:global.style/}images/line.png"/>
       <div class="center_news">
         <div class="slider_news">
           <div class="swiper-container">
@@ -381,11 +381,12 @@
 		{ms:arclist typeid=1773193652723265537}
               <div class="swiper-slide slider_star blue-slide">
                 <div style="width:100%;height:100%;">
-                  <img style="width:100%;height:100%;" src="{@ms:file field.litpic/}">
+                  <img style="width:100%;height:100%;
+  object-fit: cover;" src="{@ms:file field.litpic/}">
                 </div>
                 <div class="star_mask">
-                  <div>${field.title}</div>
                   <div>${field.shorttitle}</div>
+                  <div>${field.title}</div>
                 </div>
               </div>
     	 {/ms:arclist}        
@@ -404,11 +405,12 @@
               {ms:arclist typeid=1773193652723265538}
               <div class="swiper-slide slider_star blue-slide">
                 <div style="width:100%;height:100%;">
-                  <img style="width:100%;height:100%;" src="{@ms:file field.litpic/}">
+                  <img style="width:100%;height:100%;
+  object-fit: cover;" src="{@ms:file field.litpic/}">
                 </div>
                 <div class="star_mask">
-                  <div>${field.title}</div>
                   <div>${field.shorttitle}</div>
+                  <div>${field.title}</div>
                 </div>
               </div>
                {/ms:arclist}   
@@ -554,16 +556,16 @@
           <div class="rigth_top_tit">
             <div class="titfont">今日值班
              <div class="dateCard">
-                <span id="z_year1"></span>
-                <span id="z_year2"></span>
-                <span id="z_year3"></span>
-                <span id="z_year4"></span>
+                <li id="z_year1"></li>
+                <li id="z_year2"></li>
+                <li id="z_year3"></li>
+                <li id="z_year4"></li>
                 <div style="font-size: 16px;">年</div>
-                <span id="z_month1"></span>
-                <span id="z_month2"></span>
+                <li id="z_month1"></li>
+                <li id="z_month2"></li>
                 <div style="font-size: 16px;">月</div>
-                <span id="z_day1"></span>
-                <span id="z_day2"></span>
+                <li id="z_day1"></li>
+                <li id="z_day2"></li>
                 <div style="font-size: 16px;">日</div>
             </div>
             </div>
@@ -580,11 +582,11 @@
               <div>北岭值班员</div>
             </div>
             <div class="right_top_con_tr">
-              <div>带班长</div>
-              <div>副带班长</div>
-              <div>守机员</div>
-              <div>值班人员</div>
-              <div>马魁15612345678</div>
+              <div class="right_top_con_tr_monitor"></div>
+              <div class="right_top_con_tr_deputyMonitor"></div>
+              <div class="right_top_con_tr_operator"></div>
+              <div class="right_top_con_tr_dutyPerson"></div>
+              <div class="right_top_con_tr_blDutyPerson"></div>
             </div>
           </div>
         </div>
@@ -668,7 +670,7 @@
               <a href="{ms:global.html/}${field.link}">
               <div style="width:100%;height:100%;">
                 <img style="width:100%;height:100%;" src="{@ms:file field.litpic/}">
-                
+        
                   
                 
               </div>
@@ -703,7 +705,7 @@
    {ms:data dataid=1773227655471837185}
    <div id="flow" onmouseover="stop()" onmouseout="start()" style="top: 0; left: 0;">
    
-    <a href="{ms:global.html/}${field.link}">
+    <a href="{ms:global.html/}zhongyaotongzhi/index.html">
       <div id="flow-content">
         <img src="/{ms:global.style/}images/z2.png" style="width: 100%;">
         <!-- <div id="flow-content-tit">今日公告：</div> -->
@@ -718,6 +720,7 @@
   </div>
      {/ms:data}
 <#include "footer.htm" />
+<script src="/{ms:global.style/}js/moment.js"></script>
 <script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
  <script>
 
@@ -860,8 +863,20 @@
   axios.get('/cms/phoneContacts/list.do').then(res=>{
    
    })
- 
-
+ //值班备勤
+  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)
+   	}
+   })
   
     </script>
 </body>

src/main/webapp/template/1/default/tongxunlu.htm

@@ -29,9 +29,9 @@
     </div>
     <!--正文begin-->
         <div class="wrap">
-            <div class="chuhuijiyao_nav">
-                <a href='http://192.168.1.104:8080/html/web/index.html'>首页<a>><a
-                            href='http://192.168.1.104:8080/html/web/index.html'>通讯录</a>
+            <div class="breadcrumb">
+                <a href='/html/web/index.html'>首页<a>
+                  <span>>通讯录</span>
             </div>
             <h1 class="title">通讯录</h1>
             <div class="tableBox">
@@ -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 {

src/main/webapp/template/1/default/zhibanbeiqing-detail.htm

@@ -35,18 +35,18 @@
             </div>
             <h1 class="chuhuijiyao_title">${field.typetitle}</h1>
             <div class="dateCard">
-                <span id="z_year1"></span>
-                <span id="z_year2"></span>
-                <span id="z_year3"></span>
-                <span id="z_year4"></span>
-                <div style="font-size: 16px;">年</div>
-                <span id="z_month1"></span>
-                <span id="z_month2"></span>
-                <div style="font-size: 16px;">月</div>
-                <span id="z_day1"></span>
-                <span id="z_day2"></span>
-                <div style="font-size: 16px;">日</div>
-            </div>
+            <li id="z_year1"></li>
+            <li id="z_year2"></li>
+            <li id="z_year3"></li>
+            <li id="z_year4"></li>
+            <div>年</div>
+            <li id="z_month1"></li>
+            <li id="z_month2"></li>
+            <div>月</div>
+            <li id="z_day1"></li>
+            <li id="z_day2"></li>
+            <div>日</div>
+        </div>
             <div class="tableHeader">
                 <div>日期</div>
                 <div>带班长</div>
@@ -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;

src/main/webapp/template/1/default/zhibanbeiqing-list.htm

@@ -19,6 +19,7 @@
     <script type="text/javascript" src="/{ms:global.style/}js/jquery.superslide.2.1.1.js">//pc导航</script>
     <script src="/{ms:global.style/}js/anim.js">//动画</script>
     <script type="text/javascript" src="/{ms:global.style/}js/basic.js"></script>
+  	<script src="/{ms:global.style/}js/moment.js"></script>
 </head>
 
 <body>
@@ -30,17 +31,17 @@
         </div>
         <h1 class="chuhuijiyao_title">${field.typetitle}</h1>
         <div class="dateCard">
-            <span id="z_year1"></span>
-            <span id="z_year2"></span>
-            <span id="z_year3"></span>
-            <span id="z_year4"></span>
-            <div style="font-size: 16px;">年</div>
-            <span id="z_month1"></span>
-            <span id="z_month2"></span>
-            <div style="font-size: 16px;">月</div>
-            <span id="z_day1"></span>
-            <span id="z_day2"></span>
-            <div style="font-size: 16px;">日</div>
+            <li id="z_year1"></li>
+            <li id="z_year2"></li>
+            <li id="z_year3"></li>
+            <li id="z_year4"></li>
+            <div>年</div>
+            <li id="z_month1"></li>
+            <li id="z_month2"></li>
+            <div>月</div>
+            <li id="z_day1"></li>
+            <li id="z_day2"></li>
+            <div>日</div>
         </div>
         <div class="tableHeader">
             <div>带班长</div>
@@ -50,11 +51,11 @@
             <div>北岭值班员</div>
         </div>
         <div class="tableBody">
-            <div>汪新</div>
-            <div>蔡小年</div>
-            <div>杨大力</div>
-            <div>贾金龙</div>
-            <div>马魁156 1234 5678</div>
+           <div class="right_top_con_tr_monitor"></div>
+          	<div class="right_top_con_tr_deputyMonitor"></div>
+              <div class="right_top_con_tr_operator"></div>
+              <div class="right_top_con_tr_dutyPerson"></div>
+              <div class="right_top_con_tr_blDutyPerson"></div>
         </div>
         <ul>
             {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)
+   	}
+   })
     </script>
 </body>
 <style>
@@ -109,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;