From 5992b5cfd2cf8a781c5eadc0cc818279618491ca Mon Sep 17 00:00:00 2001 From: dev02 Date: Tue, 18 Jul 2023 14:08:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=99=82=E5=B8=B8,=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BD=BF=E7=94=A8function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Controllers/NiagaraDataSynchronizeController.cs | 4 ++-- Backend/Views/NiagaraDataSynchronize/Index.cshtml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Backend/Controllers/NiagaraDataSynchronizeController.cs b/Backend/Controllers/NiagaraDataSynchronizeController.cs index cad41e1..d2adcb4 100644 --- a/Backend/Controllers/NiagaraDataSynchronizeController.cs +++ b/Backend/Controllers/NiagaraDataSynchronizeController.cs @@ -114,8 +114,8 @@ namespace Backend.Controllers } string LightSwitchLevel = await niagaraDataSynchronizeRepository.getLightSwitchLevel(); //獲取照明開關 是否在 device or device_node - await niagaraDataSynchronizeRepository.InsertNiagaraTagList(ds, building, tag_quantity); // 匯入 MySQL table: import_niagara_tag - await niagaraDataSynchronizeRepository.DeviceComparison(LightSwitchLevel); + //await niagaraDataSynchronizeRepository.InsertNiagaraTagList(ds, building, tag_quantity); // 匯入 MySQL table: import_niagara_tag + //await niagaraDataSynchronizeRepository.DeviceComparison(LightSwitchLevel); await niagaraDataSynchronizeRepository.CheckDiffFullNameAndCover(); await niagaraDataSynchronizeRepository.CheckFullNameEmptyReplaceByDeviceName(); await niagaraDataSynchronizeRepository.InsertBuildingMenu(); diff --git a/Backend/Views/NiagaraDataSynchronize/Index.cshtml b/Backend/Views/NiagaraDataSynchronize/Index.cshtml index b5c5304..8c9e2c7 100644 --- a/Backend/Views/NiagaraDataSynchronize/Index.cshtml +++ b/Backend/Views/NiagaraDataSynchronize/Index.cshtml @@ -161,7 +161,7 @@ success: function (rel) { if (rel.code != "0000") { toast_error(rel.msg); - showSpinner(); + hideSpinner(); document.getElementById('loadDataText').innerText = "比對資料出錯了!"; return; } @@ -210,7 +210,7 @@ success: function (rel) { if (rel.code != "0000") { toast_error(rel.msg); - showSpinner(); + hideSpinner(); document.getElementById('loadDataText').innerText = "比對資料出錯了!"; return; }