Merge branch 'master' of /data/git/tiantian2

public/dashboard/index.html

@@ -46,10 +46,11 @@
             <div class="hgphbox">
                 <h2>护工陪护实时概况</h2>
                 <div class="hgleft">
-                    <p>护工数: 940</p>
+                    <p>护工数: 736</p>
-                    <p>已陪护: 850</p>
+                    <p>已陪护: 696</p>
-                    <p>未陪护: 10</p>
+                    <p>未陪护: 40</p>
-                    <p>上工率: 90%</p>
+                    <p>陪护单: 855</p>
+                    <p>上工率: 122.5%</p>
                 </div>
                 <div id="hg" class="hgright"></div>
             </div>
@@ -57,10 +58,10 @@
             <div class="cwphbox">
                 <h2>床位陪护实时概况</h2>
                 <div class="cwleft">
-                    <p>床位数: 940</p>
+                    <p>床位数: 7650</p>
-                    <p>未陪护: 850</p>
+                    <p>正在陪护: 855</p>
-                    <p>已陪护: 10</p>
+                    <p>未陪护: 7795</p>
-                    <p>床位护理率: 90%</p>
+                    <p>陪护率: 11.2%</p>
                 </div>
                 <div id="cw" class="cwright"></div>
             </div>
@@ -78,7 +79,7 @@
         </div>
         <!-- 本月营收占比分析 -->
         <div class="byys">
-            <h2>本月营收占比分析</h2>
+            <h2>本月营收分析</h2>
             <div class="ysbox" id="ysbox"></div>
         </div>
     </div>
@@ -88,51 +89,47 @@
         <div class="lists">
             <h2>陪护统计表</h2>
             <div class="tableContent">
-                <div id="phtable" class="box"></div>
+                <div id="phtable" class="box" style="display: block; width: 380px; height: 290px;"></div>
                 <div id="cwtable" class="box"></div>
             </div>
-            <div class="tab">
-                <a>护工</a>
-                <a>床位</a>
-            </div>
         </div>
         <!-- 5月自动巡检信息 -->
         <div class="lists">
-            <h2>5月自动巡检信息</h2>
+            <h2>最新陪护单信息</h2>
             <table class="fx" width="100%" border='0' cellpadding='0' cellspacing='0'>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">张**</td>
                     <td width="60%">第一人民医院内科楼15床</td>
                     <td width="15%"><span class="ways">已派工</span></td>
                 </tr>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">任**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">武进中医院新大楼69床</td>
                     <td width="15%"><span class="ways">已派工</span></td>
                 </tr>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">王**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">阳湖院外科楼34床</td>
                     <td width="15%"><span class="ways">待处理</span></td>
                 </tr>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">林**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">常州市中医院188床</td>
                     <td width="15%"><span class="ways">待派工</span></td>
                 </tr>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">刘**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">常州市妇幼保健院63床</td>
                     <td width="15%"><span class="ways">待派工</span></td>
                 </tr>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">马**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">第一人民医院外科楼159床</td>
                     <td width="15%"><span class="ways">已派工</span></td>
                 </tr>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">宋**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">常州市中医院99床</td>
                     <td width="15%"><span class="ways">已派工</span></td>
                 </tr>
             </table>
@@ -142,13 +139,13 @@
             <h2>最新出院信息</h2>
             <table class="fx" width="100%" border='0' cellpadding='0' cellspacing='0'>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">周**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">第一人民医院内科楼132床</td>
                     <td width="15%"><span class="ways">已结算</span></td>
                 </tr>
                 <tr>
-                    <td width="25%" style="padding-left: 15px;">张大伯</td>
+                    <td width="25%" style="padding-left: 15px;">张**</td>
-                    <td width="60%">第一人民医院内科楼15床</td>
+                    <td width="60%">武进中医院75床</td>
                     <td width="15%"><span class="ways">已结算</span></td>
                 </tr>
                 <tr>
@@ -183,16 +180,16 @@
             <h2>最新投诉信息</h2>
             <table class="fx" width="100%" border='0' cellpadding='0' cellspacing='0'>
                 <tr>
-                    <td width="50%" style="padding-left: 15px;">刘大伯投诉袁护工</td>
+                    <td width="50%" style="padding-left: 15px;">陈**投诉袁护工</td>
-                    <td width="50%">武进中医院住院部23床</td>
+                    <td width="50%">武进中医院</td>
                 </tr>
                 <tr>
-                    <td width="50%" style="padding-left: 15px;">张大伯投诉王护工</td>
+                    <td width="50%" style="padding-left: 15px;">张**投诉陈护工</td>
-                    <td width="50%">武进中医院住院部23床</td>
+                    <td width="50%">常州市第一人民医院</td>
                 </tr>
                 <tr>
-                    <td width="50%" style="padding-left: 15px;">张大伯投诉王护工</td>
+                    <td width="50%" style="padding-left: 15px;">王**投诉李护工</td>
-                    <td width="50%">武进中医院住院部23床</td>
+                    <td width="50%">常州市妇幼保健院</td>
                 </tr>
                 <tr>
                     <td></td>
@@ -224,14 +221,14 @@
                     <td width="20%" style="padding-left: 10px;"><span class="percent">100</span>分</td>
                 </tr>
                 <tr class="skillbar">
-                    <td width="25%" style="padding-left: 18px;">工号<a>136</a></td>
+                    <td width="25%" style="padding-left: 18px;">工号<a>267</a></td>
                     <td width="55%" class="fill">
                         <div class="filled" data-width="90%"></div>
                     </td>
                     <td width="20%" style="padding-left: 10px;"><span class="percent">90</span>分</td>
                 </tr>
                 <tr class="skillbar">
-                    <td width="25%" style="padding-left: 18px;">工号<a>015</a></td>
+                    <td width="25%" style="padding-left: 18px;">工号<a>032</a></td>
                     <td width="55%" class="fill">
                         <div class="filled" data-width="80%"></div>
                     </td>
@@ -245,14 +242,14 @@
                     <td width="20%" style="padding-left: 10px;"><span class="percent">60</span>分</td>
                 </tr>
                 <tr class="skillbar">
-                    <td width="25%" style="padding-left: 18px;">工号<a>002</a></td>
+                    <td width="25%" style="padding-left: 18px;">工号<a>658</a></td>
                     <td width="55%" class="fill">
                         <div class="filled" data-width="55%"></div>
                     </td>
                     <td width="20%" style="padding-left: 10px;"><span class="percent">55</span>分</td>
                 </tr>
                 <tr class="skillbar">
-                    <td width="25%" style="padding-left: 18px;">工号<a>001</a></td>
+                    <td width="25%" style="padding-left: 18px;">工号<a>721</a></td>
                     <td width="55%" class="fill">
                         <div class="filled" data-width="45%"></div>
                     </td>
@@ -265,19 +262,115 @@
 <script src="skin/default/js/an-skill-bar.js"></script>
 <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=VGIBZ-YUMLK-LTKJN-ASK67-6ZCP3-Q5BRF"></script>
 <script>
+    var current_hospital = 0;
+    var map, marker;
+    var hospitals = [
+        {
+            name: "常州市第一人民医院",
+            lat: 31.77956,
+            lng: 119.960747
+        },
+        {
+            name: "常州市中医院",
+            lat: 31.773121,
+            lng: 119.964615
+        },
+        {
+            name: "常州市武进人民医院（南院）",
+            lat: 31.687063,
+            lng: 119.978226
+        },
+        {
+            name: "常州市第二人民医院阳湖院",
+            lat: 31.688465,
+            lng: 119.938339
+        },
+        {
+            name: "常州市妇幼保健院",
+            lat: 31.783091,
+            lng: 119.893227
+        },
+        {
+            name: "武进区中医院",
+            lat: 31.783091,
+            lng: 119.893227
+        },
+        {
+            name: "武进区中医院",
+            lat: 31.783091,
+            lng: 119.893227
+        }
+    ];
+
     $(function () {
         initMap();
     });
 
     function initMap() {
-        var center = new TMap.LatLng(39.984104, 116.307503);
+        var center = new TMap.LatLng(31.77956, 119.960747);
         //初始化地图
-        var map = new TMap.Map("map", {
+        map = new TMap.Map("map", {
             rotation: 20,//设置地图旋转角度
-            pitch: 30, //设置俯仰角度（0~45）
+            pitch: 45, //设置俯仰角度（0~45）
-            zoom: 12,//设置地图缩放级别
+            zoom: 17,//设置地图缩放级别
             center: center//设置地图中心点坐标
         });
+        //初始化marker
+        marker = new TMap.MultiMarker({
+            id: "marker-layer", //图层id
+            map: map,
+            styles: { //点标注的相关样式
+                "marker": new TMap.MarkerStyle({
+                    "width": 25,
+                    "height": 35,
+                    "anchor": {x: 16, y: 32},
+                    "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png"
+                })
+            },
+            geometries: [{ //点标注数据数组
+                "id": "demo",
+                "styleId": "marker",
+                "position": center,
+                "properties": {
+                    "title": "marker"
+                }
+            }]
+        });
+        window.setInterval(function () {
+            panToHospital();
+        }, 3000);
+    }
+
+    function panToHospital() {
+        current_hospital++;
+        if (current_hospital == hospitals.length) {
+            current_hospital = 0;
+        }
+        var center = new TMap.LatLng(hospitals[current_hospital].lat, hospitals[current_hospital].lng);
+        map.panTo(center);
+
+        marker.setMap(null);
+        marker = null;
+        marker = new TMap.MultiMarker({
+            id: "marker-layer", //图层id
+            map: map,
+            styles: { //点标注的相关样式
+                "marker": new TMap.MarkerStyle({
+                    "width": 25,
+                    "height": 35,
+                    "anchor": {x: 16, y: 32},
+                    "src": "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png"
+                })
+            },
+            geometries: [{ //点标注数据数组
+                "id": "demo",
+                "styleId": "marker",
+                "position": center,
+                "properties": {
+                    "title": "marker"
+                }
+            }]
+        });
     }
 
     $('.skillbar').skillbar({
@@ -288,11 +381,11 @@
         series: [{
             // name:'访问量',
             type: 'pie',
-            color: ["#ffc34a", "#04c6c7"],
+            color: ["#04c6c7", "#ffc34a"],
             radius: '70%',
             data: [
-                {value: 140, name: '已陪护'},
+                {value: 696, name: '已陪护'},
-                {value: 800, name: '未陪护'}
+                {value: 40, name: '未陪护'}
             ]
         }]
     };
@@ -302,11 +395,11 @@
     var option1 = {
         series: [{
             type: 'pie',
-            color: ["#ffc34a", "#04c6c7"],
+            color: ["#04c6c7", "#ffc34a"],
             radius: '70%',
             data: [
-                {value: 140, name: '已陪护'},
+                {value: 855, name: '已陪护'},
-                {value: 800, name: '未陪护'}
+                {value: 7795, name: '未陪护'}
             ]
         }]
     };
@@ -350,7 +443,7 @@
                     fontSize: '14px'
                 }
             },
-            data: ["第一人民医院", "市中医院", "二院阳湖院", "武中"],
+            data: ["一院", "市中", "武进南院", "阳湖院", "康复医院", "妇幼院", "武中", "溧阳院"],
         },
         yAxis: {
             axisLine: {
@@ -390,12 +483,8 @@
                     opacity: 1
                 }
             },
-            data: [{
+
-                value: 52,
+            data: [336, 150, 42, 156, 42, 30, 54, 45],
-                itemStyle: {
-                    color: 'red'
-                }
-            }, 28, 11, 19],
         }, {
             name: '陪护订单量',
             type: 'pictorialBar',
@@ -413,35 +502,6 @@
         tooltip: {
             trigger: 'item'
         },
-        legend: {
-            show: true,
-            itemWidth: 18,
-            itemHeight: 8,
-            itemGap: 10,
-
-            data: [{
-                name: '第一人民医院',
-                itemStyle: {
-                    color: "#01babb",
-                }
-            }, {
-                name: "市中医院",
-                itemStyle: {
-                    color: "#ffb22f",
-                }
-            }, {
-                name: "武中",
-                itemStyle: {
-                    color: "#ff4954",
-                }
-            }],
-            textStyle: {
-                color: "#02c1c1",
-                fontSize: '14px'
-            },
-            orient: 'vertical',
-            left: 'left',
-        },
         series: [
             {
                 type: 'pie',
@@ -449,9 +509,14 @@
                 center: ['50%', '50%'],
                 color: ["#ffb22f", "#ff4954", "#01babb"],
                 data: [
-                    {value: 15, name: '武中'},
+                    {value: 75, name: '一院'},
-                    {value: 25, name: '市中医院'},
+                    {value: 60, name: '市中'},
-                    {value: 75, name: '第一人民医院'},
+                    {value: 30, name: '武进南院'},
+                    {value: 25, name: '阳湖院'},
+                    {value: 30, name: '康复医院'},
+                    {value: 20, name: '妇幼院'},
+                    {value: 25, name: '武中'},
+                    {value: 18, name: '溧阳院'}
                 ].sort(function (a, b) {
                     return a.value - b.value;
                 }),
@@ -469,7 +534,108 @@
     var myChart3 = echarts.init(document.getElementById('ysbox'));
     myChart3.setOption(option3);
 
-    //
+    // 陪护统计表
+    var app = {};
+
+    var chartDom = document.getElementById('phtable');
+    var myChart4 = echarts.init(chartDom);
+    var option4;
+
+    option4 = {
+        color: ['#018fff'],
+        lineStyle: {
+            color: '#018fff'
+        },
+        legend: {
+            itemWidth: 18,
+            itemHeight: 8,
+            itemGap: 10,
+            data: [{
+                name: '陪护',
+                itemStyle: {
+                    color: "#ffb22f",
+                }
+            }, {
+                name: "护工数",
+                itemStyle: {
+                    color: "#0087ff",
+                }
+            }],
+            orient: 'horizontal',
+            left: 'center',
+            textStyle: {
+                color: "rgba(255,255,255,.7)",
+                fontSize: '14px'
+            }
+        },
+        xAxis: {
+            type: 'category',
+            data: ['一院', '市中', '武进南院', '阳湖院', '康复医院', '妇幼院', '武中', '溧阳院'],
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: '#018fff',
+                }
+            },
+            axisTick: {
+                show: true,
+                alignWithLabel: true,
+            },
+            axisLabel: {
+                interval: 0,
+                textStyle: {
+                    color: '#fff',
+                    fontSize: '14px'
+                }
+            }
+        },
+        yAxis: {
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: '#018fff',
+                }
+            },
+            axisTick: {
+                show: true,
+                alignWithLabel: true,
+            },
+            axisLabel: {
+                interval: 0,
+                textStyle: {
+                    color: '#fff',
+                    fontSize: '14px'
+                }
+            },
+            type: 'value',
+            name: '人数',
+            nameTextStyle: {
+                color: "#2b7ba0",
+                fontSize: '14px'
+            }
+        },
+        series: [
+            {
+                type: 'bar',
+                name: '陪护单数',
+                data: [336, 150, 42, 156, 42, 30, 54, 45],
+                itemStyle: {
+                    color: '#ffb22f',
+                }
+            },
+            {
+                type: 'bar',
+                name: '总护工数',
+                data: [288, 130, 35, 125, 38, 30, 50, 40],
+                itemStyle: {
+                    color: '#0087ff'
+                }
+            }
+        ],
+        color: ["#ffb22f", "#0087ff"],
+    };
+    option4 && myChart4.setOption(option4);
+
 
 </script>
 </body>