git 4 gadi atpakaļ
vecāks
revīzija
25720e0dab

gitee-datav/智慧运维/PetsDataView/icon/考勤.png → gitee-datav/智慧运维/PetsDataView/icon/clock.png


BIN
gitee-datav/智慧运维/PetsDataView/icon/dog.png


gitee-datav/智慧运维/PetsDataView/icon/高亮图标大.png → gitee-datav/智慧运维/PetsDataView/icon/find-big.png


gitee-datav/智慧运维/PetsDataView/icon/高亮图标小.png → gitee-datav/智慧运维/PetsDataView/icon/find-sm.png


BIN
gitee-datav/智慧运维/PetsDataView/icon/full-screen.png


BIN
gitee-datav/智慧运维/PetsDataView/icon/hospital.png


gitee-datav/智慧运维/PetsDataView/icon/下降趋势.png → gitee-datav/智慧运维/PetsDataView/icon/line-down.png


gitee-datav/智慧运维/PetsDataView/icon/上升趋势.png → gitee-datav/智慧运维/PetsDataView/icon/line-up.png


gitee-datav/智慧运维/PetsDataView/icon/selectIcon.png → gitee-datav/智慧运维/PetsDataView/icon/location-red.png


BIN
gitee-datav/智慧运维/PetsDataView/icon/min-screen.png


gitee-datav/智慧运维/PetsDataView/icon/区域完成数排名.png → gitee-datav/智慧运维/PetsDataView/icon/right.png


+ 8 - 3
gitee-datav/智慧运维/PetsDataView/index.html

@@ -4,6 +4,8 @@
     <meta charset="UTF-8">
     <title>智慧宠物大屏展示</title>
     <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=WSrX4bCfgcjTfhWNCwvfI1ZnQnfZDxFW"></script>
+	<script type="text/javascript" src="{{{resource_url('__VENDOR__/jquery/jquery-3.3.1.min.js')}}}"></script> 
+	<script type="text/javascript" src="{{{resource_url('__VENDOR__/cl-admin/js/plugins/echarts/echarts.min.js')}}}"></script> 
 </head>
 <body>
     <div id="mapContainer"></div>
@@ -13,17 +15,20 @@
             <span id="date"></span>
             <span id="time"></span>
         </div>
+        <div id='nav-top-screen'>
+            <img class="nav-full-screen nav-icon-screen-full" src="{{{resource_url('__COMPBASE__/icon/full-screen.png')}}}" alt="最大/小化"/>
+        </div>
     </div>
-
+    
     <!-- 顶部悬浮 -->
     <div id="position_top" class="legend-container top-nav" style="min-width:500px; position: fixed; top: 90px; left: calc(20vw + 20px);"></div>
 
     <!-- 左侧区域悬浮 -->
-    <div id="position_left" style="width: 20vw; min-width: 300px; position: fixed; top: 90px; left: 10px;"></div>
+    <div id="position_left" style="width: 20vw; min-width: 380px; position: fixed; top: 90px; left: 10px;"></div>
 
     <!-- 右侧区域悬浮 -->
     <div id="position_right" style="width: 22vw; min-width: 400px; position: fixed; top: 90px; right: 10px;"></div>
 
-<script type="text/javascript" src="lib/loadingScript.js"></script>
+<script type="text/javascript" src="{{{resource_url('__COMPBASE__/lib/loadingScript.js')}}}"></script>
 </body>
 </html>

+ 85 - 23
gitee-datav/智慧运维/PetsDataView/js/bdMap.js

@@ -1,42 +1,104 @@
-function checkhHtml5()
-{
-    if (typeof(Worker) === "undefined")
-    {
-        if(navigator.userAgent.indexOf("MSIE 9.0")<=0)
-        {
+function checkhHtml5() {
+    if (typeof(Worker) === "undefined") {
+        if(navigator.userAgent.indexOf("MSIE 9.0")<=0) {
             alert("请使用: chrome、firefox、safari、IE10 浏览器");
         }
-
     }
 }
 checkhHtml5();
 
-//初始化地图
+var bdMap;
+
+// 初始化地图
 function initBdMap () {
-    var map = new BMap.Map("mapContainer",{toolBarVisible:false});
-    var point = new BMap.Point(116.404, 39.915);
-    map.loaded = function () {
-        console.log('map loaded')
-    };
-    var map = new BMap.Map('mapContainer');
-    map.centerAndZoom(new BMap.Point(116.404, 40.10), 10);
-    map.enableScrollWheelZoom(true);
+    bdMap = new BMap.Map('mapContainer');
+    // 设置中心点
+    if(curCityInfo.lng && curCityInfo.lat){
+		var point = new BMap.Point(curCityInfo.lng, curCityInfo.lat);
+		bdMap.centerAndZoom(point, curCityInfo.zoom || 10);
+	}
+	else{
+		// 创建地址解析器实例
+    	var myGeo = new BMap.Geocoder();
+    	// 将地址解析结果显示在地图上,并调整地图视野
+		var address =  curCityInfo.name;
+    	myGeo.getPoint(address, function (point) {
+    		if (point) {
+				bdMap.centerAndZoom(point, curCityInfo.zoom || 10);
+    		} else {
+    			alert("您选择地址没有解析到结果!");
+    		}
+    	}, address);
+	}
+    bdMap.enableScrollWheelZoom(true);
     
+    // 设置地图风格
     var  mapStyle ={
         features: ["road", "building","water","land"],//隐藏地图上的poi
-        style : "midnight"  //设置地图风格为高端黑
+        style : "midnight"  
     };
-    map.setMapStyle(mapStyle);
+    bdMap.setMapStyle(mapStyle);
 
+    bdMap.clearOverlays();
+    // 初始化宠物医院数据
+    localStorage.getItem('isShowHospital') && initHospital();
+    // 初始化宠物数据
+    localStorage.getItem('isShowPets') && initPets();
 }
 
 // 宠物医院
 function initHospital() {
-
-    console.log(hospitalData)
+    let length = hospitalData.length;
+    if (length == 0) {
+        return;
+    }
+    var config = {
+        icon: compbase + '/icon/hospital.png',
+        iconWidth: 32,
+        iconHeight: 32,
+    };
+    for(var i=0; i<length; i++) {
+        let point = new BMap.Point(hospitalData[i]['Longitude'],hospitalData[i]['Latitude']);
+        addBdMarker(point, config);
+    }
+    
+}
+// 宠物数据
+function initPets() {
+    let length = 0;
+    let mapPetData = [];
+    for (index in petData) {
+        petData[index] && $.merge(mapPetData, petData[index]);
+    }
+    length = mapPetData.length;
+    
+    if (length == 0) {
+        return;
+    }
+    var config = {
+        icon: compbase + '/icon/dog.png',
+        iconWidth: 32,
+        iconHeight: 32,
+    };
+    for(var i=0; i<length; i++) {
+        let point = new BMap.Point(mapPetData[i]['Longitude'],mapPetData[i]['Latitude']);
+        addBdMarker(point, config);
+    }
+    
 }
 
+// 添加覆盖物
+function addBdMarker(point, config){
+    var options = {};
+    // 图标尺寸
+    var iconWidth = config.iconWidth || 32;
+    var iconHeight = config.iconHeight || 32;
+    var iconSize = new BMap.Size(iconWidth,iconHeight);
 
-
-
-initBdMap();
+    if (config.icon) {
+        options.icon = new BMap.Icon(config.icon,iconSize);
+    }
+    
+    var marker = new BMap.Marker(point, options);
+    bdMap.addOverlay(marker);
+}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 115 - 33
gitee-datav/智慧运维/PetsDataView/js/data.js


+ 163 - 197
gitee-datav/智慧运维/PetsDataView/js/index.js

@@ -1,51 +1,80 @@
- //时间
- var timer = null;
- function setTime(){
-     if(timer !== null){
-         clearTimeout(timer);
-     }
-     setTimeout(function () {
-         $("#date").text(getTime()[0]);
-         $("#time").text(getTime()[1] +"  "+ getTime()[2]);
-         setTime();
-     },1000);
- }
- setTime();
-
- //legend 生成图例
- function createLegend() {
-     var html = '';
-         html += '<div class="legend-content" onmouseover="$(this).css(\'cursor\',\'pointer\');showCityOpt();" onmouseout="hideCityOpt();"><span><img src="icon/legend.png"/>运维区域</span></div>';
-         html += '<div class="legend-content">';
-         html += '<span><input type="checkbox" id="pets_distribute" /><label for="pets_distribute" style="font-size: 14px;">宠物分布</label></span>';
-         html += '<span><input type="checkbox" id="pets_hospital" /><label for="pets_hospital" style="font-size: 14px;">宠物医院</label></span>';
-         html += '<span><input type="checkbox" id="pets_vaccine" /><label for="pets_vaccine" style="font-size: 14px;">疫苗注射点</label></span>';
-         html += '<span><input type="checkbox" id="pets_service" /><label for="pets_service" style="font-size: 14px;">上牌服务点</label></span>';
-         html += '</div>';
-         //  选择城市
-         html += '<div id="cityOpt" onmouseover="showCityOpt()" onmouseout="hideCityOpt()">';
-         cityData.map(function(e){
-            html += "<ul class='city-item'><li>";
-            // 地市级
-            html += "<a href='javascript:void(0)' class='city-choose city' data-city-id='"+e.code+"'>"+ e.name +"</a>";
-            e.areas.map(function(el){
-                // 县区
-                html += "<a href='javascript:void(0)' class='city-choose county' data-city-id='"+el.code+"'>"+ el.name +"</a>";
-            })
-            html += "</li></ul>";
-
-         });
-
-         html += '</div>';
-     $("body #position_top").append(html);
-
-     initStyle();
- }
-
- createLegend();
-
- // 设置悬浮图标Css
- function initStyle() {
+// 默认显示宠物和医院
+$(function(){
+    setTime();
+    // 初始化数据
+    initData();
+    // 初始化大屏样式
+    initScreen();
+
+    var isFirstLoadding = localStorage.getItem('isFirstLoadding');
+    // 第一次加载
+    if (isFirstLoadding === null) {
+        $('#pets_distribute').attr('checked','checked');
+        localStorage.setItem('isShowPets',true);
+        $('#pets_hospital').attr('checked','checked');
+        localStorage.setItem('isShowHospital',true);
+
+        localStorage.setItem('isFirstLoadding',false);
+    } else {
+        localStorage.getItem('isShowPets') && $('#pets_distribute').attr('checked','checked');
+        localStorage.getItem('isShowHospital') && $('#pets_hospital').attr('checked','checked');
+    }
+
+    // 初始化地图
+    initBdMap();
+
+    
+});
+
+//时间
+var timer = null;
+function setTime(){
+    if(timer !== null){
+        clearTimeout(timer);
+    }
+    setTimeout(function () {
+        $("#date").text(getTime()[0]);
+        $("#time").text(getTime()[1] +"  "+ getTime()[2]);
+        setTime();
+    },1000);
+}
+
+// 初始化数据
+function initData() {
+    getHospitalData();
+    getPetData();
+    getSearchPetsData();
+    getRecordPetsPieData();
+    getRecordRankingData();
+}
+
+// 初始化大屏
+function initScreen() {
+    $('#position_left').text() && $('#position_left').html('');
+    $('#position_top').text() && $('#position_top').html('');
+    $('#position_right').text() && $('#position_right').html('');
+    // 头部导航
+    initTopNav();
+    // 上牌排名
+    initRecordRank();
+    // 数据统计
+    initStatistics();
+    // 备案宠物品种统计
+    initRecordPetsPie();
+    // 寻宠轮播
+    initSearchPets();
+    // 初始化tips
+    initStyle();
+}
+
+
+// 窗口尺寸改变
+$(window).resize(function(e){
+    initStyle();
+});
+
+// 设置悬浮图标Css
+function initStyle() {
     var window_w = $(window).width();
     var position_left_w = $('#position_left').width();
     var position_right_w = $('#position_right').width();
@@ -60,156 +89,7 @@
         $('#position_right').css({top:"90px"});
     }
     $('#cityOpt').css({left:(position_left_w + 20) +"px"});
- }
-
- // 窗口尺寸改变
- $(window).resize(function(e){
-    initStyle();
- });
-
-
- //生成卡片
- // 数据统计
- var zhzb =
-     '<ul>' +
-         '<li><span class="zhzb-li-name">已备案宠物<span class="typeStyle">(只)</span></span><span class="zhzb-li-num">653212</span></li>' +
-         '<li><span class="zhzb-li-name">宠物医院<span class="typeStyle">(所)</span></span><span class="zhzb-li-num">' + hospitalData.length + '</span></li>' +
-         '<li><span class="zhzb-li-name">疫苗注射点<span class="typeStyle">(个)</span></span><span class="zhzb-li-num">4213</span></li>' +
-         '<li><span class="zhzb-li-name">上牌服务点<span class="typeStyle">(个)</span></span><span class="zhzb-li-num">108</span></li>' +
-     '</ul>';
-
- var zzb = new CreateTip({
-     parentId: "position_left",
-     id:"zongzhibiao",
-     titleName:"数据统计",
-     icon:"icon/statistics.png",
-     width: "100%",
-//        html:zhzb
- });
- zzb.setData(zhzb);
-
-// 犬种统计图
-var species = '<div id="specie_pie"></div>';
-var specieObj = new CreateTip({
-    parentId: "position_left",
-    id: "species",
-    titleName: "犬种统计图",
-    icon: "icon/pie.png",
-    width: "100%",
-});
-specieObj.setData(species);
-
-var specie_pie = echarts.init(document.getElementById('specie_pie'));
-var specie_pie_option = {
-    textStyle: {
-        color: "#fff",
-    },
-    title: {
-        // text: '某站点用户访问来源',
-        // subtext: '纯属虚构',
-        left: 'center'
-    },
-    tooltip: {
-        trigger: 'item',
-        formatter: '{a} <br/>{b} : {c} ({d}%)'
-    },
-    legend: {
-        // orient: 'vertical',
-        left: 'left',
-        data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎'],
-        textStyle: {
-            color: "#fff",
-        }
-    },
-    series: [
-        {
-            name: '访问来源',
-            type: 'pie',
-            radius: '55%',
-            center: ['50%', '60%'],
-            data: [
-                {value: 335, name: '直接访问'},
-                {value: 310, name: '邮件营销'},
-                {value: 234, name: '联盟广告'},
-                {value: 135, name: '视频广告'},
-                {value: 1548, name: '搜索引擎'}
-            ],
-            emphasis: {
-                itemStyle: {
-                    shadowBlur: 10,
-                    shadowOffsetX: 0,
-                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-                }
-            }
-        }
-    ]
-};
-specie_pie.setOption(specie_pie_option);
-
-
-
-
- //详细指标
- var xxzb = '<div id="qybxspm"></div>';
- var xzb = new CreateTip({
-     parentId: "position_right",
-     id:"xxzb",
-     titleName:"上牌排行榜",
-     icon:"icon/statistics.png",
-     width:"100%",
-//        html:xxzb
- });
- xzb.setData(xxzb);
-
- var qybxspm = new CreateSpeed({
-     id:"qybxspm",
-     icon:"icon/fix.png",
-    //  title:"上牌排行",
-     max:1300
- });
- qybxspm.setData([
-     {"name":"中部","data":1123,"color":"#55DAED"},
-     {"name":"东部","data":904,"color":"#55B6ED"},
-     {"name":"西部","data":845,"color":"#3F80D2"},
-     {"name":"北部","data":756,"color":"#2B5DB8"},
-     {"name":"南部","data":684,"color":"#1864E3"}
- ]);
-
-// 寻宠轮播
-var search_pets = "";
-if (searchPetsData.length == 0) {
-    search_pets += '<p style="color: #fff; text-align: center;">暂无数据</p>';
-} else {
-
-    searchPetsData.forEach(function(item, index){
-        let text = item.decribe || '';
-        if (text.length > 96) {
-            text = text.slice(0,96) + '...';
-        }
-        search_pets += "<div class='pets-carousel-item' " + ((searchPetsIndex != index) ? "style='display:none'" : '') + ">";
-        search_pets += "<div class='pets-search-info'>";
-        search_pets += "<img src='"+item.photo+"' alt='宠物图片' width='120px' height='120px' />";
-        search_pets += "<div class='pets-info'>" 
-        + "<span>宠物名称:" +item.name + "</span>"
-        + "<span>设备编号:" +item.deviceNumber+ "</span>"
-        + "<span>发布人:" +item.userName + "</span>"
-        + "<span>联系电话:" +item.phone+ "</span>"
-        + "<span>丢失地点:" +item.address+ "</span></div>";
-        search_pets += "</div>";
-        search_pets += "<div class='pets-describe'>"+text+"</div>";
-        search_pets += "</div>";
-    });
-
 }
-var xcObj = new CreateTip({
-    parentId: "position_right",
-    id: "search_pets",
-    titleName: "寻宠信息",
-    icon: "icon/alarm.png",
-    width: "100%"
-});
-xcObj.setData(search_pets);
- 
 // 显示/隐藏城市
 function showCityOpt() {
     $('#cityOpt').show();
@@ -217,3 +97,89 @@ function showCityOpt() {
 function hideCityOpt() {
     $('#cityOpt').hide();
 }
+
+// 寻宠轮播
+setInterval(function(){
+    var times = searchPetsData.length;
+    if (times <= 1) {
+        return;
+    }
+    $('#pets-carousel-item'+searchPetsIndex).hide();
+    searchPetsIndex++;
+    if (searchPetsIndex == times) {
+        searchPetsIndex = 0;
+    }
+    $('#pets-carousel-item'+searchPetsIndex).show();
+},searchPetsInterval * 1000);
+
+// 全屏模式
+function fullScreen() {
+    var e = document.documentElement
+      , a = e.requestFullScreen || e.webkitRequestFullScreen || e.mozRequestFullScreen || e.msRequestFullscreen;
+    "undefined" != typeof a && a && a.call(e)
+}
+function exitScreen() {
+    document.documentElement;
+    document.exitFullscreen ? document.exitFullscreen() : document.mozCancelFullScreen ? document.mozCancelFullScreen() : document.webkitCancelFullScreen ? document.webkitCancelFullScreen() : document.msExitFullscreen && document.msExitFullscreen()
+}
+
+$('.nav-full-screen').on('click',function(e){
+    var a = "nav-icon-screen-full"
+        , t = "nav-icon-screen-restore";
+    $(this).hasClass(a) ? (fullScreen(),$(this).addClass(t).removeClass(a).attr('src',compbase + '/icon/min-screen.png')) : (exitScreen(),$(this).addClass(a).removeClass(t).attr('src',compbase + '/icon/full-screen.png'));
+});
+
+// 显示/隐藏宠物覆盖物
+$(document).on('click','#pets_distribute',function(){
+    var isChecked = $(this).attr('checked');
+    if (isChecked) {
+        $(this).removeAttr('checked');
+        localStorage.removeItem('isShowPets');
+    } else {
+        $(this).attr('checked','checked');
+        localStorage.setItem('isShowPets',true);
+    }
+    initBdMap();
+});
+// 显示/隐藏宠物医院覆盖物
+$(document).on('click','#pets_hospital',function(){
+    var isChecked = $(this).attr('checked');
+    if (isChecked) {
+        $(this).removeAttr('checked');
+        localStorage.removeItem('isShowHospital');
+    } else {
+        $(this).attr('checked','checked');
+        localStorage.setItem('isShowHospital',true);
+    }
+    initBdMap();
+});
+// 切换城市
+$(document).on('click','.city-choose',function(e){
+    var cityid = $(this).data('cityid');
+
+    cityData.some(function(item1){
+        if (item1.id == cityid) {
+            curCityInfo = item1;
+            return true;
+        }
+        item1.sub && item1.sub.some(function(item2){
+            if (item2.id == cityid) {
+                curCityInfo = item2;
+                return true;
+            }
+        })
+    });
+
+    localStorage.setItem('curCityInfo',JSON.stringify(curCityInfo));
+
+    // 重新加载数据
+    getHospitalData();
+    getPetData();
+    getSearchPetsData();
+    getRecordPetsPieData();
+    getRecordRankingData();
+
+    initScreen();
+
+    initBdMap();
+});

+ 183 - 0
gitee-datav/智慧运维/PetsDataView/js/tips.js

@@ -0,0 +1,183 @@
+//生成卡片
+// 头部导航
+function initTopNav() {
+    var html = '';
+        html += '<div class="legend-content" onmouseover="$(this).css(\'cursor\',\'pointer\');showCityOpt();" onmouseout="hideCityOpt();">'
+              + '<span><img src="' + compbase + '/icon/legend.png"/>城市</span>' 
+              + '<span> [ '+ curCityInfo.name +' ] </span></div>';
+        html += '<div class="legend-content">';
+        html += '<span><input type="checkbox" id="pets_distribute" /><label for="pets_distribute" style="font-size: 14px;">宠物分布</label></span>';
+        html += '<span><input type="checkbox" id="pets_hospital" /><label for="pets_hospital" style="font-size: 14px;">宠物医院</label></span>';
+        // html += '<span><input type="checkbox" id="pets_vaccine" /><label for="pets_vaccine" style="font-size: 14px;">疫苗注射点</label></span>';
+        // html += '<span><input type="checkbox" id="pets_service" /><label for="pets_service" style="font-size: 14px;">上牌服务点</label></span>';
+        html += '</div>';
+        //  选择城市
+        html += '<div id="cityOpt" onmouseover="showCityOpt()" onmouseout="hideCityOpt()">';
+        cityData.length && cityData.map(function(e){
+           html += "<ul class='city-item'><li>";
+           // 地市级
+           html += "<a href='javascript:void(0)' class='city-choose city' data-cityid='"+e.id+"'>"+ e.name +"</a>";
+            e.sub && e.sub.length && e.sub.map(function(el){
+               // 县区
+               html += "<a href='javascript:void(0)' class='city-choose county' data-cityid='"+el.id+"'>"+ el.name +"</a>";
+           })
+           html += "</li></ul>";
+
+        });
+
+        html += '</div>';
+    $("body #position_top").append(html);
+}
+
+// 数据统计
+function initStatistics() {
+    // 计算登记宠物数
+    var petsNum = 0;
+    var waitRenewalNum = 0;
+    petData.wait_renewal && (waitRenewalNum = petData.wait_renewal.length) && (petsNum += waitRenewalNum);
+    petData.normal && (petsNum += petData.normal.length);
+    var zhzb =
+    '<ul>' +
+        '<li><span class="zhzb-li-name">宠物医院<span class="typeStyle">(所)</span></span><span class="zhzb-li-num">' + hospitalData.length + '</span></li>' +
+        '<li><span class="zhzb-li-name">登记犬只数<span class="typeStyle">(只)</span></span><span class="zhzb-li-num">'+ petsNum +'</span></li>' +
+        '<li><span class="zhzb-li-name">待续期犬证<span class="typeStyle">(张)</span></span><span class="zhzb-li-num">'+ waitRenewalNum +'</span></li>'
+        // '<li><span class="zhzb-li-name">疫苗注射点<span class="typeStyle">(个)</span></span><span class="zhzb-li-num">4213</span></li>' +
+        // '<li><span class="zhzb-li-name">上牌服务点<span class="typeStyle">(个)</span></span><span class="zhzb-li-num">108</span></li>' +
+    '</ul>';
+
+    var zzb = new CreateTip({
+    parentId: "position_left",
+    id:"zongzhibiao",
+    titleName:"数据统计",
+    icon:"icon/statistics.png",
+    width: "100%",
+    //        html:zhzb
+    });
+    zzb.setData(zhzb);
+}
+
+// 上牌排行
+function initRecordRank() {
+    // 计算上牌数
+    var petsNum = 0;
+    petData.wait_renewal && (petsNum += petData.wait_renewal.length);
+    petData.normal && (petsNum += petData.normal.length);
+    //详细指标
+    var xxzb = '<div id="qybxspm">';  
+                if (petsNum == 0) {
+                    xxzb += '<p style="color: #fff; text-align: center;">暂无数据</p>';
+                }
+        xxzb += '</div>';
+    var xzb = new CreateTip({
+        parentId: "position_right",
+        id:"xxzb",
+        titleName:"上牌排行榜",
+        icon:"icon/statistics.png",
+        width:"100%",
+    //        html:xxzb
+    });
+    xzb.setData(xxzb);
+
+    var qybxspm = new CreateSpeed({
+        id:"qybxspm",
+        icon:"icon/fix.png",
+        //  title:"上牌排行",
+        max: petsNum
+    });
+    qybxspm.setData(recordRankingData);
+}
+
+// 寻宠轮播
+function initSearchPets() {
+    var search_pets = "";
+    if (searchPetsData.length == 0) {
+        search_pets += '<p style="color: #fff; text-align: center;">暂无数据</p>';
+    } else {
+        
+        searchPetsData.forEach(function(item, index){
+            let text = item.Description || '';
+            if (text.length > 96) {
+                text = text.slice(0,96) + '...';
+            }
+            search_pets += "<div class='pets-carousel-item' " + ((searchPetsIndex != index) ? "style='display:none'" : '') + " id='pets-carousel-item"+index+"' >";
+            search_pets += "<div class='pets-search-info'>";
+            search_pets += "<img src='"+(item.PetPhotos_0 || item.PetPhotos_1 || compbase +'/icon/pet-default.jpg')+"' alt='宠物图片' width='120px' height='120px' />";
+            search_pets += "<div class='pets-info'>" 
+            + "<span>宠物昵称:" +(item.PetName || '') + "</span>"
+            + "<span>狗牌编号:" +(item.DeviceNumber || '') + "</span>"
+            + "<span>发布人:" +item.UserName + "</span>"
+            + "<span>联系电话:" +item.Mobile+ "</span>"
+            + "<span>丢失地点:" +(item.Address || '')+ "</span></div>";
+            search_pets += "</div>";
+            search_pets += "<div class='pets-describe'>"+text+"</div>";
+            search_pets += "</div>";
+        });
+    
+    }
+    var xcObj = new CreateTip({
+        parentId: "position_right",
+        id: "search_pets",
+        titleName: "寻宠信息",
+        icon: "icon/alarm.png",
+        width: "100%"
+    });
+    xcObj.setData(search_pets);
+}
+ 
+// 犬种统计图
+function initRecordPetsPie() {
+    var species = '<div id="specie_pie"></div>';
+    var specieObj = new CreateTip({
+        parentId: "position_left",
+        id: "species",
+        titleName: "已备案品种统计",
+        icon: "icon/pie.png",
+        width: "100%",
+    });
+    specieObj.setData(species);
+
+    var specie_pie = echarts.init(document.getElementById('specie_pie'));
+    var specie_pie_option = {
+        textStyle: {
+            color: "#fff",
+        },
+        title: {
+            // text: '标题',
+            // subtext: '子标题',
+            left: 'center'
+        },
+        tooltip: {
+            trigger: 'item',
+            formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+            // orient: 'vertical',
+            left: 'left',
+            data: recordPetsPieData.map(function(e){return e.name}),
+            textStyle: {
+                color: "#fff",
+            }
+        },
+        series: [
+            {
+                name: '宠物品种',
+                type: 'pie',
+                radius: '55%',
+                center: ['45%', '60%'],
+                data: recordPetsPieData.map(function(e){
+                    //e.name = e.name + '(' + e.value +')';
+                    return e;
+                }),
+                emphasis: {
+                    itemStyle: {
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                    }
+                }
+            }
+        ]
+    };
+    specie_pie.setOption(specie_pie_option);
+
+}

+ 1 - 1
gitee-datav/智慧运维/PetsDataView/lib/createSpeed.js

@@ -17,7 +17,7 @@ CreateSpeed.prototype = {
             if (_view_.option.title) {
 
                 html += '<div class="speed-title">';
-                html += '<span><img src="'+_view_.option.icon+'"></span><span>'+_view_.option.title+'</span><span><img src="icon/xjt.png"></span>';
+                html += '<span><img src="'+ compbase +'/'+_view_.option.icon+'"></span><span>'+_view_.option.title+'</span><span><img src="'+ compbase +'/icon/xjt.png"></span>';
                 html += '</div>';
             }
                 

+ 3 - 3
gitee-datav/智慧运维/PetsDataView/lib/createTip.js

@@ -14,7 +14,7 @@ CreateTip.prototype = {
         var _view_ = this;
         var html = '';
         html += '<div id="'+_view_.option.id+'" class="tip-container" style="width: '+_view_.option.width +'">';
-        html += '<div class="tip-title"><span><img src="'+_view_.option.icon+'"/></span><span>'+_view_.option.titleName+'</span><span class="tip-dropDown"><img src="icon/fold.png"/></span></div>';
+        html += '<div class="tip-title"><span><img src="'+ compbase +'/'+_view_.option.icon+'"/></span><span>'+_view_.option.titleName+'</span><span class="tip-dropDown"><img src="'+ compbase +'/icon/fold.png"/></span></div>';
         html += '<div class="tip-content">';
         // html += _view_.option.html;
         html += '</div>';
@@ -41,11 +41,11 @@ CreateTip.prototype = {
             var $tipContent =  $("#"+_view_.option.id+" .tip-content");
             if(!_view_.drop){
                 $tipContent.slideUp();
-                $(this).find("img").attr("src","icon/unfold.png");
+                $(this).find("img").attr("src",compbase + "/icon/unfold.png");
                 _view_.drop = true;
             }else{
                 $tipContent.slideDown();
-                $(this).find("img").attr("src","icon/fold.png");
+                $(this).find("img").attr("src",compbase + "/icon/fold.png");
                 _view_.drop = false;
             }
         });

+ 1 - 0
gitee-datav/智慧运维/PetsDataView/lib/loadingScript.js

@@ -32,6 +32,7 @@
         "lib/createTip.js",
         "lib/createSpeed.js",
         "js/data.js",
+        "js/tips.js",
         "js/bdMap.js",
         "js/index.js"
     ];

+ 18 - 10
gitee-datav/智慧运维/PetsDataView/style/cssFile.css

@@ -41,7 +41,7 @@ ul,li,img{
 .nav-top-time{
     position: absolute;
     top:0;
-    right: 10px;
+    left: 10px;
     padding: 20px;
 }
 .nav-top-time span{
@@ -148,26 +148,25 @@ ul,li,img{
     margin: 0;
 }
 .speed-content ul li span:nth-child(1){
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
     display: block;
     width: 30%;
-    /*height: 20px;*/
     float: left;
     padding: 0;
     margin: 0;
-    /*line-height: 20px;*/
 }
 .speed-content ul li span:nth-child(2){
     display: block;
-    /*height: 20px;*/
     float: right;
     padding: 0;
     margin: 0;
-    /*line-height: 20px;*/
 }
 .speed-line{
     width: 200px;
     background-color: #043037;
-    width: 70%;
+    width: 68%;
     height: 13px;
     margin-top: 8px!important;
     border-radius: 5px;
@@ -348,17 +347,19 @@ ul,li,img{
 }
 
 #specie_pie {
-    width: 300px;
+    width: 380px;
     height: 300px;
 }
 
+#specie_bar {
+    width: 380px;
+    height: 400px;
+}
+
 #search_pets {
     color: #fff;
 }
 
-/* .pets-carousel-item {
-    display: none;
-} */
 .pets-search-info {
     display: flex;
 }
@@ -370,4 +371,11 @@ ul,li,img{
 .pets-describe {
     margin-top: 10px;
     text-indent: 2em;
+}
+
+#nav-top-screen {
+    position: absolute;
+    top: 0;
+    right: 10px;
+    padding: 20px;
 }

BIN
gitee-datav/智慧运维/PetsDataView/可视化监控管理平台.png