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

@@ -1,13 +1,12 @@
 "use strict";
 
-angular.module('app.storage').controller("rulelibraryCtrl", function($scope,safeProduceNotifyService,$state, $http,$rootScope, $stateParams, APP_CONFIG) {
-    //安全生产通告列表
+angular.module('app.storage').controller("rulelibraryCtrl", function($scope,lawRegulationInfoService,$state, $http,$rootScope, $stateParams, APP_CONFIG, $uibModal) {
+	
+    //获取数据
     $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;
+        lawRegulationInfoService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize).then(function(data){
+            $scope.pageInfo = data.data;
         },function(data){
             console.log(data);
         });
@@ -21,34 +20,50 @@ angular.module('app.storage').controller("rulelibraryCtrl", function($scope,safe
         $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("删除失败");
+	// 预览
+    $scope.preview = function (info) {
+        var uibModalInstance = $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/storage/views/safeproduce/ruleLibraryView.html',
+	        controller : 'ruleLibraryViewCtrl',
+            resolve: {
+                info: info,
+                type: function () {
+                    return $stateParams.type;
+                }
             }
         });
-    }
-    
-});
+    };
+
+	$scope.download = function(id) {
+		var url =  APP_CONFIG.depotStorageUrl + '/lawRegulationInfo/download?fileId=' + id
+		window.open(url)
+	}
+}).filter('systype', function() {
+	return function(value) {
+		if (value) {
+			var typeList = [
+				{
+					value: 1,
+					label: '法律法规',
+				},
+				{
+					value: 2,
+					label: '行业规定',
+				},
+				{
+					value: 3,
+					label: '相关标准',
+				},
+			]
+			for (var i = 0; i < typeList.length; i++) {
+				var e = typeList[i];
+				if(e.value == value) {
+					return e.label
+				}
+			}
+		}
+	}
+})
 
 

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

@@ -0,0 +1,42 @@
+"use strict";
+
+angular.module('app.storage').controller("ruleLibraryViewCtrl", function($scope,lawRegulationInfoService,$state, $http,$rootScope, $stateParams, APP_CONFIG, $uibModalInstance, info) {
+    $scope.info = info
+
+	// 关闭模态窗口
+	$scope.cancel = function() {
+		$uibModalInstance.close();
+	}
+	// 下载
+	$scope.download = function(id) {
+		var url =  APP_CONFIG.depotStorageUrl + '/lawRegulationInfo/download?fileId=' + id
+		window.open(url)
+	}
+}).filter('systype', function() {
+	return function(value) {
+		if (value) {
+			var typeList = [
+				{
+					value: 1,
+					label: '法律法规',
+				},
+				{
+					value: 2,
+					label: '行业规定',
+				},
+				{
+					value: 3,
+					label: '相关标准',
+				},
+			]
+			for (var i = 0; i < typeList.length; i++) {
+				var e = typeList[i];
+				if(e.value == value) {
+					return e.label
+				}
+			}
+		}
+	}
+})
+
+

src/main/resources/static/app/storage/service/lawRegulationInfoService.js

@@ -0,0 +1,22 @@
+"use strict";
+
+angular.module('app.storage').service("lawRegulationInfoService", function($http, $q, APP_CONFIG) {
+    this.getPageInfo = function(pageNum, pageSize){
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/lawRegulationInfo/getLawRegulationInfo',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+})

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

@@ -8,32 +8,16 @@
                 <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>
+                        <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">
@@ -48,22 +32,23 @@
                                 <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 style="text-align:center;" data-hide="expand">文件名称</th>
+                                        <th style="text-align:center;" data-class="expand">类别</th>
+                                        <th style="text-align:center;" data-class="expand">下发时间</th>
+                                        <th style="text-align:center;" data-hide="expand">来源</th>
+                                        <th style="text-align:center;" 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>
+                                    <tr ng-repeat="item in pageInfo.list">
+                                        <td style="text-align:center;">{{item.filename}}</td>
+                                        <td style="text-align:center;">{{item.sys_type | systype }}</td>
+                                        <td style="text-align:center;">{{item.upload_time}}</td>
+                                        <td style="text-align:center;">市平台</td>
+                                        <td style="text-align:center;">
+                                            <a has-permission="466" class="btn btn-xs btn-default no-margin" href-void="" ng-click="preview(item)" href="#"><i class="fa fa-edit"></i>查看</a>
+											<a has-permission="467" class="btn btn-xs btn-default no-margin" href-void="" ng-click="download(item.file_id)" href="#"><i class="fa fa-download"></i>下载</a>
                                         </td>
                                     </tr>
                                     </tbody>

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

@@ -0,0 +1,53 @@
+<div class="modal-content">
+	<div class="modal-header">
+		<button type="button" class="close" ng-click="cancel()">&times;</button>
+		<h4 class="modal-title" id="myModalLabel">法律规章文件查看</h4>
+	</div>
+	<div class="modal-body">
+		<form class="form-horizontal ng-pristine ng-valid">
+		    <fieldset>
+		    	<div class="form-group">
+			        <label class="col-md-2 control-label">文件名称</label>
+			        <div class="col-md-10">
+			            <input class="form-control" type="text" ng-model="info.filename" readonly="">
+			        </div>
+			    </div>
+		    	<div class="form-group">
+			        <label class="col-md-2 control-label">
+			        	<span>相关附件</span>
+			        </label>
+			        <div class="col-md-6">
+			            <input class="form-control" type="text" ng-model="info.filename" readonly="">
+			        </div>
+			        <div class="col-md-4">
+                        <a class="btn btn-default" href-void ng-click="download(info.file_id)"><i class="fa fa-download"></i>下载</a>
+			        </div>
+			    </div>
+				<div class="form-group">
+			        <label class="col-md-2 control-label">类别</label>
+			        <div class="col-md-10">
+			            <input class="form-control" type="text" value="{{ info.sys_type | systype }}" readonly="">
+			        </div>
+			    </div>
+		    	<div class="form-group">
+			        <label class="col-md-2 control-label">上传时间</label>
+			        <div class="col-md-10">
+			            <input class="form-control" type="text" value="{{ info.upload_time | date:'yyyy-MM-dd HH:mm:ss'}}" readonly="">
+			        </div>
+			    </div>
+		    	<div class="form-group">
+			        <label class="col-md-2 control-label">上传人</label>
+			        <div class="col-md-10">
+			            <input class="form-control" type="text" ng-model="info.upload_user" readonly="">
+			        </div>
+			    </div>
+		    </fieldset>
+		</form>
+	</div>
+	<div class="modal-footer">
+		<button ng-click="cancel()" type="button" class="btn btn-default">关闭</button>
+	</div>
+	<form id="download-form" method="post" target="_blank">
+		<input type="hidden" name="filePath" id="filePath">
+	</form>
+</div>

src/main/resources/static/app/supervise/controller/violationDetailCtrl.js

@@ -42,11 +42,11 @@ angular.module('app.supervise')
 					$scope.form.orgId = $rootScope.orgInfo.orgId
 					$scope.form.disposeTime = $("input[name='disposeTime']").val(); // 时间控件获取值
 					violationWarningAlarmService.updateWarningInfo($scope.form).then(function(data){
-						if (data.status == 'success') {
+						if (data.message == 'success') {
 							alert("保存成功！");
 							$scope.retList();
 						} else {
-							alert(data.msg);
+							alert(data.message);
 							$scope.saveFlag = false;
 						}
 					},function(data){