更改菜单

src/main/resources/static/app/additionalHome/controller/businessCtrl.js

@@ -136,7 +136,7 @@ angular.module('app.additionalHome').controller('businessCtrl', function ($rootS
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -204,7 +204,7 @@ angular.module('app.additionalHome').controller('businessCtrl', function ($rootS
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.storage.safeproduce.notifyList");
+    	$state.go("app.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -213,11 +213,11 @@ angular.module('app.additionalHome').controller('businessCtrl', function ($rootS
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.list', {type:1});
+    		$state.go('app.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/defendCtrl.js

@@ -47,19 +47,19 @@ angular.module('app.additionalHome').controller('defendCtrl', function ($rootSco
 	// 查看页面
     $scope.showViewNotify = function(id) {
     	$scope.switchTopMenu(19);
-        $state.go('app.storage.safeproduce.notifyAdd', {id:id,isNotEdit:true});
+        $state.go('app.safeproduce.notifyAdd', {id:id,isNotEdit:true});
     };
     
     // 发布通知公告
     $scope.showAddNotify=function () {
     	$scope.switchTopMenu(19);
-        $state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+        $state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     };
     
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.storage.safeproduce.notifyList");
+    	$state.go("app.safeproduce.notifyList");
     }
     
     //跳转报警信息列表
@@ -76,9 +76,9 @@ angular.module('app.additionalHome').controller('defendCtrl', function ($rootSco
     $scope.safeProduceTodo=function(layerType) {
     	$scope.switchTopMenu(19);
     	if("publish" == layerType){//跳转文档发布页面
-    		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
+    		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
     	}else if("list" == layerType) {//跳转文档列表页面
-    		$state.go('app.storage.safeproduce.list', {type:1});
+    		$state.go('app.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/qualityCtrl.js

@@ -96,7 +96,7 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
 	// 查看页面
     $scope.showViewNotify = function(id) {
     	$scope.switchTopMenu(19);
-        $state.go('app.storage.safeproduce.notifyAdd', {id:id,isNotEdit:true});
+        $state.go('app.safeproduce.notifyAdd', {id:id,isNotEdit:true});
     };
     
     // 发布通知公告
@@ -104,7 +104,7 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -149,7 +149,7 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.storage.safeproduce.notifyList");
+    	$state.go("app.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -158,11 +158,11 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.list', {type:1});
+    		$state.go('app.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/storageCtrl.js

@@ -117,7 +117,7 @@ angular.module('app.additionalHome').controller('storageCtrl', function ($rootSc
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -168,7 +168,7 @@ angular.module('app.additionalHome').controller('storageCtrl', function ($rootSc
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.storage.safeproduce.notifyList");
+    	$state.go("app.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -177,11 +177,11 @@ angular.module('app.additionalHome').controller('storageCtrl', function ($rootSc
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.list', {type:1});
+    		$state.go('app.safeproduce.list', {type:1});
     	}
     }
     

src/main/resources/static/app/additionalHome/controller/transferCtrl.js

@@ -96,7 +96,7 @@ angular.module('app.additionalHome').controller('transferCtrl', function ($rootS
     	var className = $("#"+id).parent().parent().attr("class");
     	if(className.indexOf("flip-current") != -1){
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    		$state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     	}
     };
     
@@ -118,7 +118,7 @@ angular.module('app.additionalHome').controller('transferCtrl', function ($rootS
     // 安全生产通知
     $scope.safeProduceNotifyTodo=function() {
     	$scope.switchTopMenu(19);
-    	$state.go("app.storage.safeproduce.notifyList");
+    	$state.go("app.safeproduce.notifyList");
     }
     
     // 安全生产管理制度
@@ -127,11 +127,11 @@ angular.module('app.additionalHome').controller('transferCtrl', function ($rootS
     		var className = $("#"+id).parent().parent().attr("class");
         	if(className.indexOf("flip-current") != -1){
         		$scope.switchTopMenu(19);
-        		$state.go('app.storage.safeproduce.list', {type:1,layerType:'publish'});
+        		$state.go('app.safeproduce.list', {type:1,layerType:'publish'});
         	}
     	}else if("list" == layerType) {//跳转文档列表页面
     		$scope.switchTopMenu(19);
-    		$state.go('app.storage.safeproduce.list', {type:1});
+    		$state.go('app.safeproduce.list', {type:1});
     	}
     }
     

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

@@ -51,7 +51,7 @@ angular.module('app', [
     'app.supervise',
     'app.cameraRecord',
     'app.alarm',
-    // 'app.safeproduce',
+    'app.safeproduce',
     //'app.foodbasicinfo',
     'app.qualityDlag',
     'app.cameraGroup',

src/main/resources/static/app/basic/index/views/basic-index.html

@@ -59,12 +59,12 @@
 					$("a[data-ui-sref='app.basic.warehouseList']").click();
 				});
 				$("#keeperList").click(function(){
-					$("a[data-ui-sref='app.system.keeperList']").parents('li').each(function () {
+					$("a[data-ui-sref='app.basic.keeperList']").parents('li').each(function () {
 						if($(this).attr("ng-show") == null && !$(this).hasClass('open')){//非顶级且当前不是打开的
 			                $(this).find("a:first").click();
 						}
 		            });
-					$("a[data-ui-sref='app.system.keeperList']").click();
+					$("a[data-ui-sref='app.basic.keeperList']").click();
 				});
 				$("#cameraList").click(function(){
 					$("a[data-ui-sref='app.basic.cameraList']").parents('li').each(function () {

src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js

@@ -15,12 +15,12 @@ angular.module('app.basic')
      
      // 新增或修改跳转到录入页面
      $scope.edit = function(id, showType) {
-    	 $state.go('app.system.keeperEdit',{id:id, showType:showType});
+    	 $state.go('app.basic.keeperEdit',{id:id, showType:showType});
      }
      
      // 查看
      $scope.view = function(id) {
-    	 $state.go('app.system.keeperView',{id:id, types : $stateParams.functionType});
+    	 $state.go('app.basic.keeperView',{id:id, types : $stateParams.functionType});
      }
 
     // 删除一条记录
@@ -297,7 +297,7 @@ angular.module('app.basic')
 	    		} else {
 	                alert("保存失败！");
 	            }
-	    		$state.go('app.system.keeperList');
+	    		$state.go('app.basic.keeperList');
 	        },function(data){
 	            console.log(data);
 	        });
@@ -407,7 +407,7 @@ angular.module('app.basic')
 		if ($rootScope.previousState_name != '') {
         	$rootScope.back();
         } else {
-        	$state.go("app.system.keeperList");
+        	$state.go("app.basic.keeperList");
         }
 	}
 
@@ -490,7 +490,7 @@ angular.module('app.basic')
     // 新增或修改跳转到录入页面
     $scope.showKeeper = function(id) {
        // 新增或修改跳转到录入页面
-    	$state.go('app.system.keeperEdit',{id:id, showType:1});
+    	$state.go('app.basic.keeperEdit',{id:id, showType:1});
     }
     
     //返回和取消
@@ -501,7 +501,7 @@ angular.module('app.basic')
             }else if($stateParams.types != ''){
                 $state.go("app.synth.barn.view", {id : $stateParams.types});
             }else{
-                $state.go("app.system.keeperList");
+                $state.go("app.basic.keeperList");
             }
         }else{
             $rootScope.back();

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

@@ -9,7 +9,7 @@ angular.module('app.basic')
     .state('app.basic', {
         abstract: true,
         data: {
-            title: '基础数据'
+            title: '基本信息'
         }
     })
     //仓房管理list页
@@ -395,4 +395,527 @@ angular.module('app.basic')
             }
         }
     })
+    
+    
+    /*----------------------------------------------客户------------------------------------*/
+    .state('app.basic.customer', {
+        abstract: true,
+        data: {
+            title: '客户管理'
+        }
+    })
+    
+    .state('app.basic.customer.list', {
+        url: '/basic/customer',
+        data: {
+            title: '客户档案管理'
+        },
+        views: {
+            "content@app": {
+                controller: 'customerCtrl',
+                templateUrl: 'app/business/customer/views/customer-list.html'
+            }
+        }
+    })
+    .state('app.basic.customer.add', {
+            url: '/basic/customer/add/:id',
+            data: {
+                title: '客户档案新增'
+            },
+            views: {
+                "content@app": {
+                    controller: 'customerSaveCtrl as datatables',
+                    templateUrl: 'app/business/customer/views/customer-edit.html'
+                }
+            }
+        }
+    )
+    .state('app.basic.customer.edit', {
+        url: '/basic/customer/edit/:id',
+        data: {
+            title: '客户档案修改'
+        },
+        views: {
+            "content@app": {
+                controller: 'customerSaveCtrl as datatables',
+                templateUrl: 'app/business/customer/views/customer-edit.html'
+            }
+        }
+    })
+    
+    
+    .state('app.basic.customer.badrecord', {
+        url: '/basic/customer/badrecord',
+        data: {
+            title: '客户不良记录管理'
+        },
+        views: {
+            "content@app": {
+                controller: 'customerBadrecordCtrl',
+                templateUrl: 'app/business/customer/views/customerBadrecord-list.html'
+            }
+        }
+    })
+    
+    .state('app.basic.customer.blackList', {
+        url: '/basic/customer/blackList',
+        data: {
+            title: '客户黑名单管理'
+        },
+        views: {
+            "content@app": {
+                controller: 'customerBlackListCtrl',
+                templateUrl: 'app/business/customer/views/customer-blackList.html'
+            }
+        }
+    })
+    
+    
+    //-----------------------------------------------------智能器材库------------------------------------------------------//
+        // 设备器材管理二级路由
+        .state('app.basic.device', {
+            abstract: true,
+            data: {
+                title: '设备器材管理'
+            }
+        })
+        // 设备器材入库
+        .state('app.basic.device.deviceStorageList', {
+            url: '/device/deviceStorageList',
+            data: {
+                title: '设备器材入库'
+            },
+            views: {
+                "content@app": {
+                    controller: 'deviceStorageCtrl',
+                    templateUrl: 'app/business/device/views/deviceStorage-list.html'
+                }
+            }
+        })
+        // 详情,编辑
+        .state('app.basic.device.deviceStorageList.edit', {
+            url: '/device/deviceStorageList/edit/:id/:isNotEdit',
+            data: {
+                title: '设备器材入库详情'
+            },
+            views: {
+                "content@app": {
+                    controller: 'deviceStorageEditCtrl',
+                    templateUrl: 'app/business/device/views/deviceStorage-edit.html'
+                }
+            }
+        })
+        //----------------设备入库登记开始---------------//
+        .state('app.basic.deviceInputList', {
+            url: '/deviceInputList',
+            data: {
+                title: '设备入库列表'
+            },
+            views: {
+                "content@app": {
+                    controller: 'deviceInputCtrl',
+                    templateUrl: 'app/business/device/views/deviceInput-list.html'
+                }
+            }
+        })  
+        .state('app.basic.deviceInputAdd', {
+        	url: '/deviceInputAdd/:id/:isNotEdit',
+        	data: {
+        		title: '设备入库'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceInputCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
+        		}
+        	}
+        })  
+        .state('app.basic.inputEdit', {
+        	url: '/inputEdit/:id/:isNotEdit',
+        	data: {
+        		title: '设备查看'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceInputCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
+        		}
+        	}
+        })  
+        //----------------设备入库登记结束---------------//
+        
+        //----------------器材领用开始---------------//
+        .state('app.basic.device.deviceGetList', {
+        	url: '/deviceGetList',
+        	data: {
+        		title: '机械器材领用'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-list.html'
+        		}
+        	}
+        })  
+        .state('app.basic.device.deviceGetAdd', {
+        	url: '/deviceGetAdd',
+        	data: {
+        		title: '领用信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-add.html'
+        		}
+        	}
+        })  
+        .state('app.basic.device.deviceGetBack', {
+        	url: '/deviceGetBack/:id/:getCount',
+        	data: {
+        		title: '归还信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetBackCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-back.html'
+        		}
+        	}
+        })  
+        .state('app.basic.device.deviceChack', {
+        	url: '/deviceChack/:id',
+        	data: {
+        		title: '信息详情'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceGetBackCtrl',
+        			templateUrl: 'app/business/device/views/deviceGet-detail.html'
+        		}
+        	}
+        })  
+        //----------------器材领用结束---------------//
+
+        // 设备器材管理三级路由
+        .state('app.basic.device.manage', {
+            abstract: true,
+            data: {
+                title: '设备管理'
+            }
+        })
+        //----------------器材保养开始---------------//
+        .state('app.basic.device.manage.deviceKeepList', {
+        	url: '/deviceKeepList',
+        	data: {
+        		title: '器材保养'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceKeepCtrl',
+        			templateUrl: 'app/business/device/views/deviceKeep-list.html'
+        		}
+        	}
+        })  
+        .state('app.basic.device.manage.deviceKeepAdd', {
+        	url: '/deviceKeepAdd',
+        	data: {
+        		title: '添加保养信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceKeepAddCtrl',
+        			templateUrl: 'app/business/device/views/deviceKeep-add.html'
+        		}
+        	}
+        }) 
+        .state('app.basic.device.manage.deviceKeepMassage', {
+        	url: '/deviceKeepMassage/:id',
+        	data: {
+        		title: '保养信息明细'
+        	},
+        	views: {   
+        		"content@app": {
+        			controller: 'deviceKeepSelCtrl',
+        			templateUrl: 'app/business/device/views/deviceKeep-olist.html'
+        		}
+        	}
+        }) 
+         //----------------器材保养结束---------------//
+        
+         //----------------器材维修开始---------------//
+        .state('app.basic.device.manage.deviceRepairList', {
+        	url: '/deviceRepairList',
+        	data: {
+        		title: '器材维修'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceRepairCtrl',
+        			templateUrl: 'app/business/device/views/deviceRepair-list.html'
+        		}
+        	}
+        })  
+        .state('app.basic.device.manage.devicerepairAdd', {
+        	url: '/devicerepairAdd',
+        	data: {
+        		title: '添加维修信息'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceRepairAddCtrl',
+        			templateUrl: 'app/business/device/views/deviceRepair-add.html'
+        		}
+        	}
+        })  
+        .state('app.basic.device.manage.deviceRepairMassage', {
+        	url: '/deviceRepairMassage/:id/:isNotEdit',
+        	data: {
+        		title: '维修信息明细'
+        	},
+        	views: {   
+        		"content@app": {
+        			controller: 'deviceRepairSaveCtrl',
+        			templateUrl: 'app/business/device/views/deviceRepair-olist.html'
+        		}
+        	}
+        }) 
+        
+        //----------------器材维修结束---------------//
+        
+        
+        //----------------设备报废开始---------------//
+        .state('app.basic.device.manage.deviceOutList', {
+        	url: '/deviceOutList',
+        	data: {
+        		title: '设备报废'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceOutCtrl',
+        			templateUrl: 'app/business/device/views/deviceOut-list.html'
+        		}
+        	}
+        })  
+         //----------------设备报废结束---------------//
+        //----------------台账开始---------------//
+        .state('app.basic.device.deviceAccountList', {
+        	url: '/deviceAccountList',
+        	data: {
+        		title: '台账'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceAccountCtrl',
+        			templateUrl: 'app/business/device/views/deviceAccount-list.html'
+        		}
+        	}
+        })
+        
+        .state('app.basic.device.accountEdit', {
+        	url: '/accountEdit/:deviceType/:deviceName/:model/:isNotEdit',
+        	data: {
+        		title: '设备台账'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceInputCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceAccount-edit.html'
+        		}
+        	}
+        }) 
+         //----------------台账结束---------------//
+        .state('app.basic.device.deviceCheckList', {
+        	url: '/deviceCheckList',
+        	data: {
+        		title: '盘点单'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceCheckCtrl',
+        			templateUrl: 'app/business/device/views/deviceCheck-list.html'
+        		}
+        	}
+        })
+        .state('app.basic.device.checkAdd', {
+        	url: '/checkAdd',
+        	data: {
+        		title: '新建盘点单'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceCheckAddCtrl',
+        			templateUrl: 'app/business/device/views/deviceAdd.html'
+        		}
+        	}
+        })
+        .state('app.basic.device.checkEdit', {
+        	url: '/checkEdit/:checkNumber/:isNotEdit',
+        	data: {
+        		title: '修改盘点单'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'deviceCheckEditCtrl',
+        			templateUrl: 'app/business/device/views/deviceEdit.html'
+        		}
+        	}
+        })
+        //---------------------------------设施管理------------------------------------------------------
+         // 设施管理二级路由
+         .state('app.basic.facility', {
+            abstract: true,
+            data: {
+                title: '设施管理'
+            }
+        })
+        //----------------设施基础信息维护开始---------------//
+        .state('app.basic.facility.facilityStorageList', {
+            url: '/facilityStorageList',
+            data: {
+                title: '设施基础信息维护'
+            },
+            views: {
+                "content@app": {
+                    controller: 'facilityListCtrl',
+                    templateUrl: 'app/business/facility/views/facility-list.html'
+                }
+            }
+        })  
+        .state('app.basic.facility.addFacility', {
+            url: '/addFacility/:isNotEdit/:facility?',
+            data: {
+                title: '新增设施'
+            },
+            views: {
+                "content@app": {
+                    controller: 'addfacilityCtrl',
+                    templateUrl: 'app/business/facility/views/add-facility.html'
+                }
+            }
+        })  
+        
+        //----------------设施基础信息维护结束---------------//
+        //----------------设施保养开始---------------//
+        .state('app.basic.facility.facilityKeepList', {
+            url: '/facilityKeepList',
+            data: {
+                title: '设施保养'
+            },
+            views: {
+                "content@app": {
+                    controller: 'facilityKeepListCtrl',
+                    templateUrl: 'app/business/facility/views/facility-keep.html'
+                }
+            }
+        }) 
+        .state('app.basic.facility.addFacilityKeep', {
+            url: '/addFacilityKeep/:isNotEdit/:facility?',
+            data: {
+                title: '添加设施保养信息'
+            },
+            views: {
+                "content@app": {
+                    controller: 'addfacilityKeepCtrl',
+                    templateUrl: 'app/business/facility/views/add-facility-keep.html'
+                }
+            }
+        })  
+        
+        //----------------设施保养结束---------------//
+         //----------------设施维修开始---------------//
+         .state('app.basic.facility.facilityGetList', {
+            url: '/facilityGetList',
+            data: {
+                title: '设施维修'
+            },
+            views: {
+                "content@app": {
+                    controller: 'facilityGetListCtrl',
+                    templateUrl: 'app/business/facility/views/facility-get-list.html'
+                }
+            }
+        }) 
+        .state('app.basic.facility.addFacilityGet', {
+            url: '/addfacilityGet/:isNotEdit/:facility?',
+            data: {
+                title: '添加设施维修信息'
+            },
+            views: {
+                "content@app": {
+                    controller: 'addFacilityGetCtrl',
+                    templateUrl: 'app/business/facility/views/add-facility-get.html'
+                }
+            }
+        })  
+        
+        //----------------设施维修结束---------------//
+        // //----------------设施报废开始---------------//
+        // .state('app.basic.facility.facilityScrapList', {
+        //     url: '/facilityScrapList',
+        //     data: {
+        //         title: '设施报废'
+        //     },
+        //     views: {
+        //         "content@app": {
+        //             controller: 'facilityScrapListCtrl',
+        //             templateUrl: 'app/business/facility/views/facility-scraplist.html'
+        //         }
+        //     }
+        // }) 
+        // .state('app.basic.facility.addFacilityScrap', {
+        //     url: '/addFacilityScrap',
+        //     data: {
+        //         title: '添加设施报废信息'
+        //     },
+        //     views: {
+        //         "content@app": {
+        //             controller: 'addFacilityScrapCtrl',
+        //             templateUrl: 'app/business/facility/views/add-facility-scrap.html'
+        //         }
+        //     }
+        // })  
+        
+        // //----------------设施报废结束---------------//
+        
+        
+        
+        //初始化员工信息调用
+    .state('app.basic.keeperList', {
+    	url: '/keeperList',
+        data: {
+            title: '人员管理'
+        },
+        views: {
+            "content@app": {
+                controller: 'keeperCtrl',
+                templateUrl: 'app/basic/keeper/views/keeper-list.html'
+            }
+        }
+    })
+    
+    //点新增或修改保管员信息调用
+    .state('app.basic.keeperEdit', {
+    	url: '/keeperEdit/:id/:showType',
+        data: {
+            title: '人员信息详情'
+        },
+        views: {
+            "content@app": {
+                controller: 'keeperCtrlEdit',
+                templateUrl: 'app/basic/keeper/views/keeper-edit.html'
+            }
+        }
+    })
+    //点查看跳转页面
+    .state('app.basic.keeperView', {
+    	url: '/keeperView/:id/:types',
+        data: {
+            title: '人员信息展示'
+        },
+        views: {
+            "content@app": {
+                controller: 'keeperViewCtrl',
+                templateUrl: 'app/basic/keeper/views/keeper-view.html'
+            }
+        }
+    })
 });

src/main/resources/static/app/business/customer/controller/customerCtrl.js

@@ -28,7 +28,7 @@ angular.module('app.business').controller("customerCtrl", function($scope, $root
     	if($scope.menu!=null){
     		$state.go('app.business.management.customer.add', {id : 0,menu:$scope.menu});
     	}else{
-    		$state.go('app.system.customer.add', {id : 0});
+    		$state.go('app.basic.customer.add', {id : 0});
     	}
         
     }
@@ -38,7 +38,7 @@ angular.module('app.business').controller("customerCtrl", function($scope, $root
     	if($scope.menu!=null){
     		$state.go('app.business.management.customer.edit', {id : id,menu:$scope.menu});
     	}else{
-    		$state.go('app.system.customer.edit', {id : id});
+    		$state.go('app.basic.customer.edit', {id : id});
     	}
     }
     

src/main/resources/static/app/business/customer/controller/customerSaveCtrl.js

@@ -163,7 +163,7 @@ angular.module('app.business').controller("customerSaveCtrl", function($scope, $
         if ($rootScope.previousState_name != '') {
         	$rootScope.back();
         } else {
-        	$state.go('app.system.customer.list');
+        	$state.go('app.basic.customer.list');
         }
     }
     

src/main/resources/static/app/business/device/controller/deviceAccountCtrl.js

@@ -23,7 +23,7 @@ angular.module('app.business')
 	    
 	 // 查看页面
 	    $scope.showViewInput = function(deviceType,deviceName,model) {
-	    	$state.go('app.system.device.accountEdit',{ssfl:deviceType,deviceName:deviceName,model:model,isNotEdit:true});
+	    	$state.go('app.basic.device.accountEdit',{ssfl:deviceType,deviceName:deviceName,model:model,isNotEdit:true});
 	    }
 	 
 })

src/main/resources/static/app/business/device/controller/deviceCheckCtrl.js

@@ -37,7 +37,7 @@ angular.module('app.business')
 
         //新增
         $scope.showCheck = function () {
-            $state.go('app.system.device.checkAdd');
+            $state.go('app.basic.device.checkAdd');
         }
 
         // 翻页
@@ -59,7 +59,7 @@ angular.module('app.business')
 
         //修改
         $scope.loadDataById = function (checkNumber, type) {
-            $state.go("app.system.device.checkEdit", {checkNumber: checkNumber, isNotEdit: type});
+            $state.go("app.basic.device.checkEdit", {checkNumber: checkNumber, isNotEdit: type});
         }
 
         // 翻页
@@ -133,7 +133,7 @@ angular.module('app.business')
         }
 
         $scope.back = function () {
-            $state.go("app.system.device.deviceCheckList");
+            $state.go("app.basic.device.deviceCheckList");
         }
         var validator = $("#deviceCheck-form").validate();
         $scope.pd = {};
@@ -166,7 +166,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.system.device.deviceCheckList');
+                        $state.go('app.basic.device.deviceCheckList');
                     } else {
                         alert("保存失败！");
                     }
@@ -233,7 +233,7 @@ angular.module('app.business')
             if (type == 1) return years + "-" + month + "-" + strDate + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
         };
         $scope.back = function () {
-            $state.go("app.system.device.deviceCheckList");
+            $state.go("app.basic.device.deviceCheckList");
         }
 
         $scope.deviceCheck = {};
@@ -293,7 +293,7 @@ angular.module('app.business')
             }).then(function successCallback(response) {
                 if (response.data.status == "success") {
                     alert("保存成功！");
-                    $state.go('app.system.device.deviceCheckList');
+                    $state.go('app.basic.device.deviceCheckList');
                 } else {
                     alert("保存失败！");
                 }

src/main/resources/static/app/business/device/controller/deviceGetCtrl.js

@@ -174,18 +174,18 @@ angular.module('app.business')
 
         //领取
         $scope.showGet = function () {
-            $state.go('app.system.device.deviceGetAdd');
+            $state.go('app.basic.device.deviceGetAdd');
         }
 
 
         //归还
         $scope.showGetBack = function (id, getCount) {
-            $state.go('app.system.device.deviceGetBack', {id: id, getCount: getCount});
+            $state.go('app.basic.device.deviceGetBack', {id: id, getCount: getCount});
         }
 
         //查看
         $scope.showMassage = function (id) {
-            $state.go('app.system.device.deviceChack', {id: id});
+            $state.go('app.basic.device.deviceChack', {id: id});
         }
 
         // 翻页
@@ -230,7 +230,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.system.device.deviceGetList');
+                        $state.go('app.basic.device.deviceGetList');
                     } else {
                         alert(response.data.msg);
                     }
@@ -322,7 +322,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("归还成功！");
-                        $state.go('app.system.device.deviceGetList');
+                        $state.go('app.basic.device.deviceGetList');
                     } else {
                         alert(response.data.msg);
                     }

src/main/resources/static/app/business/device/controller/deviceInputCtrl.js

@@ -32,7 +32,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.system.device.deviceInputAdd',{id:0,isNotEdit:false});
+		 $state.go('app.basic.device.deviceInputAdd',{id:0,isNotEdit:false});
 	 }
 
 
@@ -57,12 +57,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.showViewInput = function(id) {
-    	$state.go('app.system.device.inputEdit',{id:id,isNotEdit:true});
+    	$state.go('app.basic.device.inputEdit',{id:id,isNotEdit:true});
     }
     
     //修改页面
     $scope.showEditInput = function(id) {
-    	$state.go('app.system.device.inputEdit',{id:id,isNotEdit:false});
+    	$state.go('app.basic.device.inputEdit',{id:id,isNotEdit:false});
     }
 
     //树形下拉框获取器材设备名称
@@ -182,7 +182,7 @@ angular.module('app.business')
    			}).then(function successCallback(response) {
    				if(response.data.status == "success"){
    					alert("保存成功！");
-   					$state.go('app.system.device.deviceInputList');
+   					$state.go('app.basic.device.deviceInputList');
    				}else{
    					alert(response.data.msg);
    					$scope.saveFlag = false;

src/main/resources/static/app/business/device/controller/deviceKeepCtrl.js

@@ -34,12 +34,12 @@ angular.module('app.business')
 
         //新增
         $scope.showKeep = function () {
-            $state.go('app.system.device.manage.deviceKeepAdd');
+            $state.go('app.basic.device.manage.deviceKeepAdd');
         }
 
         //展示保养信息
         $scope.showKeepMassage = function (id) {
-            $state.go('app.system.device.manage.deviceKeepMassage', {id: id});
+            $state.go('app.basic.device.manage.deviceKeepMassage', {id: id});
         }
 
 
@@ -137,7 +137,7 @@ angular.module('app.business')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.system.device.manage.deviceKeepList');
+                        $state.go('app.basic.device.manage.deviceKeepList');
                     } else {
                         alert("保存失败！");
                     }

src/main/resources/static/app/business/device/controller/deviceRepairCtrl.js

@@ -34,12 +34,12 @@ angular.module('app.business')
     
 	 //添加维护信息页面
 	 $scope.showRepair = function () {
-	   $state.go('app.system.device.manage.devicerepairAdd');
+	   $state.go('app.basic.device.manage.devicerepairAdd');
 	 }
 	 
 	 //维护信息详情
 	 $scope.showRepairMassage = function (id) {
-		 $state.go('app.system.device.manage.deviceRepairMassage',{id:id,isNotEdit:false});
+		 $state.go('app.basic.device.manage.deviceRepairMassage',{id:id,isNotEdit:false});
 	 }
 
     	
@@ -205,7 +205,7 @@ angular.module('app.business')
                     }).then(function successCallback(response) {
                         if (response.data.status == "success") {
                             alert("保存成功！");
-                            $state.go('app.system.device.manage.deviceRepairList');
+                            $state.go('app.basic.device.manage.deviceRepairList');
                         } else {
                             alert("保存失败！");
                         }

src/main/resources/static/app/business/device/controller/deviceStorageCtrl.js

@@ -31,17 +31,17 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
 
     // 新增页面
     $scope.showAdd = function () {
-        $state.go('app.system.device.deviceStorageList.edit', { id: '0', isNotEdit: false });
+        $state.go('app.basic.device.deviceStorageList.edit', { id: '0', isNotEdit: false });
     };
     // 修改页面
     $scope.showEdit = function (dSbxxsjy) {
         dSbxxsjy.ssfl.toString();
-        $state.go("app.system.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: false });
+        $state.go("app.basic.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: false });
     };
     // 查看页面
     $scope.showView = function (dSbxxsjy) {
         dSbxxsjy.ssfl.toString();
-        $state.go("app.system.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: true });
+        $state.go("app.basic.device.deviceStorageList.edit", { id: angular.toJson(dSbxxsjy), isNotEdit: true });
     };
     // 删除一条记录.
     $scope.delete = function (id) {
@@ -251,7 +251,7 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         if ($rootScope.previousState_name != '') {
             $rootScope.back();
         } else {
-            $state.go("app.system.device.deviceStorageList");
+            $state.go("app.basic.device.deviceStorageList");
         }
     };
 

src/main/resources/static/app/business/facility/controller/facilityGetListCtrl.js

@@ -17,7 +17,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.system.facility.addFacilityGet',{isNotEdit:false});
+		 $state.go('app.basic.facility.addFacilityGet',{isNotEdit:false});
 	 }
 
 
@@ -42,12 +42,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.viewFacility = function(facility) {
-    	$state.go('app.system.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:true});
+    	$state.go('app.basic.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:true});
     }
     
     //修改页面
     $scope.editFacility = function(facility) {
-    	$state.go('app.system.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:false});
+    	$state.go('app.basic.facility.addFacilityGet',{facility:angular.toJson(facility),isNotEdit:false});
     }
 
     // //树形下拉框获取器材设备名称
@@ -176,7 +176,7 @@ angular.module('app.business')
                 FacilityGetService.savaFacility({dFacilitiesRepairJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");
-                        $state.go('app.system.facility.facilityGetList');
+                        $state.go('app.basic.facility.facilityGetList');
                     }else{
                         alert(response.msg);
                         $scope.saveFlag = false;

src/main/resources/static/app/business/facility/controller/facilityKeepListCtrl.js

@@ -17,7 +17,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.system.facility.addFacilityKeep',{isNotEdit:false});
+		 $state.go('app.basic.facility.addFacilityKeep',{isNotEdit:false});
 	 }
 
 
@@ -42,12 +42,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.viewFacility = function(facility) {
-    	$state.go('app.system.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:true});
+    	$state.go('app.basic.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:true});
     }
     
     //修改页面
     $scope.editFacility = function(facility) {
-    	$state.go('app.system.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:false});
+    	$state.go('app.basic.facility.addFacilityKeep',{facility:angular.toJson(facility),isNotEdit:false});
     }
 
     // //树形下拉框获取器材设备名称
@@ -172,7 +172,7 @@ angular.module('app.business')
                 facilityKeepService.savaFacility({dFacilitiesMaintainJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");
-                        $state.go('app.system.facility.facilityKeepList');
+                        $state.go('app.basic.facility.facilityKeepList');
                     }else{
                         alert(response.msg);
                         $scope.saveFlag = false;

src/main/resources/static/app/business/facility/controller/facilityListCtrl.js

@@ -18,7 +18,7 @@ angular.module('app.business')
 	 $scope.loadData();
 	 //新增
 	 $scope.showAddInput = function () {
-		 $state.go('app.system.facility.addFacility',{isNotEdit:false});
+		 $state.go('app.basic.facility.addFacility',{isNotEdit:false});
 	 }
 
 
@@ -43,12 +43,12 @@ angular.module('app.business')
 	
 	// 查看页面
     $scope.viewFacility = function(facility) {
-    	$state.go('app.system.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:true});
+    	$state.go('app.basic.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:true});
     }
     
     //修改页面
     $scope.editFacility = function(facility) {
-    	$state.go('app.system.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:false});
+    	$state.go('app.basic.facility.addFacility',{facility:angular.toJson(facility),isNotEdit:false});
     }
 
     // 报废
@@ -174,7 +174,7 @@ angular.module('app.business')
                 facilityListService.savaFacility({dFacilitiesBasicsJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");
-                        $state.go('app.system.facility.facilityStorageList');
+                        $state.go('app.basic.facility.facilityStorageList');
                     }else{
                         alert(response.msg);
                     }

src/main/resources/static/app/business/index/views/business-index.html

@@ -70,12 +70,12 @@
 			$("a[data-ui-sref='app.business.plan-schedule']").click();
 		});
 		$("#customer").click(function(){
-			$("a[data-ui-sref='app.system.customer.list']").parents('li').each(function () {
+			$("a[data-ui-sref='app.basic.customer.list']").parents('li').each(function () {
 				if($(this).attr("ng-show") == null && !$(this).hasClass('open')){//非顶级且当前不是打开的
 	                $(this).find("a:first").click();
 				}
             });
-			$("a[data-ui-sref='app.system.customer.list']").click();
+			$("a[data-ui-sref='app.basic.customer.list']").click();
 		});
 		setTimeout(function(){
 			var receiveNotice = $("#images")[0].width*0.35936+","+$("#images")[0].height*0.49819+",50";

src/main/resources/static/app/business/util/controller/addCustomerModal.js

@@ -117,7 +117,7 @@ angular.module('app.business').controller("addCustomerCtrl", function($scope, $h
     
     // 返回.
    /* $scope.retList = function () {
-    	$state.go('app.system.customer.list');
+    	$state.go('app.basic.customer.list');
     }*/
     // 返回.
     $scope.retList = function () {

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

@@ -29,7 +29,7 @@ angular.module('app.system')
         // 安全生产通知链接
         var safeProduceNotifyCtrlScope = $('div[ng-controller="headerCtrl"]').scope();
         $scope.safeProduceNotifyTodo = function () {
-            safeProduceNotifyCtrlScope.switchTopMenu(19, "app.storage.safeproduce.notifyList");
+            safeProduceNotifyCtrlScope.switchTopMenu(19, "app.safeproduce.notifyList");
         };
 
         // ----------------获取药剂采购审批事项数据------------------

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

@@ -49,7 +49,7 @@
 						<div has-func="2" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==2]">
 							<a href-void ng-click="switchTopMenu(2,'app.basic.index')">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/jicsj-icon.png" /></i>
-								基础数据</a>
+								基本信息</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]">

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

@@ -36,8 +36,45 @@
                     <!-- <li has-func="290" data-ui-sref-active="active">
                         <a data-ui-sref="app.system.orgPower">机构授权管理</a>
                     </li> -->
+                    
+                    <li data-ui-sref-active="active">
+                        <a data-ui-sref="app.system.pwd">修改密码</a>
+                    </li>
+                    <li has-func="287" data-ui-sref-active="active">
+                        <a data-ui-sref="app.system.resetPwd">重置密码</a>
+                    </li>
+                    <li has-func="430"  data-ui-sref-active="active">
+                        <a data-ui-sref="app.system.systemLog">日志管理</a>
+                    </li>
+                    <li has-func="217" data-ui-sref-active="active">
+                        <a data-ui-sref="app.system.depotUrl">库端url配置</a>
+                    </li>
+                </ul>
+            </li>
+            <li data-menu-collapse id="menu-2" ng-show="childSysId==2">
+                <a href="#" style="background: #2259a5;">
+                    <i class="nav-icon"><img style="margin-bottom: -12px;"
+                                             src="styles/img/home-1/nav-icon/jicsj-icon.png"/></i>
+                    <span class="menu-item-parent" style="color:#fff;background: #2259a5;">基本信息</span>
+                </a>
+                <ul>
+                    <li data-ui-sref-active="active" class="active">
+                        <a data-ui-sref="app.basic.index">业务介绍</a>
+                    </li>
+                    <li has-func="6" data-ui-sref-active="active">
+                        <a data-ui-sref="app.basic.enumList">数据字典</a>
+                    </li>
+                    <li has-func="7" data-ui-sref-active="active">
+                        <a data-ui-sref="app.basic.storehouseList({type:2})">仓房管理</a>
+                    </li>
+                    <li has-func="22" data-ui-sref-active="active">
+                        <a data-ui-sref="app.basic.warehouseList">货位管理</a>
+                    </li>
+                    <li has-func="325" data-ui-sref-active="active">
+                        <a data-ui-sref="app.basic.tankList">油罐管理</a>
+                    </li>
                     <li has-func="24" data-ui-sref-active="active">
-                        <a data-ui-sref="app.system.keeperList">人员管理</a>
+                        <a data-ui-sref="app.basic.keeperList">人员管理</a>
                     </li>
                     <li data-menu-collapse>
                         <a has-func="43" href="#">
@@ -45,16 +82,19 @@
                         </a>
                         <ul>
                             <li has-func="44">
-                                <a data-ui-sref="app.system.customer.list">客户档案管理</a>
+                                <a data-ui-sref="app.basic.customer.list">客户档案管理</a>
                             </li>
                             <li has-func="45">
-                                <a data-ui-sref="app.system.customer.badrecord">客户不良记录管理</a>
+                                <a data-ui-sref="app.basic.customer.badrecord">客户不良记录管理</a>
                             </li>
                             <li has-func="46">
-                                <a data-ui-sref="app.system.customer.blackList">客户黑名单管理</a>
+                                <a data-ui-sref="app.basic.customer.blackList">客户黑名单管理</a>
                             </li>
                         </ul>
                     </li>
+                    <li has-func="438" data-ui-sref-active="active">
+                        <a data-ui-sref="app.basic.equipmentEquipmentPoolList">设备器材库</a>
+                    </li>
                      <!-- 设备器材管理开始 -->
                     <li data-menu-collapse>
                         <a has-func="158" href="#">
@@ -62,13 +102,13 @@
                         </a>
                         <ul>
                             <li has-func="159" data-ui-sref-active="active">
-                                <a data-ui-sref="app.system.device.deviceStorageList">设备器材入库</a>
+                                <a data-ui-sref="app.basic.device.deviceStorageList">设备器材入库</a>
                             </li>
                             <!-- <li has-func="159" data-ui-sref-active="active">
-                                 <a data-ui-sref="app.system.deviceInputList">设备入库登记</a>
+                                 <a data-ui-sref="app.basic.deviceInputList">设备入库登记</a>
                              </li>-->
                             <li has-func="402" data-ui-sref-active="active">
-                                <a data-ui-sref="app.system.device.deviceGetList">设备领用</a>
+                                <a data-ui-sref="app.basic.device.deviceGetList">设备领用</a>
                             </li>
                             <li has-func="432" data-menu-collapse>
                                 <a href="#">
@@ -76,18 +116,18 @@
                                 </a>
                                 <ul>
                                     <li has-func="433" data-ui-sref-active="active"><a
-                                            data-ui-sref="app.system.device.manage.deviceKeepList">设备保养</a></li>
+                                            data-ui-sref="app.basic.device.manage.deviceKeepList">设备保养</a></li>
                                     <li has-func="434" data-ui-sref-active="active"><a
-                                            data-ui-sref="app.system.device.manage.deviceRepairList">设备维修</a></li>
+                                            data-ui-sref="app.basic.device.manage.deviceRepairList">设备维修</a></li>
                                     <li has-func="438" data-ui-sref-active="active"><a
-                                            data-ui-sref="app.system.device.manage.deviceOutList">设备报废</a></li>
+                                            data-ui-sref="app.basic.device.manage.deviceOutList">设备报废</a></li>
                                 </ul>
                             </li>
                             <li has-func="436" data-ui-sref-active="active">
-                                <a data-ui-sref="app.system.device.deviceAccountList">设备管理台账</a>
+                                <a data-ui-sref="app.basic.device.deviceAccountList">设备管理台账</a>
                             </li>
                             <li has-func="437" data-ui-sref-active="active">
-                                <a data-ui-sref="app.system.device.deviceCheckList">盘点单</a>
+                                <a data-ui-sref="app.basic.device.deviceCheckList">盘点单</a>
                             </li>
                         </ul>
                     </li>
@@ -98,55 +138,16 @@
                         </a>
                         <ul>
                             <li has-func="458" data-ui-sref-active="active">
-                                <a data-ui-sref="app.system.facility.facilityStorageList">设施基础信息维护</a>
+                                <a data-ui-sref="app.basic.facility.facilityStorageList">设施基础信息维护</a>
                             </li>
                             <li has-func="459" data-ui-sref-active="active">
-                                <a data-ui-sref="app.system.facility.facilityKeepList">设施保养</a>
+                                <a data-ui-sref="app.basic.facility.facilityKeepList">设施保养</a>
                             </li>
                             <li has-func="460" data-ui-sref-active="active">
-                                <a data-ui-sref="app.system.facility.facilityGetList">设施维修</a>
+                                <a data-ui-sref="app.basic.facility.facilityGetList">设施维修</a>
                             </li>
                         </ul>
                     </li>
-                    <li data-ui-sref-active="active">
-                        <a data-ui-sref="app.system.pwd">修改密码</a>
-                    </li>
-                    <li has-func="287" data-ui-sref-active="active">
-                        <a data-ui-sref="app.system.resetPwd">重置密码</a>
-                    </li>
-                    <li has-func="430"  data-ui-sref-active="active">
-                        <a data-ui-sref="app.system.systemLog">日志管理</a>
-                    </li>
-                    <li has-func="217" data-ui-sref-active="active">
-                        <a data-ui-sref="app.system.depotUrl">库端url配置</a>
-                    </li>
-                </ul>
-            </li>
-            <li data-menu-collapse id="menu-2" ng-show="childSysId==2">
-                <a href="#" style="background: #2259a5;">
-                    <i class="nav-icon"><img style="margin-bottom: -12px;"
-                                             src="styles/img/home-1/nav-icon/jicsj-icon.png"/></i>
-                    <span class="menu-item-parent" style="color:#fff;background: #2259a5;">基础数据</span>
-                </a>
-                <ul>
-                    <li data-ui-sref-active="active" class="active">
-                        <a data-ui-sref="app.basic.index">业务介绍</a>
-                    </li>
-                    <li has-func="6" data-ui-sref-active="active">
-                        <a data-ui-sref="app.basic.enumList">数据字典</a>
-                    </li>
-                    <li has-func="7" data-ui-sref-active="active">
-                        <a data-ui-sref="app.basic.storehouseList({type:2})">仓房管理</a>
-                    </li>
-                    <li has-func="22" data-ui-sref-active="active">
-                        <a data-ui-sref="app.basic.warehouseList">货位管理</a>
-                    </li>
-                    <li has-func="325" data-ui-sref-active="active">
-                        <a data-ui-sref="app.basic.tankList">油罐管理</a>
-                    </li>
-                    <li has-func="438" data-ui-sref-active="active">
-                        <a data-ui-sref="app.basic.equipmentEquipmentPoolList">设备器材库</a>
-                    </li>
                     <li has-func="27" data-ui-sref-active="active">
                         <!--<a data-ui-sref="app.nvr.list">硬盘录像机管理</a>-->
                         <a data-ui-sref="app.basic.nvrList">硬盘录像机管理</a>
@@ -802,6 +803,91 @@
                         <a href="app/monitor/nvrPlay.exe" title="监控控件">控件下载</a>
                     </li>
                                 </ul>
+                        </li>
+                        
+                        
+                           <!--安全生产开始-->
+                            <li data-menu-collapse><!--原: 安全生产-->
+                                <a has-func="94" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
+                                    安全管理</a>
+                                <!--三级菜单开始-->
+                                <ul>
+                                    <li has-func="110" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.list({type:1})">安全生产管理制度</a>
+                                    </li>
+                                    <li has-func="111" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.list({type:2})">安全生产应急预案</a>
+                                    </li>
+                                    <li has-func="112" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.list({type:3})">安全生产管理责任</a>
+                                    </li>
+                                    <li has-func="180" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.notifyList">安全生产通告</a>
+                                    </li>
+                                    <li has-func="461" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.safeRiskLevelCtrl">安全风险分级管控</a>
+                                    </li>
+                                     <!-- <li has-func="462" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.storage.safeproduce.safeDangerHandle">安全隐患跟踪处理</a>
+                                    </li>  -->
+                                    <li  data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.safeManage">安全隐患排查治理</a>
+                                    </li>
+                                    <!--<li has-func="181" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.storage.safeproduce.recordList">粮库危险作业备案</a>
+                                    </li>-->
+                                    <li has-func="182" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.safeAccidentManageList">安全生产事故管理</a>
+                                    </li>
+                                    <li has-func="463" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.safeproduce.rulelibrary">法律规章信息库</a>
+                                    </li>
+                                    <!--备案及实施情况的管理-->
+                                    <!--<li data-menu-collapse>
+                                        <a has-func="185" href="#">
+                                            <i class="fa fa-lg fa-fw fa-folder-open"></i>备案管理
+                                        </a>
+                                        <ul>
+                                            <li has-func="186" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.storage.safeproduce.recordManage.fumigationPlan">熏蒸方案</a>
+                                            </li>
+                                            <li has-func="187" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.storage.safeproduce.recordManage.fumigationProcess">熏蒸过程</a>
+                                            </li>
+                                            <li has-func="188" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.storage.safeproduce.recordManage.fumigationDealWith">善后工作</a>
+                                            </li>
+                                        </ul>
+                                    </li>-->
+
+                                    <li data-menu-collapse><!--原名: 粮情检查管理-->
+                                        <a has-func="118" href="#">
+                                            <i class="fa fa-lg fa-fw fa-folder-open"></i>
+                                            安全检查
+                                        </a>
+                                        <ul>
+                                            <li has-func="405" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.safeproduce.safeCheck.dailyList">日常检查</a>
+                                            </li>
+											<li has-func="336" data-ui-sref-active="active">
+				                                <a data-ui-sref="app.safeproduce.safeCheck.insectPestDetectionList">虫害检查</a>
+				                            </li>
+                                            <li has-func="183" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.safeproduce.safeCheck.fbelist">节前安全检查</a>
+                                            </li>
+                                            <li has-func="184" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.safeproduce.safeCheck.wrslist">风雨雪三查</a>
+                                            </li>
+                                            <li has-func="119" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.safeproduce.safeCheck.ttplist">五温检查</a>
+                                            </li>
+                                            <li has-func="120" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.safeproduce.safeCheck.otherchecklist">其他检查</a>
+                                            </li>
+                                        </ul>
+                                    </li>
+                                </ul>
+                                <!--三级菜单结束-->
                             </li>
                     
                 </ul>
@@ -1538,89 +1624,7 @@
                             </li>
                             <!--粮情卡结束-->
 
-                            <!--安全生产开始-->
-                            <li data-menu-collapse><!--原: 安全生产-->
-                                <a has-func="94" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
-                                    粮食安全生产管理</a>
-                                <!--三级菜单开始-->
-                                <ul>
-                                    <li has-func="110" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.list({type:1})">安全生产管理制度</a>
-                                    </li>
-                                    <li has-func="111" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.list({type:2})">安全生产应急预案</a>
-                                    </li>
-                                    <li has-func="112" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.list({type:3})">安全生产管理责任</a>
-                                    </li>
-                                    <li has-func="180" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.notifyList">安全生产通告</a>
-                                    </li>
-                                    <li has-func="461" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.safeRiskLevelCtrl">安全风险分级管控</a>
-                                    </li>
-                                     <!-- <li has-func="462" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.safeDangerHandle">安全隐患跟踪处理</a>
-                                    </li>  -->
-                                    <li  data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.safeManage">安全隐患排查治理</a>
-                                    </li>
-                                    <!--<li has-func="181" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.recordList">粮库危险作业备案</a>
-                                    </li>-->
-                                    <li has-func="182" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.safeAccidentManageList">安全生产事故管理</a>
-                                    </li>
-                                    <li has-func="463" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.storage.safeproduce.rulelibrary">法律规章信息库</a>
-                                    </li>
-                                    <!--备案及实施情况的管理-->
-                                    <!--<li data-menu-collapse>
-                                        <a has-func="185" href="#">
-                                            <i class="fa fa-lg fa-fw fa-folder-open"></i>备案管理
-                                        </a>
-                                        <ul>
-                                            <li has-func="186" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.recordManage.fumigationPlan">熏蒸方案</a>
-                                            </li>
-                                            <li has-func="187" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.recordManage.fumigationProcess">熏蒸过程</a>
-                                            </li>
-                                            <li has-func="188" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.recordManage.fumigationDealWith">善后工作</a>
-                                            </li>
-                                        </ul>
-                                    </li>-->
-
-                                    <li data-menu-collapse><!--原名: 粮情检查管理-->
-                                        <a has-func="118" href="#">
-                                            <i class="fa fa-lg fa-fw fa-folder-open"></i>
-                                            安全检查
-                                        </a>
-                                        <ul>
-                                            <li has-func="405" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.safeCheck.dailyList">日常检查</a>
-                                            </li>
-											<li has-func="336" data-ui-sref-active="active">
-				                                <a data-ui-sref="app.storage.safeproduce.safeCheck.insectPestDetectionList">虫害检查</a>
-				                            </li>
-                                            <li has-func="183" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.safeCheck.fbelist">节前安全检查</a>
-                                            </li>
-                                            <li has-func="184" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.safeCheck.wrslist">风雨雪三查</a>
-                                            </li>
-                                            <li has-func="119" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.safeCheck.ttplist">五温检查</a>
-                                            </li>
-                                            <li has-func="120" data-ui-sref-active="active">
-                                                <a data-ui-sref="app.storage.safeproduce.safeCheck.otherchecklist">其他检查</a>
-                                            </li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                                <!--三级菜单结束-->
-                            </li>
+                         
                             <!--安全生产结束-->
                             <!--转储管理开始-->
                             <!--                             <li has-func="256" data-ui-sref-active="active"> -->

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

@@ -193,4 +193,425 @@ angular.module('app.log', ['ui.router', 'datatables', 'datatables.bootstrap'])
 	                }
 	            }
 	        })
-	});
+	});
+
+angular.module('app.safeproduce', ['ui.router', 'datatables', 'datatables.bootstrap'])
+.config(function ($stateProvider) {
+    $stateProvider
+        .state('app.safeproduce', {
+            abstract: true,
+            data: {
+                title: '安全生产 / 安全管理'
+            }
+        })
+        //----------------安全生产开始---------------//
+            .state('app.safeproduce.list', {
+                url: '/safeproduce/list/:type/:layerType',
+                data: {
+                    title: '安全生产管理'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeproduceCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-list.html'
+                    }
+                }
+            })
+
+            // 安全风险等级管控
+            .state('app.safeproduce.safeRiskLevelCtrl', {
+                url: '/safeproduce/riskLevelCtrl',
+                data: {
+                    title: '安全风险分级管控'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceRiskCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-list.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeRiskAdd', {
+                url: '/safeproduce/riskLevelCtrl/:id/:isNotEdit',
+                data: {
+                    title: '安全风险分级管控编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceRiskCtrlSave',
+                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-edit.html'
+                    }
+                }
+            })
+            // 安全隐患跟踪处理
+            .state('app.safeproduce.safeDangerHandle', {
+                url: '/safeproduce/dangerHandle',
+                data: {
+                    title: '安全隐患跟踪处理'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceDangerHandle',
+                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-list.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeProduceDangerHandleSave', {
+                url: '/safeproduce/dangerHandle/:id/:isNotEdit',
+                data: {
+                    title: '安全隐患跟踪处理编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceDangerHandleSave',
+                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-edit.html'
+                    }
+                }
+            })
+
+            /*--------------安全生产通知---------------*/
+            .state('app.safeproduce.notifyList', {
+                url: '/safeproduce/list',
+                data: {
+                    title: '安全生产通告'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceNotifyCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-list.html'
+                    }
+                }
+            })
+
+            .state('app.safeproduce.notifyAdd', {
+                url: '/safeproduce/add/:id/:isNotEdit/:topRow',
+                data: {
+                    title: '安全生产通知编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceNotifySaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-edit.html'
+                    }
+                }
+            })
+
+            .state('app.safeproduce.notifyView', {
+                url: '/safeproduce/view/:id/:isNotEdit',
+                data: {
+                    title: '安全生产通知查看'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeProduceNotifySaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-view.html'
+                    }
+                }
+            })
+            /*--------------法律规章信息库---------------*/
+            .state('app.safeproduce.rulelibrary', {
+                url: '/rulelibrary/list',
+                data: {
+                    title: '法律规章信息库'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'rulelibraryCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/ruleLibrary.html'
+                    }
+                }
+            })
+            // 安全事故管理
+            .state('app.safeproduce.safeAccidentManageList', {
+                url: '/safeproduce/safeAccidentManageList',
+                data: {
+                    title: '安全生产事故管理'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeAccidentManageCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeAccidentManage-list.html'
+                    }
+                }
+            })
+            // 编辑
+            .state('app.safeproduce.safeAccidentManageList.edit', {
+                url: '/safeproduce/safeAccidentManageEdit/:id/:isNotEdit',
+                data: {
+                    title: '安全事故管理编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeAccidentManageSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeAccidentManage-edit.html'
+                    }
+                }
+            })
+            // ---------------------备案及实施情况的管理------------------- //
+            // 三级路由--备案管理
+            .state('app.safeproduce.recordManage', {
+                abstract: true,
+                data: {
+                    title: '备案管理'
+                }
+            })
+            // ----------安全检查---------//
+            // 三级路由--安全检查
+            .state('app.safeproduce.safeCheck', {
+                abstract: true,
+                data: {
+                    title: '安全检查'
+                }
+            })
+            //日常检查
+            .state('app.safeproduce.safeCheck.dailyList', {
+                url: '/safeproduce/safeCheck/dailyList',
+                data: {
+                    title: '日常检查'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'dailyListCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-list.html'
+                    }
+                }
+            })
+             //日常检查新增
+             .state('app.safeproduce.safeCheck.dailyList.add', {
+                url: '/safeproduce/safeCheck/dailyList/add/:id/:isNotEdit',
+                data: {
+                    title: '新增'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'dailyListAddCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-add.html'
+                    }
+                }
+            })
+            //日常检查修改
+             .state('app.safeproduce.safeCheck.dailyList.edit', {
+                url: '/safeproduce/safeCheck/dailyList/edit/:id/:isNotEdit',
+                data: {
+                    title: '修改'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'dailyListAddCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-add.html'
+                    }
+                }
+            })
+
+            // 节前安全检查
+            .state('app.safeproduce.safeCheck.fbelist', {
+                url: '/safeproduce/safeCheck/fbelist',
+                data: {
+                    title: '节前安全检查'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'festivalbeforeCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-list.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeCheck.fbelist.add', {
+                url: '/safeproduce/safeCheck/fbeadd/add/:id/:isNotEdit',
+                data: {
+                    title: '新增'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'festivalbeforeSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeCheck.fbelist.edit', {
+                url: '/safeproduce/safeCheck/fbeedit/edit/:id/:isNotEdit',
+                data: {
+                    title: '修改'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'festivalbeforeSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeCheck.fbelist.view', {
+                url: '/safeproduce/safeCheck/fbeedit/view/:id/:isNotEdit',
+                data: {
+                    title: '查看'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'festivalbeforeSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
+                    }
+                }
+            })
+
+            // 风雨雪三查
+            .state('app.safeproduce.safeCheck.wrslist', {
+                url: '/safeproduce/safeCheck/wrslist',
+                data: {
+                    title: '风雨雪三查'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'windrainsnowCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-list.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeCheck.wrslist.add', {
+                url: '/safeproduce/safeCheck/wrslist/add/:id/:isNotEdit',
+                data: {
+                    title: '新增'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'windrainsnowSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeCheck.wrslist.edit', {
+                url: '/safeproduce/safeCheck/wrslist/edit/:id/:isNotEdit',
+                data: {
+                    title: '修改'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'windrainsnowSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
+                    }
+                }
+            })
+            .state('app.safeproduce.safeCheck.wrslist.view', {
+                url: '/safeproduce/safeCheck/wrslist/view/:id/:isNotEdit',
+                data: {
+                    title: '查看'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'windrainsnowSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
+                    }
+                }
+            })
+
+            // 五温检查
+            .state('app.safeproduce.safeCheck.ttplist', {
+                url: '/safeproduce/safeCheck/ttplist/:houseId',
+                data: {
+                    title: '五温检查'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'threetempCheckCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-threetempcheck-list.html'
+                    }
+                },
+                resolve: {
+                    scripts: function(lazyScript){
+                        return lazyScript.register([
+                            'build/vendor.graphs.js'
+                        ]);
+                    }
+                }
+            })
+
+            // 其他检查
+            .state('app.safeproduce.safeCheck.otherchecklist', {
+                url: '/safeproduce/safeCheck/otherchecklist',
+                data: {
+                    title: '其他检查'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'foodotherCheckCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safeproduce-foodothercheck-list.html'
+                    }
+                },
+                resolve: {
+                    scripts: function(lazyScript){
+                        return lazyScript.register([
+                            'build/vendor.graphs.js'
+                        ]);
+                    }
+                }
+            })
+            
+            // 虫害检测
+	        .state('app.safeproduce.safeCheck.insectPestDetectionList', {
+	                url: '/safeproduce/safeCheck/insectPestDetectionList/:show/:vCfCode',
+	                data: {
+	                    title: '虫害检测列表'
+	                },
+	                views: {
+	                    "content@app": {
+	                        controller: 'insectPestDetectionNewCtrl',
+	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetection-list.html'
+	                    }
+	                }
+	            }
+	        )
+	        // 虫害手工录入
+	        .state('app.safeproduce.safeCheck.insectPestDetectionEdit', {
+	                url: '/safeproduce/safeCheck/insectPestDetectionEdit/:id/:butType',
+	                data: {
+	                    title: '虫害检测数据'
+	                },
+	                views: {
+	                    "content@app": {
+	                        controller: 'insectPestEditNewCtrl',
+	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetection-edit.html'
+	                    }
+	                }
+	            }
+	        )
+	        // 虫害检测图表展示
+	        .state('app.safeproduce.safeCheck.insectPestDetectionList.chart', {
+	                url: '/safeproduce/safeCheck/insectPestDetectionList/chart',
+	                data: {
+	                    title: '虫害检测图表'
+	                },
+	                views: {
+	                    "content@app": {
+	                        controller: 'insectPestDetectionChartNew',
+	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetectionChart.html'
+	                    }
+	                }
+	            }
+	        )
+
+            //安全隐患排查治理
+            .state('app.safeproduce.safeManage', {
+                url: '/safeproduce/safeManage/safeManageList',
+                data: {
+                    title: '安全隐患排查治理'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeManageCtrl',
+                        templateUrl: 'app/storage/safe-manage/views/safeManage-list.html'
+                    }
+                }
+            })
+
+            .state('app.safeproduce.safeManage.edit', {
+                url: '/safeproduce/safeManage/safeManageEdit/:id/:butType',
+                data: {
+                    title: '安全隐患排查治理详情'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safeManageEditCtrl',
+                        templateUrl: 'app/storage/safe-manage/views/safeManage-edit.html'
+                    }
+                }
+            })
+});

src/main/resources/static/app/storage/controller/dailyListCtrl.js

@@ -90,17 +90,17 @@ angular.module('app.storage')
 
         //新增
         $scope.addDailyList=function () {
-            $state.go('app.storage.safeproduce.safeCheck.dailyList.add',{id:0,isNotEdit:false});
+            $state.go('app.safeproduce.safeCheck.dailyList.add',{id:0,isNotEdit:false});
         };
 
         //修改
         $scope.showEditFbe=function (id) {
-            $state.go('app.storage.safeproduce.safeCheck.dailyList.edit',{id:id,isNotEdit:false});
+            $state.go('app.safeproduce.safeCheck.dailyList.edit',{id:id,isNotEdit:false});
         };
 
         // 查看页面
         $scope.showViewOut = function(id) {
-            $state.go('app.storage.safeproduce.safeCheck.dailyList.add',{id:id,isNotEdit:true});
+            $state.go('app.safeproduce.safeCheck.dailyList.add',{id:id,isNotEdit:true});
         }
 
         // 根据id删除信息
@@ -263,7 +263,7 @@ angular.module('app.storage')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.storage.safeproduce.safeCheck.dailyList');
+                        $state.go('app.safeproduce.safeCheck.dailyList');
                     } else {
                         alert("保存失败！");
                     }

src/main/resources/static/app/storage/controller/festivalbeforeCtrl.js

@@ -83,15 +83,15 @@ angular.module('app.storage')
 
         // 显示增加页面
         $scope.showAddFbe=function () {
-            $state.go('app.storage.safeproduce.safeCheck.fbelist.add', {id:0,isNotEdit:false});
+            $state.go('app.safeproduce.safeCheck.fbelist.add', {id:0,isNotEdit:false});
         };
         //修改编辑页面
         $scope.showEditFbe = function (id) {
-            $state.go('app.storage.safeproduce.safeCheck.fbelist.edit', {id:id,isNotEdit:false});
+            $state.go('app.safeproduce.safeCheck.fbelist.edit', {id:id,isNotEdit:false});
         };
         // 查看页面
         $scope.showViewFbe = function(id) {
-            $state.go('app.storage.safeproduce.safeCheck.fbelist.view', {id:id,isNotEdit:true});
+            $state.go('app.safeproduce.safeCheck.fbelist.view', {id:id,isNotEdit:true});
         };
 
         // 根据id删除信息
@@ -169,7 +169,7 @@ angular.module('app.storage')
                         if ($rootScope.previousState_name != '') {
                             $rootScope.back();
                         } else {
-                            $state.go('app.storage.safeproduce.safeCheck.fbelist');
+                            $state.go('app.safeproduce.safeCheck.fbelist');
                         }
                     } else {
                         alert("保存失败！");

src/main/resources/static/app/storage/controller/safeAccidentManageCtrl.js

@@ -1,5 +1,5 @@
 "use strict";
-angular.module('app.storage').controller("safeAccidentManageCtrl", function($scope,$state, $rootScope, $stateParams,warehouseService,safeAccidentManageService) {
+angular.module('app.safeproduce').controller("safeAccidentManageCtrl", function($scope,$state, $rootScope, $stateParams,warehouseService,safeAccidentManageService) {
     // 安全事故管理列表
     $scope.pageInfo = {pageNum : 1, pageSize : 10};
     $scope.search = {};
@@ -14,12 +14,12 @@ angular.module('app.storage').controller("safeAccidentManageCtrl", function($sco
 
     // 显示增加页面
     $scope.showAddAccident=function () {
-        $state.go('app.storage.safeproduce.safeAccidentManageList.edit', {id:0,isNotEdit:false});
+        $state.go('app.safeproduce.safeAccidentManageList.edit', {id:0,isNotEdit:false});
     };
 
     // 调转详情页面
     $scope.showDetails=function (id) {
-        $state.go('app.storage.safeproduce.safeAccidentManageList.edit', {id:id,isNotEdit:true});
+        $state.go('app.safeproduce.safeAccidentManageList.edit', {id:id,isNotEdit:true});
     };
 
     // 翻页

src/main/resources/static/app/storage/controller/safeProduceDangerHandle.js

@@ -42,14 +42,14 @@ angular
       };
       // 添加页面
       $scope.showAddDanger = function () {
-        $state.go("app.storage.safeproduce.safeProduceDangerHandleSave", {
+        $state.go("app.safeproduce.safeProduceDangerHandleSave", {
           id: 0,
           isNotEdit: false,
         });
       };
       // 修改编辑页面
       $scope.showEditDanger = function (id) {
-        $state.go("app.storage.safeproduce.safeProduceDangerHandleSave", {
+        $state.go("app.safeproduce.safeProduceDangerHandleSave", {
           id: id,
           isNotEdit: false,
         });
@@ -57,7 +57,7 @@ angular
 
       // 查看页面
       $scope.showViewDanger = function (id) {
-        $state.go("app.storage.safeproduce.safeProduceDangerHandleSave", {
+        $state.go("app.safeproduce.safeProduceDangerHandleSave", {
           id: id,
           isNotEdit: true,
         });
@@ -187,7 +187,7 @@ angular
       };
       // 返回
       $scope.backLayer = function () {
-        $state.go("app.storage.safeproduce.safeDangerHandle");
+        $state.go("app.safeproduce.safeDangerHandle");
       };
     }
   );

src/main/resources/static/app/storage/controller/safeProduceNotifyCtrl.js

@@ -1,6 +1,6 @@
 "use strict";
 
-angular.module('app.storage').controller("safeProduceNotifyCtrl", function($scope,safeProduceNotifyService,$state, $http,$rootScope, $stateParams, APP_CONFIG) {
+angular.module('app.safeproduce').controller("safeProduceNotifyCtrl", function($scope,safeProduceNotifyService,$state, $http,$rootScope, $stateParams, APP_CONFIG) {
     //安全生产通告列表
     $scope.pageInfo = {pageNum : 1, pageSize : 10};
     $scope.search = {fileName:""};
@@ -23,15 +23,15 @@ angular.module('app.storage').controller("safeProduceNotifyCtrl", function($scop
 
     // 显示增加页面
     $scope.showAddNotify=function () {
-        $state.go('app.storage.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+        $state.go('app.safeproduce.notifyAdd', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
     };
     //修改编辑页面
     $scope.showEditNotify = function (id) {
-        $state.go('app.storage.safeproduce.notifyAdd', {id:id,isNotEdit:false});
+        $state.go('app.safeproduce.notifyAdd', {id:id,isNotEdit:false});
     };
     // 查看页面
     $scope.showViewNotify = function(id) {
-        $state.go('app.storage.safeproduce.notifyAdd', {id:id,isNotEdit:true});
+        $state.go('app.safeproduce.notifyAdd', {id:id,isNotEdit:true});
     };
 
     // 根据id删除信息
@@ -111,7 +111,7 @@ angular.module('app.storage').controller("safeProduceNotifyCtrl", function($scop
         
         //返回
 	    $scope.backLayer = function(){
-	    	$state.go('app.storage.safeproduce.notifyList');
+	    	$state.go('app.safeproduce.notifyList');
 	    }
 
     });

src/main/resources/static/app/storage/controller/safeProduceRiskCtrl.js

@@ -45,14 +45,14 @@ angular
       };
       // 添加页面
       $scope.showAddRisk = function () {
-        $state.go("app.storage.safeproduce.safeRiskAdd", {
+        $state.go("app.safeproduce.safeRiskAdd", {
           id: 0,
           isNotEdit: false,
         });
       };
       // 修改编辑页面
       $scope.showEditRisk = function (id) {
-        $state.go("app.storage.safeproduce.safeRiskAdd", {
+        $state.go("app.safeproduce.safeRiskAdd", {
           id: id,
           isNotEdit: false,
         });
@@ -60,7 +60,7 @@ angular
 
       // 查看页面
       $scope.showViewRisk = function (id) {
-        $state.go("app.storage.safeproduce.safeRiskAdd", {
+        $state.go("app.safeproduce.safeRiskAdd", {
           id: id,
           isNotEdit: true,
         });
@@ -162,7 +162,7 @@ angular
       };
       // 返回
       $scope.backLayer = function () {
-        $state.go("app.storage.safeproduce.safeRiskLevelCtrl");
+        $state.go("app.safeproduce.safeRiskLevelCtrl");
       };
     }
   );

src/main/resources/static/app/storage/controller/windrainsnowCtrl.js

@@ -83,15 +83,15 @@ angular.module('app.storage')
 
         // 显示增加页面
         $scope.showAddWrs=function () {
-            $state.go('app.storage.safeproduce.safeCheck.wrslist.add', {id:0,isNotEdit:false});
+            $state.go('app.safeproduce.safeCheck.wrslist.add', {id:0,isNotEdit:false});
         };
         //修改编辑页面
         $scope.showEditWrs = function (id) {
-            $state.go('app.storage.safeproduce.safeCheck.wrslist.edit', {id:id,isNotEdit:false});
+            $state.go('app.safeproduce.safeCheck.wrslist.edit', {id:id,isNotEdit:false});
         };
         // 查看页面
         $scope.showViewWrs = function(id) {
-            $state.go('app.storage.safeproduce.safeCheck.wrslist.view', {id:id,isNotEdit:true});
+            $state.go('app.safeproduce.safeCheck.wrslist.view', {id:id,isNotEdit:true});
         };
 
         // 根据id删除信息
@@ -168,7 +168,7 @@ angular.module('app.storage')
                 }).then(function successCallback(response) {
                     if (response.data.status == "success") {
                         alert("保存成功！");
-                        $state.go('app.storage.safeproduce.safeCheck.wrslist');
+                        $state.go('app.safeproduce.safeCheck.wrslist');
                         //   location.href = APP_CONFIG.baseUrl + '/#/safeproduce/wrslist';
                     } else {
                         alert("保存失败！");

src/main/resources/static/app/storage/insectPestDetection/controller/insectPestDetectionNewCtrl.js

@@ -61,7 +61,7 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
 
     // 新增、查看页面
     $scope.edit = function(id, butType) {
-        $state.go("app.storage.safeproduce.safeCheck.insectPestDetectionEdit", {id:id, butType:butType});
+        $state.go("app.safeproduce.safeCheck.insectPestDetectionEdit", {id:id, butType:butType});
     };
 
     // 获取所有仓房code

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

@@ -631,424 +631,15 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
 
 
 
-            //--------------------------------------安全生产------------------------------------------
+            /*//--------------------------------------安全生产------------------------------------------
             .state('app.storage.safeproduce', {
                 abstract: true,
                 data: {
                     title: '粮食安全生产管理'
                 }
-            })
-
-            //----------------安全生产开始---------------//
-            .state('app.storage.safeproduce.list', {
-                url: '/safeproduce/list/:type/:layerType',
-                data: {
-                    title: '文件管理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeproduceCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-list.html'
-                    }
-                }
-            })
-
-            // 安全风险等级管控
-            .state('app.storage.safeproduce.safeRiskLevelCtrl', {
-                url: '/safeproduce/riskLevelCtrl',
-                data: {
-                    title: '安全风险分级管控'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceRiskCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-list.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeRiskAdd', {
-                url: '/safeproduce/riskLevelCtrl/:id/:isNotEdit',
-                data: {
-                    title: '安全风险分级管控编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceRiskCtrlSave',
-                        templateUrl: 'app/storage/views/safeproduce/safeRiskLevelCtrl-edit.html'
-                    }
-                }
-            })
-            // 安全隐患跟踪处理
-            .state('app.storage.safeproduce.safeDangerHandle', {
-                url: '/safeproduce/dangerHandle',
-                data: {
-                    title: '安全隐患跟踪处理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceDangerHandle',
-                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-list.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeProduceDangerHandleSave', {
-                url: '/safeproduce/dangerHandle/:id/:isNotEdit',
-                data: {
-                    title: '安全隐患跟踪处理编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceDangerHandleSave',
-                        templateUrl: 'app/storage/views/safeproduce/safeDangerHandle-edit.html'
-                    }
-                }
-            })
-
-            /*--------------安全生产通知---------------*/
-            .state('app.storage.safeproduce.notifyList', {
-                url: '/safeproduce/list',
-                data: {
-                    title: '安全生产通告'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceNotifyCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-list.html'
-                    }
-                }
-            })
-
-            .state('app.storage.safeproduce.notifyAdd', {
-                url: '/safeproduce/add/:id/:isNotEdit/:topRow',
-                data: {
-                    title: '安全生产通知编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceNotifySaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-edit.html'
-                    }
-                }
-            })
-
-            .state('app.storage.safeproduce.notifyView', {
-                url: '/safeproduce/view/:id/:isNotEdit',
-                data: {
-                    title: '安全生产通知查看'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeProduceNotifySaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeProduceNotify-view.html'
-                    }
-                }
-            })
-            /*--------------法律规章信息库---------------*/
-            .state('app.storage.safeproduce.rulelibrary', {
-                url: '/rulelibrary/list',
-                data: {
-                    title: '法律规章信息库'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'rulelibraryCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/ruleLibrary.html'
-                    }
-                }
-            })
-            // 安全事故管理
-            .state('app.storage.safeproduce.safeAccidentManageList', {
-                url: '/safeproduce/safeAccidentManageList',
-                data: {
-                    title: '安全生产事故管理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeAccidentManageCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeAccidentManage-list.html'
-                    }
-                }
-            })
-            // 编辑
-            .state('app.storage.safeproduce.safeAccidentManageList.edit', {
-                url: '/safeproduce/safeAccidentManageEdit/:id/:isNotEdit',
-                data: {
-                    title: '安全事故管理编辑'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeAccidentManageSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeAccidentManage-edit.html'
-                    }
-                }
-            })
-            // ---------------------备案及实施情况的管理------------------- //
-            // 三级路由--备案管理
-            .state('app.storage.safeproduce.recordManage', {
-                abstract: true,
-                data: {
-                    title: '备案管理'
-                }
-            })
-            // ----------安全检查---------//
-            // 三级路由--安全检查
-            .state('app.storage.safeproduce.safeCheck', {
-                abstract: true,
-                data: {
-                    title: '安全检查'
-                }
-            })
-            //日常检查
-            .state('app.storage.safeproduce.safeCheck.dailyList', {
-                url: '/safeproduce/safeCheck/dailyList',
-                data: {
-                    title: '日常检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'dailyListCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-list.html'
-                    }
-                }
-            })
-             //日常检查新增
-             .state('app.storage.safeproduce.safeCheck.dailyList.add', {
-                url: '/safeproduce/safeCheck/dailyList/add/:id/:isNotEdit',
-                data: {
-                    title: '新增'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'dailyListAddCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-add.html'
-                    }
-                }
-            })
-            //日常检查修改
-             .state('app.storage.safeproduce.safeCheck.dailyList.edit', {
-                url: '/safeproduce/safeCheck/dailyList/edit/:id/:isNotEdit',
-                data: {
-                    title: '修改'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'dailyListAddCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-dailyList-add.html'
-                    }
-                }
-            })
-
-            // 节前安全检查
-            .state('app.storage.safeproduce.safeCheck.fbelist', {
-                url: '/safeproduce/safeCheck/fbelist',
-                data: {
-                    title: '节前安全检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-list.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeCheck.fbelist.add', {
-                url: '/safeproduce/safeCheck/fbeadd/add/:id/:isNotEdit',
-                data: {
-                    title: '新增'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeCheck.fbelist.edit', {
-                url: '/safeproduce/safeCheck/fbeedit/edit/:id/:isNotEdit',
-                data: {
-                    title: '修改'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeCheck.fbelist.view', {
-                url: '/safeproduce/safeCheck/fbeedit/view/:id/:isNotEdit',
-                data: {
-                    title: '查看'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'festivalbeforeSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html'
-                    }
-                }
-            })
-
-            // 风雨雪三查
-            .state('app.storage.safeproduce.safeCheck.wrslist', {
-                url: '/safeproduce/safeCheck/wrslist',
-                data: {
-                    title: '风雨雪三查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-list.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeCheck.wrslist.add', {
-                url: '/safeproduce/safeCheck/wrslist/add/:id/:isNotEdit',
-                data: {
-                    title: '新增'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeCheck.wrslist.edit', {
-                url: '/safeproduce/safeCheck/wrslist/edit/:id/:isNotEdit',
-                data: {
-                    title: '修改'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
-                    }
-                }
-            })
-            .state('app.storage.safeproduce.safeCheck.wrslist.view', {
-                url: '/safeproduce/safeCheck/wrslist/view/:id/:isNotEdit',
-                data: {
-                    title: '查看'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'windrainsnowSaveCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-windrainsnowcheck-edit.html'
-                    }
-                }
-            })
-
-            // 五温检查
-            .state('app.storage.safeproduce.safeCheck.ttplist', {
-                url: '/safeproduce/safeCheck/ttplist/:houseId',
-                data: {
-                    title: '五温检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'threetempCheckCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-threetempcheck-list.html'
-                    }
-                },
-                resolve: {
-                    scripts: function(lazyScript){
-                        return lazyScript.register([
-                            'build/vendor.graphs.js'
-                        ]);
-                    }
-                }
-            })
+            })*/
 
-            // 其他检查
-            .state('app.storage.safeproduce.safeCheck.otherchecklist', {
-                url: '/safeproduce/safeCheck/otherchecklist',
-                data: {
-                    title: '其他检查'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'foodotherCheckCtrl',
-                        templateUrl: 'app/storage/views/safeproduce/safeproduce-foodothercheck-list.html'
-                    }
-                },
-                resolve: {
-                    scripts: function(lazyScript){
-                        return lazyScript.register([
-                            'build/vendor.graphs.js'
-                        ]);
-                    }
-                }
-            })
             
-            // 虫害检测
-	        .state('app.storage.safeproduce.safeCheck.insectPestDetectionList', {
-	                url: '/safeproduce/safeCheck/insectPestDetectionList/:show/:vCfCode',
-	                data: {
-	                    title: '虫害检测列表'
-	                },
-	                views: {
-	                    "content@app": {
-	                        controller: 'insectPestDetectionNewCtrl',
-	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetection-list.html'
-	                    }
-	                }
-	            }
-	        )
-	        // 虫害手工录入
-	        .state('app.storage.safeproduce.safeCheck.insectPestDetectionEdit', {
-	                url: '/safeproduce/safeCheck/insectPestDetectionEdit/:id/:butType',
-	                data: {
-	                    title: '虫害检测数据'
-	                },
-	                views: {
-	                    "content@app": {
-	                        controller: 'insectPestEditNewCtrl',
-	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetection-edit.html'
-	                    }
-	                }
-	            }
-	        )
-	        // 虫害检测图表展示
-	        .state('app.storage.safeproduce.safeCheck.insectPestDetectionList.chart', {
-	                url: '/safeproduce/safeCheck/insectPestDetectionList/chart',
-	                data: {
-	                    title: '虫害检测图表'
-	                },
-	                views: {
-	                    "content@app": {
-	                        controller: 'insectPestDetectionChartNew',
-	                        templateUrl: 'app/storage/insectPestDetection/view/insectPestDetectionChart.html'
-	                    }
-	                }
-	            }
-	        )
-
-            //安全隐患排查治理
-            .state('app.storage.safeproduce.safeManage', {
-                url: '/safeproduce/safeManage/safeManageList',
-                data: {
-                    title: '安全隐患排查治理'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeManageCtrl',
-                        templateUrl: 'app/storage/safe-manage/views/safeManage-list.html'
-                    }
-                }
-            })
-
-            .state('app.storage.safeproduce.safeManage.edit', {
-                url: '/safeproduce/safeManage/safeManageEdit/:id/:butType',
-                data: {
-                    title: '安全隐患排查治理详情'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'safeManageEditCtrl',
-                        templateUrl: 'app/storage/safe-manage/views/safeManage-edit.html'
-                    }
-                }
-            })
             
             /*****************转储管理 start****************/
             .state('app.storage.dumpList', {

src/main/resources/static/app/storage/safe-manage/controller/safeManageCtrl.js

@@ -25,7 +25,7 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 
  	//新增、修改或查看
     $scope.edit = function(id, butType) {
-    	$state.go('app.storage.safeproduce.safeManage.edit', {id:id, butType:butType});
+    	$state.go('app.safeproduce.safeManage.edit', {id:id, butType:butType});
     };
 
     //刪除
@@ -298,7 +298,7 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 						safeManageService.save($scope.safeManage,angular.toJson($scope.fileIds),angular.toJson($scope.deleteFileIds)).then(function (data) {
 							if (data.status == "200") {
 								alert(data.msg);
-								$state.go('app.storage.safeproduce.safeManage');
+								$state.go('app.safeproduce.safeManage');
 							} else {
 								alert(data.msg);
 							}
@@ -308,7 +308,7 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 					safeManageService.save($scope.safeManage,angular.toJson($scope.fileIds),angular.toJson($scope.deleteFileIds)).then(function (data) {
 						if (data.status == "200") {
 							alert(data.msg);
-							$state.go('app.storage.safeproduce.safeManage');
+							$state.go('app.safeproduce.safeManage');
 						} else {
 							alert(data.msg);
 						}
@@ -319,7 +319,7 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 
 	$scope.retList = function(){
 		//$rootScope.back();
-		$state.go('app.storage.safeproduce.safeManage');
+		$state.go('app.safeproduce.safeManage');
 	};
 	
 	

src/main/resources/static/app/storage/views/index/storage-index.html

@@ -78,12 +78,12 @@
 			$("a[data-ui-sref='app.business.agent.basic.agentList']").click();
 		});
 		$("#safeproduce").click(function(){
-			$("a[data-ui-sref='app.storage.safeproduce.list({type:1})']").parents('li').each(function () {
+			$("a[data-ui-sref='app.safeproduce.list({type:1})']").parents('li').each(function () {
 				if($(this).attr("ng-show") == null && !$(this).hasClass('open')){//非顶级且当前不是打开的
 	                $(this).find("a:first").click();
 				}
             });
-			$("a[data-ui-sref='app.storage.safeproduce.list({type:1})']").click();
+			$("a[data-ui-sref='app.safeproduce.list({type:1})']").click();
 		});
 		$("#storehouse").click(function(){
 			$("a[data-ui-sref='app.storage.storehouse.houseinfo({type:1})']").parents('li').each(function () {

src/main/resources/static/app/synth/foodstuffTraces/controller/foodstuffTracesCtrl.js

@@ -310,7 +310,7 @@ angular.module('app.synth')
     		} else if (type == 'fyx') {
     			// 风雨雪三查
     			var isNotEdit = true;
-    	        $state.go('app.storage.safeproduce.wrsedit',{id:id,isNotEdit:isNotEdit});
+    	        $state.go('app.safeproduce.wrsedit',{id:id,isNotEdit:isNotEdit});
     		}
     	} else if (flowType == 'ckPlan') {
     		$state.go("app.business.plan-view",{id : id, processInstanceId : processInstanceId});

src/main/resources/static/app/synth/lifecycle/controller/lifecycleCtrl.js

@@ -155,7 +155,7 @@ angular.module('app.synth').controller("lifecycleCtrl", function($scope,$rootSco
     // 粮情信息
     $scope.showGrainAnalysisInfo = function (numbermanage) {
     	var ch = $rootScope.storehouseObj[numbermanage.ch].storehouseCode;
-    	$state.go('app.storage.safeproduce.safeCheck.ttplist',{houseId:ch});
+    	$state.go('app.safeproduce.safeCheck.ttplist',{houseId:ch});
     };
 
     // 出库明细

src/main/resources/static/app/synth/qualityTrace/controller/qualitySafeCtrl.js

@@ -74,7 +74,7 @@ angular.module('app.synth').controller("qualitySafeCtrl",function ($scope, $root
 
     	} else if (btnType == 3) {//粮情信息
     		var ch = $rootScope.storehouseObj[parseInt(obj.ch)].storehouseCode;
-    		$state.go('app.storage.safeproduce.safeCheck.ttplist',{houseId:ch});
+    		$state.go('app.safeproduce.safeCheck.ttplist',{houseId:ch});
     	} else if (btnType == 4) {//作业记录
     		$state.go("app.supervise.operation.ccZy", {houseId: parseInt(obj.ch)});
     	} else if (btnType == 5) {//报警信息

src/main/resources/static/app/synth/qualityTrace/controller/warehouseSourceCtrl.js

@@ -74,7 +74,7 @@ angular.module('app.synth').controller("warehouseSourceCtrl",function ($scope, $
 
     	} else if (btnType == 3) {
     		var ch = $rootScope.storehouseObj[parseInt(obj.ch)].storehouseCode;
-    		$state.go('app.storage.safeproduce.safeCheck.ttplist',{houseId:ch});
+    		$state.go('app.safeproduce.safeCheck.ttplist',{houseId:ch});
     	} else if (btnType == 4) {
     		$state.go("app.supervise.operation.ccZy", {houseId: parseInt(obj.ch)});
     	}

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

@@ -321,526 +321,5 @@ angular.module('app.system').config(function ($stateProvider) {
     })
     
     
-     /*----------------------------------------------客户------------------------------------*/
-    .state('app.system.customer', {
-        abstract: true,
-        data: {
-            title: '客户管理'
-        }
-    })
-    
-    .state('app.system.customer.list', {
-        url: '/system/customer',
-        data: {
-            title: '客户档案管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerCtrl',
-                templateUrl: 'app/business/customer/views/customer-list.html'
-            }
-        }
-    })
-    .state('app.system.customer.add', {
-            url: '/system/customer/add/:id',
-            data: {
-                title: '客户档案新增'
-            },
-            views: {
-                "content@app": {
-                    controller: 'customerSaveCtrl as datatables',
-                    templateUrl: 'app/business/customer/views/customer-edit.html'
-                }
-            }
-        }
-    )
-    .state('app.system.customer.edit', {
-        url: '/system/customer/edit/:id',
-        data: {
-            title: '客户档案修改'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerSaveCtrl as datatables',
-                templateUrl: 'app/business/customer/views/customer-edit.html'
-            }
-        }
-    })
-    
-    
-    .state('app.system.customer.badrecord', {
-        url: '/system/customer/badrecord',
-        data: {
-            title: '客户不良记录管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerBadrecordCtrl',
-                templateUrl: 'app/business/customer/views/customerBadrecord-list.html'
-            }
-        }
-    })
-    
-    .state('app.system.customer.blackList', {
-        url: '/system/customer/blackList',
-        data: {
-            title: '客户黑名单管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'customerBlackListCtrl',
-                templateUrl: 'app/business/customer/views/customer-blackList.html'
-            }
-        }
-    })
-    
-    
-    //-----------------------------------------------------智能器材库------------------------------------------------------//
-        // 设备器材管理二级路由
-        .state('app.system.device', {
-            abstract: true,
-            data: {
-                title: '设备器材管理'
-            }
-        })
-        // 设备器材入库
-        .state('app.system.device.deviceStorageList', {
-            url: '/device/deviceStorageList',
-            data: {
-                title: '设备器材入库'
-            },
-            views: {
-                "content@app": {
-                    controller: 'deviceStorageCtrl',
-                    templateUrl: 'app/business/device/views/deviceStorage-list.html'
-                }
-            }
-        })
-        // 详情,编辑
-        .state('app.system.device.deviceStorageList.edit', {
-            url: '/device/deviceStorageList/edit/:id/:isNotEdit',
-            data: {
-                title: '设备器材入库详情'
-            },
-            views: {
-                "content@app": {
-                    controller: 'deviceStorageEditCtrl',
-                    templateUrl: 'app/business/device/views/deviceStorage-edit.html'
-                }
-            }
-        })
-        //----------------设备入库登记开始---------------//
-        .state('app.system.deviceInputList', {
-            url: '/deviceInputList',
-            data: {
-                title: '设备入库列表'
-            },
-            views: {
-                "content@app": {
-                    controller: 'deviceInputCtrl',
-                    templateUrl: 'app/business/device/views/deviceInput-list.html'
-                }
-            }
-        })  
-        .state('app.system.deviceInputAdd', {
-        	url: '/deviceInputAdd/:id/:isNotEdit',
-        	data: {
-        		title: '设备入库'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceInputCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
-        		}
-        	}
-        })  
-        .state('app.system.inputEdit', {
-        	url: '/inputEdit/:id/:isNotEdit',
-        	data: {
-        		title: '设备查看'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceInputCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceInput-edit.html'
-        		}
-        	}
-        })  
-        //----------------设备入库登记结束---------------//
-        
-        //----------------器材领用开始---------------//
-        .state('app.system.device.deviceGetList', {
-        	url: '/deviceGetList',
-        	data: {
-        		title: '机械器材领用'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-list.html'
-        		}
-        	}
-        })  
-        .state('app.system.device.deviceGetAdd', {
-        	url: '/deviceGetAdd',
-        	data: {
-        		title: '领用信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-add.html'
-        		}
-        	}
-        })  
-        .state('app.system.device.deviceGetBack', {
-        	url: '/deviceGetBack/:id/:getCount',
-        	data: {
-        		title: '归还信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetBackCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-back.html'
-        		}
-        	}
-        })  
-        .state('app.system.device.deviceChack', {
-        	url: '/deviceChack/:id',
-        	data: {
-        		title: '信息详情'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceGetBackCtrl',
-        			templateUrl: 'app/business/device/views/deviceGet-detail.html'
-        		}
-        	}
-        })  
-        //----------------器材领用结束---------------//
-
-        // 设备器材管理三级路由
-        .state('app.system.device.manage', {
-            abstract: true,
-            data: {
-                title: '设备管理'
-            }
-        })
-        //----------------器材保养开始---------------//
-        .state('app.system.device.manage.deviceKeepList', {
-        	url: '/deviceKeepList',
-        	data: {
-        		title: '器材保养'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceKeepCtrl',
-        			templateUrl: 'app/business/device/views/deviceKeep-list.html'
-        		}
-        	}
-        })  
-        .state('app.system.device.manage.deviceKeepAdd', {
-        	url: '/deviceKeepAdd',
-        	data: {
-        		title: '添加保养信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceKeepAddCtrl',
-        			templateUrl: 'app/business/device/views/deviceKeep-add.html'
-        		}
-        	}
-        }) 
-        .state('app.system.device.manage.deviceKeepMassage', {
-        	url: '/deviceKeepMassage/:id',
-        	data: {
-        		title: '保养信息明细'
-        	},
-        	views: {   
-        		"content@app": {
-        			controller: 'deviceKeepSelCtrl',
-        			templateUrl: 'app/business/device/views/deviceKeep-olist.html'
-        		}
-        	}
-        }) 
-         //----------------器材保养结束---------------//
-        
-         //----------------器材维修开始---------------//
-        .state('app.system.device.manage.deviceRepairList', {
-        	url: '/deviceRepairList',
-        	data: {
-        		title: '器材维修'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceRepairCtrl',
-        			templateUrl: 'app/business/device/views/deviceRepair-list.html'
-        		}
-        	}
-        })  
-        .state('app.system.device.manage.devicerepairAdd', {
-        	url: '/devicerepairAdd',
-        	data: {
-        		title: '添加维修信息'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceRepairAddCtrl',
-        			templateUrl: 'app/business/device/views/deviceRepair-add.html'
-        		}
-        	}
-        })  
-        .state('app.system.device.manage.deviceRepairMassage', {
-        	url: '/deviceRepairMassage/:id/:isNotEdit',
-        	data: {
-        		title: '维修信息明细'
-        	},
-        	views: {   
-        		"content@app": {
-        			controller: 'deviceRepairSaveCtrl',
-        			templateUrl: 'app/business/device/views/deviceRepair-olist.html'
-        		}
-        	}
-        }) 
-        
-        //----------------器材维修结束---------------//
-        
-        
-        //----------------设备报废开始---------------//
-        .state('app.system.device.manage.deviceOutList', {
-        	url: '/deviceOutList',
-        	data: {
-        		title: '设备报废'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceOutCtrl',
-        			templateUrl: 'app/business/device/views/deviceOut-list.html'
-        		}
-        	}
-        })  
-         //----------------设备报废结束---------------//
-        //----------------台账开始---------------//
-        .state('app.system.device.deviceAccountList', {
-        	url: '/deviceAccountList',
-        	data: {
-        		title: '台账'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceAccountCtrl',
-        			templateUrl: 'app/business/device/views/deviceAccount-list.html'
-        		}
-        	}
-        })
-        
-        .state('app.system.device.accountEdit', {
-        	url: '/accountEdit/:deviceType/:deviceName/:model/:isNotEdit',
-        	data: {
-        		title: '设备台账'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceInputCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceAccount-edit.html'
-        		}
-        	}
-        }) 
-         //----------------台账结束---------------//
-        .state('app.system.device.deviceCheckList', {
-        	url: '/deviceCheckList',
-        	data: {
-        		title: '盘点单'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceCheckCtrl',
-        			templateUrl: 'app/business/device/views/deviceCheck-list.html'
-        		}
-        	}
-        })
-        .state('app.system.device.checkAdd', {
-        	url: '/checkAdd',
-        	data: {
-        		title: '新建盘点单'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceCheckAddCtrl',
-        			templateUrl: 'app/business/device/views/deviceAdd.html'
-        		}
-        	}
-        })
-        .state('app.system.device.checkEdit', {
-        	url: '/checkEdit/:checkNumber/:isNotEdit',
-        	data: {
-        		title: '修改盘点单'
-        	},
-        	views: {
-        		"content@app": {
-        			controller: 'deviceCheckEditCtrl',
-        			templateUrl: 'app/business/device/views/deviceEdit.html'
-        		}
-        	}
-        })
-        //---------------------------------设施管理------------------------------------------------------
-         // 设施管理二级路由
-         .state('app.system.facility', {
-            abstract: true,
-            data: {
-                title: '设施管理'
-            }
-        })
-        //----------------设施基础信息维护开始---------------//
-        .state('app.system.facility.facilityStorageList', {
-            url: '/facilityStorageList',
-            data: {
-                title: '设施基础信息维护'
-            },
-            views: {
-                "content@app": {
-                    controller: 'facilityListCtrl',
-                    templateUrl: 'app/business/facility/views/facility-list.html'
-                }
-            }
-        })  
-        .state('app.system.facility.addFacility', {
-            url: '/addFacility/:isNotEdit/:facility?',
-            data: {
-                title: '新增设施'
-            },
-            views: {
-                "content@app": {
-                    controller: 'addfacilityCtrl',
-                    templateUrl: 'app/business/facility/views/add-facility.html'
-                }
-            }
-        })  
-        
-        //----------------设施基础信息维护结束---------------//
-        //----------------设施保养开始---------------//
-        .state('app.system.facility.facilityKeepList', {
-            url: '/facilityKeepList',
-            data: {
-                title: '设施保养'
-            },
-            views: {
-                "content@app": {
-                    controller: 'facilityKeepListCtrl',
-                    templateUrl: 'app/business/facility/views/facility-keep.html'
-                }
-            }
-        }) 
-        .state('app.system.facility.addFacilityKeep', {
-            url: '/addFacilityKeep/:isNotEdit/:facility?',
-            data: {
-                title: '添加设施保养信息'
-            },
-            views: {
-                "content@app": {
-                    controller: 'addfacilityKeepCtrl',
-                    templateUrl: 'app/business/facility/views/add-facility-keep.html'
-                }
-            }
-        })  
-        
-        //----------------设施保养结束---------------//
-         //----------------设施维修开始---------------//
-         .state('app.system.facility.facilityGetList', {
-            url: '/facilityGetList',
-            data: {
-                title: '设施维修'
-            },
-            views: {
-                "content@app": {
-                    controller: 'facilityGetListCtrl',
-                    templateUrl: 'app/business/facility/views/facility-get-list.html'
-                }
-            }
-        }) 
-        .state('app.system.facility.addFacilityGet', {
-            url: '/addfacilityGet/:isNotEdit/:facility?',
-            data: {
-                title: '添加设施维修信息'
-            },
-            views: {
-                "content@app": {
-                    controller: 'addFacilityGetCtrl',
-                    templateUrl: 'app/business/facility/views/add-facility-get.html'
-                }
-            }
-        })  
-        
-        //----------------设施维修结束---------------//
-        // //----------------设施报废开始---------------//
-        // .state('app.system.facility.facilityScrapList', {
-        //     url: '/facilityScrapList',
-        //     data: {
-        //         title: '设施报废'
-        //     },
-        //     views: {
-        //         "content@app": {
-        //             controller: 'facilityScrapListCtrl',
-        //             templateUrl: 'app/business/facility/views/facility-scraplist.html'
-        //         }
-        //     }
-        // }) 
-        // .state('app.system.facility.addFacilityScrap', {
-        //     url: '/addFacilityScrap',
-        //     data: {
-        //         title: '添加设施报废信息'
-        //     },
-        //     views: {
-        //         "content@app": {
-        //             controller: 'addFacilityScrapCtrl',
-        //             templateUrl: 'app/business/facility/views/add-facility-scrap.html'
-        //         }
-        //     }
-        // })  
-        
-        // //----------------设施报废结束---------------//
-        
-        
-        
-        //初始化员工信息调用
-    .state('app.system.keeperList', {
-    	url: '/keeperList',
-        data: {
-            title: '人员管理'
-        },
-        views: {
-            "content@app": {
-                controller: 'keeperCtrl',
-                templateUrl: 'app/basic/keeper/views/keeper-list.html'
-            }
-        }
-    })
-    
-    //点新增或修改保管员信息调用
-    .state('app.system.keeperEdit', {
-    	url: '/keeperEdit/:id/:showType',
-        data: {
-            title: '人员信息详情'
-        },
-        views: {
-            "content@app": {
-                controller: 'keeperCtrlEdit',
-                templateUrl: 'app/basic/keeper/views/keeper-edit.html'
-            }
-        }
-    })
-    //点查看跳转页面
-    .state('app.system.keeperView', {
-    	url: '/keeperView/:id/:types',
-        data: {
-            title: '人员信息展示'
-        },
-        views: {
-            "content@app": {
-                controller: 'keeperViewCtrl',
-                templateUrl: 'app/basic/keeper/views/keeper-view.html'
-            }
-        }
-    })
     
 })