..

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

@@ -486,13 +486,13 @@
                             <li has-func="301">
                                 <a data-ui-sref="app.business.warning.temperaturefunction">测温点故障数</a>
                             </li>
-                            <li has-func="301">
+                            <li has-func="295">
                                 <a data-ui-sref="app.business.warning.jybgcqWarning">检验报告超期预警</a>
                             </li>
-                            <li has-func="301">
+                            <li has-func="295">
                                 <a data-ui-sref="app.business.warning.jkqWarning">架空期预警</a>
                             </li>
-                            <li has-func="301">
+                            <li has-func="295">
                                 <a data-ui-sref="app.business.warning.zqlWarning">转圈粮预警</a>
                             </li>
                         </ul>

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

@@ -150,6 +150,8 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function($scope, $ro
     $scope.loadData = function() {
     	$scope.kdmc = $rootScope.orgInfo.orgName;
     	var kqbm = $rootScope.orgInfo.kqbm;
+    	$scope.search.startTime = $("#startTime").val();
+    	$scope.search.endTime = $("#endTime").val();
 		sptService.getZqlyjxxListPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, kqbm, $scope.search.cphm, 
 				$scope.search.mxpz, $scope.search.startTime, $scope.search.endTime).then(function (data) {
 			if (data.code == 200) {

src/main/resources/static/app/supervise/views/zqlyj-list.html

@@ -16,10 +16,15 @@
                             <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
-                                        <label>报警日期:
-                                            <input class="form-control" type="text" ng-model="search.bjsj" name="bjsj" id="bjsj"
-                                                         onClick="WdatePicker({lang:'zh-cn'})">
+                                        <label>车牌号:
+                                            <input class="form-control" type="text" ng-model="search.cphm" name="cphm" />
                                         </label>
+                                        <label> 日期:
+												<input type="text" ng-model="search.startTime" id="startTime" class="form-control Wdate" 
+												onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endTime\')}'})" > ~ 
+												<input type="text" ng-disabled="isArchive" ng-model="search.endTime" id="endTime" class="form-control Wdate"
+												onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startTime\')}'})" >
+										</label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
                                         </a>
@@ -41,20 +46,26 @@
                                         <thead>
                                         <tr>
                                             <th data-class="expand" style="text-align:center;">序号</th>
-                                            <th data-class="expand" style="text-align:center;">承储企业</th>
-                                            <th data-class="expand" style="text-align:center;">监控点名称</th>
-                                            <th data-class="expand" style="text-align:center;">故障类型</th>
-                                            <th data-class="expand" style="text-align:center;">报警时间</th>
+                                            <th data-class="expand" style="text-align:center;">车牌号</th>
+                                            <th data-class="expand" style="text-align:center;">仓房名称</th>
+                                            <th data-class="expand" style="text-align:center;">出入库时间</th>
+                                            <th data-class="expand" style="text-align:center;">明细品种</th>
+                                            <th data-class="expand" style="text-align:center;">等级</th>
+                                            <th data-class="expand" style="text-align:center;">净重(吨)</th>
+                                            <th data-class="expand" style="text-align:center;">出入库类型</th>
                                         </tr>
                                         </thead>
 
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ warning.kqmc }}</td>
-                                            <td style="text-align:center;">{{ warning.jkdmc }}</td>
-                                            <td style="text-align:center;">{{ warning.gzlx }}</td>
-                                            <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.cch }}</td>
+                                            <td style="text-align:center;">{{ warning.cfmc }}</td>
+                                            <td style="text-align:center;">{{ warning.crksj }}</td>
+                                            <td style="text-align:center;">{{ warning.lspzmc }}</td>
+                                            <td style="text-align:center;">{{ warning.lydjmc }}</td>
+                                            <td style="text-align:center;">{{ warning.jz }}</td>
+                                            <td style="text-align:center;">{{ warning.crklx }}</td>
                                         </tr>
                                         </tbody>
                                     </table>