Merge branch 'master' of http://101.133.214.75:3000/lixinru/YtIoT

.gitignore

@@ -0,0 +1,2 @@
+/.idea/
+/out/

WebRoot/res/img/myImages.css

@@ -1636,7 +1636,7 @@ textarea.x-form-field{
 
 .company_bg_tr {
 	position:absolute;
-	width:406px;
+	width:407px;
 	height:762px;
 	top:0px;
 	right:0px;
@@ -1693,7 +1693,7 @@ textarea.x-form-field{
 .company_bg_br {
 	position:absolute;
 	height:170px;
-	width:406px;
+	width:407px;
 	bottom:0px;
 	right:0px;
 	background:url(icons/company_br.png) no-repeat;

WebRoot/view/frontpage/css/myImages.css

@@ -2075,7 +2075,7 @@
 
 .company_bg_tr {
 	position:absolute;
-	width:406px;
+	width:407px;
 	height:762px;
 	top:0px;
 	right:0px;
@@ -2132,7 +2132,7 @@
 .company_bg_br {
 	position:absolute;
 	height:170px;
-	width:406px;
+	width:407px;
 	bottom:0px;
 	right:0px;
 	background:url(icons/company_br.png) no-repeat;

WebRoot/view/frontpage/scripts/company.js

@@ -1761,31 +1761,31 @@ var show_realtime_status = function (idx) {
                     $("#HighTemperatureC").html((status_list[i].point_data == '0') ? '正常' : '告警');
                 } else if (status_list[i].point_code == 65) {
                     if (status_list[i].point_data.length > 0)
-                        $("#VoltageA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#VoltageA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 66) {
                     if (status_list[i].point_data.length > 0)
-                        $("#VoltageB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#VoltageB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 67) {
                     if (status_list[i].point_data.length > 0)
-                        $("#VoltageC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#VoltageC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 68) {
                     if (status_list[i].point_data.length > 0)
-                        $("#CurrentA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#CurrentA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 69) {
                     if (status_list[i].point_data.length > 0)
-                        $("#CurrentB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#CurrentB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 70) {
                     if (status_list[i].point_data.length > 0)
-                        $("#CurrentC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#CurrentC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 71) {
                     if (status_list[i].point_data.length > 0)
-                        $("#TemperatureA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#TemperatureA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 72) {
                     if (status_list[i].point_data.length > 0)
-                        $("#TemperatureB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#TemperatureB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 73) {
                     if (status_list[i].point_data.length > 0)
-                        $("#TemperatureC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#TemperatureC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 }
             }
         } else if (devicesStore[idx].dwtype == 'YTSM') {
@@ -1808,7 +1808,7 @@ var show_realtime_status = function (idx) {
                     if (status_list[i].point_code == 1)
                         sta_value.innerHTML = status_list[i].content;
                     else
-                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
+                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
                     tr.appendChild(sta_value);
                 }
             }
@@ -1831,7 +1831,7 @@ var show_realtime_status = function (idx) {
                     //					sta_value.style.paddingBottom='12px';
                     if (devicesStore[idx].dwtype == 'YTUI') {
                         if (V_LOGINNAME == 'admin')
-                            sta_value.innerHTML = status_list[i].content + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_userinfo_detail(' + devicesStore[idx].owner_code + ')"/>';
+                            sta_value.innerHTML = status_list[i].content + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_userinfo_detail(\'' + devicesStore[idx].owner_code + '\')"/>';
                         else
                             sta_value.innerHTML = status_list[i].content;
                     } else if ((devicesStore[idx].dwtype == 'YTWP') || (devicesStore[idx].dwtype == 'YTLL')) {
@@ -1841,9 +1841,9 @@ var show_realtime_status = function (idx) {
                             else
                                 sta_value.innerHTML = '--';
                         } else if (status_list[i].point_data.length > 0)
-                            sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
+                            sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
                     } else if (status_list[i].point_data.length > 0)
-                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
+                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
                     tr.appendChild(sta_value);
                 }
             }

WebRoot/view/frontpage/scripts/map.js

@@ -1640,7 +1640,7 @@ var draw_all = function() {
             d7a += obj.d7a;
             d7oc += obj.d7oc;
             d7ac += obj.d7ac;
-            if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 120) && (obj.lng < 125)) {
+            if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 100) && (obj.lng < 125)) {
                 totalLng += obj.lng;
                 totalLat += obj.lat;
                 latngCount++;
@@ -1944,7 +1944,7 @@ var chk_company_cur = function(idx) {
         if (idx >= StatusStore.length)
             idx = 0;
         var obj = StatusStore[idx];
-        if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 120) && (obj.lng < 125))
+        if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 100) && (obj.lng < 125))
             return idx;
         nrow++;
         if (nrow >= StatusStore.length)

YtIoT.iml

@@ -9,6 +9,7 @@
         <webroots>
           <root url="file://$MODULE_DIR$/WebRoot" relative="/" />
         </webroots>
+        <sourceRoots />
       </configuration>
     </facet>
   </component>