From eea897aeac44a75e93fdc90939261f1b44711087 Mon Sep 17 00:00:00 2001
From: lgq <1015864684@qq.com>
Date: 星期二, 08 七月 2025 18:11:31 +0800
Subject: [PATCH] 1.同步最新文件

---
 local/www/js/page/three-img.js |  464 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 268 insertions(+), 196 deletions(-)

diff --git a/local/www/js/page/three-img.js b/local/www/js/page/three-img.js
index bd305cb..70852f4 100644
--- a/local/www/js/page/three-img.js
+++ b/local/www/js/page/three-img.js
@@ -20,50 +20,58 @@
 
 var testList = [
     {
-        "id":"21",
+        "id":"2211",
         "name":"娓╂箍搴�#1",
-        "category":"2001",
-        "type":"0",
-        "leftV":"0.4840",
-        "topV":"0.2015",
-        "value":[{
-            "passcode":"3",
-            "name":"娓╁害",
-            "value":"18"
-        },{
-            "passcode":"4",
-            "name":"婀垮害",
-            "value":"60"
-        }]
-    },{
-        "id":"2",
-        "name":"娓╂箍搴�#1",
-        "category":"2001",
-        "type":"0",
-        "leftV":"0.4840",
-        "topV":"0.2015",
-        "value":[{
-            "passcode":"3",
-            "name":"娓╁害",
-            "value":"18"
-        },{
-            "passcode":"4",
-            "name":"婀垮害",
-            "value":"60"
-        }]
-    },{
-        "id":"3",
-        "name":"绮惧瘑绌鸿皟#1",
         "category":"3004",
+        "type":"0",
+        "leftV":"0.4040",
+        "topV":"0.2515",
+        "value":[{
+            "passcode":"2",
+            "name":"娓╁害",
+            "value":"1"
+        },{
+            "passcode":"3",
+            "name":"娓╁害",
+            "value":"18"
+        },{
+            "passcode":"4",
+            "name":"婀垮害",
+            "value":"60"
+        }]
+    },{
+        "id":"2221",
+        "name":"娓╂箍搴�#1",
+        "category":"2002",
+        "type":"0",
+        "leftV":"0.4840",
+        "topV":"0.2015",
+        "value":[{
+            "passcode":"3",
+            "name":"娓╁害",
+            "value":"18"
+        },{
+            "passcode":"4",
+            "name":"婀垮害",
+            "value":"60"
+        }]
+    },{
+        "id":"3331",
+        "name":"绮惧瘑绌鸿皟#1",
+        "category":"2002",
         "type":"0",
         "leftV":"0.6840",
         "topV":"0.5015",
         "value":[{
             "passcode":"1",
             "name":"娓╁害",
-            "value":"18"
+            "value":"1"
         },{
             "passcode":"2",
+            "name":"娓╁害",
+            "value":"1"
+        },{
+            "passcode":"3",
             "name":"婀垮害",
             "value":"60"
         }]
@@ -144,7 +152,9 @@
     if(imgData){
         $("#img-three").attr('src', imgData);
     }
-    // $("#img-three").css("height", imgHei);
+    $("#img-three").css("height", imgHei);
+    // $("#img-three").css("width", "100%");
+    $("#img-three").show();
 };
 
 //鑾峰彇璁惧鍒楄〃锛屾覆鏌撴樉绀鸿澶囦俊鎭�
@@ -179,74 +189,113 @@
     var tagValue;
     var category;
     var recordMap;
-    var warnState;
+    var warnState = 0;
     var i;
-    console.log("=========鎵�鏈夎澶囦俊鎭�=========");
-    console.log(listDevice);
+    var name;
+    var warnStr = " warn-div ";
+    // console.log("=========鎵�鏈夎澶囦俊鎭�=========");
+    // console.log(listDevice);
     $.each(listDevice, function (index, device) {
+
         i = index;
         left = (parentWidth * device.leftV).toFixed(4);
         top = (parentHeight * device.topV).toFixed(4);
         category = device.category;//璁惧绫诲瀷
         id = device.id;//璁惧ID
-        if(id && category){
-            if(category != CATEGORY.D2090.code && category != CATEGORY.D2091.code){
-                recordMap = device.value;//璁惧鐩戞帶灞炴�ч泦鍚�
-                warnState = device.type;
-                tagValue = addCurData(category, recordMap, warnState,device);
-                temp = "";
-                if(device.id == thId1 || device.id == thId2){
-                    if(device.id == thId1){
-                        thData1 = device;
+        name = device.name;
+
+        if(category != CATEGORY.D3009.code){
+            if(id && category){
+                if(category != CATEGORY.D2090.code && category != CATEGORY.D2091.code){
+                    recordMap = device.value;//璁惧鐩戞帶灞炴�ч泦鍚�
+                    warnState = device.type;
+                    tagValue = addCurData(category, recordMap, warnState,device);
+                    warnState = tagValue.warnState;
+                    if(warnState == 0){
+                        warnStr = "";
                     }else{
-                        thData2 = device;
-                    }
-                    temp += "<div id='" + device.id
-                        + "' class='tip arrow_box'  style='left:" + left+ "px;top:" + top + "px;display: none;' "
-                        + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
-                    temp += "<div class = 'div-c'>";
-                    temp += "</div>";
-                    temp += "<div class = 'div-d' style='font-size: 14px;'><p style='margin-bottom: 5px;'><span>闇茬偣娓╁害1</span><span style='margin-left: 10%;'>闇茬偣娓╁害2</span></p>" +
-                        "<p><span style='margin-left: 1%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span>" +
-                        "<span style='margin-left: 15%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span></div>";
-                    temp += "</div>";
-
-                }else{
-                    if ("FULL" == tagValue.code) {
-                        temp += "<div id='" + device.id
-                            + "' class='tip arrow_box'  style='left:" + left+ "px;top:" + top + "px;' "
-                            + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
-                    } else {
-                        temp += "<div id='" + device.id
-                            + "' class='tip arrow_min'  style='left:" + left + "px;top:" + top + "px;' "
-                            + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+                        warnStr = " warn-div ";
                     }
 
-                    temp += "<div class = 'div-c'>";
-                    temp += addCurImg(category);
-                    temp += "</div>";
-                    temp += tagValue.htm;
-                    temp += "</div>";
-                }
-                // if(category == CATEGORY.D3001.code){
-                //     console.log("=========闂ㄧ璁惧=========璁惧淇℃伅锛�");
-                //     console.log(device);
-                // }
+                    temp = "";
+                    if(device.id == thId1 || device.id == thId2){
+                        if(device.id == thId1){
+                            thData1 = device;
+                        }else{
+                            thData2 = device;
+                        }
+                        temp += "<div id='" + device.id
+                            + "' class='tip arrow_box "+warnStr+"'  style='left:" + left+ "px;top:" + top + "px;display: none;' "
+                            + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+                        temp += "<div class = 'div-c'>";
+                        temp += "</div>";
+                        temp += "<div class = 'div-d' style='font-size: 14px;'><p style='margin-bottom: 5px;'><span>闇茬偣娓╁害1</span><span style='margin-left: 10%;'>闇茬偣娓╁害2</span></p>" +
+                            "<p><span style='margin-left: 1%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span>" +
+                            "<span style='margin-left: 15%;background-color: rgba(21, 221, 86, 1);padding: 0% 5%;'>22.2鈩�</span></div>";
+                        temp += "</div>";
 
-                if(device.id != "1001" && device.id != "1002"){
+                    }else{
+                        if ("FULL" == tagValue.code) {
+                            temp += "<div id='" + device.id
+                                + "' class='tip arrow_box "+warnStr+"'  style='left:" + left+ "px;top:" + top + "px;' "
+                                + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+                            temp += "<div class = 'div-c'>";
+                            temp += addCurImg(category,warnState);
+                            temp += "</div>";
+                            temp += tagValue.htm;
+
+                            // temp += "<div class = 'div-d' style='margin-top: -5px;'>";
+                            // temp += "<span style='padding: 2px;background-color: #524c4c;color: white;'>";
+                            // temp += name;
+                            // temp += "</span>";
+                            // temp += "</div>";
+
+                            temp += "</div>";
+                        } else {
+                            temp += "<div id='" + device.id
+                                + "' class='tip arrow_min "+warnStr+"'  style='left:" + left + "px;top:" + top + "px;' "
+                                + "name='" + device.name + "' category='" + category + "' index='" + index + "'>";
+                            temp += "<div class = 'div-c'>";
+                            temp += addCurImg(category,warnState);
+                            temp += "</div>";
+                            temp += tagValue.htm;
+
+                            // temp += "<div class = 'div-d' style='margin-top: -10px;'>";
+                            // temp += "<span style='padding: 2px;background-color: #524c4c;color: white;'>";
+                            // temp += name;
+                            // temp += "</span>";
+                            // temp += "</div>";
+
+                            temp += "</div>";
+                        }
+
+                        // temp += "<div class = 'div-c'>";
+                        // temp += addCurImg(category);
+                        // temp += "</div>";
+                        // temp += tagValue.htm;
+                        // temp += "</div>";
+                    }
+                    // if(category == CATEGORY.D3001.code){
+                    //     console.log("=========闂ㄧ璁惧=========璁惧淇℃伅锛�");
+                    //     console.log(device);
+                    // }
+
+                    // if(device.id != "1001" && device.id != "1002"){
+                    //     //鍒犻櫎鍘熸湁鍏冪礌锛屽湪杩涜杩藉姞
+                    //     $("#"+device.id).remove();
+                    //     parent.append(temp);
+                    //
+                    // }
                     //鍒犻櫎鍘熸湁鍏冪礌锛屽湪杩涜杩藉姞
                     $("#"+device.id).remove();
                     parent.append(temp);
-
                 }
-                // //鍒犻櫎鍘熸湁鍏冪礌锛屽湪杩涜杩藉姞
-                // $("#"+device.id).remove();
-                // parent.append(temp);
+            }else{
+                console.log("=========娌℃湁鑾峰彇鍒拌璁惧鐨勮澶噄d锛堢被鍨嬶級=========璁惧淇℃伅锛�");
+                console.log(device);
             }
-        }else{
-            console.log("=========娌℃湁鑾峰彇鍒拌璁惧鐨勮澶噄d锛堢被鍨嬶級=========璁惧淇℃伅锛�");
-            console.log(device);
         }
+
 
 
     });
@@ -308,25 +357,25 @@
             name = "娓╂劅";
         }
         if (category == CATEGORY.D3004.code) {
-            // url = "./detail-video.html?id=999&type=" + category;
-            // name = "瑙嗛";
-            var html = '';
-            html += '<iframe class="J_iframe" name="iframe0" width="100%" height="100%" ';
-            html += 'src="./detail-video-pop.html?id='+deviceId+'&type='+category+'" ';
-            html += ' frameborder="0" data-id="detail-ty-2.html" seamless></iframe>';
-            $("#video .popCon").html(html);
-            $("#device-name").text(name);
-            layer.open({
-                skin: 'mypop',
-                type: 1,
-                title: false,
-                area: ['100%', '100%'],
-                closeBtn: 0,
-                shade: 0,
-                scrollbar: false,
-                content: $('#video')
-            });
-            return;
+            url = "./detail-video.html?id=999&type=" + category;
+            name = "瑙嗛";
+            // var html = '';
+            // html += '<iframe class="J_iframe" name="iframe0" width="100%" height="100%" ';
+            // html += 'src="./detail-video-pop.html?id='+deviceId+'&type='+category+'" ';
+            // html += ' frameborder="0" data-id="detail-ty-2.html" seamless></iframe>';
+            // $("#video .popCon").html(html);
+            // $("#device-name").text(name);
+            // layer.open({
+            //     skin: 'mypop',
+            //     type: 1,
+            //     title: false,
+            //     area: ['100%', '100%'],
+            //     closeBtn: 0,
+            //     shade: 0,
+            //     scrollbar: false,
+            //     content: $('#video')
+            // });
+            // return;
         }
         // console.log("===================璺宠浆==================");
         // console.log("url="+url);
@@ -586,20 +635,22 @@
             recordMap[record[i].passcode] = record[i];
         }
     }
-    var result = {code: "FULL", htm: ""};
+    var result = {code: "FULL", htm: "",warnState:0};
     var temp = "";
-    //娓╂箍搴�-鍙樉绀烘俯搴﹀拰婀垮害
+    // //娓╂箍搴�-鍙樉绀烘俯搴﹀拰婀垮害
     if (category == CATEGORY.D2001.code) {
         if(recordMap){
             if(recordMap[1] && recordMap[1].value == 1){
                 temp += "<div class = 'div-d font-warn'>";
                 // temp += "<p><span>"+device.name+"</span></p>";
                 temp += "<p><span>閫氳寮傚父</span></p>";
+                result.warnState = 1;
             }else{
                 if(recordMap[2] && recordMap[2].value == 1){
                     temp += "<div class = 'div-d font-warn'>";
                     // temp += "<p><span>"+device.name+"</span></p>";
                     // temp += "<p><span>鎶ヨ</span></p>";
+                    result.warnState = 1;
                 }else{
                     temp += "<div class = 'div-d'>";
                     // temp += "<p><span>"+device.name+"</span></p>";
@@ -616,6 +667,7 @@
             temp += "<div class = 'div-d font-warn'>";
             temp += "<p><span>"+device.name+"</span></p>";
             temp += "<p><span>閫氳寮傚父</span></p>";
+            result.warnState = 1;
         }
         temp += "</div>";
         result.htm = temp;
@@ -628,108 +680,114 @@
                 temp += "<div class = 'div-d font-warn'>";
                 // temp += "<p><span>"+device.name+"</span></p>";
                 temp += "<p><span>閫氳寮傚父</span></p>";
+                result.warnState = 1;
             }else{
                 if(recordMap[2] && recordMap[2].value == 1){
                     temp += "<div class = 'div-d font-warn'>";
                     // temp += "<p><span>"+device.name+"</span></p>";
                     // temp += "<p><span>鎶ヨ</span></p>";
+                    result.warnState = 1;
                 }else{
                     temp += "<div class = 'div-d'>";
                     // temp += "<p><span>"+device.name+"</span></p>";
                     // temp += "<p><span>姝e父</span></p>";
-                }
-                if (recordMap[6]) {
-                    temp += "<p><span>璁惧畾娓╁害锛�" + recordMap[7].value + "鈩�</span></p>";
-                }
-                if (recordMap[6]) {
-                    temp += "<p><span>璁惧畾婀垮害锛�" + recordMap[7].value + "%</span></p>";
-                }
-            }
-        }else{
-            temp += "<div class = 'div-d font-warn'>";
-            temp += "<p><span>"+device.name+"</span></p>";
-            temp += "<p><span>閫氳寮傚父</span></p>";
-        }
-        temp += "</div>";
-        result.htm = temp;
-        return result;
-    }
-    //鏅�氱┖璋�
-    if (category == CATEGORY.D2003.code) {
-        if(recordMap){
-            if(recordMap[1] && recordMap[1].value == 1){
-                temp += "<div class = 'div-d font-warn'>";
-                // temp += "<p><span>"+device.name+"</span></p>";
-                temp += "<p><span>閫氳寮傚父</span></p>";
-            }else{
-                if(recordMap[2] && recordMap[2].value == 1){
-                    temp += "<div class = 'div-d font-warn'>";
-                    // temp += "<p><span>"+device.name+"</span></p>";
-                    // temp += "<p><span>鎶ヨ</span></p>";
-                }else{
-                    temp += "<div class = 'div-d'>";
-                    // temp += "<p><span>"+device.name+"</span></p>";
-                    // temp += "<p><span>姝e父</span></p>";
-                }
-                if (recordMap[3]) {
-                    temp += "<p><span>璁惧畾娓╁害锛�" + recordMap[3].value + "鈩�</span></p>";
                 }
                 if (recordMap[4]) {
-                    temp += "<p><span>璁惧畾婀垮害锛�" + recordMap[4].value + "%</span></p>";
+                    temp += "<p><span>瀹ゅ唴娓╁害锛�" + recordMap[4].value + "鈩�</span></p>";
+                }
+                if (recordMap[5]) {
+                    temp += "<p><span>瀹ゅ唴婀垮害锛�" + recordMap[5].value + "%</span></p>";
+                }
+                if (recordMap[6]) {
+                    temp += "<p><span>璁惧畾娓╁害" + recordMap[6].value + "鈩�</span></p>";
                 }
             }
         }else{
             temp += "<div class = 'div-d font-warn'>";
             temp += "<p><span>"+device.name+"</span></p>";
             temp += "<p><span>閫氳寮傚父</span></p>";
+            result.warnState = 1;
         }
         temp += "</div>";
         result.htm = temp;
         return result;
     }
-    //鐢垫睜
-    if (category == CATEGORY.D1005.code) {
-        if(recordMap){
-            if(recordMap[1] && recordMap[1].value == 1){
-                temp += "<div class = 'div-d font-warn'>";
-                // temp += "<p><span>"+device.name+"</span></p>";
-                temp += "<p><span>閫氳寮傚父</span></p>";
-            }else{
-                if(recordMap[2] && recordMap[2].value == 1){
-                    temp += "<div class = 'div-d font-warn'>";
-                    // temp += "<p><span>"+device.name+"</span></p>";
-                    // temp += "<p><span>鎶ヨ</span></p>";
-                }else{
-                    temp += "<div class = 'div-d'>";
-                    // temp += "<p><span>"+device.name+"</span></p>";
-                    // temp += "<p><span>姝e父</span></p>";
-                }
-                if (recordMap[125]) {
-                    temp += "<p><span>鎬� 鐢� 鍘嬶細" + recordMap[125].value + "</span></p>";
-                }
-                if (recordMap[124]) {
-                    temp += "<p><span>鎬� 鐢� 娴侊細" + recordMap[124].value + "</span></p>";
-                }
-                // if (recordMap[3]) {
-                //     temp += "<p><span>鐢垫睜涓暟锛�" + recordMap[3].value + "</span></p>";
-                // }
-                // if (recordMap[126]) {
-                //     temp += "<p><span>鍚庡鏃堕棿锛�" + recordMap[126].value + "</span></p>";
-                // }
-            }
-        }else{
-            temp += "<div class = 'div-d font-warn'>";
-            temp += "<p><span>"+device.name+"</span></p>";
-            temp += "<p><span>閫氳寮傚父</span></p>";
-        }
-        temp += "</div>";
-        // temp += "</marquee>";
-        result.htm = temp;
-        return result;
-    }
+    // //鏅�氱┖璋�
+    // if (category == CATEGORY.D2003.code) {
+    //     if(recordMap){
+    //         if(recordMap[1] && recordMap[1].value == 1){
+    //             temp += "<div class = 'div-d font-warn'>";
+    //             // temp += "<p><span>"+device.name+"</span></p>";
+    //             temp += "<p><span>閫氳寮傚父</span></p>";
+    //         }else{
+    //             if(recordMap[2] && recordMap[2].value == 1){
+    //                 temp += "<div class = 'div-d font-warn'>";
+    //                 // temp += "<p><span>"+device.name+"</span></p>";
+    //                 // temp += "<p><span>鎶ヨ</span></p>";
+    //             }else{
+    //                 temp += "<div class = 'div-d'>";
+    //                 // temp += "<p><span>"+device.name+"</span></p>";
+    //                 // temp += "<p><span>姝e父</span></p>";
+    //             }
+    //             if (recordMap[3]) {
+    //                 temp += "<p><span>璁惧畾娓╁害锛�" + recordMap[3].value + "鈩�</span></p>";
+    //             }
+    //             if (recordMap[4]) {
+    //                 temp += "<p><span>璁惧畾婀垮害锛�" + recordMap[4].value + "%</span></p>";
+    //             }
+    //         }
+    //     }else{
+    //         temp += "<div class = 'div-d font-warn'>";
+    //         temp += "<p><span>"+device.name+"</span></p>";
+    //         temp += "<p><span>閫氳寮傚父</span></p>";
+    //     }
+    //     temp += "</div>";
+    //     result.htm = temp;
+    //     return result;
+    // }
+    // //鐢垫睜
+    // if (category == CATEGORY.D1005.code) {
+    //     if(recordMap){
+    //         if(recordMap[1] && recordMap[1].value == 1){
+    //             temp += "<div class = 'div-d font-warn'>";
+    //             // temp += "<p><span>"+device.name+"</span></p>";
+    //             temp += "<p><span>閫氳寮傚父</span></p>";
+    //         }else{
+    //             if(recordMap[2] && recordMap[2].value == 1){
+    //                 temp += "<div class = 'div-d font-warn'>";
+    //                 // temp += "<p><span>"+device.name+"</span></p>";
+    //                 // temp += "<p><span>鎶ヨ</span></p>";
+    //             }else{
+    //                 temp += "<div class = 'div-d'>";
+    //                 // temp += "<p><span>"+device.name+"</span></p>";
+    //                 // temp += "<p><span>姝e父</span></p>";
+    //             }
+    //             if (recordMap[125]) {
+    //                 temp += "<p><span>鎬� 鐢� 鍘嬶細" + recordMap[125].value + "</span></p>";
+    //             }
+    //             if (recordMap[124]) {
+    //                 temp += "<p><span>鎬� 鐢� 娴侊細" + recordMap[124].value + "</span></p>";
+    //             }
+    //             // if (recordMap[3]) {
+    //             //     temp += "<p><span>鐢垫睜涓暟锛�" + recordMap[3].value + "</span></p>";
+    //             // }
+    //             // if (recordMap[126]) {
+    //             //     temp += "<p><span>鍚庡鏃堕棿锛�" + recordMap[126].value + "</span></p>";
+    //             // }
+    //         }
+    //     }else{
+    //         temp += "<div class = 'div-d font-warn'>";
+    //         temp += "<p><span>"+device.name+"</span></p>";
+    //         temp += "<p><span>閫氳寮傚父</span></p>";
+    //     }
+    //     temp += "</div>";
+    //     // temp += "</marquee>";
+    //     result.htm = temp;
+    //     return result;
+    // }
     if(category == CATEGORY.D3001.code){
         temp += "<div class = 'div-d'>";
-        temp += "<p><span>"+device.name+"</span></p>";
+        // temp += "<p><span>"+device.name+"</span></p>";
         temp += "</div>";
         result.htm = temp;
         result.code = "EMPTY";
@@ -752,21 +810,24 @@
                 temp += "<div class = 'div-d font-warn'>";
                 // temp += "<p><span>"+device.name+"</span></p>";
                 temp += "<p><span>閫氳寮傚父</span></p>";
+                result.warnState = 1;
             }else{
                 if(recordMap[2] && recordMap[2].value == 1){
                     temp += "<div class = 'div-d font-warn'>";
                     // temp += "<p><span>"+device.name+"</span></p>";
                     temp += "<p><span>鎶ヨ</span></p>";
+                    result.warnState = 1;
                 }else{
-                    temp += "<div class = 'div-d'>";
+                    temp += "<div class = 'div-d '>";
                     // temp += "<p><span>"+device.name+"</span></p>";
                     temp += "<p><span>姝e父</span></p>";
                 }
             }
         }else{
             temp += "<div class = 'div-d font-warn'>";
-            temp += "<p><span>"+device.name+"</span></p>";
+            // temp += "<p><span>"+device.name+"</span></p>";
             temp += "<p><span>閫氳寮傚父</span></p>";
+            result.warnState = 1;
         }
         temp += "</div>";
         result.htm = temp;
@@ -778,23 +839,26 @@
     if(recordMap){
         if(recordMap[1] && recordMap[1].value == 1){
             temp += "<div class = 'div-d font-warn'>";
-            temp += "<p><span>"+device.name+"</span></p>";
-            temp += "<p><span>閫氳寮傚父</span></p>";
+            // temp += "<p><span>"+device.name+"</span></p>";
+            // temp += "<p><span>閫氳寮傚父</span></p>";
+            result.warnState = 1;
         }else{
             if(recordMap[2] && recordMap[2].value == 1){
                 temp += "<div class = 'div-d font-warn'>";
-                temp += "<p><span>"+device.name+"</span></p>";
-                temp += "<p><span>鎶ヨ</span></p>";
+                // temp += "<p><span>"+device.name+"</span></p>";
+                // temp += "<p><span>鎶ヨ</span></p>";
+                result.warnState = 1;
             }else{
                 temp += "<div class = 'div-d'>";
-                temp += "<p><span>"+device.name+"</span></p>";
-                temp += "<p><span>姝e父</span></p>";
+                // temp += "<p><span>"+device.name+"</span></p>";
+                // temp += "<p><span>姝e父</span></p>";
             }
         }
     }else{
         temp += "<div class = 'div-d font-warn'>";
-        temp += "<p><span>"+device.name+"</span></p>";
-        temp += "<p><span>閫氳寮傚父</span></p>";
+        // temp += "<p><span>"+device.name+"</span></p>";
+        // temp += "<p><span>閫氳寮傚父</span></p>";
+        result.warnState = 1;
     }
     temp += "</div>";
     result.htm = temp;
@@ -808,7 +872,7 @@
  * @param category
  * @returns {String}
  */
-function addCurImg(category) {
+function addCurImg(category,warnState) {
     //娓╂箍搴�
     if (category == CATEGORY.D2001.code) {
         return "<img src='images/icon-ht@64.png'/>";
@@ -823,10 +887,16 @@
     }
     //UPS-涓夌浉
     if (category == CATEGORY.D1002.code) {
+        if(warnState == 1){
+            return "<img src='images/icon-ups@64.png'/>";
+        }
         return "<img src='images/icon-ups@64.png'/>";
     }
     //UPS-鍗曞悜
     if (category == CATEGORY.D1001.code) {
+        if(warnState == 1){
+            return "<img src='images/icon-ups@64.png'/>";
+        }
         return "<img src='images/icon-ups@64.png'/>";
     }
     //闂ㄧ
@@ -836,10 +906,12 @@
     //绮惧瘑绌鸿皟
     if (category == CATEGORY.D2002.code) {
         return "<img src='images/img-kt.png'/>";
+        // return "<img src='images/icon-ups@64.png'/>";
     }
     //鏅�氱┖璋�
     if (category == CATEGORY.D2003.code) {
         return "<img src='images/img-kt2.png'/>";
+        // return "<img src='images/icon-ups@64.png'/>";
     }
     //椋庢満
     if (category == CATEGORY.D2004.code) {

--
Gitblit v1.9.3