rabin 7 years ago
parent
commit
a1584d6d8d

+ 0 - 4
front/page/device.py

@@ -94,12 +94,10 @@ class screen_path(Load):
 
 		Device.statBase(self, deviceInfo)
 		log_search = {}
-		"""
 		if device:
 			log_search['device_id'] = device
 		else:
 			log_search['device_id--ins'] = self.data['setting']['farmInfo']['gateways']
-		"""
 		log_search['device_id--ins'] = self.data['setting']['farmInfo']['gateways']
 		log_search['type_id'] = 2
 		log_search['farm_id'] = self.data['setting']['farm']
@@ -190,12 +188,10 @@ class screens_path(Load):
 
 		Device.statBase(self, deviceInfo)
 		log_search = {}
-		"""
 		if device:
 			log_search['device_id'] = device
 		else:
 			log_search['device_id--ins'] = devices
-		"""
 		log_search['device_id--ins'] = devices
 		log_search['type_id'] = 2
 		log_search['farm_id--ins'] = farm

+ 1 - 1
front/templates/pc/device/screen.html

@@ -30,7 +30,7 @@
     	                            </div>
     	                            <div class="cam-tabs">
     		                            {% for v in data['camera'] %}
-    		                            <a href="javascript:;" class="cur" data-source="{{v['value']}}" onclick="$('#cam img').attr('src', '{{v['value']}}')">{{v['name']}}</a>
+    		                            <a href="javascript:;" class="cur" data-source="{{v['value']}}" onclick="$('.cam img').attr('src', '{{v['value']}}')">{{v['name']}}</a>
     		                            {% end %}
     	                            </div>
     	                        </div>

+ 1 - 1
front/templates/pc/device/screens.html

@@ -30,7 +30,7 @@
     	                            </div>
     	                            <div class="cam-tabs">
     		                            {% for v in data['camera'] %}
-    		                            <a href="javascript:;" class="cur" data-source="{{v['value']}}" onclick="$('#cam img').attr('src', '{{v['value']}}')">{{v['name']}}</a>
+    		                            <a href="javascript:;" class="cur" data-source="{{v['value']}}" onclick="$('.cam img').attr('src', '{{v['value']}}')">{{v['name']}}</a>
     		                            {% end %}
     	                            </div>
     	                        </div>