优化

README.md

@@ -0,0 +1,2 @@
+## 养老呼叫看板
+```

index.html

@@ -18,7 +18,7 @@
         <div class="title" id="title">维鼎康联养老看板</div>
     </div>
     <div class="clearfix"></div>
-    <div class="viewport">        
+    <div class="viewport">
         <div class="column">
             <div class="overview panel">
                 <div class="inner">
@@ -100,7 +100,7 @@
         </div>
         <div class="column">
             <!-- 地图 -->
-            <div class="map">                
+            <div class="map">
                 <div class="chart">
                     <div class="geo"></div>
                 </div>
@@ -200,7 +200,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>                    
+                    </div>
                 </div>
             </div>
         </div>
@@ -208,6 +208,7 @@
     <canvas id="canvas" style="position: absolute;top: 0;left: 0;"></canvas>
 </body>
 
+<script src="./js/mapStyleJson.js"></script>
 <script src="./js/jquery.min.js"></script>
 <script src="./js/echarts.min.js"></script>
 <!--<script src="https://fastly.jsdelivr.net/npm/echarts@5.3.3/dist/echarts.min.js"></script>-->
@@ -218,6 +219,5 @@
 <script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=4lgYDZ9MWQMbTvjX5R5M5pZG"></script>
 <script type="text/javascript" src="https://fastly.jsdelivr.net/npm/echarts@5.3.3/dist/extension/bmap.min.js"></script>
 <script src="./js/mymap.js"></script>
-<script src="./js/mapStyleJson.js"></script>
 
-</html>
+</html>

js/index.js

@@ -1,4 +1,5 @@
-const url = "http://47.107.28.109:8006/";
+const host_port = "119.23.151.229:8006/";
+const url = "http://" + host_port;
 // const url = "http://127.0.0.1:8006/";
 var myPieEchart = echarts.init($('.pie')[0]); // 饼图
 var myLineEchart = echarts.init($('.line')[0]); // 折线图
@@ -90,9 +91,15 @@ function getSOSInfo() {
         // 最新事件报警表格
         var rows = []
         $.each(data.actionList, function (i, n) {
+            var name = '';
+            if (n.from_member_name == null || n.from_member_name === "") {
+                name = n.from_frame_name;
+            } else {
+                name = n.from_member_name;
+            }
             var row = '<div class="row">\n' +
                 '<span class="col">'+unixToDate(n.create_date, "MM-dd hh:mm")+'</span>\n' +
-                '<span class="col">'+n.from_member_name+'</span>\n' +
+                '<span class="col">'+name+'</span>\n' +
                 '<span class="col">'+n.from_device_name+'</span>\n' +
                 '<span class="icon-dot"></span>\n' +
                 '</div>';
@@ -149,7 +156,7 @@ function initWebSocket() {
     var time = Math.round(new Date()) + "" + Math.round(Math.random()*100);
     console.log(time)
     // var s = "ws://127.0.0.1:8006/bulletinBoard/" + time + "/" + partId;
-    var s = "ws://47.107.28.109:8006/bulletinBoard/" + time + "/" + partId;
+    var s = "ws://" + host_port + "bulletinBoard/" + time + "/" + partId;
     console.log(s)
     var ws = new WebSocket(s);
     ws.onopen = function(evt) {
@@ -176,9 +183,11 @@ function initWebSocket() {
         // "renewType":"SOS","sex":1,"status":0}
         const data = JSON.parse(e.data);
         if (data.renewType === 'SOS') {
+            console.log('有人报警...')
             openSOSMap(data); // 地图高亮
             getSOSInfo(); // 刷新看板
         } else if ("LOG") {
+            console.log('体征异常...')
             openSOSMap(data); // 地图高亮
             getLogInfo(); // 刷新体征
         } else { // USER
@@ -257,7 +266,7 @@ function openTimer() {
     $('.monitor').on('click', ' a', function () {
         //点击当前的a 加类名 active  他的兄弟删除类名
         $(this).addClass('active').siblings().removeClass('active');
-        //获取一一对应的下标 
+        //获取一一对应的下标
         var index = $(this).index();
         //选取content 然后对应下标的 显示   当前的兄弟.content隐藏
         $('.content').eq(index).show().siblings('.content').hide();
@@ -454,6 +463,7 @@ function initLineChar() {
             textStyle: {
                 color: '#4c9bfd' // 图例文字颜色
             },
+            type: 'scroll',
             right: '10%'//距离右边10%
         },
         // 设置网格样式
@@ -515,6 +525,7 @@ function initMeasureItem(data) {
 }
 // 动态报警折线图
 function initDynamicAlarm(item) {
+    myLineEchart.resize({ height: $('.line').height() - 10 })
     var lineOption = initLineChar();
     lineOption.series = [];
     if (item.week[0].length > 0) {

js/mapStyleJson.js

@@ -1298,4 +1298,4 @@ function returnMapStyleJson() {
             "color": "#ffffff00"
         }
     }]
-}
+}