兼容性问题修复

api/request.js

@@ -1,9 +1,9 @@
-// 动态获取url
-const BASEURL = getRequestPrefix();
+// // 动态获取url
+// const BASEURL = getRequestPrefix();
 
-// 动态获取用户名密码
-const LOGIN_NAME = sessionStorage.getItem('V_LOGINNAME');
-const LOGIN_PASSWORD = sessionStorage.getItem('V_PASSWORD');
+// // 动态获取用户名密码
+// const LOGIN_NAME = sessionStorage.getItem('V_LOGINNAME');
+// const LOGIN_PASSWORD = sessionStorage.getItem('V_PASSWORD');
 
 
 
@@ -11,22 +11,15 @@ const LOGIN_PASSWORD = sessionStorage.getItem('V_PASSWORD');
 // //服务端url
 // // const BASEURL = "http://101.133.214.75:8080/Device_Manager/";
 
-<<<<<<< HEAD
-
-=======
-// //本地调试url
-// const BASEURL = "http://127.0.0.1:8080/Device_Manager/";
->>>>>>> 367d44477e07140a575d1c0b0e1297518c8b0c3f
-
 // //最新测试url
 // // const BASEURL = "http://121.40.217.77:8080/Device_Manager/";
 
 // //本地调试url
 const BASEURL = "http://127.0.0.1:8080/Device_Manager/";
 
-//用户名、密码 
-// const LOGIN_NAME = "admin";
-// const LOGIN_PASSWORD = "e10adc3949ba59abbe56e057f20f883e";
+// 用户名、 密码
+const LOGIN_NAME = "admin";
+const LOGIN_PASSWORD = "e10adc3949ba59abbe56e057f20f883e";
 
 
 

css/common.css

@@ -1,7 +1,7 @@
 * {
     margin: 0;
     padding: 0;
-    box-sizing: border-box
+    box-sizing: border-box;
 }
 
 
@@ -149,7 +149,7 @@ a.button {
     text-align: center;
     background: #031252;
     cursor: pointer;
-    font-size: 0.175rem
+    font-size: 0.2rem;
 }
 
 @media screen and (max-width:1024px) {
@@ -209,6 +209,10 @@ a.button {
 .treebox {
     height: 8.25rem;
     overflow-y: scroll;
+    /* overflow-y: scroll; */
+    scrollbar-color: transparent transparent;
+    scrollbar-track-color: transparent;
+    -ms-scrollbar-track-color: transparent;
 }
 
 .tree {
@@ -300,6 +304,7 @@ li.parent_li ul li ul li {
     /* -moz-border-radius:5px;
     -webkit-border-radius:5px;
     border-radius:5px; */
+    font-size: 0.2rem;
     display: block;
     padding: 0.0175rem 0.1rem;
     text-decoration: none;
@@ -555,7 +560,7 @@ li.parent_li ul li ul li {
 
 .pager-left li:not(.pg-des) {
     width: 22px;
-    height: 22px;
+    /* height: 18px; */
     background-repeat: no-repeat;
     background-position: center center;
 }
@@ -616,7 +621,8 @@ li.parent_li ul li ul li {
 
 .pg-next.disabled {
     background: url(../images/page-next-disabled.gif);
-    pointer-events: none
+    pointer-events: none;
+    height: 22px
 }
 
 .pg-last {
@@ -625,7 +631,8 @@ li.parent_li ul li ul li {
 
 .pg-last.disabled {
     background: url(../images/page-last-disabled.gif);
-    pointer-events: none
+    pointer-events: none;
+    height: 22px
 }
 
 .pg-refresh {
@@ -827,12 +834,13 @@ border: 1px solid #ffffff;
 
 /*定义了轨道的样式*/
 
-.departlist-box ::-webkit-scrollbar-track {
-    /*滚动条里面轨道*/
+
+/* .departlist-box ::-webkit-scrollbar-track {
+
     -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
     border-radius: 5px;
     background: rgba(0, 0, 0, 0);
-}
+} */
 
 .disabled {
     pointer-events: none

css/per-manage.css

@@ -30,6 +30,7 @@
 .column3 {
     /* flex: 8; */
     overflow: hidden;
+    /* height: 10rem; */
     height: 10rem;
     position: relative;
     /* border:1px solid yellow */
@@ -64,7 +65,7 @@
 .column1 li a {
     color: #0082FF;
     line-height: 0.65rem;
-    font-size: 0.1875rem;
+    font-size: 0.2rem;
     padding-left: .4rem;
     display: block;
     margin-bottom: 0.25rem;
@@ -145,7 +146,7 @@ ul.depart-opera {
     border-radius: 5px;
     text-indent: 0.0625rem;
     margin-right: 0.2rem;
-    font-size: 0.175rem;
+    font-size: 0.2rem;
     border: none;
 }
 
@@ -206,7 +207,7 @@ ul.depart-opera {
     text-align: center;
     border: 1px solid black;
     line-height: 0.3125rem;
-    font-size: 0.175rem;
+    font-size: 0.2rem;
     border-collapse: collapse;
     border-spacing: 0;
     /* width: 0.3375rem */
@@ -277,7 +278,7 @@ ul.depart-opera {
     color: #fff;
     border-top-left-radius: 6px;
     border-top-right-radius: 6px;
-    font-size: 0.175rem;
+    font-size: 0.2rem;
     margin: 0.025rem auto 0.0125rem;
     cursor: pointer;
     border: 1px solid #2e3746;
@@ -336,7 +337,7 @@ ul.depart-opera {
 .event-count-box li span {
     vertical-align: middle;
     color: #fff;
-    font-size: 0.175rem;
+    font-size: 0.2rem;
 }
 
 .event-count-box li img {

js/device-check.js

@@ -333,6 +333,7 @@ layui.use('layer', function() {
 
     //新增弹框
     $('.add').click(function() {
+            getTypeListDataAjax()
             layerCreateIndex = layer.open({
                 type: 1,
                 title: false,
@@ -508,10 +509,10 @@ $('#addData').click(function() {
     ajaxRequest(DEVICE_CHECK_ADD, "POST", { "ID_LIST": [allParam] }, function(result) {
             layer.close(layerCreateIndex);
             layer.msg('添加成功!', { icon: 6 });
+
             getListDataAjax();
+
             $('#addDeviceCheckForm')[0].reset();
-            getTypeListDataAjax()
-                // allParam.device_code = []
 
             console.log('formAllParam2')
             console.log($("#addDeviceCheckForm").serializeArray())

system-manage.html

@@ -10,6 +10,7 @@
     <link rel="stylesheet" href="css/common.css" />
     <link rel="stylesheet" href="css/per-manage.css" />
 
+
 </head>
 
 <body style="background-image:url(images/big-bg.png)">

system-manage/per-manage.html

@@ -12,7 +12,11 @@
     <link rel="stylesheet" href="../css/per-manage.css" />
 
     <style>
-
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
     </style>
 </head>
 
@@ -89,11 +93,19 @@
 
                     </tbody>
                 </table>
+
+
+
+
+
             </div>
 
 
 
+
+
         </div>
+
         <div class="pager has-data flex">
             <div class="pager-left flex1 align-left">
                 <ul>
@@ -121,6 +133,7 @@
 
 
         </div>
+
     </div>