添加设备监控管理功能和增加序号列

src/main/java/com/founder/cjqx/controller/SysClientVpController.java

@@ -38,11 +38,11 @@ public class SysClientVpController {
         ResultMap resultMap=new ResultMap();
         User user =(User)request.getSession().getAttribute("User");
         //设备审批管理  默认查询本单位
-        if(sysClientVp.getCjsblxcode().equals("1")){
+        if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("1")){
             sysClientVp.setSsdwcode(user.getUnitcode());
         }
         //我的设备管理  默认查询本人采集
-        if(sysClientVp.getCjsblxcode().equals("2")){
+        if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("2")){
             sysClientVp.setZrmjjh(user.getPolicemanid());
         }
         //ip  mac 加密   查询条件加密

src/main/resources/templates/cjqx/frame.html

@@ -73,9 +73,10 @@
 		        	<li>
 		                <a href="javascript:void(0)" onclick="menuCAClick('sbspglform',this,'page40001')"><i class="iconfont icon-quanxian left"></i><font>设备审批管理</font></a>
 		           	</li>
-		        	<li>
+		        <!--	<li>
 		                <a href="javascript:void(0)" onclick="menuCAClick('sbdaglform',this,'page50001')"><i class="iconfont icon-liuchengshuoming left"></i><font>设备档案管理</font></a>
 		           	</li>
+		           	-->
 		        	<li>
 		                <a href="javascript:void(0)" onclick="menuCAClick('sbjkglform',this,'page60001')"><i class="iconfont icon-kehu left"></i><font>设备监控管理</font></a>
 		           	</li>

src/main/resources/templates/cjqx/sbspglform.html

@@ -163,6 +163,7 @@
                 [
                    // { field:'spzt',fixed: 'left',title:'操作',align:'center', width:'10%',toolbar: '#toolbarDemo'}
                     {fixed: 'right', title:'操作',align:'center',  width:'10%',toolbar: '#barDemo'}
+                    ,{type:'numbers', title:'序号',align:'center', width:'3%', edit: 'text'}
                     ,{field:'ip', title:'IP地址',align:'center', width:'8%', edit: 'text'}
                     ,{field:'mac', title:'MAC地址',align:'center', width:'8%', edit: 'text'}
                     ,{field:'ifythcjy', title:'是否一体化采集仪',align:'center', width:'10%', edit: 'text'}
@@ -174,7 +175,7 @@
                     ,{field:'ifhmcjy', title:'虹膜',align:'center', width:'5%', edit: 'text',templet: '#ifhm'}
                     ,{field:'lrsj', title:'注册时间',align:'center', width:'8%', edit: 'text',templet : "<div>{{layui.util.toDateString(d.lrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
                     ,{field:'ssdwname', title:'隶属单位',align:'center', width:'10%', edit: 'text'}
-                    ,{field:'zrmjname', title:'负责人',align:'center', width:'8%', edit: 'text'}
+                    ,{field:'zrmjname', title:'负责人',align:'center', width:'5%', edit: 'text'}
                     ,{field:'sbztstr', title:'设备状态',align:'center', width:'8%', edit: 'text',templet: '#ifsbzt'}
                     /*     ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
                          ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo4', width:140}*/

src/main/resources/templates/cjqx/sbxxform.html

@@ -139,6 +139,15 @@
       <span class="layui-badge layui-bg-green">启用</span>
      {{#  } }}
 </script>
+<script type="text/html" id="ifspzt">
+    {{#  if(d.spzt == '1'){ }}
+    <span class="layui-badge layui-bg-green">通 过</span>
+    {{#  } else if(d.spzt == '2'){ }}
+    <span class="layui-badge">退 回</span>
+    {{#  } else{ }}
+     <span class="layui-badge layui-bg-green">未审批</span>
+    {{#  } }}
+</script>
 
 <script src="/static/layui/layui.js" charset="utf-8"></script>
 <script src="/static/layui/layui.all.js" charset="utf-8"></script>
@@ -159,9 +168,10 @@
             ,cols: [
                 [
                     {type: 'checkbox', fixed: 'left',align:'center', width:'3%'}
-                    ,{field:'ip', title:'IP地址',align:'center', width:'10%', edit: 'text'}
+                    ,{type:'numbers', title:'序号',align:'center', width:'3%', edit: 'text'}
+                    ,{field:'ip', title:'IP地址',align:'center', width:'8%', edit: 'text'}
                     ,{field:'mac', title:'MAC地址',align:'center', width:'10%', edit: 'text'}
-                    ,{field:'ifythcjy', title:'是否一体化采集仪',align:'center', width:'10%', edit: 'text'}
+                    ,{field:'ifythcjy', title:'是否一体化采集仪',align:'center', width:'8%', edit: 'text'}
                     ,{field:'ifzwcjy', title:'指纹',align:'center', width:'5%', edit: 'text',templet: '#jsifzwcjy'}
                     ,{field:'ifsftzzzcjy', title:'身高体重',align:'center', width:'5%', edit: 'text',templet: '#ifsgtz'}
                     ,{field:'ifsjcjy', title:'手机',align:'center', width:'5%', edit: 'text',templet: '#ifsj'}
@@ -169,9 +179,10 @@
                     ,{field:'ifswcjy', title:'声纹',align:'center', width:'5%', edit: 'text',templet: '#ifsw'}
                     ,{field:'ifhmcjy', title:'虹膜',align:'center', width:'5%', edit: 'text',templet: '#ifhm'}
                     ,{field:'lrsj', title:'注册时间',align:'center', width:'10%', edit: 'text',templet : "<div>{{layui.util.toDateString(d.lrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
-                    ,{field:'ssdwname', title:'隶属单位',align:'center', width:'10%', edit: 'text'}
-                    ,{field:'zrmjname', title:'负责人',align:'center', width:'8%', edit: 'text'}
-                    ,{field:'sbztstr', title:'设备状态',align:'center', width:'8%', edit: 'text',templet: '#ifsbzt'}
+                    ,{field:'ssdwname', title:'隶属单位',align:'center', width:'8%', edit: 'text'}
+                    ,{field:'zrmjname', title:'负责人',align:'center', width:'7%', edit: 'text'}
+                    ,{field:'sbztstr', title:'设备状态',align:'center', width:'7%', edit: 'text',templet: '#ifsbzt'}
+                    ,{field:'spzt', title:'审批状态',align:'center', width:'6%', edit: 'text',templet: '#ifspzt'}
                     /*     ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
                          ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo4', width:140}*/
                 ]