diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml index 4489fd6..673a548 100644 --- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml +++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml @@ -133,7 +133,7 @@ LEFT JOIN ( SELECT tower_id,next_tower_id FROM tb_three_span tts - WHERE tts.span_type = '1' + WHERE tts.span_type = '1' AND tts.is_active = '1' GROUP BY tower_id,next_tower_id ) B ON (tt.id = B.tower_id) OR (tt.id = B.next_tower_id) LEFT JOIN ( diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml index 0af79e8..5dff50f 100644 --- a/src/main/resources/mappers/backstage/ProProgressMapper.xml +++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml @@ -149,16 +149,16 @@ diff --git a/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js b/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js index 8f34858..835e674 100644 --- a/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js +++ b/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js @@ -284,7 +284,7 @@ function loadTowerOptions() { params = { encryptedData: encryptCBC(JSON.stringify(params)), }; - ajaxRequest(url, "POST", params, true, null, function (result) { + ajaxRequest(url, "POST", params, false, null, function (result) { if (result.code === 200) { let options = ''; // 保存杆塔列表数据 @@ -314,7 +314,7 @@ function getThreeSpanById() { url, "POST", params, - true, + false, null, function (result) { layer.close(loadingMsg); @@ -442,6 +442,7 @@ function setFormData(data) { form.render("select"); } } + layui.form.render(); } function saveData2() {