不合理样式优化

ioc_frontweb/index.html

@@ -243,6 +243,21 @@
         </a>
       </div> -->
       <div class="alarm" id="alarm">
+        <div class="itemh2">
+          预警监控
+          <img src="images/vector12.png" alt="" style="width: 14px;margin-right: 10px;">
+        </div>
+        <div class="itemout">
+          <div class="item">
+            <div class="itemTitle">预警总数</div><div class="num">0</div>
+          </div>
+          <div class="item">
+            <div class="itemTitle">已处理</div><div class="num">0</div>
+          </div>
+          <div class="item">
+            <div class="itemTitle">未处理</div><div class="num">0</div>
+          </div>
+        </div>
       </div>
       <div style="background: linear-gradient(to left,#111a2e,#64FEFF,#111a2e);height:1px;margin-top: 20px;margin-bottom: 20px;margin-left: 20px;width: 90%;"></div>
       <div id="" class="leftBar-legend">

ioc_frontweb/js/app.js

@@ -437,7 +437,7 @@ $(function () {
       currEventsArr = [...getCurrEventsArr, ...socketCurrEventsArr];
       $(".currEvNum").html(currEventsArr.length);
       if (getCurrEventsArr.length > 0)
-        $(".escbox-txt").html('<font style="color:red">有待处理事件！</font>');
+        $(".escbox-txt").html('<font style="color:red">有待处理事件!</font>');
       if (socketCurrEventsArr.length > 0)
         $(".escbox-txt").html('<font style="color:red">发生事件！</font>');
       layTable.render({
@@ -1150,15 +1150,15 @@ $(function () {
     function defalutMApP() {
       cont = 0;
       map.clearMap();
-      district.search("新乐市", function (status, result) {
+      district.search("赞皇", function (status, result) {
         var bounds = result.districtList[0].boundaries;
-        var mask = [];
-        for (var i = 0; i < bounds.length; i += 1) {
-          mask.push([bounds[i]]);
-        }
-        var defaultCenter = [114.72995, 38.37417];
+        // var mask = [];
+        // for (var i = 0; i < bounds.length; i += 1) {
+        //   mask.push([bounds[i]]);
+        // }
+        var defaultCenter = [114.391885,37.672925];
         map = new AMap.Map("container", {
-          mask: mask,
+          // mask: mask,
           center: defaultCenter,
           // resizeEnable: true,
           disableSocket: true,
@@ -1166,7 +1166,7 @@ $(function () {
           showLabel: true,
           // labelzIndex: 110,
           pitch: 8,
-          zoom: 11.5,
+          zoom: 12.5,
           // mapStyle: 'amap://styles/darkblue',
           mapStyle: "amap://styles/3b679a15f448a4740ba2ff7524e1a4ae",
         });

ioc_frontweb/js/utils.js

@@ -1334,28 +1334,28 @@ function queryGisTrails(memId, startTime, endTime) {
 }
 
 // 语音呼叫
-function makeCall(callee) {
-  var opts = {
-    url: apis.scooper.makeCall,
-    type: 'post',
-    data: {
-      token: token,
-      caller: '8001',
-      callee: callee,
-      businessId: '998',
-      isRecord: 1,
-    },
-    contentType: 'application/x-www-form-urlencoded',
-    success: function (res) {
-      if (res.code == 0) {
-        console.log(res);
-      } else {
-        alert('呼叫失败：' + data.message);
-      }
-    },
-  };
-  jQueryAjax(opts);
-}
+// function makeCall(callee) {
+//   var opts = {
+//     url: apis.scooper.makeCall,
+//     type: 'post',
+//     data: {
+//       token: token,
+//       caller: '8001',
+//       callee: callee,
+//       businessId: '998',
+//       isRecord: 1,
+//     },
+//     contentType: 'application/x-www-form-urlencoded',
+//     success: function (res) {
+//       if (res.code == 0) {
+//         console.log(res);
+//       } else {
+//         alert('呼叫失败：' + data.message);
+//       }
+//     },
+//   };
+//   jQueryAjax(opts);
+// }
 
 // 视频呼叫
 function makeVideoCall(callee, callback) {
@@ -1466,7 +1466,7 @@ function getDutyInfo() {
 			for(var a =0;a<duteManInfo.length;a++){
 				if(a==2){
 					var phone = "'"+duteManInfo[a]+"'";
-					html+= '<dd><button class="layui-btn layui-btn-xs" onclick="makeCall('+phone+')">'+duteManInfo[a]+'</button></dd>';
+					html+= '<dd>'+duteManInfo[a]+'</dd>';
 				}else{
 					html+= "<dd>"+duteManInfo[a]+"</dd>";
 				}

ioc_frontweb/style/style.css

@@ -782,7 +782,7 @@ table.layui-table th {
   line-height: 70px;
   display: inline;
   float: left;
-  margin-left: 10px;
+  margin-left: 5px;
 }
 .escbox-bottom .escbox-top {
   height: auto;