[設備管理] 前端building-guid main-system-guid sub-system-guid 皆改為tag
This commit is contained in:
parent
6fbc9b41fb
commit
75fdda80fe
@ -607,7 +607,7 @@
|
|||||||
<script src="~/js/echarts.min.js"></script>
|
<script src="~/js/echarts.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var buildingCollapses;
|
var buildingCollapses;
|
||||||
var selected_building_menu = {}, selected_floor_guid;
|
var selected_building_menu = {}, selected_floor_tag;
|
||||||
var chartDom, myChart, option,
|
var chartDom, myChart, option,
|
||||||
floor_map_mode = "view", //平面圖當前模式
|
floor_map_mode = "view", //平面圖當前模式
|
||||||
selected_temp_device, //被選擇要修改的設備
|
selected_temp_device, //被選擇要修改的設備
|
||||||
@ -747,10 +747,10 @@
|
|||||||
"url": "/DeviceManage/DeviceTableList",
|
"url": "/DeviceManage/DeviceTableList",
|
||||||
"type": "POST",
|
"type": "POST",
|
||||||
"data": function (d) {
|
"data": function (d) {
|
||||||
d.Building_guid = selected_building_menu.building_guid ? selected_building_menu.building_guid : "";
|
d.Buliding_tag = selected_building_menu.buliding_tag ? selected_building_menu.buliding_tag : "";
|
||||||
d.Main_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_guid : "";
|
d.Main_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||||
d.Sub_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_guid : "" : "";
|
d.Sub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||||
d.Floor_guid = selected_floor_guid ? selected_floor_guid : "";
|
d.Floor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||||
},
|
},
|
||||||
"dataSrc": function (rel) {
|
"dataSrc": function (rel) {
|
||||||
if (rel.code == "9999") {
|
if (rel.code == "9999") {
|
||||||
@ -1050,10 +1050,10 @@
|
|||||||
"url": "/DeviceManage/GetDeviceMasterTableList",
|
"url": "/DeviceManage/GetDeviceMasterTableList",
|
||||||
"type": "POST",
|
"type": "POST",
|
||||||
"data": function (d) {
|
"data": function (d) {
|
||||||
d.Building_guid = selected_building_menu.building_guid ? selected_building_menu.building_guid : "";
|
d.Buliding_tag = selected_building_menu.buliding_tag ? selected_building_menu.buliding_tag : "";
|
||||||
d.Main_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_guid : "";
|
d.Main_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||||
d.Sub_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_guid : "" : "";
|
d.Sub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||||
d.Floor_guid = selected_floor_guid ? selected_floor_guid : "";
|
d.Floor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||||
},
|
},
|
||||||
"dataSrc": function (rel) {
|
"dataSrc": function (rel) {
|
||||||
if (rel.code == "9999") {
|
if (rel.code == "9999") {
|
||||||
@ -1077,11 +1077,11 @@
|
|||||||
$("#device-master-list-btn").click(function (e) {
|
$("#device-master-list-btn").click(function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
var selectedBuilding_guid = selected_building_menu.building_guid ? selected_building_menu.building_guid : "";
|
var selectedBuliding_tag = selected_building_menu.buliding_tag ? selected_building_menu.buliding_tag : "";
|
||||||
var selectedMain_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_guid : "";
|
var selectedMain_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||||
var selectedSub_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_guid : "" : "";
|
var selectedSub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||||
var selectedFloor_guid = selected_floor_guid ? selected_floor_guid : "";
|
var selectedFloor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||||
if (selectedBuilding_guid == '' || selectedMain_system_guid == '' || selectedSub_system_guid == '' || selectedFloor_guid == '') {
|
if (selectedBuliding_tag == '' || selectedMain_system_tag == '' || selectedSub_system_tag == '' || selectedFloor_tag == '') {
|
||||||
toast_warning("請先選擇系統類別及樓層。");
|
toast_warning("請先選擇系統類別及樓層。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1494,10 +1494,10 @@
|
|||||||
"url": "/DeviceManage/DeviceKindTableList",
|
"url": "/DeviceManage/DeviceKindTableList",
|
||||||
"type": "POST",
|
"type": "POST",
|
||||||
"data": function (d) {
|
"data": function (d) {
|
||||||
d.Building_guid = selected_building_menu.building_guid ? selected_building_menu.building_guid : "";
|
d.Buliding_tag = selected_building_menu.buliding_tag ? selected_building_menu.buliding_tag : "";
|
||||||
d.Main_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_guid : "";
|
d.Main_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||||
d.Sub_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_guid : "" : "";
|
d.Sub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||||
d.Floor_guid = selected_floor_guid ? selected_floor_guid : "";
|
d.Floor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||||
},
|
},
|
||||||
"dataSrc": function (rel) {
|
"dataSrc": function (rel) {
|
||||||
if (rel.code == "9999") {
|
if (rel.code == "9999") {
|
||||||
@ -1549,10 +1549,10 @@
|
|||||||
device_kind_data = rel.data;
|
device_kind_data = rel.data;
|
||||||
|
|
||||||
//取得單一設備基本資料
|
//取得單一設備基本資料
|
||||||
var selectedSub_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_guid : "" : "";
|
var selectedSub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||||
var url = "/DeviceManage/GetDeviceItem";
|
var url = "/DeviceManage/GetDeviceItem";
|
||||||
var send_data = {
|
var send_data = {
|
||||||
sub_system_guid: selectedSub_system_guid
|
sub_system_tag: selectedSub_system_tag
|
||||||
}
|
}
|
||||||
|
|
||||||
$.post(url, send_data, function (rel) {
|
$.post(url, send_data, function (rel) {
|
||||||
@ -1910,9 +1910,9 @@
|
|||||||
html += `
|
html += `
|
||||||
<li class="list-group-item pr-0 d-flex justify-content-between">
|
<li class="list-group-item pr-0 d-flex justify-content-between">
|
||||||
<a href="javascript:;" onclick="ChangeFloorPanel(this)"
|
<a href="javascript:;" onclick="ChangeFloorPanel(this)"
|
||||||
data-building-guid="${buildingCollapse.building_guid}"
|
data-building-tag="${buildingCollapse.buliding_tag}"
|
||||||
data-main-system-guid="${main_system.main_system_guid}"
|
data-main-system-tag="${main_system.main_system_tag}"
|
||||||
data-sub-system-guid="${sub_system.sub_system_guid}">
|
data-sub-system-tag="${sub_system.sub_system_tag}">
|
||||||
${sub_system.full_name}
|
${sub_system.full_name}
|
||||||
</a>
|
</a>
|
||||||
</li>`;
|
</li>`;
|
||||||
@ -1944,26 +1944,26 @@
|
|||||||
function ChangeFloorPanel(dom) {
|
function ChangeFloorPanel(dom) {
|
||||||
|
|
||||||
var selected_target = {
|
var selected_target = {
|
||||||
"building_guid": $(dom).attr("data-building-guid") ? $(dom).attr("data-building-guid") : "",
|
"buliding_tag": $(dom).attr("data-building-tag") ? $(dom).attr("data-building-tag") : "",
|
||||||
"main_system_guid": $(dom).attr("data-main-system-guid") ? $(dom).attr("data-main-system-guid") : "",
|
"main_system_tag": $(dom).attr("data-main-system-tag") ? $(dom).attr("data-main-system-tag") : "",
|
||||||
"sub_system_guid": $(dom).attr("data-sub-system-guid") ? $(dom).attr("data-sub-system-guid") : "",
|
"sub_system_tag": $(dom).attr("data-sub-system-tag") ? $(dom).attr("data-sub-system-tag") : "",
|
||||||
}
|
}
|
||||||
|
|
||||||
buildingCollapses.forEach(function (building_item, building_index) {
|
buildingCollapses.forEach(function (building_item, building_index) {
|
||||||
if (building_item.building_guid == selected_target.building_guid) {
|
if (building_item.buliding_tag == selected_target.buliding_tag) {
|
||||||
selected_building_menu.building_guid = building_item.building_guid;
|
selected_building_menu.buliding_tag = building_item.buliding_tag;
|
||||||
selected_building_menu.main_system = {};
|
selected_building_menu.main_system = {};
|
||||||
|
|
||||||
building_item.main_systems.forEach(function (main_system_item, main_system_index) {
|
building_item.main_systems.forEach(function (main_system_item, main_system_index) {
|
||||||
if (main_system_item.main_system_guid == selected_target.main_system_guid) {
|
if (main_system_item.main_system_tag == selected_target.main_system_tag) {
|
||||||
selected_building_menu.main_system.main_system_guid = main_system_item.main_system_guid
|
selected_building_menu.main_system.main_system_tag = main_system_item.main_system_tag
|
||||||
selected_building_menu.main_system.sub_system = {};
|
selected_building_menu.main_system.sub_system = {};
|
||||||
|
|
||||||
$("#select-main-system-name").html(main_system_item.full_name);
|
$("#select-main-system-name").html(main_system_item.full_name);
|
||||||
|
|
||||||
main_system_item.sub_systems.forEach(function (sub_system_item, sub_system_index) {
|
main_system_item.sub_systems.forEach(function (sub_system_item, sub_system_index) {
|
||||||
if (sub_system_item.sub_system_guid == selected_target.sub_system_guid) {
|
if (sub_system_item.sub_system_tag == selected_target.sub_system_tag) {
|
||||||
selected_building_menu.main_system.sub_system.sub_system_guid = sub_system_item.sub_system_guid
|
selected_building_menu.main_system.sub_system.sub_system_tag = sub_system_item.sub_system_tag
|
||||||
selected_building_menu.main_system.sub_system.floors = sub_system_item.floors;
|
selected_building_menu.main_system.sub_system.floors = sub_system_item.floors;
|
||||||
|
|
||||||
$("#select-sub-system-name").html(sub_system_item.full_name);
|
$("#select-sub-system-name").html(sub_system_item.full_name);
|
||||||
@ -1971,7 +1971,7 @@
|
|||||||
//匯入floor panel
|
//匯入floor panel
|
||||||
$(".floor-panel-wrap").empty();
|
$(".floor-panel-wrap").empty();
|
||||||
sub_system_item.floors.forEach(function (floor_item, floor_index) {
|
sub_system_item.floors.forEach(function (floor_item, floor_index) {
|
||||||
$(".floor-panel-wrap").append(`<button type="button" class="btn btn-secondary waves-effect waves-themed mr-2 mb-2 btn-floor" onclick="ChangeDevicePanel(this)" data-floor-guid="${floor_item.floor_guid}">${floor_item.full_name}</button>`)
|
$(".floor-panel-wrap").append(`<button type="button" class="btn btn-secondary waves-effect waves-themed mr-2 mb-2 btn-floor" onclick="ChangeDevicePanel(this)" data-floor-guid="${floor_item.Floor_tag}">${floor_item.full_name}</button>`)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -1987,10 +1987,10 @@
|
|||||||
//#region 變更平面圖與設備的控制面板
|
//#region 變更平面圖與設備的控制面板
|
||||||
function ChangeDevicePanel(dom) {
|
function ChangeDevicePanel(dom) {
|
||||||
|
|
||||||
selected_floor_guid = $(dom).attr("data-floor-guid") ? $(dom).attr("data-floor-guid") : ""
|
selected_floor_tag = $(dom).attr("data-floor-guid") ? $(dom).attr("data-floor-guid") : ""
|
||||||
|
|
||||||
var current_floor = selected_building_menu.main_system.sub_system.floors.filter(function (item) {
|
var current_floor = selected_building_menu.main_system.sub_system.floors.filter(function (item) {
|
||||||
return item.floor_guid == selected_floor_guid
|
return item.Floor_tag == selected_floor_tag
|
||||||
})[0];
|
})[0];
|
||||||
|
|
||||||
$.each($(".btn-floor"), function (index, item) {
|
$.each($(".btn-floor"), function (index, item) {
|
||||||
@ -2522,11 +2522,11 @@
|
|||||||
//#region 新增設備
|
//#region 新增設備
|
||||||
function AddDevice() {
|
function AddDevice() {
|
||||||
|
|
||||||
var selectedBuilding_guid = selected_building_menu.building_guid ? selected_building_menu.building_guid : "";
|
var selectedBuliding_tag = selected_building_menu.buliding_tag ? selected_building_menu.buliding_tag : "";
|
||||||
var selectedMain_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_guid : "";
|
var selectedMain_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||||
var selectedSub_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_guid : "" : "";
|
var selectedSub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||||
var selectedFloor_guid = selected_floor_guid ? selected_floor_guid : "";
|
var selectedFloor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||||
if (selectedBuilding_guid == '' || selectedMain_system_guid == '' || selectedSub_system_guid == '' || selectedFloor_guid == '') {
|
if (selectedBuliding_tag == '' || selectedMain_system_tag == '' || selectedSub_system_tag == '' || selectedFloor_tag == '') {
|
||||||
toast_warning("請先選擇系統類別及樓層。");
|
toast_warning("請先選擇系統類別及樓層。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -2676,11 +2676,11 @@
|
|||||||
//#region 設備儲存(透過新增按鈕)
|
//#region 設備儲存(透過新增按鈕)
|
||||||
function SaveDeviceAdd() {
|
function SaveDeviceAdd() {
|
||||||
|
|
||||||
var selectedBuilding_guid = selected_building_menu.building_guid ? selected_building_menu.building_guid : "";
|
var selectedBuliding_tag = selected_building_menu.buliding_tag ? selected_building_menu.buliding_tag : "";
|
||||||
var selectedMain_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_guid : "";
|
var selectedMain_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||||
var selectedSub_system_guid = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_guid : "" : "";
|
var selectedSub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||||
var selectedFloor_guid = selected_floor_guid ? selected_floor_guid : "";
|
var selectedFloor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||||
if (selectedBuilding_guid == '' || selectedMain_system_guid == '' || selectedSub_system_guid == '' || selectedFloor_guid == '')
|
if (selectedBuliding_tag == '' || selectedMain_system_tag == '' || selectedSub_system_tag == '' || selectedFloor_tag == '')
|
||||||
{
|
{
|
||||||
toast_warning("請先選擇系統類別及樓層。");
|
toast_warning("請先選擇系統類別及樓層。");
|
||||||
return;
|
return;
|
||||||
@ -2710,10 +2710,10 @@
|
|||||||
var url = "/DeviceManage/SaveDeviceInfoAdd";
|
var url = "/DeviceManage/SaveDeviceInfoAdd";
|
||||||
|
|
||||||
@*var send_data = {
|
@*var send_data = {
|
||||||
Building_guid: selectedBuilding_guid,
|
Buliding_tag: selectedBuliding_tag,
|
||||||
Main_system_guid: selectedMain_system_guid,
|
Main_system_tag: selectedMain_system_tag,
|
||||||
Sub_system_guid: selectedSub_system_guid,
|
Sub_system_tag: selectedSub_system_tag,
|
||||||
Floor_guid: selectedFloor_guid,
|
Floor_tag: selectedFloor_tag,
|
||||||
SelectedDevices: selectedDevices
|
SelectedDevices: selectedDevices
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2734,10 +2734,10 @@
|
|||||||
|
|
||||||
|
|
||||||
var formData = new FormData();
|
var formData = new FormData();
|
||||||
formData.append("Building_guid", selectedBuilding_guid);
|
formData.append("Buliding_tag", selectedBuliding_tag);
|
||||||
formData.append("Main_system_guid", selectedMain_system_guid);
|
formData.append("Main_system_tag", selectedMain_system_tag);
|
||||||
formData.append("Sub_system_guid", selectedSub_system_guid);
|
formData.append("Sub_system_tag", selectedSub_system_tag);
|
||||||
formData.append("Floor_guid", selectedFloor_guid);
|
formData.append("Floor_tag", selectedFloor_tag);
|
||||||
formData.append("SelectedDevicesFile", blob);
|
formData.append("SelectedDevicesFile", blob);
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
Loading…
Reference in New Issue
Block a user