Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
This commit is contained in:
		
						commit
						0da4c4cdd7
					
				@ -643,9 +643,11 @@
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		function refTable(data) {
 | 
							function refTable(data) {
 | 
				
			||||||
				let tag = "#alertTable";
 | 
								let tag = "#alertTable";
 | 
				
			||||||
				$.each(data, function (i, v) {
 | 
								
 | 
				
			||||||
						v.formId = AlertList(v.uuid);
 | 
								$.each(data, function (i, v) {
 | 
				
			||||||
 | 
										v.formId = AlertList(v.uuid.$val);
 | 
				
			||||||
 | 
									
 | 
				
			||||||
				});
 | 
									});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				let column_defs = [
 | 
									let column_defs = [
 | 
				
			||||||
@ -680,7 +682,6 @@
 | 
				
			|||||||
								"title": "設備名稱",
 | 
													"title": "設備名稱",
 | 
				
			||||||
								"data": "sourceName_zh",
 | 
													"data": "sourceName_zh",
 | 
				
			||||||
								render: (data) => {
 | 
													render: (data) => {
 | 
				
			||||||
										console.log(data);
 | 
					 | 
				
			||||||
										return allDevices.find(d => d.device_number === data)?.full_name || ""
 | 
															return allDevices.find(d => d.device_number === data)?.full_name || ""
 | 
				
			||||||
								}
 | 
													}
 | 
				
			||||||
						},
 | 
											},
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user