feat: 安全管理

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

@@ -126,7 +126,7 @@ angular.module('app.business')
             $scope.facilityInfo = receiveFacility;
             $scope.deviceNameTreeData = [{ "id": null, "name": receiveFacility.ssfl, selected: true }];
         } else {
-            $scope.getDeviceName('', '5476');
+            $scope.getDeviceName('', '7255');
             $scope.facilityInfo = {
                 ssmc: '',
                 ssfl: '',

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

@@ -911,6 +911,15 @@
                                     <li has-func="182" data-ui-sref-active="active">
                                         <a data-ui-sref="app.storage.safeproduce.safeAccidentManageList">安全生产事故管理</a>
                                     </li>
+                                    <li data-ui-sref-active="active">
+                                        <a data-ui-sref="app.storage.safeproduce.safelevel">安全风险分级管控</a>
+                                    </li>
+                                    <li data-ui-sref-active="active">
+                                        <a data-ui-sref="app.storage.safeproduce.dangerHandel">安全隐患跟踪处理</a>
+                                    </li>
+                                    <li data-ui-sref-active="active">
+                                        <a data-ui-sref="app.storage.safeproduce.rulelibrary">法律规章信息库</a>
+                                    </li>
                                     <!--备案及实施情况的管理-->
                                     <!--<li data-menu-collapse>
                                         <a has-func="185" href="#">

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

@@ -0,0 +1,119 @@
+"use strict";
+
+angular.module('app.storage').controller("dangerHandelCtrl", function($scope,safeProduceNotifyService,$state, $http,$rootScope, $stateParams, APP_CONFIG) {
+    //安全生产通告列表
+    $scope.pageInfo = {pageNum : 1, pageSize : 10};
+    $scope.search = {fileName:""};
+    $scope.loadData = function() {
+        safeProduceNotifyService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.search.fileName)
+            .then(function(data){
+            $scope.pageInfo = data;
+        },function(data){
+            console.log(data);
+        });
+    };
+
+    $scope.loadData();
+
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    };
+
+    // 显示增加页面
+    $scope.showAddNotify=function () {
+        $state.go('app.storage.safeproduce.dangerHandelEdit', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    };
+    //修改编辑页面
+    $scope.showEditNotify = function (id) {
+        $state.go('app.storage.safeproduce.dangerHandelEdit', {id:id,isNotEdit:false});
+    };
+    // 查看页面
+    $scope.showViewNotify = function(id) {
+        $state.go('app.storage.safeproduce.dangerHandelEdit', {id:id,isNotEdit:true});
+    };
+
+    // 根据id删除信息
+    $scope.removeNotify = function(id) {
+        if (!confirm("确定要删除吗？")) {
+            return;
+        }
+        safeProduceNotifyService.removeById(id).then(function (data) {
+            if(data.status == "success"){
+                alert("删除成功");
+                $scope.loadData();
+            }else{
+                alert("删除失败");
+            }
+        });
+    }
+    
+})
+    .controller("dangerHandelSaveCtrl", function($scope,$rootScope, $state,$http,$stateParams,$filter,safeProduceNotifyService) {
+        $scope.safeProduceNotify={};
+        //下面的判断用于查看页面只读状态
+        if($stateParams.isNotEdit != null){
+            if ($stateParams.isNotEdit == "false") { // 修改
+                $scope.isNotEdit = false;
+            } else if ($stateParams.isNotEdit == "true") { // 查看
+                $scope.isNotEdit = true;
+            }
+        }else{
+            $scope.isNotEdit = false;
+        }
+
+        if ($stateParams.topRow != null) {
+            $scope.safeProduceNotify.notify=$stateParams.topRow;
+        }
+
+        $scope.loadDataById = function(id) {
+            safeProduceNotifyService.edit(id).then(function(data){
+                // console.log(data);
+                if (id==0){
+                    // 通告人
+                    $scope.safeProduceNotify.operator = $rootScope.userInfo.realName;
+                    // 通告来源
+                    $scope.safeProduceNotify.source = $rootScope.orgInfo.orgName;
+                    // 通告事件
+                    $scope.safeProduceNotify.operationTime = $filter('date')(new Date(), "yyyy-MM-dd");
+                }else{
+                    $scope.safeProduceNotify = data;
+                    $scope.safeProduceNotify.operationTime = $filter('date')($scope.safeProduceNotify.operationTime, "yyyy-MM-dd");
+                }
+            },function(data){
+                // console.log(data);
+            });
+        };
+
+        $scope.loadDataById($stateParams.id);
+
+        // 提交表单
+        var validator = $("#safeProduceNotify-form").validate();
+        $scope.saveData = function () {
+            if (validator.form()) {
+                $scope.safeProduceNotify.operationTime = $("input[name='operationTime']").val(); // 时间控件获取值
+                $scope.safeProduceNotify.orgId = $rootScope.orgInfo.orgId;
+                safeProduceNotifyService.save($scope.safeProduceNotify)
+                    .then(function(data){
+                    if (data.status == 'success') {
+                        alert("保存成功！");
+                        //$scope.back();
+                        $scope.backLayer();
+                    } else {
+                        alert("保存失败！");
+                    }
+                },function(data) {
+                    console.log(data);
+                });
+            }
+        }
+        
+        //返回
+	    $scope.backLayer = function(){
+	    	$state.go('app.storage.safeproduce.dangerHandel');
+	    }
+
+    });
+
+

src/main/resources/static/app/storage/controller/keepAccount/keepDetailedAccountCtrl.js

@@ -147,7 +147,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 	}
 	// 记账
 	$scope.bookkeep = function(event) {
-		$state.go('app.storage.account.keepingDetailedAccount', {id: event.dataid, type: 1});
+		$state.go('app.storage.account.keepingDetailedAccount', {account: event, type: 1});
 	}
 	// 翻页
 	$scope.goPage = function(pageNum) {
@@ -176,6 +176,11 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 	};
 	
 })
-.controller('keepingDetailedAccount', function($scope) {
-
+.controller('keepingDetailedAccount', function($scope, $stateParams, $rootScope) {
+	$scope.accountInfo = angular.fromJson($stateParams.account);
+	$scope.accountInfo.storehouseName = $rootScope.storehouseObj[$scope.accountInfo.ch].storehouseName;
+	$scope.accountInfo.warehouseName = $rootScope.warehouseObj[$scope.accountInfo.hwh].warehouseName;
+	$scope.accountInfo.lyxz = $rootScope.dicData[$scope.accountInfo.hwxz];
+	$scope.accountInfo.pz = $rootScope.dicData[$scope.accountInfo.pz];
+	$scope.accountInfo.dj = $rootScope.dicData[$scope.accountInfo.dj];
 });

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

@@ -0,0 +1,54 @@
+"use strict";
+
+angular.module('app.storage').controller("rulelibraryCtrl", function($scope,safeProduceNotifyService,$state, $http,$rootScope, $stateParams, APP_CONFIG) {
+    //安全生产通告列表
+    $scope.pageInfo = {pageNum : 1, pageSize : 10};
+    $scope.search = {fileName:""};
+    $scope.loadData = function() {
+        safeProduceNotifyService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.search.fileName)
+            .then(function(data){
+            $scope.pageInfo = data;
+        },function(data){
+            console.log(data);
+        });
+    };
+
+    $scope.loadData();
+
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    };
+
+    // 显示增加页面
+    $scope.showAddNotify=function () {
+        $state.go('app.storage.safeproduce.safeleveledit', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    };
+    //修改编辑页面
+    $scope.showEditNotify = function (id) {
+        $state.go('app.storage.safeproduce.safeleveledit', {id:id,isNotEdit:false});
+    };
+    // 查看页面
+    $scope.showViewNotify = function(id) {
+        $state.go('app.storage.safeproduce.safeleveledit', {id:id,isNotEdit:true});
+    };
+
+    // 根据id删除信息
+    $scope.removeNotify = function(id) {
+        if (!confirm("确定要删除吗？")) {
+            return;
+        }
+        safeProduceNotifyService.removeById(id).then(function (data) {
+            if(data.status == "success"){
+                alert("删除成功");
+                $scope.loadData();
+            }else{
+                alert("删除失败");
+            }
+        });
+    }
+    
+});
+
+

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

@@ -0,0 +1,119 @@
+"use strict";
+
+angular.module('app.storage').controller("safelevelCtrl", function($scope,safeProduceNotifyService,$state, $http,$rootScope, $stateParams, APP_CONFIG) {
+    //安全生产通告列表
+    $scope.pageInfo = {pageNum : 1, pageSize : 10};
+    $scope.search = {fileName:""};
+    $scope.loadData = function() {
+        safeProduceNotifyService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.search.fileName)
+            .then(function(data){
+            $scope.pageInfo = data;
+        },function(data){
+            console.log(data);
+        });
+    };
+
+    $scope.loadData();
+
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    };
+
+    // 显示增加页面
+    $scope.showAddNotify=function () {
+        $state.go('app.storage.safeproduce.safeleveledit', {id:0,isNotEdit:false,topRow:$rootScope.orgInfo.orgName+"通告:\n"});
+    };
+    //修改编辑页面
+    $scope.showEditNotify = function (id) {
+        $state.go('app.storage.safeproduce.safeleveledit', {id:id,isNotEdit:false});
+    };
+    // 查看页面
+    $scope.showViewNotify = function(id) {
+        $state.go('app.storage.safeproduce.safeleveledit', {id:id,isNotEdit:true});
+    };
+
+    // 根据id删除信息
+    $scope.removeNotify = function(id) {
+        if (!confirm("确定要删除吗？")) {
+            return;
+        }
+        safeProduceNotifyService.removeById(id).then(function (data) {
+            if(data.status == "success"){
+                alert("删除成功");
+                $scope.loadData();
+            }else{
+                alert("删除失败");
+            }
+        });
+    }
+    
+})
+    .controller("safelevelSaveCtrl", function($scope,$rootScope, $state,$http,$stateParams,$filter,safeProduceNotifyService) {
+        $scope.safeProduceNotify={};
+        //下面的判断用于查看页面只读状态
+        if($stateParams.isNotEdit != null){
+            if ($stateParams.isNotEdit == "false") { // 修改
+                $scope.isNotEdit = false;
+            } else if ($stateParams.isNotEdit == "true") { // 查看
+                $scope.isNotEdit = true;
+            }
+        }else{
+            $scope.isNotEdit = false;
+        }
+
+        if ($stateParams.topRow != null) {
+            $scope.safeProduceNotify.notify=$stateParams.topRow;
+        }
+
+        $scope.loadDataById = function(id) {
+            safeProduceNotifyService.edit(id).then(function(data){
+                // console.log(data);
+                if (id==0){
+                    // 通告人
+                    $scope.safeProduceNotify.operator = $rootScope.userInfo.realName;
+                    // 通告来源
+                    $scope.safeProduceNotify.source = $rootScope.orgInfo.orgName;
+                    // 通告事件
+                    $scope.safeProduceNotify.operationTime = $filter('date')(new Date(), "yyyy-MM-dd");
+                }else{
+                    $scope.safeProduceNotify = data;
+                    $scope.safeProduceNotify.operationTime = $filter('date')($scope.safeProduceNotify.operationTime, "yyyy-MM-dd");
+                }
+            },function(data){
+                // console.log(data);
+            });
+        };
+
+        $scope.loadDataById($stateParams.id);
+
+        // 提交表单
+        var validator = $("#safeProduceNotify-form").validate();
+        $scope.saveData = function () {
+            if (validator.form()) {
+                $scope.safeProduceNotify.operationTime = $("input[name='operationTime']").val(); // 时间控件获取值
+                $scope.safeProduceNotify.orgId = $rootScope.orgInfo.orgId;
+                safeProduceNotifyService.save($scope.safeProduceNotify)
+                    .then(function(data){
+                    if (data.status == 'success') {
+                        alert("保存成功！");
+                        //$scope.back();
+                        $scope.backLayer();
+                    } else {
+                        alert("保存失败！");
+                    }
+                },function(data) {
+                    console.log(data);
+                });
+            }
+        }
+        
+        //返回
+	    $scope.backLayer = function(){
+	    	$state.go('app.storage.safeproduce.safelevel');
+	    }
+
+    });
+
+

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

@@ -743,6 +743,69 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     }
                 }
             })
+            /*--------------安全风险分级管控---------------*/
+            .state('app.storage.safeproduce.safelevel', {
+                url: '/safelevel/list',
+                data: {
+                    title: '安全风险分级管控'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safelevelCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safelevel-list.html'
+                    }
+                }
+            })
+            .state('app.storage.safeproduce.safeleveledit', {
+                url: '/safeleveledit/:id/:isNotEdit/:topRow',
+                data: {
+                    title: '安全风险分级管控编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'safelevelSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/safelevel-edit.html'
+                    }
+                }
+            })
+            /*--------------安全隐患跟踪处理---------------*/
+            .state('app.storage.safeproduce.dangerHandel', {
+                url: '/dangerHandel/list',
+                data: {
+                    title: '安全隐患跟踪处理'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'dangerHandelCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/dangerHandel-list.html'
+                    }
+                }
+            })
+            .state('app.storage.safeproduce.dangerHandelEdit', {
+                url: '/dangerHandeledit/:id/:isNotEdit/:topRow',
+                data: {
+                    title: '安全隐患跟踪处理编辑'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'dangerHandelSaveCtrl',
+                        templateUrl: 'app/storage/views/safeproduce/dangerHandel-edit.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',
@@ -1384,7 +1447,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
             .state('app.storage.account.keepingDetailedAccount', {
-                url: '/storage/quantity/keepingDetailedAccount/:id/:type',// type: 1、记账 0、查看
+                url: '/storage/quantity/keepingDetailedAccount/:account/:type',// type: 1、记账 0、查看
                 data: {
                     title: '保管明细账记账'
                 },

src/main/resources/static/app/storage/views/keepAccount/houseKeepAccount-list.html

@@ -123,7 +123,7 @@
 			                        		<td>{{account.auditor}}</td>
 			                        		<td>
 			                        			<a href-void ng-hide="isArchive" ng-click="edit(account, 0)" ng-show="returnTotals"><i class="fa fa-plus"></i>记账</a>
-											    <a href-void ng-hide="true" ng-click="edit(account, 1)"><i class="fa fa-edit"></i>审核</a>
+											    <a href-void ng-click="edit(account, 1)"><i class="fa fa-edit"></i>审核</a>
 											    <a href-void ng-click="edit(account, 2)"><i class="fa fa-info-circle"></i>查看</a>
 											    <a href-void ng-hide="isArchive" ng-click="edit(account, 3)"><i class="fa fa-info-circle"></i>明细账</a>
 											</td>

src/main/resources/static/app/storage/views/keepAccount/keepDetailedAccount-edit.html

@@ -34,29 +34,23 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="fcbgz.lcmc" ng-readonly="true">
+													<input type="text" ng-model="accountInfo.lcmc" ng-readonly="true">
 												</label>
 											</th>
 											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">仓房/油罐名称</label>
 											</th>
 											<th>
-												<label class="select">
-													<select ng-model="account.houseId" class="form-control input-sm" ng-disabled="true"
-														ng-options="store.storehouseId as store.storehouseName for store in store_tank_list" >
-														<option value="">请选择</option>
-													</select>
+												<label class="input">
+													<input type="text" ng-model="accountInfo.storehouseName" ng-readonly="true">
 												</label>
 											</th>
 											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">货位名称</label>
 											</th>
 											<th>
-												<label class="select">
-													<select ng-model="account.wareId" class="form-control input-sm" ng-disabled="true"
-														ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" >
-														<option value="">请选择</option>
-													</select>
+												<label class="input">
+													<input type="text" ng-model="accountInfo.warehouseName" ng-readonly="true">
 												</label>
 											</th>
 										</tr>
@@ -74,25 +68,23 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="fcbgz.hwxz" ng-readonly="true">
+													<input type="text" ng-model="accountInfo.lyxz" ng-readonly="true">
 												</label>
-												<input type="hidden" ng-model="account.hwxz" />
 											</th>
 											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">粮油名称</label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="fcbgz.pz" ng-readonly="true">
+													<input type="text" ng-model="accountInfo.pz" ng-readonly="true">
 												</label>
-												<input type="hidden" ng-model="account.lspz" />
 											</th>
 											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">日期</label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="account.rq" ng-disabled="true" 
+													<input type="text" ng-model="accountInfo.rq" ng-disabled="true" 
 													required class="form-control datepicker" data-smart-datepicker>
 												</label>
 <!-- 												<input type="hidden" ng-model="account.rq" -->
@@ -105,7 +97,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="account.remark" ng-readonly="true" class="form-control" />
+													<input type="text" ng-model="accountInfo.dj" ng-readonly="true" class="form-control" />
 												</label>
 											</th>
 											<th>
@@ -113,7 +105,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="account.remark" ng-readonly="true" class="form-control" />
+													<input type="text" ng-model="accountInfo.bpsf" ng-readonly="true" class="form-control" />
 												</label>
 											</th>
 											<th>
@@ -121,7 +113,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="account.remark" ng-readonly="true" class="form-control" />
+													<input type="text" ng-model="account.bpzz" ng-readonly="true" class="form-control" />
 												</label>
 											</th>
 										</tr>
@@ -131,7 +123,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="account.remark" ng-readonly="true" class="form-control" />
+													<input type="text" ng-model="account.lqgs" ng-readonly="true" class="form-control" />
 												</label>
 											</th>
 											<th>

src/main/resources/static/app/storage/views/keepAccount/keepTotalAccount-list.html

@@ -90,7 +90,7 @@
 			                        		<td>{{account.auditor}}</td>
 			                        		<td>
 			                        			<a href-void ng-click="edit(account, 0)"><i class="fa fa-plus"></i>记账</a> 
-											    <a href-void ng-hide="true" ng-click="edit(account, 1)"><i class="fa fa-edit"></i>审核</a>
+											    <a href-void ng-click="edit(account, 1)"><i class="fa fa-edit"></i>审核</a>
 											    <a href-void ng-click="edit(account, 2)"><i class="fa fa-info-circle"></i>查看</a>
 											    <a href-void ng-click="edit(account, 3)"><i class="fa fa-info-circle"></i>分仓账</a>
 											</td>

src/main/resources/static/app/storage/views/keepAccount/keepVoucher.html

@@ -88,6 +88,13 @@
                                                 <td>{{account.kcsl}}</td>
                                                 <td>{{account.kcsl}}</td>
                                                 <td>{{account.kcsl}}</td>
+                                                <td>{{account.kcsl}}</td>
+                                                <td>{{account.kcsl}}</td>
+                                                <td>
+                                                    <a href-void ng-hide="isArchive" ng-click="edit(account, 0)" ng-show="returnTotals"><i class="fa fa-plus"></i>记账</a>
+                                                    <a href-void ng-click="edit(account, 1)"><i class="fa fa-edit"></i>审核</a>
+                                                    <a href-void ng-click="edit(account, 2)"><i class="fa fa-info-circle"></i>查看</a>
+                                                </td>
                                             </tr>
                                         </tbody>
                                     </table>

src/main/resources/static/app/storage/views/safeproduce/dangerHandel-edit.html

@@ -0,0 +1,98 @@
+<div id="content">
+    <section id="widget-grid" widget-grid>
+        <div class="row">
+            <article class="col-sm-12 col-md-12 col-lg-12">
+                <div jarvis-widget id="form-grid-widget" data-widget-colorbutton="false" data-widget-editbutton="false"
+                     data-widget-custombutton="false">
+                    <div>
+                        <div class="widget-body no-padding">
+                            <form id="safeProduceNotify-form" class="smart-form" data-validator-option="validateOptions" novalidate="novalidate">
+                                <button type="submit" class="bv-hidden-submit" style="display: none; width: 0px; height: 0px;"></button>
+                                <header>
+                                    <a href-void class="btn btn-default btn-xs" ng-click="backLayer()">
+                                        <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+                                    </a>
+                                    &nbsp;<strong>安全生产通告编辑</strong>
+                                </header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">单位名称：<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.fileName" name="fileName"  ng-disabled="isNotEdit" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">整改时限：<span style="color: red;">*</span></label>
+                                            
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.operationTime" name="operationTime" ng-readonly="true" ng-disabled="isNotEdit"
+                                                       onClick="WdatePicker({lang:'zh-cn'})" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">责任单位:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.operator" name="operator" ng-disabled="true">
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">责任人:</label>
+                                            <label class="select">
+                                                <input type="text" ng-model="safeProduceNotify.operator" name="operator" ng-disabled="true">
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">隐患信息<span style="color: red;">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">隐患排查信息<span style="color: red;">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">隐患整改信息<span style="color: red;">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify" required></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">事故基本信息<span style="color: red;">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify" required></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">隐患整改验收信息<span style="color: red;">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify" required></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                </fieldset>
+                                <footer class="modal-footer text-align-center">
+                                    <button ng-click="back()" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
+                                    <button ng-click="saveData()" type="button" class="btn btn-primary btn-lg" ng-hide="isNotEdit">提交</button>
+                                </footer>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/storage/views/safeproduce/dangerHandel-list.html

@@ -0,0 +1,91 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>安全风险分级管控</h2>
+                    </header>
+                    <div>
+                        <div class="widget-body no-padding">
+                            <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                                <div class="dt-toolbar">
+                                    <div class="col-xs-3 col-sm-1">
+                                        <a has-permission="578" href-void class="btn btn-primary btn-sm" ng-click="showAddNotify()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
+                                    </div>
+                                    <div class="col-xs-12 col-sm-6">
+                                        <div class="form-group">
+                                            <label> 
+                                                出入库日期：
+                                                <input style="width: 100px;" class="form-control" type="text"
+                                                           ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
+                                                           onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
+                                            --&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-disabled="isArchive"
+                                                           ng-model="search.searchEndDate" name="searchEndDate" id="endDate"
+                                                           onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
+                                                <!-- <input type="text" class="form-control" ng-model="search.beginDate" size="10" data-smart-datepicker> - 
+                                                <input type="text" class="form-control" ng-model="search.endDate" size="10" data-smart-datepicker> -->
+                                            </label>
+                                            
+                                            <a class="btn btn-default btn-sm" ng-click="loadData()">
+                                                <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-5 col-xs-6 hidden-xs">
+                                        <div class="dataTables_length" id="DataTables_Table_8_length">
+                                            <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+                                                                ng-options="num as num for num in [10,25,50,100]"
+                                                                class="form-control input-sm"></select> 条
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <table class="table table-striped table-bordered table-hover" width="100%">
+                                    <thead>
+                                    <tr>
+                                        <th data-hide="expand">序号</th>
+                                        <th data-class="expand">库区名称</th>
+                                        <th data-class="expand">隐患信息</th>
+                                        <th data-hide="expand">隐患排查信息</th>
+                                        <th data-hide="expand">隐患整改信息</th>
+                                        <th data-hide="expand">隐患责任人</th>
+                                        <th data-hide="expand">操作</th>
+                                    </tr>
+                                    </thead>
+
+                                    <tbody>
+                                    <tr ng-repeat="safeProduceNotify in pageInfo.list">
+                                        <td align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
+                                        <td>{{safeProduceNotify.fileName}}</td>
+                                        <td>{{safeProduceNotify.operationTime | date:'yyyy-MM-dd'}}</td>
+                                        <td>{{safeProduceNotify.operator}}</td>
+                                        <td>{{safeProduceNotify.source}}</td>
+                                        <td>{{safeProduceNotify.source}}</td>
+                                        <td>
+                                            <a has-permission="579" href-void ng-click="showViewNotify(safeProduceNotify.id)"><i class="fa fa-info-circle"></i>查看</a>
+                                            <a has-permission="580" href-void ng-click="showEditNotify(safeProduceNotify.id)"><i class="fa fa-edit"></i>修改</a>
+                                            <a has-permission="581" href-void ng-click="removeNotify(safeProduceNotify.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+
+                                </table>
+
+                                <div smart-include="app/layout/partials/page.tpl.html"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+    <!--<form id="download-form" method="post" target="_blank">
+        <input type="hidden" name="fileName" id="fileName">
+        <input type="hidden" name="filePaths" id="filePaths">
+    </form>-->
+</div>

src/main/resources/static/app/storage/views/safeproduce/ruleLibrary.html

@@ -0,0 +1,85 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>安全风险分级管控</h2>
+                    </header>
+                    <div>
+                        <div class="widget-body no-padding">
+                            <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                                <div class="dt-toolbar">
+                                    <div class="col-xs-3 col-sm-1">
+                                        <a has-permission="578" href-void class="btn btn-primary btn-sm" ng-click="showAddNotify()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
+                                    </div>
+                                    <div class="col-xs-12 col-sm-6">
+                                        <div class="form-group">
+                                            <label> 
+                                                出入库日期：
+                                                <input style="width: 100px;" class="form-control" type="text"
+                                                           ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
+                                                           onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
+                                            --&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-disabled="isArchive"
+                                                           ng-model="search.searchEndDate" name="searchEndDate" id="endDate"
+                                                           onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
+                                                <!-- <input type="text" class="form-control" ng-model="search.beginDate" size="10" data-smart-datepicker> - 
+                                                <input type="text" class="form-control" ng-model="search.endDate" size="10" data-smart-datepicker> -->
+                                            </label>
+                                            
+                                            <a class="btn btn-default btn-sm" ng-click="loadData()">
+                                                <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-5 col-xs-6 hidden-xs">
+                                        <div class="dataTables_length" id="DataTables_Table_8_length">
+                                            <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+                                                                ng-options="num as num for num in [10,25,50,100]"
+                                                                class="form-control input-sm"></select> 条
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <table class="table table-striped table-bordered table-hover" width="100%">
+                                    <thead>
+                                    <tr>
+                                        <th data-hide="expand">文件名称</th>
+                                        <th data-class="expand">类别</th>
+                                        <th data-class="expand">下发时间</th>
+                                        <th data-hide="expand">来源</th>
+                                        <th data-hide="expand">操作</th>
+                                    </tr>
+                                    </thead>
+
+                                    <tbody>
+                                    <tr ng-repeat="safeProduceNotify in pageInfo.list">
+                                        <td align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
+                                        <td>{{safeProduceNotify.fileName}}</td>
+                                        <td>{{safeProduceNotify.operationTime | date:'yyyy-MM-dd'}}</td>
+                                        <td>市平台</td>
+                                        <td>
+                                            <a has-permission="579" href-void ng-click="showViewNotify(safeProduceNotify.id)"><i class="fa fa-info-circle"></i>查看</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+
+                                </table>
+
+                                <div smart-include="app/layout/partials/page.tpl.html"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+    <!--<form id="download-form" method="post" target="_blank">
+        <input type="hidden" name="fileName" id="fileName">
+        <input type="hidden" name="filePaths" id="filePaths">
+    </form>-->
+</div>

src/main/resources/static/app/storage/views/safeproduce/safelevel-edit.html

@@ -0,0 +1,121 @@
+<div id="content">
+    <section id="widget-grid" widget-grid>
+        <div class="row">
+            <article class="col-sm-12 col-md-12 col-lg-12">
+                <div jarvis-widget id="form-grid-widget" data-widget-colorbutton="false" data-widget-editbutton="false"
+                     data-widget-custombutton="false">
+                    <div>
+                        <div class="widget-body no-padding">
+                            <form id="safeProduceNotify-form" class="smart-form" data-validator-option="validateOptions" novalidate="novalidate">
+                                <button type="submit" class="bv-hidden-submit" style="display: none; width: 0px; height: 0px;"></button>
+                                <header>
+                                    <a href-void class="btn btn-default btn-xs" ng-click="backLayer()">
+                                        <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+                                    </a>
+                                    &nbsp;<strong>安全生产通告编辑</strong>
+                                </header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">库点名称：<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.fileName" name="fileName"  ng-disabled="isNotEdit" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">识别人：<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.operationTime" name="operationTime" ng-readonly="true" ng-disabled="isNotEdit"
+                                                       onClick="WdatePicker({lang:'zh-cn'})" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">环节/部位：</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.operator" name="operator" ng-disabled="true">
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">风险等级：</label>
+                                            <label class="select">
+                                                <select ng-model="threetempcheck.checkSign" name="checkSign" required class="form-control" ng-disabled="isNotEdit">
+                                                    <option value="">--请选择--</option>
+                                                    <option value="1">A级-重大风险</option>
+                                                    <option value="1">B级-较大风险</option>
+                                                    <option value="1">C级-一般风险</option>
+                                                    <option value="1">D级-低风险</option>
+                                                </select>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">风险类型：</label>
+                                            <label class="select">
+                                                <select ng-model="threetempcheck.checkSign" name="checkSign" required class="form-control" ng-disabled="isNotEdit">
+                                                    <option value="">--请选择--</option>
+                                                    <option value="1">基础设施</option>
+                                                    <option value="2">网络安全</option>
+                                                    <option value="3">消防安全</option>
+                                                    <option value="4">用电安全</option>
+                                                    <option value="5">作业安全</option>
+                                                    <option value="6">用药安全</option>
+                                                    <option value="7">管理风险</option>
+                                                    <option value="8">其他风险</option>
+                                                </select>
+                                            </label>
+                                        </section>
+                                    </div>
+
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">风险辨识</label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">可能导致事故类型</label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12">
+                                            <label class="label">风险管控措施<span style="color: red;">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" cols="147" class="custom-scroll"  ng-model="safeProduceNotify.notify"  ng-disabled="isNotEdit" name="notify" required></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">责任部门
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.fileName" name="fileName"  ng-disabled="isNotEdit" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">责任人：
+                                            <label class="input">
+                                                <input type="text" ng-model="safeProduceNotify.operationTime" name="operationTime" ng-readonly="true" ng-disabled="isNotEdit"
+                                                       onClick="WdatePicker({lang:'zh-cn'})" required>
+                                            </label>
+                                        </section>
+                                    </div>
+                                </fieldset>
+                                <footer class="modal-footer text-align-center">
+                                    <button ng-click="back()" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
+                                    <button ng-click="saveData()" type="button" class="btn btn-primary btn-lg" ng-hide="isNotEdit">提交</button>
+                                </footer>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/storage/views/safeproduce/safelevel-list.html

@@ -0,0 +1,95 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>安全风险分级管控</h2>
+                    </header>
+                    <div>
+                        <div class="widget-body no-padding">
+                            <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                                <div class="dt-toolbar">
+                                    <div class="col-xs-3 col-sm-1">
+                                        <a has-permission="578" href-void class="btn btn-primary btn-sm" ng-click="showAddNotify()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
+                                    </div>
+                                    <div class="col-xs-12 col-sm-6">
+                                        <div class="form-group">
+                                            <label> 
+                                                出入库日期：
+                                                <input style="width: 100px;" class="form-control" type="text"
+                                                           ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
+                                                           onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
+                                            --&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-disabled="isArchive"
+                                                           ng-model="search.searchEndDate" name="searchEndDate" id="endDate"
+                                                           onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
+                                                <!-- <input type="text" class="form-control" ng-model="search.beginDate" size="10" data-smart-datepicker> - 
+                                                <input type="text" class="form-control" ng-model="search.endDate" size="10" data-smart-datepicker> -->
+                                            </label>
+                                            
+                                            <a class="btn btn-default btn-sm" ng-click="loadData()">
+                                                <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-5 col-xs-6 hidden-xs">
+                                        <div class="dataTables_length" id="DataTables_Table_8_length">
+                                            <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+                                                                ng-options="num as num for num in [10,25,50,100]"
+                                                                class="form-control input-sm"></select> 条
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <table class="table table-striped table-bordered table-hover" width="100%">
+                                    <thead>
+                                    <tr>
+                                        <th data-hide="expand">序号</th>
+                                        <th data-class="expand">环节/部位</th>
+                                        <th data-class="expand">风险辨识</th>
+                                        <th data-hide="expand"> 风险等级</th>
+                                        <th data-hide="expand">可能导致事故类型</th>
+                                        <th data-hide="expand">风险管控措施</th>
+                                        <th data-hide="expand">责任部门</th>
+                                        <th data-hide="expand">责任人</th>
+                                        <th data-hide="expand">操作</th>
+                                    </tr>
+                                    </thead>
+
+                                    <tbody>
+                                    <tr ng-repeat="safeProduceNotify in pageInfo.list">
+                                        <td align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
+                                        <td>{{safeProduceNotify.fileName}}</td>
+                                        <td>{{safeProduceNotify.operationTime | date:'yyyy-MM-dd'}}</td>
+                                        <td>{{safeProduceNotify.operator}}</td>
+                                        <td>{{safeProduceNotify.source}}</td>
+                                        <td>{{safeProduceNotify.source}}</td>
+                                        <td>{{safeProduceNotify.source}}</td>
+                                        <td>{{safeProduceNotify.source}}</td>
+                                        <td>
+                                            <a has-permission="579" href-void ng-click="showViewNotify(safeProduceNotify.id)"><i class="fa fa-info-circle"></i>查看</a>
+                                            <a has-permission="580" href-void ng-click="showEditNotify(safeProduceNotify.id)"><i class="fa fa-edit"></i>修改</a>
+                                            <a has-permission="581" href-void ng-click="removeNotify(safeProduceNotify.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+
+                                </table>
+
+                                <div smart-include="app/layout/partials/page.tpl.html"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+    <!--<form id="download-form" method="post" target="_blank">
+        <input type="hidden" name="fileName" id="fileName">
+        <input type="hidden" name="filePaths" id="filePaths">
+    </form>-->
+</div>