Browse Source

Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

moccus 2 years ago
parent
commit
c6d32714bf

+ 1 - 1
public/static/config/modeConfig.js

@@ -21,7 +21,7 @@ const showModuleName = 0;
 if (localTest) {
     // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
     // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
-    baseURL = "http://192.168.10.8:8082/" // 联机调试 - 王昌盛
+    baseURL = "http://192.168.10.4:8082/" // 联机调试 - 王昌盛
 
     tilesUrl = "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII";
 } else {

+ 56 - 0
src/views/WindSite/components/boosterstation/BoosterStation.js

@@ -2003,6 +2003,62 @@ export class BoosterStation {
 			'hzjsc364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1723"},
 			'hzjsc369':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0129"},
 			'hzjsc305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0495"}
+		},
+		'AK_GDC':{
+			'akua':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0019"},
+			'akub':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0020"},
+			'akuc':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0021"},
+			'akuo':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0022"},
+			'aki':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0091"},
+			'akp':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0079"},
+			'akq':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0080"},
+			'akrfdl':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0167"},
+			'akljfdl':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0168"},
+			'akdy001':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_001_AI0049"},
+			'akgl001':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_001_AI0056"},
+			'akrf001':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_001_AI0068"},
+			'akzf001':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_001_AI0067"},
+			'akljfd2':{tag: "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0168"},
+			'akdy002':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_002_AI0049"},
+			'akgl002':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_002_AI0056"},
+			'akrf002':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_002_AI0068"},
+			'akzf002':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_002_AI0067"},
+			'akdy003':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_003_AI0049"},
+			'akgl003':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_003_AI0056"},
+			'akrf003':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_003_AI0068"},
+			'akzf003':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_003_AI0067"},
+			'akdy004':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_004_AI0049"},
+			'akgl004':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_004_AI0056"},
+			'akrf004':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_004_AI0068"},
+			'akzf004':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_004_AI0067"},
+			'akdy005':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_005_AI0049"},
+			'akgl005':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_005_AI0056"},
+			'akrf005':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_005_AI0068"},
+			'akzf005':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_005_AI0067"},
+			'akdy006':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_006_AI0049"},
+			'akgl006':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_006_AI0056"},
+			'akrf006':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_006_AI0068"},
+			'akzf006':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_006_AI0067"},
+			'akdy007':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_007_AI0049"},
+			'akgl007':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_007_AI0056"},
+			'akrf007':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_007_AI0068"},
+			'akzf007':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_007_AI0067"},
+			'akdy008':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_008_AI0049"},
+			'akgl008':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_008_AI0056"},
+			'akrf008':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_008_AI0068"},
+			'akzf008':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_008_AI0067"},
+			'akdy009':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_009_AI0049"},
+			'akgl009':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_009_AI0056"},
+			'akrf009':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_009_AI0068"},
+			'akzf009':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_009_AI0067"},
+			'akdy010':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_010_AI0049"},
+			'akgl010':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_010_AI0056"},
+			'akrf010':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_010_AI0068"},
+			'akzf010':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_010_AI0067"},
+			'akdy011':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_011_AI0049"},
+			'akgl011':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_011_AI0056"},
+			'akrf011':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_011_AI0068"},
+			'akzf011':{tag: "AKGF.NX_GD_AKG_GF_P1_L1_011_AI0067"},
 		}
 	}
 

File diff suppressed because it is too large
+ 4545 - 55
src/views/WindSite/components/boosterstation/ak.vue