laowo 4 lat temu
rodzic
commit
064c2e1259

+ 1 - 1
WebRoot/view/frontpage/js/map.js

@@ -571,7 +571,7 @@ var getCurrentData = function(){
 		query.company_code = $("#company_code").val();
 	var qdata = JSON.stringify(query);
 	var qurl = 'http://47.103.74.123:8080/YtIoT/cgi-bin/WebAction.cgi';
-	if((baseUrl.indexOf('localhost')>=0)||(baseUrl.indexOf('127.0.0.1')>=0))
+//	if((baseUrl.indexOf('localhost')>=0)||(baseUrl.indexOf('127.0.0.1')>=0))
 		qurl = 'http://47.103.74.123:8080/YtIoT/cgi-bin/WebAction.cgi';
     $.ajax({
         type:'POST',

+ 1 - 1
WebRoot/view/frontpage/scripts/map.js

@@ -1902,7 +1902,7 @@ var getCurrentData = function() {
         query.company_code = $("#company_code").val();
     var qdata = JSON.stringify(query);
     var qurl = baseUrl + '/cgi-bin/WebAction.cgi';
-    if ((baseUrl.indexOf('localhost') >= 0) || (baseUrl.indexOf('127.0.0.1') >= 0))
+  //  if ((baseUrl.indexOf('localhost') >= 0) || (baseUrl.indexOf('127.0.0.1') >= 0))
         qurl = 'http://47.103.74.123:8080/YtIoT/cgi-bin/WebAction.cgi';
     $.ajax({
         type: 'POST',

+ 190 - 0
WebRoot/view/scripts/log.html

@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <script src="https://cdn.jsdelivr.net/npm/vue@2.6.14"></script>
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
+    <style>
+	html,body,#app{
+            width: 100%;
+            height: 100%;
+            padding: 0;
+			margin:0;
+	}
+        .home {
+            width: 100%;
+            height: 100%;
+            padding: 30px;
+            box-sizing: border-box;
+            display: flex;
+            flex-direction: column;
+        }
+        
+        .title {
+            font-size: 50px;
+            line-height: 100px;
+            text-align: center;
+        }
+        
+        .search {
+            height: 50px;
+        }
+        
+        .el-input {
+            width: 500px;
+        }
+        
+        .el-button {
+            margin-left: 10px;
+        }
+        
+        .tableBox {
+            flex: 1;
+            width: 100%;
+        }
+        
+        .el-pagination {
+            display: flex;
+            justify-content: flex-end;
+            padding: 20px 20px 0;
+        }
+    </style>
+</head>
+
+<body>
+    <div id="app">
+        <div class="home">
+            <el-row class="title">{{ typeList[typeFree].name }}</el-row>
+            <el-row class="search" v-if="typeList[typeFree].inputList.length > 0">
+                <el-input v-model="inputObj[item.prop]" placeholder="请输入内容" v-for="item in typeList[typeFree].inputList" :key="item.symbol"></el-input>
+                <el-button type="primary" @click="getData()">查询</el-button>
+            </el-row>
+            <el-row class="tableBox">
+                <el-table :data="tableData" border style="width: 100%" height="100%">
+                    <el-table-column type="index" align="center" width="50" label="序号">
+                    </el-table-column>
+                    <el-table-column align="center" v-for="(item, ind) in typeList[typeFree].tableDataHeader" :key="ind" :prop="item.prop" :label="item.name">
+					  <template slot-scope="scope">{{item.prop === 'operateType' ? (scope.row[item.prop] == 1 ? '查询': scope.row[item.prop] == 2 ? '添加' : scope.row[item.prop] == 3 ? '修改' : scope.row[item.prop] ==  4 ? '删除' :'') : item.prop === 'logType' ? (scope.row[item.prop] == 1 ? '登录日志': scope.row[item.prop] == 2 ? '操作日志' : '') : scope.row[item.prop]}}</template>
+                    </el-table-column>
+                </el-table>
+            </el-row>
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[30, 50, 100, 150]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
+            </el-pagination>
+        </div>
+    </div>
+</body>
+
+<!-- <script src="http://172.16.120.92:8080/YtIoT/iot/log/queryLogList?callback=dosomething"></script> -->
+<script>
+    var app = new Vue({
+        el: '#app',
+        data() {
+            return {
+                typeList: [{
+                    name: "操作日志查询",
+                    tableDataHeader: [{
+                        prop: "logType",
+                        name: "日志类型"
+                    }, {
+                        prop: "logContent",
+                        name: "日志内容"
+                    }, {
+                        prop: "operateType",
+                        name: "操作类型"
+                    }, {
+                        prop: "userid",
+                        name: "操作用户账号"
+                    }, {
+                        prop: "username",
+                        name: "操作用户名称"
+                    }, {
+                        prop: "ip",
+                        name: "IP"
+                    }, {
+                        prop: "costTime",
+                        name: "耗时"
+                    }, {
+                        prop: "createBy",
+                        name: "创建人"
+                    }, {
+                        prop: "createTime",
+                        name: "创建时间"
+                    }, {
+                        prop: "updateBy",
+                        name: "更新人"
+                    }, {
+                        prop: "updateTime",
+                        name: "更新时间"
+                    }, ],
+                    url: "http://127.0.0.1:8080/YtIoT/iot/log/queryLogList",
+                    inputList: [
+                        //     {
+                        //     prop: "unit",
+                        //     name: "单位信息",
+                        //     symbol: Symbol()
+                        // }
+                    ],
+                }, ],
+                inputObj: {},
+                typeFree: 0,
+                tableData: [],
+                currentPage: 1,
+                pageSize: 50,
+                total: 0,
+            };
+        },
+        created() {
+            this.inputObj = {};
+            // if (
+            //     this.$route.query.type &&
+            //     this.$route.query.type < this.typeList.length
+            // ) {
+            //     this.typeFree = this.$route.query.type;
+            // } else {
+            //     this.typeFree = 0;
+            // }
+        },
+        mounted() {
+            this.getData();
+        },
+        methods: {
+            async getData() {
+                let data = {
+                    current: this.currentPage,
+                    size: this.pageSize,
+                };
+                Object.assign(data, this.inputObj)
+                let res = await axios.get(
+                    this.typeList[this.typeFree].url + "?current=" + this.currentPage + "&pageSize=" + this.pageSize
+                );
+				console.log(res)
+				console.log(res.data.pageList)
+                this.tableData = res.data.pageList;
+                this.total = res.data.totalCount;
+            },
+            // dosomething(jsondata) {
+            //     console.log(jsondata)
+            //         // this.tableData = res.data.data.records;
+            //         // this.total = res.data.data.total;
+            // },
+            handleSizeChange(val) {
+                this.pageSize = val;
+                this.getData();
+                console.log(`每页 ${this.pageSize} 条`);
+            },
+            handleCurrentChange(val) {
+                this.currentPage = val;
+                this.getData();
+                console.log(`当前页: ${this.currentPage}`);
+            },
+        },
+    })
+</script>
+
+</html>

+ 2 - 2
WebRoot/view/scripts/map.js

@@ -765,7 +765,7 @@ var getCurrentData2 = function(){
 	if($("#company_code").val().length>0)
 		query.company_code = $("#company_code").val();
 	var qurl = baseUrl+'/cgi-bin/WebAction.cgi';
-	 if((baseUrl.indexOf('localhost')>=0)||(baseUrl.indexOf('127.0.0.1')>=0))
+//	 if((baseUrl.indexOf('localhost')>=0)||(baseUrl.indexOf('127.0.0.1')>=0))
 		qurl = 'http://47.103.74.123:8080/YtIoT/cgi-bin/WebAction.cgi';
 //	ConfirmStore=null;
 //	StatusStore=null;
@@ -994,7 +994,7 @@ var getCurrentData = function(){
 //	ConfirmStore=null;
 //	StatusStore=null;
 	var qurl = baseUrl+'/cgi-bin/WebAction.cgi';
-	 if((baseUrl.indexOf('localhost')>=0)||(baseUrl.indexOf('127.0.0.1')>=0))
+//	 if((baseUrl.indexOf('localhost')>=0)||(baseUrl.indexOf('127.0.0.1')>=0))
 		qurl = 'http://47.103.74.123:8080/YtIoT/cgi-bin/WebAction.cgi';
     $.ajax({
         type:'POST',

+ 1333 - 1323
WebRoot/view/scripts/menubar.js

@@ -1,1379 +1,1389 @@
 /**
- * 
+ *
  */
 
 var baseUrl = '';
 var theme = '';
-var viewAlarmType,pieAlarmType,statusType
+var viewAlarmType, pieAlarmType, statusType
 var menu_shown = true;
 var start_count = 0;
 var KeepMenu = false;
 
-var boxclick = function(self){
-	alert(self.getAttribute('item_id'));
+var boxclick = function (self) {
+    alert(self.getAttribute('item_id'));
 }
 
-var keep_menu=function(){
-	KeepMenu=true;
-	show_menu();
+var keep_menu = function () {
+    KeepMenu = true;
+    show_menu();
 }
 
-var hiding_menu=function(){
-	KeepMenu=false;
+var hiding_menu = function () {
+    KeepMenu = false;
 }
 
-if(sessionStorage.getItem('V_LOGINNAME')=="admin"){
-	var menuconfig = {
-			id:'mainmenu',
-			target:'mainframe',
-			brand_icon:{
-				url:'../res/img/usky/logo.png',
-				width:160,
-				height:20
-			},
-			items:[{
-				name:'智慧消防',
-				type:'group',
-				side:'left',
-				items:[{
-					name:'综合查询',
-					type:'leaf',
-					action:'hiding_menu()',
-					href:baseUrl+'frontpage/map.jsp?viewAlarmType='+viewAlarmType+'&pieAlarmType='+pieAlarmType+'&statusType='+statusType+'&theme='+theme+($("#company_code").val()!=''?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'告警信息',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'fireAlarm/subFireAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'电气火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'efireAlarm/subeFireAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'消防水系统监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'waterAlarm/subWaterAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'RTU监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'rtuAlarm/subRtuAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')// TODO 告警信息三级分类
-					},{
-	                    name:'视频监控系统',
-	                    type:'leaf',
-	                    action:'keep_menu()',
-	                    href:baseUrl+'videoAlarm/subVideoAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-	                },{
-	                    name:'电梯状态监控',
-	                    type:'leaf',
-	                    action:'keep_menu()',
-	                    href:baseUrl+'liftAlarm/subliftAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-	                }]
-				},{
-					name:'设备监控',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'fireAlarm/FireDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'电气火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'efireAlarm/eFireDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'消防水系统监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'waterAlarm/WaterDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'RTU综合监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'rtuAlarm/RtuDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')// TODO 设备监控三级分类
-					},{
-						name:'视频监控系统',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'videoAlarm/VideoDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'电梯状态监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'liftAlarm/liftDeviceindex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					}]
-				},{
-					name:'数据查询',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'电气火灾数据查询',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'dataSearch/fireIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'消防水系统数据查询',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'dataSearch/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'RTU综合数据查询',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'dataSearch/rtuIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					}]
-				},{
-					name:'物管服务',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'安全巡检',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'proform/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'维保工作',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'proform2/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'报修服务',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'proform3/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-                        name:'电气火灾隐患分析',
-                        type:'leaf',
-                        action:'keep_menu()',
-                        href:baseUrl+'efireAnalysis/eleFireIndex.html?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                    },{
-                        name:'水系统隐患分析',
-                        type:'leaf',
-                        action:'keep_menu()',
-                        href:baseUrl+'efireAnalysis/waterIndex.html?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                    }]
-				},{
-					name:'工作考评',
-					type:'leaf',
-					action:'keep_menu()',
-					href:baseUrl+'projectWoker/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				}]
-			},{
-				name:'子系统',
-				type:'group',
-				side:'left',
-				disabled:'disabled',
-				items:[{
-					name:'火灾监控',
-					disabled:'disabled',
-					type:'leaf',
-					action:'keep_menu()',
-					href:baseUrl+'fireAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'电器火灾监控',
-					disabled:'disabled',
-					type:'leaf',
-					action:'keep_menu()',
-					href:baseUrl+'waterAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'通道告警监控',
-					disabled:'disabled',
-					action:'keep_menu()',
-					type:'leaf'
-				},{
-					name:'消防电源监控',
-					disabled:'disabled',
-					action:'keep_menu()',
-					type:'leaf'
-				},{
-					name:'RTU综合监控',
-					disabled:'disabled',
-					action:'keep_menu()',
-					type:'leaf',
-					href:baseUrl+'rtuAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				}]
-			},{
-				name:'视图',
-				type:'group',
-				side:'split',
-				disabled:'disabled',
-				items:[{
-					name:'主题皮肤',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'单位',
-						type:'checkbox',
-						id:'001',
-						action:'boxclick(this)',
-						checked:'checked'
-					},{
-						name:'区域',
-						type:'checkbox',
-						id:'002',
-						action:'boxclick(this)',
-						checked:'checked'
-					}]
-				},{
-					name:'地图显示',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'全选',
-						type:'checkbox',
-						id:'000',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'火警监控告警',
-						type:'checkbox',
-						id:'001',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'电气火灾告警',
-						type:'checkbox',
-						id:'002',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'水监控告警',
-						type:'checkbox',
-						id:'003',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'通道监控告警',
-						type:'checkbox',
-						id:'004',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'电源监控告警',
-						type:'checkbox',
-						id:'005',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'RTU监控告警',
-						type:'checkbox',
-						id:'006',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'烟感监控告警',
-						type:'checkbox',
-						id:'007',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					}]
-				},{
-					name:'声光告警',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'范围',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'告警级别',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'语音',
-						type:'leaf',
-						disabled:'disabled'
-					}]
-				},{
-					name:'统计显示',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'全选',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'火警监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'电气火灾监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'消防水监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'通道监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'消防电源监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'RTU监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'烟感监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					}]
-				},{
-					name:'系统显示',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'火灾监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'电器火灾监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'通道告警监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'消防电源监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'RTU综合监控',
-						disabled:'disabled',
-						type:'leaf'
-					}]
-				},{
-					name:'系统信息',
-					disabled:'disabled',
-					type:'leaf'
-				}]
-			},{
-				name:'IoT-02智慧消防物联网平台 v1.00',
-				type:'systitle_label',
-				side:'split',
-				divid:'systitle_bar'
-			},{
-				name:'时间戳',
-				type:'systime_label',
-				side:'right',
-				divid:'timestamp_bar'
-			},{
-				name:'系统设置',
-				type:'group',
-				side:'right',
-				items:[{
-					name:'推送配置',
-					type:'leaf',
-					disabled:'disabled'
+if (sessionStorage.getItem('V_LOGINNAME') == "admin") {
+    var menuconfig = {
+        id: 'mainmenu',
+        target: 'mainframe',
+        brand_icon: {
+            url: '../res/img/usky/logo.png',
+            width: 160,
+            height: 20
+        },
+        items: [{
+            name: '智慧消防',
+            type: 'group',
+            side: 'left',
+            items: [{
+                name: '综合查询',
+                type: 'leaf',
+                action: 'hiding_menu()',
+                href: baseUrl + 'frontpage/map.jsp?viewAlarmType=' + viewAlarmType + '&pieAlarmType=' + pieAlarmType + '&statusType=' + statusType + '&theme=' + theme + ($("#company_code").val() != '' ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '告警信息',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'fireAlarm/subFireAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAlarm/subeFireAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'waterAlarm/subWaterAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'rtuAlarm/subRtuAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')// TODO 告警信息三级分类
+                }, {
+                    name: '视频监控系统',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'videoAlarm/subVideoAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电梯状态监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'liftAlarm/subliftAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '设备监控',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'fireAlarm/FireDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAlarm/eFireDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'waterAlarm/WaterDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU综合监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'rtuAlarm/RtuDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')// TODO 设备监控三级分类
+                }, {
+                    name: '视频监控系统',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'videoAlarm/VideoDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电梯状态监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'liftAlarm/liftDeviceindex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '数据查询',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '电气火灾数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/fireIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU综合数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/rtuIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '物管服务',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '安全巡检',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '维保工作',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform2/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '报修服务',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform3/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾隐患分析',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAnalysis/eleFireIndex.html?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '水系统隐患分析',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAnalysis/waterIndex.html?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '工作考评',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'projectWoker/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }]
+        }, {
+            name: '子系统',
+            type: 'group',
+            side: 'left',
+            disabled: 'disabled',
+            items: [{
+                name: '火灾监控',
+                disabled: 'disabled',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'fireAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '电器火灾监控',
+                disabled: 'disabled',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'waterAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '通道告警监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf'
+            }, {
+                name: '消防电源监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf'
+            }, {
+                name: 'RTU综合监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf',
+                href: baseUrl + 'rtuAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }]
+        }, {
+            name: '视图',
+            type: 'group',
+            side: 'split',
+            disabled: 'disabled',
+            items: [{
+                name: '主题皮肤',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '单位',
+                    type: 'checkbox',
+                    id: '001',
+                    action: 'boxclick(this)',
+                    checked: 'checked'
+                }, {
+                    name: '区域',
+                    type: 'checkbox',
+                    id: '002',
+                    action: 'boxclick(this)',
+                    checked: 'checked'
+                }]
+            }, {
+                name: '地图显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '全选',
+                    type: 'checkbox',
+                    id: '000',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '火警监控告警',
+                    type: 'checkbox',
+                    id: '001',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '电气火灾告警',
+                    type: 'checkbox',
+                    id: '002',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '水监控告警',
+                    type: 'checkbox',
+                    id: '003',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '通道监控告警',
+                    type: 'checkbox',
+                    id: '004',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '电源监控告警',
+                    type: 'checkbox',
+                    id: '005',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: 'RTU监控告警',
+                    type: 'checkbox',
+                    id: '006',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '烟感监控告警',
+                    type: 'checkbox',
+                    id: '007',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }]
+            }, {
+                name: '声光告警',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '范围',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '告警级别',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '语音',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }]
+            }, {
+                name: '统计显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '全选',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '火警监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '电气火灾监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '消防水监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '通道监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '消防电源监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: 'RTU监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '烟感监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }]
+            }, {
+                name: '系统显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '火灾监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '电器火灾监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '通道告警监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '消防电源监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: 'RTU综合监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }]
+            }, {
+                name: '系统信息',
+                disabled: 'disabled',
+                type: 'leaf'
+            }]
+        }, {
+            name: '智慧消防物联网平台',
+            type: 'systitle_label',
+            side: 'split',
+            divid: 'systitle_bar'
+        }, {
+            name: '时间戳',
+            type: 'systime_label',
+            side: 'right',
+            divid: 'timestamp_bar'
+        }, {
+            name: '系统设置',
+            type: 'group',
+            side: 'right',
+            items: [{
+                name: '推送配置',
+                type: 'leaf',
+                disabled: 'disabled'
 //					action:'keep_menu()',
 //					href:baseUrl+'proform4/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'用户管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'组织机构管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'权限管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'建筑物管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'物联网卡管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'采集接口管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'监控单元管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'监控点管理',
-					type:'leaf',
-					disabled:'disabled'
-				}]
-			},{
-				name:'账户',
-				type:'group',
-				side:'right',
-				items:[{
-					name:'注销',
-					type:'logout',
-					href:baseUrl
-				},{
-					name:'切换用户',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'密码管理',
-					type:'leaf',
-					disabled:'disabled'
-				}]
-			}]
-		}
-}else if(sessionStorage.getItem('V_LOGINNAME')=="sgec68"||sessionStorage.getItem('V_LOGINNAME')=="ypywtg"||sessionStorage.getItem('V_LOGINNAME')=="tjbywy"){
-	var menuconfig = {
-			id:'mainmenu',
-			target:'mainframe',
-			brand_icon:{
-				url:'../res/img/usky/logo.png',
-				width:160,
-				height:20
-			},
-			items:[{
-				name:'智慧消防',
-				type:'group',
-				side:'left',
-				items:[{
-					name:'综合查询',
-					type:'leaf',
-					action:'hiding_menu()',
-					href:baseUrl+'frontpage/map.jsp?viewAlarmType='+viewAlarmType+'&pieAlarmType='+pieAlarmType+'&statusType='+statusType+'&theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'告警信息',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'fireAlarm/subFireAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'电气火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'efireAlarm/subeFireAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'消防水系统监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'waterAlarm/subWaterAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'RTU监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'rtuAlarm/subRtuAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')// TODO 告警信息三级分类
-					},{
-	                    name:'视频监控系统',
-	                    type:'leaf',
-	                    action:'keep_menu()',
-	                    href:baseUrl+'videoAlarm/subVideoAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-	                },{
-	                    name:'电梯状态监控',
-	                    type:'leaf',
-	                    action:'keep_menu()',
-	                    href:baseUrl+'liftAlarm/subliftAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-	                }]
-				},{
-					name:'设备监控',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'fireAlarm/FireDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'电气火灾监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'efireAlarm/eFireDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'消防水系统监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'waterAlarm/WaterDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'RTU综合监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'rtuAlarm/RtuDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')// TODO 设备监控三级分类
-					},{
-						name:'视频监控系统',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'videoAlarm/VideoDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'电梯状态监控',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'liftAlarm/liftDeviceindex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					}]
-				},{
-					name:'数据查询',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'电气火灾数据查询',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'dataSearch/fireIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'消防水系统数据查询',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'dataSearch/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'RTU综合数据查询',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'dataSearch/rtuIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					}]
-				},{
-					name:'物管服务',
-					type:'group',
-					side:'left',
-					items:[{
-						name:'安全巡检',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'proform/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'维保工作',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'proform2/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-						name:'报修服务',
-						type:'leaf',
-						action:'keep_menu()',
-						href:baseUrl+'proform3/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-					},{
-                        name:'电气火灾隐患分析',
-                        type:'leaf',
-                        action:'keep_menu()',
-                        href:baseUrl+'efireAnalysis/eleFireIndex.html?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                    },{
-                        name:'水系统隐患分析',
-                        type:'leaf',
-                        action:'keep_menu()',
-                        href:baseUrl+'efireAnalysis/waterIndex.html?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                    }]
-				},{
-					name:'工作考评',
-					type:'leaf',
-					action:'keep_menu()',
-					href:baseUrl+'projectWoker/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				}]
-			},{
-				name:'子系统',
-				type:'group',
-				side:'left',
-				disabled:'disabled',
-				items:[{
-					name:'火灾监控',
-					disabled:'disabled',
-					type:'leaf',
-					action:'keep_menu()',
-					href:baseUrl+'fireAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'电器火灾监控',
-					disabled:'disabled',
-					type:'leaf',
-					action:'keep_menu()',
-					href:baseUrl+'waterAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'通道告警监控',
-					disabled:'disabled',
-					action:'keep_menu()',
-					type:'leaf'
-				},{
-					name:'消防电源监控',
-					disabled:'disabled',
-					action:'keep_menu()',
-					type:'leaf'
-				},{
-					name:'RTU综合监控',
-					disabled:'disabled',
-					action:'keep_menu()',
-					type:'leaf',
-					href:baseUrl+'rtuAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				}]
-			},{
-				name:'视图',
-				type:'group',
-				side:'split',
-				disabled:'disabled',
-				items:[{
-					name:'主题皮肤',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'单位',
-						type:'checkbox',
-						id:'001',
-						action:'boxclick(this)',
-						checked:'checked'
-					},{
-						name:'区域',
-						type:'checkbox',
-						id:'002',
-						action:'boxclick(this)',
-						checked:'checked'
-					}]
-				},{
-					name:'地图显示',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'全选',
-						type:'checkbox',
-						id:'000',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'火警监控告警',
-						type:'checkbox',
-						id:'001',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'电气火灾告警',
-						type:'checkbox',
-						id:'002',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'水监控告警',
-						type:'checkbox',
-						id:'003',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'通道监控告警',
-						type:'checkbox',
-						id:'004',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'电源监控告警',
-						type:'checkbox',
-						id:'005',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'RTU监控告警',
-						type:'checkbox',
-						id:'006',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					},{
-						name:'烟感监控告警',
-						type:'checkbox',
-						id:'007',
-						action:'boxclick(this)',
-						disabled:'disabled',
-						checked:'checked'
-					}]
-				},{
-					name:'声光告警',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'范围',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'告警级别',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'语音',
-						type:'leaf',
-						disabled:'disabled'
-					}]
-				},{
-					name:'统计显示',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'全选',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'火警监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'电气火灾监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'消防水监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'通道监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'消防电源监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'RTU监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					},{
-						name:'烟感监控系统告警',
-						type:'leaf',
-						disabled:'disabled'
-					}]
-				},{
-					name:'系统显示',
-					type:'group',
-					side:'left',
-					disabled:'disabled',
-					items:[{
-						name:'火灾监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'电器火灾监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'通道告警监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'消防电源监控',
-						disabled:'disabled',
-						type:'leaf'
-					},{
-						name:'RTU综合监控',
-						disabled:'disabled',
-						type:'leaf'
-					}]
-				},{
-					name:'系统信息',
-					disabled:'disabled',
-					type:'leaf'
-				}]
-			},{
-				name:'IoT-02智慧消防物联网平台 v1.00',
-				type:'systitle_label',
-				side:'split',
-				divid:'systitle_bar'
-			},{
-				name:'时间戳',
-				type:'systime_label',
-				side:'right',
-				divid:'timestamp_bar'
-			},{
-				name:'系统设置',
-				type:'group',
-				side:'right',
-				items:[{
-					name:'推送配置',
-					type:'leaf',
-					disabled:'disabled'
+            }, {
+                name: '用户管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '组织机构管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '权限管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '建筑物管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '物联网卡管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '采集接口管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '监控单元管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '监控点管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }]
+        }, {
+            name: '账户',
+            type: 'group',
+            side: 'right',
+            items: [{
+                name: '注销',
+                type: 'logout',
+                href: baseUrl
+            }, {
+                name: '切换用户',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '密码管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            },
+                {
+                    name: '日志查看',
+                    type: 'leaf',
+                    href: 'disabled'
+                }]
+        }]
+    }
+} else if (sessionStorage.getItem('V_LOGINNAME') == "sgec68" || sessionStorage.getItem('V_LOGINNAME') == "ypywtg" || sessionStorage.getItem('V_LOGINNAME') == "tjbywy") {
+    var menuconfig = {
+        id: 'mainmenu',
+        target: 'mainframe',
+        brand_icon: {
+            url: '../res/img/usky/logo.png',
+            width: 160,
+            height: 20
+        },
+        items: [{
+            name: '智慧消防',
+            type: 'group',
+            side: 'left',
+            items: [{
+                name: '综合查询',
+                type: 'leaf',
+                action: 'hiding_menu()',
+                href: baseUrl + 'frontpage/map.jsp?viewAlarmType=' + viewAlarmType + '&pieAlarmType=' + pieAlarmType + '&statusType=' + statusType + '&theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '告警信息',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'fireAlarm/subFireAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAlarm/subeFireAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'waterAlarm/subWaterAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'rtuAlarm/subRtuAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')// TODO 告警信息三级分类
+                }, {
+                    name: '视频监控系统',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'videoAlarm/subVideoAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电梯状态监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'liftAlarm/subliftAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '设备监控',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'fireAlarm/FireDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAlarm/eFireDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'waterAlarm/WaterDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU综合监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'rtuAlarm/RtuDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')// TODO 设备监控三级分类
+                }, {
+                    name: '视频监控系统',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'videoAlarm/VideoDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电梯状态监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'liftAlarm/liftDeviceindex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '数据查询',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '电气火灾数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/fireIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU综合数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/rtuIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '物管服务',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '安全巡检',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '维保工作',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform2/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '报修服务',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform3/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾隐患分析',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAnalysis/eleFireIndex.html?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '水系统隐患分析',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAnalysis/waterIndex.html?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }]
+            }, {
+                name: '工作考评',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'projectWoker/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }]
+        }, {
+            name: '子系统',
+            type: 'group',
+            side: 'left',
+            disabled: 'disabled',
+            items: [{
+                name: '火灾监控',
+                disabled: 'disabled',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'fireAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '电器火灾监控',
+                disabled: 'disabled',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'waterAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '通道告警监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf'
+            }, {
+                name: '消防电源监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf'
+            }, {
+                name: 'RTU综合监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf',
+                href: baseUrl + 'rtuAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }]
+        }, {
+            name: '视图',
+            type: 'group',
+            side: 'split',
+            disabled: 'disabled',
+            items: [{
+                name: '主题皮肤',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '单位',
+                    type: 'checkbox',
+                    id: '001',
+                    action: 'boxclick(this)',
+                    checked: 'checked'
+                }, {
+                    name: '区域',
+                    type: 'checkbox',
+                    id: '002',
+                    action: 'boxclick(this)',
+                    checked: 'checked'
+                }]
+            }, {
+                name: '地图显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '全选',
+                    type: 'checkbox',
+                    id: '000',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '火警监控告警',
+                    type: 'checkbox',
+                    id: '001',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '电气火灾告警',
+                    type: 'checkbox',
+                    id: '002',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '水监控告警',
+                    type: 'checkbox',
+                    id: '003',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '通道监控告警',
+                    type: 'checkbox',
+                    id: '004',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '电源监控告警',
+                    type: 'checkbox',
+                    id: '005',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: 'RTU监控告警',
+                    type: 'checkbox',
+                    id: '006',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '烟感监控告警',
+                    type: 'checkbox',
+                    id: '007',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }]
+            }, {
+                name: '声光告警',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '范围',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '告警级别',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '语音',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }]
+            }, {
+                name: '统计显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '全选',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '火警监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '电气火灾监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '消防水监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '通道监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '消防电源监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: 'RTU监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '烟感监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }]
+            }, {
+                name: '系统显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '火灾监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '电器火灾监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '通道告警监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '消防电源监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: 'RTU综合监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }]
+            }, {
+                name: '系统信息',
+                disabled: 'disabled',
+                type: 'leaf'
+            }]
+        }, {
+            name: '智慧消防物联网平台',
+            type: 'systitle_label',
+            side: 'split',
+            divid: 'systitle_bar'
+        }, {
+            name: '时间戳',
+            type: 'systime_label',
+            side: 'right',
+            divid: 'timestamp_bar'
+        }, {
+            name: '系统设置',
+            type: 'group',
+            side: 'right',
+            items: [{
+                name: '推送配置',
+                type: 'leaf',
+                disabled: 'disabled'
 //					action:'keep_menu()',
 //					href:baseUrl+'proform4/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-				},{
-					name:'用户管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'组织机构管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'权限管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'建筑物管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'物联网卡管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'采集接口管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'监控单元管理',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'监控点管理',
-					type:'leaf',
-					disabled:'disabled'
-				}]
-			},{
-				name:'账户',
-				type:'group',
-				side:'right',
-				items:[{
-					name:'注销',
-					type:'logout',
-					href:baseUrl
-				},{
-					name:'切换用户',
-					type:'leaf',
-					disabled:'disabled'
-				},{
-					name:'密码管理',
-					type:'leaf',
-					disabled:'disabled'
-				}]
-			}]
-		}
-}else{
+            }, {
+                name: '用户管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '组织机构管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '权限管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '建筑物管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '物联网卡管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '采集接口管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '监控单元管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '监控点管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }]
+        }, {
+            name: '账户',
+            type: 'group',
+            side: 'right',
+            items: [{
+                name: '注销',
+                type: 'logout',
+                href: baseUrl
+            }, {
+                name: '切换用户',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '密码管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            },
+                {
+                    name: '日志查看',
+                    type: 'leaf',
+                    href: baseUrl+'scripts/log.html'
+                }]
+        }]
+    }
+} else {
     var menuconfig = {
-        id:'mainmenu',
-        target:'mainframe',
-        brand_icon:{
-            url:'../res/img/usky/logo.png',
-            width:160,
-            height:20
+        id: 'mainmenu',
+        target: 'mainframe',
+        brand_icon: {
+            url: '../res/img/usky/logo.png',
+            width: 160,
+            height: 20
         },
-        items:[{
-            name:'智慧消防',
-            type:'group',
-            side:'left',
-            items:[{
-                name:'综合查询',
-                type:'leaf',
-                action:'hiding_menu()',
-                href:baseUrl+'frontpage/map.jsp?viewAlarmType='+viewAlarmType+'&pieAlarmType='+pieAlarmType+'&statusType='+statusType+'&theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-            },{
-                name:'告警信息',
-                type:'group',
-                side:'left',
-                items:[{
-                    name:'火灾监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'fireAlarm/subFireAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'电气火灾监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'efireAlarm/subeFireAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'消防水系统监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'waterAlarm/subWaterAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'RTU监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'rtuAlarm/subRtuAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')// TODO 告警信息三级分类
-                },{
-                    name:'视频监控系统',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'videoAlarm/subVideoAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'电梯状态监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'liftAlarm/subliftAlarm.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
+        items: [{
+            name: '智慧消防',
+            type: 'group',
+            side: 'left',
+            items: [{
+                name: '综合查询',
+                type: 'leaf',
+                action: 'hiding_menu()',
+                href: baseUrl + 'frontpage/map.jsp?viewAlarmType=' + viewAlarmType + '&pieAlarmType=' + pieAlarmType + '&statusType=' + statusType + '&theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '告警信息',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'fireAlarm/subFireAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAlarm/subeFireAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'waterAlarm/subWaterAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'rtuAlarm/subRtuAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')// TODO 告警信息三级分类
+                }, {
+                    name: '视频监控系统',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'videoAlarm/subVideoAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电梯状态监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'liftAlarm/subliftAlarm.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
                 }]
-            },{
-                name:'设备监控',
-                type:'group',
-                side:'left',
-                items:[{
-                    name:'火灾监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'fireAlarm/FireDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'电气火灾监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'efireAlarm/eFireDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'消防水系统监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'waterAlarm/WaterDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'RTU综合监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'rtuAlarm/RtuDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')// TODO 设备监控三级分类
-                },{
-                    name:'视频监控系统',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'videoAlarm/VideoDeviceIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'电梯状态监控',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'liftAlarm/liftDeviceindex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
+            }, {
+                name: '设备监控',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'fireAlarm/FireDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电气火灾监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'efireAlarm/eFireDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'waterAlarm/WaterDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU综合监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'rtuAlarm/RtuDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')// TODO 设备监控三级分类
+                }, {
+                    name: '视频监控系统',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'videoAlarm/VideoDeviceIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '电梯状态监控',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'liftAlarm/liftDeviceindex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
                 }]
-            },{
-                name:'数据查询',
-                type:'group',
-                side:'left',
-                items:[{
-                    name:'电气火灾数据查询',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'dataSearch/fireIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'消防水系统数据查询',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'dataSearch/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'RTU综合数据查询',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'dataSearch/rtuIndex.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
+            }, {
+                name: '数据查询',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '电气火灾数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/fireIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '消防水系统数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: 'RTU综合数据查询',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'dataSearch/rtuIndex.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
                 }]
-            },{
-                name:'物管服务',
-                type:'group',
-                side:'left',
-                items:[{
-                    name:'安全巡检',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'proform/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'维保工作',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'proform2/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-                },{
-                    name:'报修服务',
-                    type:'leaf',
-                    action:'keep_menu()',
-                    href:baseUrl+'proform3/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
+            }, {
+                name: '物管服务',
+                type: 'group',
+                side: 'left',
+                items: [{
+                    name: '安全巡检',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '维保工作',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform2/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+                }, {
+                    name: '报修服务',
+                    type: 'leaf',
+                    action: 'keep_menu()',
+                    href: baseUrl + 'proform3/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
                 }]
-            },{
-                name:'工作考评',
-                type:'leaf',
-                action:'keep_menu()',
-                href:baseUrl+'projectWoker/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
+            }, {
+                name: '工作考评',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'projectWoker/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
             }]
-        },{
-            name:'子系统',
-            type:'group',
-            side:'left',
-            disabled:'disabled',
-            items:[{
-                name:'火灾监控',
-                disabled:'disabled',
-                type:'leaf',
-                action:'keep_menu()',
-                href:baseUrl+'fireAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-            },{
-                name:'电器火灾监控',
-                disabled:'disabled',
-                type:'leaf',
-                action:'keep_menu()',
-                href:baseUrl+'waterAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-            },{
-                name:'通道告警监控',
-                disabled:'disabled',
-                action:'keep_menu()',
-                type:'leaf'
-            },{
-                name:'消防电源监控',
-                disabled:'disabled',
-                action:'keep_menu()',
-                type:'leaf'
-            },{
-                name:'RTU综合监控',
-                disabled:'disabled',
-                action:'keep_menu()',
-                type:'leaf',
-                href:baseUrl+'rtuAlarm/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
+        }, {
+            name: '子系统',
+            type: 'group',
+            side: 'left',
+            disabled: 'disabled',
+            items: [{
+                name: '火灾监控',
+                disabled: 'disabled',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'fireAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '电器火灾监控',
+                disabled: 'disabled',
+                type: 'leaf',
+                action: 'keep_menu()',
+                href: baseUrl + 'waterAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
+            }, {
+                name: '通道告警监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf'
+            }, {
+                name: '消防电源监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf'
+            }, {
+                name: 'RTU综合监控',
+                disabled: 'disabled',
+                action: 'keep_menu()',
+                type: 'leaf',
+                href: baseUrl + 'rtuAlarm/index.jsp?theme=' + theme + ($("#company_code").val() != undefined ? ('&company_code=' + $("#company_code").val()) : '')
             }]
-        },{
-            name:'视图',
-            type:'group',
-            side:'split',
-            disabled:'disabled',
-            items:[{
-                name:'主题皮肤',
-                type:'group',
-                side:'left',
-                disabled:'disabled',
-                items:[{
-                    name:'单位',
-                    type:'checkbox',
-                    id:'001',
-                    action:'boxclick(this)',
-                    checked:'checked'
-                },{
-                    name:'区域',
-                    type:'checkbox',
-                    id:'002',
-                    action:'boxclick(this)',
-                    checked:'checked'
+        }, {
+            name: '视图',
+            type: 'group',
+            side: 'split',
+            disabled: 'disabled',
+            items: [{
+                name: '主题皮肤',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '单位',
+                    type: 'checkbox',
+                    id: '001',
+                    action: 'boxclick(this)',
+                    checked: 'checked'
+                }, {
+                    name: '区域',
+                    type: 'checkbox',
+                    id: '002',
+                    action: 'boxclick(this)',
+                    checked: 'checked'
                 }]
-            },{
-                name:'地图显示',
-                type:'group',
-                side:'left',
-                disabled:'disabled',
-                items:[{
-                    name:'全选',
-                    type:'checkbox',
-                    id:'000',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
-                },{
-                    name:'火警监控告警',
-                    type:'checkbox',
-                    id:'001',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
-                },{
-                    name:'电气火灾告警',
-                    type:'checkbox',
-                    id:'002',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
-                },{
-                    name:'水监控告警',
-                    type:'checkbox',
-                    id:'003',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
-                },{
-                    name:'通道监控告警',
-                    type:'checkbox',
-                    id:'004',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
-                },{
-                    name:'电源监控告警',
-                    type:'checkbox',
-                    id:'005',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
-                },{
-                    name:'RTU监控告警',
-                    type:'checkbox',
-                    id:'006',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
-                },{
-                    name:'烟感监控告警',
-                    type:'checkbox',
-                    id:'007',
-                    action:'boxclick(this)',
-                    disabled:'disabled',
-                    checked:'checked'
+            }, {
+                name: '地图显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '全选',
+                    type: 'checkbox',
+                    id: '000',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '火警监控告警',
+                    type: 'checkbox',
+                    id: '001',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '电气火灾告警',
+                    type: 'checkbox',
+                    id: '002',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '水监控告警',
+                    type: 'checkbox',
+                    id: '003',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '通道监控告警',
+                    type: 'checkbox',
+                    id: '004',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '电源监控告警',
+                    type: 'checkbox',
+                    id: '005',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: 'RTU监控告警',
+                    type: 'checkbox',
+                    id: '006',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
+                }, {
+                    name: '烟感监控告警',
+                    type: 'checkbox',
+                    id: '007',
+                    action: 'boxclick(this)',
+                    disabled: 'disabled',
+                    checked: 'checked'
                 }]
-            },{
-                name:'声光告警',
-                type:'group',
-                side:'left',
-                disabled:'disabled',
-                items:[{
-                    name:'范围',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'告警级别',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'语音',
-                    type:'leaf',
-                    disabled:'disabled'
+            }, {
+                name: '声光告警',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '范围',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '告警级别',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '语音',
+                    type: 'leaf',
+                    disabled: 'disabled'
                 }]
-            },{
-                name:'统计显示',
-                type:'group',
-                side:'left',
-                disabled:'disabled',
-                items:[{
-                    name:'全选',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'火警监控系统告警',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'电气火灾监控系统告警',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'消防水监控系统告警',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'通道监控系统告警',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'消防电源监控系统告警',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'RTU监控系统告警',
-                    type:'leaf',
-                    disabled:'disabled'
-                },{
-                    name:'烟感监控系统告警',
-                    type:'leaf',
-                    disabled:'disabled'
+            }, {
+                name: '统计显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '全选',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '火警监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '电气火灾监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '消防水监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '通道监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '消防电源监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: 'RTU监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
+                }, {
+                    name: '烟感监控系统告警',
+                    type: 'leaf',
+                    disabled: 'disabled'
                 }]
-            },{
-                name:'系统显示',
-                type:'group',
-                side:'left',
-                disabled:'disabled',
-                items:[{
-                    name:'火灾监控',
-                    disabled:'disabled',
-                    type:'leaf'
-                },{
-                    name:'电器火灾监控',
-                    disabled:'disabled',
-                    type:'leaf'
-                },{
-                    name:'通道告警监控',
-                    disabled:'disabled',
-                    type:'leaf'
-                },{
-                    name:'消防电源监控',
-                    disabled:'disabled',
-                    type:'leaf'
-                },{
-                    name:'RTU综合监控',
-                    disabled:'disabled',
-                    type:'leaf'
+            }, {
+                name: '系统显示',
+                type: 'group',
+                side: 'left',
+                disabled: 'disabled',
+                items: [{
+                    name: '火灾监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '电器火灾监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '通道告警监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: '消防电源监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
+                }, {
+                    name: 'RTU综合监控',
+                    disabled: 'disabled',
+                    type: 'leaf'
                 }]
-            },{
-                name:'系统信息',
-                disabled:'disabled',
-                type:'leaf'
+            }, {
+                name: '系统信息',
+                disabled: 'disabled',
+                type: 'leaf'
             }]
-        },{
-            name:'IoT-02智慧消防物联网平台 v1.00',
-            type:'systitle_label',
-            side:'split',
-            divid:'systitle_bar'
-        },{
-            name:'时间戳',
-            type:'systime_label',
-            side:'right',
-            divid:'timestamp_bar'
-        },{
-            name:'系统设置',
-            type:'group',
-            side:'right',
-            items:[{
-                name:'推送配置',
-                type:'leaf',
-                disabled:'disabled'
+        }, {
+            name: '智慧消防物联网平台',
+            type: 'systitle_label',
+            side: 'split',
+            divid: 'systitle_bar'
+        }, {
+            name: '时间戳',
+            type: 'systime_label',
+            side: 'right',
+            divid: 'timestamp_bar'
+        }, {
+            name: '系统设置',
+            type: 'group',
+            side: 'right',
+            items: [{
+                name: '推送配置',
+                type: 'leaf',
+                disabled: 'disabled'
 //					action:'keep_menu()',
 //					href:baseUrl+'proform4/index.jsp?theme='+theme+($("#company_code").val()!=undefined?('&company_code='+$("#company_code").val()):'')
-            },{
-                name:'用户管理',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'组织机构管理',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'权限管理',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'建筑物管理',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'物联网卡管理',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'采集接口管理',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'监控单元管理',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'监控点管理',
-                type:'leaf',
-                disabled:'disabled'
+            }, {
+                name: '用户管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '组织机构管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '权限管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '建筑物管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '物联网卡管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '采集接口管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '监控单元管理',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '监控点管理',
+                type: 'leaf',
+                disabled: 'disabled'
             }]
-        },{
-            name:'账户',
-            type:'group',
-            side:'right',
-            items:[{
-                name:'注销',
-                type:'logout',
-                href:baseUrl
-            },{
-                name:'切换用户',
-                type:'leaf',
-                disabled:'disabled'
-            },{
-                name:'密码管理',
-                type:'leaf',
-                disabled:'disabled'
+        }, {
+            name: '账户',
+            type: 'group',
+            side: 'right',
+            items: [{
+                name: '注销',
+                type: 'logout',
+                href: baseUrl + 'view/scripts/index.html'
+            }, {
+                name: '切换用户',
+                type: 'leaf',
+                disabled: 'disabled'
+            }, {
+                name: '密码管理',
+                type: 'leaf',
+                disabled: 'disabled'
             }]
         }]
     }
 }
 
 
-var redrawpage=function(){
-	var w = $(window).width();
-	var h = $(window).height();
-	menu_shown = true;
-	start_count = 0;
-	$(document.body).css({
-		"border":0,
-		"margin":0,
-		"padding":0,
-		"overflow":"hidden"
-	});
-	$("#menubar").css({
-		"position":"absolute",
-		"top":0,
-		"left":0,
-		"height":50,
-		"width":w
-	});
-	$("#mainframe").css({
-		"position":"absolute",
-		"top":50,
-		"left":0,
-		"width":w,
-		"height":(h-50),
-		"overflow":"hidden"
-	});
+var redrawpage = function () {
+    var w = $(window).width();
+    var h = $(window).height();
+    menu_shown = true;
+    start_count = 0;
+    $(document.body).css({
+        "border": 0,
+        "margin": 0,
+        "padding": 0,
+        "overflow": "hidden"
+    });
+    $("#menubar").css({
+        "position": "absolute",
+        "top": 0,
+        "left": 0,
+        "height": 50,
+        "width": w
+    });
+    $("#mainframe").css({
+        "position": "absolute",
+        "top": 50,
+        "left": 0,
+        "width": w,
+        "height": (h - 50),
+        "overflow": "hidden"
+    });
 //	timer_start();
 }
 
-var hide_menu = function(){
-	var h = $(window).height();
-	$("#menubar").animate({
-		top:'-45px'
-	},250);
-	$("#mainframe").animate({
-		top:'5px',
-		height:((h-5)+'px')
-	}, 250);
+var hide_menu = function () {
+    var h = $(window).height();
+    $("#menubar").animate({
+        top: '-45px'
+    }, 250);
+    $("#mainframe").animate({
+        top: '5px',
+        height: ((h - 5) + 'px')
+    }, 250);
 }
 
-var show_menu = function(){
-	if(!menu_shown){
-		var h = $(window).height();
-		$("#menubar").animate({
-			top:'0px'
-		},250);
-		$("#mainframe").animate({
-			top:'50px',
-			height:((h-50)+'px')
-		}, 250);
-		menu_shown = true;
-	}
-	start_count = 0;
+var show_menu = function () {
+    if (!menu_shown) {
+        var h = $(window).height();
+        $("#menubar").animate({
+            top: '0px'
+        }, 250);
+        $("#mainframe").animate({
+            top: '50px',
+            height: ((h - 50) + 'px')
+        }, 250);
+        menu_shown = true;
+    }
+    start_count = 0;
 }
 
-var timer_start = function(){
-	if(KeepMenu){
-		menu_shown = true;
-		show_menu();
-	}else if(menu_shown){
-		start_count = (start_count+1);
-		if(start_count>10){
-			menu_shown = false;
-			hide_menu();
-			setTimeout("timer_start()", 1000); 
-			return;
-		}
-	}
-	$("#timestamp_bar").html((new Date()).Format("yyyy-MM-dd hh:mm:ss"));
-	setTimeout("timer_start()", 1000); 
+var timer_start = function () {
+    if (KeepMenu) {
+        menu_shown = true;
+        show_menu();
+    } else if (menu_shown) {
+        start_count = (start_count + 1);
+        if (start_count > 10) {
+            menu_shown = false;
+            hide_menu();
+            setTimeout("timer_start()", 1000);
+            return;
+        }
+    }
+    $("#timestamp_bar").html((new Date()).Format("yyyy-MM-dd hh:mm:ss"));
+    setTimeout("timer_start()", 1000);
 }
 
-$(document).ready(function(){
-	baseUrl = document.getElementById('basePath').value;
-	theme = document.getElementById('theme').value;
-	viewAlarmType = document.getElementById('viewAlarmType').value;
-	pieAlarmType = document.getElementById('pieAlarmType').value;
-	statusType = document.getElementById('statusType').value;
-	$("#V_LOGINNAME").val(sessionStorage.getItem('V_LOGINNAME'));
-	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
-	var menubar = new UMenuBar();
-	menubar.create(menuconfig);
-	redrawpage();
-	$("#mainframe").attr('src','frontpage/map.jsp');
-	$('[data-submenu]').submenupicker();
-	timer_start();
+$(document).ready(function () {
+    baseUrl = document.getElementById('basePath').value;
+    theme = document.getElementById('theme').value;
+    viewAlarmType = document.getElementById('viewAlarmType').value;
+    pieAlarmType = document.getElementById('pieAlarmType').value;
+    statusType = document.getElementById('statusType').value;
+    $("#V_LOGINNAME").val(sessionStorage.getItem('V_LOGINNAME'));
+    $("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
+    var menubar = new UMenuBar();
+    menubar.create(menuconfig);
+    redrawpage();
+    $("#mainframe").attr('src', 'frontpage/map.jsp');
+    $('[data-submenu]').submenupicker();
+    timer_start();
 });
 
-$(document).mousemove(function(e){
-	if(e.pageY<5)
-		show_menu();
+$(document).mousemove(function (e) {
+    if (e.pageY < 5)
+        show_menu();
 });
 
-$(window).resize(function(){
-	redrawpage();
+$(window).resize(function () {
+    redrawpage();
 });

+ 6 - 2
src/cn/com/usky/iot/controller/AlarmViewController.java

@@ -4,6 +4,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.annotion.AutoLog;
 import cn.com.usky.iot.auth.TokenAuthBO;
 import cn.com.usky.iot.auth.TokenAuthService;
 import cn.com.usky.iot.controller.login.Constants;
@@ -412,6 +413,7 @@ public class AlarmViewController {
         return mav;
     }
 
+    @AutoLog("电气火灾告警处理")
     @RequestMapping(value = "/updateEf", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateEf(@RequestParam(value = "queryJson", required = false) String queryJson,
                                  HttpServletRequest request) {
@@ -442,7 +444,7 @@ public class AlarmViewController {
         }
         return mav;
     }
-
+    @AutoLog("水警告警处理")
     @RequestMapping(value = "/updateSj", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateSj(@RequestParam(value = "queryJson", required = false) String queryJson,
                                  HttpServletRequest request) {
@@ -473,7 +475,7 @@ public class AlarmViewController {
         }
         return mav;
     }
-
+    @AutoLog("RTU告警处理")
     @RequestMapping(value = "/updateRtu", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateRtu(@RequestParam(value = "queryJson", required = false) String queryJson,
                                   HttpServletRequest request) {
@@ -511,6 +513,7 @@ public class AlarmViewController {
      * @param queryJson
      * @return
      */
+    @AutoLog("视频告警处理")
     @RequestMapping(value = "/updateVideo", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateVideo(@RequestParam(value = "queryJson", required = false) String queryJson,
                                     HttpServletRequest request) {
@@ -545,6 +548,7 @@ public class AlarmViewController {
      * @param queryJson
      * @return
      */
+    @AutoLog("视频离线告警处理")
     @RequestMapping(value = "/updateVideoOffline ", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView updateVideoOffline(@RequestParam(value = "queryJson", required = false) String queryJson,
                                            HttpServletRequest request) {

+ 38 - 0
src/cn/com/usky/iot/controller/Log.java

@@ -0,0 +1,38 @@
+package cn.com.usky.iot.controller;
+
+import cn.com.usky.iot.entity.sys.SysLogDTO;
+import cn.com.usky.log.LogService;
+import cn.com.usky.utils.Page;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author laowo
+ * @version v1.0
+ * @date 2021/8/6 12:49
+ * @description TODO
+ **/
+@Controller
+@RequestMapping("/iot/log")
+public class Log {
+    @Autowired
+    private LogService logService;
+
+    @RequestMapping("queryLogList")
+    @ResponseBody
+    public String queryLogList(
+            @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
+            @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo
+    ) {
+        Page<SysLogDTO> sysLogDTOPage = logService.queryLogList(pageSize, pageNo);
+        String s = JSONObject.toJSON(sysLogDTOPage).toString();
+        return s;
+    }
+
+
+}

+ 3 - 0
src/cn/com/usky/log/LogService.java

@@ -1,7 +1,10 @@
 package cn.com.usky.log;
 
 import cn.com.usky.iot.entity.sys.SysLogDTO;
+import cn.com.usky.utils.Page;
 
 public interface LogService {
     void addLog(SysLogDTO dto);
+
+    Page<SysLogDTO> queryLogList(Integer pageSize, Integer pageNo);
 }

+ 34 - 0
src/cn/com/usky/log/LogServiceImpl.java

@@ -2,8 +2,17 @@ package cn.com.usky.log;
 
 
 import cn.com.usky.iot.entity.sys.SysLogDTO;
+import cn.com.usky.utils.Page;
+import org.aspectj.weaver.ast.Var;
+import org.hibernate.HibernateException;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.springframework.orm.hibernate3.HibernateCallback;
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
+import java.sql.SQLException;
+import java.util.List;
+
 /**
  * @author laowo
  * @version v1.0
@@ -27,4 +36,29 @@ public class LogServiceImpl implements LogService {
         hibernateTemplate.save(dto);
 
     }
+
+    @Override
+    public Page<SysLogDTO> queryLogList(Integer pageSize, Integer pageNo) {
+
+        List<SysLogDTO> list = hibernateTemplate.executeFind(new HibernateCallback() {
+            @Override
+            public Object doInHibernate(Session session) throws HibernateException, SQLException {
+                Query query = session.createQuery("from SysLogDTO ");
+
+                return query.list();
+            }
+        });
+        List<SysLogDTO> listPage = hibernateTemplate.executeFind(new HibernateCallback() {
+            @Override
+            public Object doInHibernate(Session session) throws HibernateException, SQLException {
+                Query query = session.createQuery("from SysLogDTO ");
+                query.setFirstResult((pageNo - 1) * pageSize);
+                query.setMaxResults(pageSize);
+                return query.list();
+            }
+        });
+        Page<SysLogDTO> result = new Page<>(list.size(), pageSize);
+        result.setPageList(listPage);
+        return result;
+    }
 }