Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

public/datav/detail/static/js/public-detail.js

@@ -34,9 +34,9 @@ let jessibucaPlayer = {};
         }
     );
 
-    var host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '192.168.13.200') + ':8013';
+    var host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
 
-    var selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host;
+    var selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host;
 
 
     // 请求 token 用

public/datav/index.html

@@ -1184,14 +1184,13 @@
 						if(i < 3){
 							reqiust(list[0].id, i);
 						}else{
-							//var item = {
-							//	name: "全部",
-							//	label: "全部",
-							//	id: 7,
-							//};
-							//
-							//list.unshift(item);
+							var item = {
+								name: "全部",
+								label: "全部",
+								id: 24,
+							};
 							
+							list.unshift(item);
 							that.reqEnterprise(list[0] && list[0].id || 0, selects[i]);
 						};
 					});