http

leiSP-admin/src/main/resources/application.yml

@@ -55,6 +55,7 @@ logging:
     com.business.slfh.app.applyassistance.mapper : debug
     com.business.slfh.manager.firemanager.mapper : debug
     com.business.slfh.manager.levelmanager.mapper : debug
+    com.sooka.system.mapper : debug
     org.springframework: warn
 
 # 用户配置

leiSP-admin/src/main/resources/templates/system/user/user.html

@@ -185,6 +185,14 @@
                     }
                 },
                 {
+                    visible: editFlag == 'hidden' ? false : true,
+                    title: '手机端摄像头',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return statusToolsIsCamera(row);
+                    }
+                },
+                {
                     field: 'createTime',
                     title: '创建时间',
                     sortable: true
@@ -299,7 +307,13 @@
             return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="diableJGMsg(\'' + row.userId + '\')"></i> ';
         }
     }
-
+    function statusToolsIsCamera(row) {
+        if (row.iscamera == 0) {
+            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enableCamera(\'' + row.userId + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="diableCamera(\'' + row.userId + '\')"></i> ';
+        }
+    }
 
     /* 用户管理-停用 */
     function disable(userId) {
@@ -335,6 +349,17 @@
             $.operate.post(prefix + "/changeStatus", {"userId": userId, "isjgmsg": 1});
         })
     }
+    function diableCamera(userId) {
+        $.modal.confirm("确认要停用手机端摄像头吗？", function () {
+            $.operate.post(prefix + "/changeStatus", {"userId": userId, "iscamera": 0});
+        })
+    }
+    function enableCamera(userId) {
+        $.modal.confirm("确认要启用手机端摄像头吗？", function () {
+            $.operate.post(prefix + "/changeStatus", {"userId": userId, "iscamera": 1});
+        })
+    }
+
 
 
 </script>

leiSP-system/src/main/java/com/sooka/system/domain/SysUser.java

@@ -153,6 +153,9 @@ public class SysUser extends BaseEntity {
 
     //是否极光推送0-不发送 1-发送
     private Integer isjgmsg;
+
+
+    private Integer iscamera;
     /**
      * 岗位组
      */
@@ -166,6 +169,13 @@ public class SysUser extends BaseEntity {
 
     }
 
+    public Integer getIscamera() {
+        return iscamera;
+    }
+
+    public void setIscamera(Integer iscamera) {
+        this.iscamera = iscamera;
+    }
 
     public void setOrgDept(SysDept orgDept) {
         this.orgDept = orgDept;

leiSP-system/src/main/java/com/sooka/system/mapper/SysUserMapper.java

@@ -19,6 +19,7 @@ public interface SysUserMapper
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
+
     public List<SysUser> selectUserList(SysUser sysUser);
 
     /**

leiSP-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -34,9 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
-        <include refid="selectNoticeVo"/>
+        select t.dept_id,event_id,reserveplan_type,t.is_group_notice,
+        (select dept_name from sys_dept where dept_id=t.dept_id) dept_name,
+        t.create_user_id, t.notice_id, ifnull(t.notice_title,"") notice_title, ifnull(t.notice_type,"") notice_type,
+        ifnull(t.notice_content,"") notice_content, t.status, t.create_by, t.create_time, t.update_by, t.update_time, t.remark
+        from sys_notice t,sys_dept d
         <where>
-            1=1
+            t.dept_id=d.dept_id
 			<if test="noticeTitle != null and noticeTitle != ''">
 				AND notice_title like concat('%', #{noticeTitle}, '%')
 			</if>
@@ -49,10 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">
 				AND create_by like concat('%', #{createBy}, '%')
 			</if>
-            <if test="userId != null and userId != ''">
-                and t.notice_id in (select notice_id from sys_notice_to where user_id = #{userId}) or t.is_group_notice = '1'
-            </if>
+            <!--<if test="userId != null and userId != ''">-->
+                <!--and t.notice_id in (select notice_id from sys_notice_to where user_id = #{userId}) or t.is_group_notice = '1'-->
+            <!--</if>-->
 		</where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by create_time desc
     </select>
 
@@ -64,10 +70,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != '' ">status, </if>
 			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+
         <if test="eventId != null and eventId != ''">event_id,</if>
         <if test="reserveplanType != null and reserveplanType != ''">reserveplan_type,</if>
         <if test="isGroupNotice != null and isGroupNotice != ''">is_group_notice,</if>
-
+        <if test="deptId != null and deptId != ''">dept_id,</if>
  			create_time
  		)values(
 			<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
@@ -79,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="eventId != null and eventId != ''">#{eventId},</if>
         <if test="reserveplanType != null and reserveplanType != ''">#{reserveplanType},</if>
         <if test="isGroupNotice != null and isGroupNotice != ''">#{isGroupNotice},</if>
- 			sysdate()
+        <if test="deptId != null and deptId != ''">#{deptId},</if>
+        sysdate()
 		)
     </insert>
 

leiSP-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="orgDeptName"       column="orgDeptName"       />
 		<result property="issendmsg"       column="issendmsg"       />
 		<result property="isjgmsg"       column="isjgmsg"       />
+		<result property="iscamera"       column="iscamera"       />
 		<result property="postNames"       column="postNames"       />
 		<result property="postSort"       column="postSort"       />
 
@@ -75,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.forestdept_type, u.pinyin_short,u.pinyin_first,u.pinyin_full,u.user_id, u.dept_id,u.org_dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,
        		    d.dept_id,orgd.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    orgd.dept_id org_dept_id, orgd.parent_id org_parent_id, orgd.dept_name org_dept_name, orgd.order_num org_order_num, orgd.leader org_leader, orgd.status as org_dept_status,
-       		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status ,u.issendmsg,u.isjgmsg
+       		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status ,u.issendmsg,u.isjgmsg,u.iscamera
 
 		from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
@@ -88,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select u.pinyin_short,u.pinyin_first,u.pinyin_full,u.user_id, u.dept_id,u.org_dept_id,
 		u.login_name, u.user_name, u.user_type, u.email, u.avatar,
 		u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag,
-		u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.issendmsg,u.isjgmsg,
+		u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.issendmsg,u.isjgmsg,u.iscamera,
 		(select dept_name from sys_dept where dept_id=u.org_dept_id) as orgDeptName,
 		(select GROUP_CONCAT(spost.post_name SEPARATOR ',') from sys_user_post upost,sys_post spost where upost.post_id=spost.post_id and upost.user_id=u.user_id) postNames,
 		(select min(spost.post_sort) from sys_user_post upost,sys_post spost where upost.post_id=spost.post_id and upost.user_id=u.user_id) postSort
@@ -125,13 +126,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
-
+		order by u.dept_id
 	</select>
 
 	<select id="selectUserListByUserIds" parameterType="java.util.Map" resultMap="SysUserResult">
 		select u.pinyin_short,u.pinyin_first,u.pinyin_full,u.user_id, u.dept_id,u.org_dept_id, u.login_name,
 		u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag,
-		u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.issendmsg,u.isjgmsg
+		u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.issendmsg,u.isjgmsg,u.iscamera
 
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -140,10 +141,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<foreach item="userId" index="index" collection="userIds"   open="(" separator="," close=")">
 			#{userId}
 		</foreach>
+		order by u.dept_id
 	</select>
 
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.pinyin_short,u.pinyin_first,u.pinyin_full,u.user_id, u.dept_id,u.org_dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,u.issendmsg,u.isjgmsg
+	    select distinct u.pinyin_short,u.pinyin_first,u.pinyin_full,u.user_id, u.dept_id,u.org_dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,u.issendmsg,u.isjgmsg,u.iscamera
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_dept orgd on u.org_dept_id = orgd.dept_id
@@ -158,10 +160,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
+		order by u.dept_id
 	</select>
 
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.pinyin_short,u.pinyin_first,u.pinyin_full,u.user_id, u.dept_id,u.org_dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,u.issendmsg,u.isjgmsg
+	    select distinct u.pinyin_short,u.pinyin_first,u.pinyin_full,u.user_id, u.dept_id,u.org_dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,u.issendmsg,u.isjgmsg,u.iscamera
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_dept orgd on u.org_dept_id = orgd.dept_id
@@ -177,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
+		order by u.dept_id
 	</select>
 
 	<select id="selectUserByLoginName" parameterType="String" resultMap="SysUserResult">
@@ -265,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
 			<if test="issendmsg != null">issendmsg = #{issendmsg},</if>
 			<if test="isjgmsg != null">isjgmsg = #{isjgmsg},</if>
+			<if test="iscamera != null">iscamera = #{iscamera},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

mybusiness/src/main/java/com/business/slfh/app/camera/controller/AppCameraController.java

@@ -4,6 +4,8 @@ import com.business.slfh.app.appbase.controller.AppBaseController;
 import com.business.slfh.app.appbase.domain.AppDataModel;
 import com.business.slfh.app.camera.domain.AppCameraVO;
 import com.business.slfh.app.camera.service.AppCameraService;
+import com.business.slfh.manager.cameramanager.domain.TResCamera;
+import com.business.slfh.manager.cameramanager.service.ITResCameraService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,10 +20,19 @@ public class AppCameraController extends AppBaseController {
     @Resource
     AppCameraService appCameraService;
 
+    @Resource
+    ITResCameraService itResCameraService;
+
     @RequestMapping("getCamera")
     @ResponseBody
     public AppDataModel getCamera(@RequestBody AppCameraVO appCameraVO) {
         setAppLongUser(appCameraVO.getUserId());
         return appCameraService.getCamera(appCameraVO);
     }
+
+    @RequestMapping("getAppCamera")
+    @ResponseBody
+    public AppDataModel getAppCamera(@RequestBody AppCameraVO appCameraVO) {
+        return appCameraService.getAppCamera(appCameraVO);
+    }
 }

mybusiness/src/main/java/com/business/slfh/app/camera/service/AppCameraService.java

@@ -6,4 +6,6 @@ import com.business.slfh.app.camera.domain.AppCameraVO;
 public interface AppCameraService {
 
     public AppDataModel getCamera(AppCameraVO appCameraVO);
+
+    public AppDataModel getAppCamera(AppCameraVO appCameraVO);
 }

mybusiness/src/main/java/com/business/slfh/app/camera/service/impl/AppCameraServiceImpl.java

@@ -10,6 +10,7 @@ import com.business.slfh.app.event.domain.AppEventVo;
 import com.business.slfh.app.event.mapper.AppEventMapper;
 import com.business.slfh.manager.cameramanager.domain.TResCamera;
 import com.business.slfh.manager.cameramanager.mapper.TResCameraMapper;
+import com.business.slfh.manager.cameramanager.service.ITResCameraService;
 import com.business.slfh.manager.firemanager.domain.TUEventFire;
 import com.business.slfh.tools.DistanceRad;
 import com.business.slfh.visualization.event.domain.Visualization_Camera;
@@ -43,6 +44,9 @@ public class AppCameraServiceImpl extends AppBaseService implements AppCameraSer
     @Resource
     AppEventMapper appEventMapper;
 
+    @Resource
+    ITResCameraService itResCameraService;
+
     @Override
     @DataScope(deptAlias = "d")
     public AppDataModel getCamera(AppCameraVO appCameraVO) {
@@ -136,4 +140,19 @@ public class AppCameraServiceImpl extends AppBaseService implements AppCameraSer
 
         return appDataModel;
     }
+
+    @Override
+    public AppDataModel getAppCamera(AppCameraVO appCameraVO) {
+        AppDataModel appDataModel = getAppDataModel();
+        try{
+            List<TResCamera>  ls = itResCameraService.selectTResCameraList(new TResCamera());
+            appDataModel.data.put("cameralist", ls);
+            appDataModel.status = Service_Success;
+            appDataModel.message = "查询成功";
+        }catch (Exception e) {
+            appDataModel.status = Service_Error;
+            appDataModel.message = "查询失败";
+        }
+        return appDataModel;
+    }
 }

mybusiness/src/main/java/com/business/slfh/app/maillist/service/impl/AppMailListServiceImpl.java

@@ -6,10 +6,12 @@ import com.business.slfh.app.maillist.domain.AppDeptsUsersBean;
 import com.business.slfh.app.maillist.domain.AppMailListBean;
 import com.business.slfh.app.maillist.mapper.AppMailListMapper;
 import com.business.slfh.app.maillist.service.AppMailListService;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.system.domain.SysDept;
 import com.sooka.system.domain.SysUser;
 import com.sooka.system.mapper.SysDeptMapper;
 import com.sooka.system.mapper.SysUserMapper;
+import com.sooka.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,12 +34,16 @@ public class AppMailListServiceImpl extends AppBaseService implements AppMailLis
 
 
 
+    @Resource
+    ISysUserService iSysUserService;
 
     @Override
+    @DataScope(deptAlias = "d")
     public AppDataModel queryAllSysUser(SysUser sysUser) {
         AppDataModel appDataModel = getAppDataModel();
         try{
-            List ls = appMailListMapper.queryAllSysUser(sysUser);
+            List ls = iSysUserService.selectUserList(sysUser);
+//            List ls = appMailListMapper.queryAllSysUser(sysUser);
             appDataModel.data.put("maillist",ls);
             appDataModel.message ="查询成功";
             appDataModel.status = 1;

mybusiness/src/main/java/com/business/slfh/app/notice/service/impl/AppNoticeServiceImpl.java

@@ -4,6 +4,7 @@ import com.business.slfh.app.appbase.domain.AppDataModel;
 import com.business.slfh.app.appbase.service.AppBaseService;
 import com.business.slfh.app.notice.domain.AppNoticeVO;
 import com.business.slfh.app.notice.service.AppNoticeService;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.system.domain.SysNotice;
 import com.sooka.system.mapper.SysNoticeMapper;
 import org.springframework.stereotype.Service;
@@ -19,6 +20,7 @@ public class AppNoticeServiceImpl extends AppBaseService implements AppNoticeSer
     SysNoticeMapper sysNoticeMapper;
 
     @Override
+    @DataScope(deptAlias = "d")
     public AppDataModel getNotice(AppNoticeVO appNoticeVO) {
         AppDataModel appDataModel = getAppDataModel();
         try{

mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java

@@ -28,6 +28,7 @@ import com.sooka.common.utils.uuid.IdUtils;
 import com.sooka.common.utils.uuid.UUID;
 import com.sooka.system.domain.SysUser;
 import com.sooka.system.mapper.SysUserMapper;
+import com.sooka.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -60,6 +61,9 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
     TUEventprocessMapper tuEventprocessMapper;
 
     @Resource
+    ISysUserService iSysUserService;
+
+    @Resource
     SysUserMapper sysUserMapper;
 
     private TResCamera getTResCameraByCameraCode(String CameraCode) {
@@ -221,7 +225,8 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
                     retJSON += ",\"content\":" + "\"" + $content + "\"";
                     retJSON += "}";
                     System.out.println(retJSON + "=retJSON");
-                    List<SysUser> userlist = sysUserMapper.selectUserList(new SysUser());
+//                    List<SysUser> userlist = sysUserMapper.selectUserList(new SysUser());
+                    List<SysUser> userlist = iSysUserService.selectUserList(new SysUser());
                     for (int i = 0; i < userlist.size(); i++) {
                         SysUser uu = userlist.get(i);
                         if (uu.getIsjgmsg() == 1) {

mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java

@@ -191,6 +191,7 @@ public class TUEventFireServiceImpl implements ITUEventFireService {
             notice.setReserveplanType(reserveplan_type);
             notice.setGlobalUserIds(user.getUserId().toString());
             notice.setIsGroupNotice("1");//群发模式 不插入扩展表
+            notice.setDeptId(user.getDeptId());
             noticeService.insertNotice(notice);
 
             //手机推送

mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Confirm_Controller.java

@@ -15,6 +15,7 @@ import com.sooka.common.utils.DateUtils;
 import com.sooka.common.utils.StringUtils;
 import com.sooka.system.domain.SysUser;
 import com.sooka.system.mapper.SysUserMapper;
+import com.sooka.system.service.ISysUserService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,6 +41,9 @@ public class Visualization_Confirm_Controller extends BaseController{
     @Resource
     SysUserMapper sysUserMapper;
 
+    @Resource
+    ISysUserService iSysUserService;
+
     private String prefix = "business/visualization";
 
     /**
@@ -158,10 +162,13 @@ public class Visualization_Confirm_Controller extends BaseController{
     /**
      * 选择确认事件消息通知人树
      */
+
+
     @GetMapping(value = { "/selectUser"})
     public String selectUser(ModelMap map) {
 
-        List<SysUser> list = sysUserMapper.selectUserList(new SysUser());
+//        List<SysUser> list = sysUserMapper.selectUserList(new SysUser());
+        List<SysUser> list = iSysUserService.selectUserList(new SysUser());
         map.put("userList", list);
 
         return prefix + "/confirm1";

mybusiness/src/main/resources/mapper/grid/app/AppMailListMapper.xml

@@ -81,6 +81,8 @@
         <if test="deptId != null">
             and u.dept_id = #{deptId}
         </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by u.pinyin_first asc
     </select>
 

mybusiness/src/main/resources/static/visualization/js/sj.js

@@ -1,6 +1,8 @@
-
 //时间
-function getNow(Mytime) { return Mytime < 10 ? '0' + Mytime : Mytime; }
+function getNow(Mytime) {
+    return Mytime < 10 ? '0' + Mytime : Mytime;
+}
+
 function CurrentTime() {
     var myDate = new Date();
     //获取当前年份
@@ -14,33 +16,33 @@ function CurrentTime() {
     //获取当前分钟数(0-59)
     var m = myDate.getMinutes();
     var s = myDate.getSeconds();
-    var now = year + '年' + getNow(month)+ '月' + getNow(date)+ '日';
-    var now2 =  getNow(h)+ ':' + getNow(m) + ':' + getNow(s);
+    var now = year + '年' + getNow(month) + '月' + getNow(date) + '日';
+    var now2 = getNow(h) + ':' + getNow(m) + ':' + getNow(s);
     $(".nyr").text(now);
     $(".sfm").text(now2);
 }
 
 
-
-$(function(){
+$(function () {
     //间隔一秒执行一次获取当前时间的方法
-    setInterval(function () { CurrentTime() }, 1000);
-
+    setInterval(function () {
+        CurrentTime()
+    }, 1000);
 
 
 //	二维三维切换
-    $(".wei a").on("click", function() {
+    $(".wei a").on("click", function () {
         var position = $(this)
             .parent()
             .position();
         var width = $(this)
             .parent()
             .width();
-        $(".wei .slide1").css({ opacity: 1, left: +position.left, width: width });
+        $(".wei .slide1").css({opacity: 1, left: +position.left, width: width});
         $(this).addClass('active').parents('li').siblings('li').find('a').removeClass('active');
     });
 
-    $(".wei a").on("mouseover", function() {
+    $(".wei a").on("mouseover", function () {
         var position = $(this)
             .parent()
             .position();
@@ -56,9 +58,9 @@ $(function(){
             .addClass("squeeze");
     });
 
-    $(".wei a").on("mouseout", function() {
+    $(".wei a").on("mouseout", function () {
         $(".wei .slide2")
-            .css({ opacity: 0 })
+            .css({opacity: 0})
             .removeClass("squeeze");
     });
 
@@ -67,61 +69,67 @@ $(function(){
         .parent("li")
         .width();
     var current = $(".wei_tab .active").position();
-    $(".wei .slide1").css({ left: +current.left, width: currentWidth });
+    $(".wei .slide1").css({left: +current.left, width: currentWidth});
 
 
 //	二维三维 图片切换
 
-    $(".wei_tab .aa").on('click',function(){
-        if($(this).hasClass('ew_li')){
+    $(".wei_tab .aa").on('click', function () {
+        if ($(this).hasClass('ew_li')) {
             $('.map_tab').show();
-        }else{
+        } else {
             $('.map_tab').hide();
         }
     });
 
 
-
 //右侧导航显示隐藏
     var a = 0
 
-    $(".zhly_close").on('click',function(){
-        var wid = $(".zhly_k").width()+39;
+    $(".zhly_close").on('click', function () {
+        var wid = $(".zhly_k").width() + 39;
         a = a + 1;
         if (a % 2 != 0) {
             $(".zhly_k").animate({
-                right: '-'+ wid  +'px'
-            },500)
-        }else {
+                right: '-' + wid + 'px'
+            }, 500)
+        } else {
             $('.zhly_k').stop(true, true).animate({
-                right:'0px'
+                right: '0px'
             }, 500);
         }
     });
 
 
-
-
 //nav导航点击切换
     $(".nav_div .nav").on('click', function () {
+
+
+        if ($(this)[0].className == 'nav sj') {
+            setCookie("flushpage_switch", "true", 1000000000000)
+        }else{
+            setCookie("flushpage_switch", "false", 1000000000000)
+        }
+
+
         $(this).children('div').addClass('on');
         $(this).siblings('.nav').children('div').removeClass('on');
         // if($(this).children('div').attr("url") == "getVisualizationFrame_WRJ"){
-        if($(this)[0].className == "nav wrj" || $(this)[0].className == "nav cl" || $(this)[0].className == "nav clmj" ){
+        if ($(this)[0].className == "nav wrj" || $(this)[0].className == "nav cl" || $(this)[0].className == "nav clmj") {
             $(".zhly_k").hide();
-        }else{
+        } else {
             $(".zhly_k").show();
         }
         $("#qt_iframe").attr("src", "/visualization/event/" + $(this).children('div').attr("url"));
         //首页得导航
-        if($(".sj").children('div').hasClass('on')){
+        if ($(".sj").children('div').hasClass('on')) {
             $(".left_nav").show();
-        }else{
+        } else {
             $(".left_nav").hide();
         }
-        if($(".sl").children('div').hasClass('on')){
+        if ($(".sl").children('div').hasClass('on')) {
             $("#sl_nav").show();
-        }else{
+        } else {
             $("#sl_nav").hide();
         }
     });
@@ -140,5 +148,4 @@ $(function(){
 //	$("#qt_iframe").width(wid);
 
 
-
 });

mybusiness/src/main/resources/templates/business/visualization/event.html

@@ -68,6 +68,19 @@
 
 
         function reloadMarks(arr) {
+            var offon = true
+            for(var i=0;i<arr.length;i++){
+                if(arr[i]=="lwt" || arr[i]=="phd" ||arr[i]=="jjd" ||arr[i]=="qxz" || arr[i]=="fhjcz" || arr[i]=="jywz" || arr[i]=="lc" || arr[i]=="sy" || arr[i]=="sq" ||arr[i]=="qsk"){
+                    setCookie("flushpage_switch","false",1000000000000)
+                    offon = false
+                    break;
+                }
+            }
+            if(offon){
+                setCookie("flushpage_switch","true",1000000000000)
+            }
+
+
             $("#map")[0].contentWindow.reloadMarks(arr);
         }