新首页左侧导航bug

.gitignore

@@ -12,3 +12,4 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+src/main/resources/static/build/app.js

src/main/resources/static/app/additionalHome/module.js

@@ -18,7 +18,7 @@ angular.module('app.additionalHome', ['ui.router', 'ngResource']).config(functio
 	                return lazyScript.register('build/vendor.graphs.js');
 	            }
 	        }
-	    })
+	    })	
 	    .state('app.additionalHome.defendHome', {
 	    	url: '/additionalHome/defendHome', 
 	    	views: {
@@ -82,5 +82,20 @@ angular.module('app.additionalHome', ['ui.router', 'ngResource']).config(functio
                     templateUrl: 'app/additionalHome/social-wall.html'
                 }
             }
-        });
+        })
+		// 监管首页
+		.state('app.additionalHome.superviseHome', {
+	    	url: '/additionalHome/superviseHome', 
+	    	views: {
+	    		"content@app": {
+	    			controller: 'QualityCheckCtrl',
+	    			templateUrl: 'app/dashboard/dashboardCopy.html'
+	    		}
+	    	},
+	    	resolve:{
+	    		scripts: function(lazyScript){
+	    			return lazyScript.register('build/vendor.graphs.js');
+	    		}
+	    	}
+	    });
 });

src/main/resources/static/app/dashboard/DashboardCtrl.js

@@ -1,11 +1,9 @@
 'use strict';
 
-angular.module('app.dashboard').controller('DashboardCtrl', function ($scope, $interval, CalendarEvent) {
+angular.module('app.dashboard').controller('DashboardCtrl', function ($scope,$state,$rootScope, $interval, CalendarEvent) {
 
     // Live Feeds Widget Data And Display Controls
     // Live Stats Tab
-
-
     function getFakeItem(index, prevValue){
         var limitUp = Math.min(100, prevValue + 5),
             limitDown = Math.abs(prevValue - 5);
@@ -304,5 +302,23 @@ angular.module('app.dashboard').controller('DashboardCtrl', function ($scope, $i
         $scope.events = events;
     });
 
+           //跳转到监管页面
+           $scope.skipLqBugList1 = function () {
+            //  $scope.switchTopMenu("app.dashboard.superviseHome");
+                $state.go("app.additionalHome.superviseHome")
+        };
+    
+        $scope.switchTopMenu = function(funcId) {
+            if (!$("#menu-"+funcId).hasClass('open')) {
+                $("#menu-"+funcId).smartCollapseToggle();
+            }
+            if (funcId==446) {
+                $('body').addClass("minified");
+            } else {
+                $('body').removeClass("minified");
+            }
+            $rootScope.childSysId = funcId;
+            sessionStorage.setItem("childSysId", funcId);
+        }
 
 });

src/main/resources/static/app/dashboard/dashboard.html

@@ -17,12 +17,11 @@
                 <!--**待办事项 视频监控 粮食市场价格变化 col-sm-3**-->
                 <div class="col-lg-9 col-md-9 col-sm-12 home-search-main" style="height:100%;">
                     <div class="row" style="height: 100%;">
-                        <div class="home-search-wrap row" style="height:15%;" >
-                            <a href="#/prewarning/index">
-                                <img style="width:100%" src="styles/img/home/home-bg.png" alt="">
+                        <!-- home-search-wrap  max-height: 558px; padding-top: 15px;-->
+                        <div class=" row" style="height:15%;" >
+                            <a ng-click="skipLqBugList1()" href="javascript:void(0)" style="display: inline-block;width:100%;">
+                                <img style="width:100%;padding-top: 12px;" src="styles/img/home-1/02-shiditu.png" alt="">     
                             </a>
-                        
-                        
                         </div>
                        
                     </div>

src/main/resources/static/app/dashboard/module.js

@@ -26,8 +26,8 @@ angular.module('app.dashboard', [
         })
         //新首页
 
-        .state('app.dashboard.newHome', {
-            url: '/dashboardHome',
+        .state('app.dashboard.superviseHome', {
+            url: '/superviseHome',
             views: {
                 "content@app": {
                     controller: 'DashboardCtrl',
@@ -36,11 +36,6 @@ angular.module('app.dashboard', [
             },
             data:{
                 title: 'Home'
-            },
-            resolve:{
-                scripts: function(lazyScript){
-                    return lazyScript.register('build/vendor.graphs.js');
-                }
             }
         })
         .state('app.dashboard-social', {

src/main/resources/static/app/home/controller/daibsxCtrl.js

@@ -1,6 +1,6 @@
 "use strict";
 angular.module('app.system')
-    .controller("daibsxCtrl", function ($scope, $stateParams, $rootScope, $timeout, $uibModal, selectService, safeProduceNotifyService, drugPurchaseAuditService, drugUseApplyAuditService) {
+    .controller("daibsxCtrl", function ($scope, $stateParams, $rootScope,$state, $timeout, $uibModal, selectService, safeProduceNotifyService, drugPurchaseAuditService, drugUseApplyAuditService) {
         // 获取代办事项数据
         $scope.loadTodoData = function () {
             selectService.getloadTodoData().then(function (data) {
@@ -75,4 +75,24 @@ angular.module('app.system')
             }
         };
 
+            //跳转到粮情bug页面
+    $scope.skipLqBugList = function () {
+        console.log(1234)
+        $scope.switchTopMenu(18,"app.supervise.cameraPT");
+        $state.go("app.supervise.situation.temperature",{isShow :'true'});
+    };
+
+    $scope.switchTopMenu = function(funcId) {
+        if (!$("#menu-"+funcId).hasClass('open')) {
+            $("#menu-"+funcId).smartCollapseToggle();
+        }
+        if (funcId==18) {
+            $('body').addClass("minified");
+        } else {
+            $('body').removeClass("minified");
+        }
+        $rootScope.childSysId = funcId;
+        sessionStorage.setItem("childSysId", funcId);
+    }
+
     });

src/main/resources/static/app/home/controller/liangspzCtrl.js

@@ -69,6 +69,12 @@ angular.module('app.system').controller("liangspzCtrl",
                         height:100,
                         width:100 // y轴间距，值越大，间距越小
                     },
+					/* grid: {
+						left: '3%',
+						right: '14%',
+						bottom: '5%',
+						containLabel: true
+					  }, */
             	    calculable: true,
             	    xAxis: [
             	        {
@@ -164,7 +170,6 @@ angular.module('app.system').controller("liangspzCtrl",
 	        lspz.setOption(option);
 	   setTimeout(function (){
 	    window.onresize = function () {
-			console.log(1111)
 	    	lspz.resize();
 	    }
 	},200)

src/main/resources/static/app/home/views/daibsx.html

@@ -12,16 +12,20 @@
             </div>
         </div> -->
         <div style="padding:0 10px;width:100%;position: absolute;top:35px;">
-            <div style="display:flex;justify-content: space-between;border-bottom:1px dashed #cecccc;padding-bottom:5px;cursor:pointer">
-                <div style="color:#807c7c;font-size:14px">1号温度过高，请及时查看</div>
+            <!-- <ul>
+                <li ng-click='skipLqBugList()' style='cursor: pointer;'>粮情报警</li>
+            </ul> -->
+            
+            <div ng-click="skipLqBugList()" style="display:flex;justify-content: space-between;border-bottom:1px dashed #cecccc;padding-bottom:5px;cursor:pointer">
+                <div style="color:#807c7c;font-size:14px">1号温度过高，请及时查看1</div>
                 <div style="color:#807c7c;font-size:14px">今天 12:32:23</div>
             </div>
-            <div style="display:flex;justify-content: space-between;border-bottom:1px dashed #cecccc;padding:5px 0;cursor:pointer">
-                <div style="color:#807c7c;font-size:14px">1号温度过高，请及时查看</div>
+            <div ng-click="skipLqBugList()" style="display:flex;justify-content: space-between;border-bottom:1px dashed #cecccc;padding:5px 0;cursor:pointer">
+                <div style="color:#807c7c;font-size:14px">1号温度过高，请及时查看2</div>
                 <div style="color:#807c7c;font-size:14px">今天 12:32:23</div>
             </div>
-            <div style="display:flex;justify-content: space-between;border-bottom:1px dashed #cecccc;padding:5px 0;cursor:pointer">
-                <div style="color:#807c7c;font-size:14px">1号温度过高，请及时查看</div>
+            <div ng-click="skipLqBugList()" style="display:flex;justify-content: space-between;border-bottom:1px dashed #cecccc;padding:5px 0;cursor:pointer">
+                <div style="color:#807c7c;font-size:14px">1号温度过高，请及时查看3</div>
                 <div style="color:#807c7c;font-size:14px">今天 12:32:23</div>
             </div>
         </div>

src/main/resources/static/app/layout/partials/header.tpl.html

@@ -47,7 +47,7 @@
 							<i class="nav-feng-line"></i>
 						</div> -->
 						<div class="nav-li" role="presentation">
-							<a href-void ng-click="switchTopMenu(445,'app.prewarning.index')">
+							<a href-void ng-click="switchTopMenu(445,'app.prewarning.temperature')">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/liangkyw-icon.png" /></i>
 								预警报警</a>
 							<i class="nav-feng-line"></i>
@@ -70,12 +70,12 @@
 								智能安防</a>
 							<i class="nav-feng-line"></i>
 						</div>
-						<!-- <div has-func="18" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==18]">
+						<div has-func="18" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==18]">
 							<a href-void ng-click="switchTopMenu(18,'app.supervise.cameraPT')">
 								<i class="nav-icon" style='position: relative;top:7px'><img src="styles/img/home-1/nav-icon/yuancjg-icon.png" /></i>
 								粮库决策</a>
 							<i class="nav-feng-line"></i>
-						</div> -->
+						</div>
 						<!-- <div has-func="324" class="nav-li" role="presentation">
 							<a href="{{financeUrl}}" target="_blank">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/cwgl-icon.png" /></i>

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -656,11 +656,10 @@
                                     <li has-func="78">
                                         <a data-ui-sref="app.supervise.operation.ccZy">仓储作业记录</a>
                                     </li>
-                                    <li has-func="427" data-menu-collapse>
+                                    <!-- <li has-func="427" data-menu-collapse>
                                         <a href="#">
                                             <i class="fa fa-lg fa-fw fa-folder-open"></i>出入库记录
-                                        </a>
-                                        <!--三级菜单开始-->
+                                        </a> 
                                         <ul>
                                             <li has-func="428" data-ui-sref-active="active">
                                                 <a data-ui-sref="app.storage.quantity.crkresult.trainList">火车出入库记录</a>
@@ -668,9 +667,8 @@
                                             <li has-func="429" data-ui-sref-active="active">
                                                 <a data-ui-sref="app.storage.quantity.crkresult.truckList">汽车出入库记录</a>
                                             </li>
-                                        </ul>
-                                        <!--三级菜单结束-->
-                                    </li>
+                                        </ul> 
+                                    </li> -->
                                 </ul>
                             </li>
                             <li data-menu-collapse>
@@ -720,11 +718,10 @@
                                 <a data-ui-sref="app.supervise.decisionSupport.storeSuperviseList">库存监管统计</a>
                             </li>
                             <!--粮食购销统计-->
-                            <li has-func="199" data-menu-collapse>
+                            <!-- <li has-func="199" data-menu-collapse>
                                 <a has-func="" href="#">
                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>粮食购销统计
                                 </a>
-                                <!--三级菜单开始-->
                                 <ul>
                                     <li has-func="200">
                                         <a data-ui-sref="app.supervise.decisionSupport.SalesStatistics.plan-schedule">计划执行进度</a>
@@ -736,17 +733,16 @@
                                         <a data-ui-sref="app.supervise.decisionSupport.SalesStatistics.deliveryStorageNotice-schedule">通知单执行进度</a>
                                     </li>
                                 </ul>
-                                <!--三级菜单结束-->
-                            </li>
+                            </li> -->
                             <!--结束-->
                             <!--质量追溯统计-->
                             <li has-func="203">
                                 <a data-ui-sref="app.supervise.decisionSupport.qualityTraceList">质量追溯统计</a>
                             </li>
                             <!--出入库监管统计-->
-                            <li has-func="204" data-ui-sref-active="active">
+                            <!-- <li has-func="204" data-ui-sref-active="active">
                                 <a data-ui-sref="app.supervise.decisionSupport.cycleFoodCount">出入库监管统计</a>
-                            </li>
+                            </li> -->
                             <!--                            <li has-func="205">-->
                             <!--                                <a data-ui-sref="app.supervise.decisionSupport.dynamicFood">动态粮情统计</a>-->
                             <!--                            </li>-->
@@ -2100,31 +2096,30 @@
                     <span class="menu-item-parent" style="color: #fff;background: #2259a5;">预警报警</span>
                 </a>
                 <ul> 
-                    <li>
+                    <!-- <li>
                         <a data-ui-sref="app.prewarning.index">业务介绍</a>
-                    </li>
+                    </li> -->
                     <li>
-                        <a data-ui-sref="app.supervise.situation.temperature">温度报警</a>
+                        <a data-ui-sref="app.prewarning.temperature">温度报警</a>
                     </li>
-                    <!-- <li data-menu-collapse>
-                        <a href="#">
+                    <li data-menu-collapse data-ui-sref-active="active">
+                        <a href="#" data-ui-sref="app.numbermanage.numbermanage.emptyPoliceList">
                             <i class="fa fa-lg fa-fw fa-folder-open"></i>库存空仓报警
                         </a>
                         <ul>
                             <li data-ui-sref-active="active">
                                 <a data-ui-sref="app.business.agent.monitor.play">视频分析</a></li>
                         </ul>
-                    </li> -->
-                    <li>
-                        <a data-ui-sref="app.numbermanage.numbermanage.emptyPoliceList">库存空仓报警</a>
                     </li>
                     <li data-ui-sref-active="active">
                         <a data-ui-sref="app.intelligent.grainDetection.AbnormalEquipment">设备异常报警信息</a>
                     </li>
+                    <!-- <li>
+                        <a data-ui-sref="app.numbermanage.numbermanage.emptyPoliceList">库存空仓报警</a>
+                    </li> 
                     <li data-ui-sref-active="active">
                         <a data-ui-sref="app.business.agent.monitor.play">视频分析</a>
-                    </li>
-                   
+                    </li> --> 
                 </ul>
             </li>
         </ul>

src/main/resources/static/app/prewarning/module.js

@@ -12,7 +12,7 @@ angular.module('app.prewarning')
                 title: '预警报警'
             }
         })      
-        //-----------------------------------------预警管理---------------------------------------
+        //-----------------------------------------预警报警---------------------------------------
         .state('app.prewarning.index', {
 		    url: '/prewarning/index',
 		    data: {
@@ -23,6 +23,23 @@ angular.module('app.prewarning')
 		            templateUrl: 'app/business/index/views/business-index.html'
 		        }
 		    }
-		})              
+		})  
+        // 温度报警
+        .state('app.prewarning.temperature', {
+            url: '/prewarning/temperature/:isShow/:houseId',
+            data: {
+                title: '温度报警列表'
+            },
+            params:{
+                showType : "WD"
+            },
+            views: {
+                "content@app": {
+                    controller: 'warningThresholdCtrl',
+                    templateUrl: 'app/intelligent/grainDetection/views/warningThreshold-list.html'
+                }
+            }
+        }
+    )            
         
 });