From da3ed2a248ca23a986ac06a753c5f49d98abfd71 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 10 Jun 2025 17:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E8=B7=AF=EF=BC=8C=E5=8D=83=E5=BC=A0?=
=?UTF-8?q?=E5=9C=BA=E5=9C=B0=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?=
=?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../lineManagement/child/addAndEditHighway.js | 9 +++++----
.../lineManagement/child/addAndEditQzSite.js | 7 ++++---
.../js/basic/lineManagement/child/highwayList.js | 7 ++++---
.../js/basic/lineManagement/child/qzSiteList.js | 13 +++++++------
.../js/basic/lineManagement/child/ropewayList.js | 1 +
.../lineManagement/child/setQzSiteLonAndLat.js | 12 +++++++-----
.../lineManagement/child/addAndEditHighway.html | 6 +++---
.../lineManagement/child/addAndEditQzSite.html | 15 +++++++--------
.../basic/lineManagement/child/qzSiteList.html | 2 +-
9 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/src/main/resources/static/js/basic/lineManagement/child/addAndEditHighway.js b/src/main/resources/static/js/basic/lineManagement/child/addAndEditHighway.js
index 1084e80..38a47c0 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/addAndEditHighway.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/addAndEditHighway.js
@@ -64,6 +64,7 @@ function setParams(params) {
form.on("submit(formData)", function (data) {
let formData = data.field;
formData.proId = proId;
+ formData.sourceType = "2";
saveData(formData);
});
});
@@ -83,7 +84,7 @@ function loadTowerOptions() {
options += ``;
});
$('select[name="towerId"]').html(options);
- $('select[name="highwayTowerId"]').html(options);
+ // $('select[name="highwayTowerId"]').html(options);
form.render("select");
}
});
@@ -151,7 +152,7 @@ function saveData2() {
// 保存数据
function saveData(data) {
if (!pointsStr) {
- return layer.msg("请配置索道口、中转口、索道终点经纬度", { icon: 7 });
+ return layer.msg("请配置公路口、中转口、公路终点经纬度", { icon: 7 });
}
let loadingMsg = layer.msg("数据上传中,请稍候...", {
icon: 16,
@@ -225,8 +226,8 @@ function setLonAndLatData() {
obj.points = pointsStr;
openIframeByParamObj2(
"setLonAndLatData",
- "配置千张场地、区域经纬度",
- "../../lineManagement/child/setQzSiteLonAndLat.html",
+ "配置公路口、中转口、公路终点经纬度",
+ "../../lineManagement/child/setHighwayLonAndLat.html",
"92%",
"95%",
obj
diff --git a/src/main/resources/static/js/basic/lineManagement/child/addAndEditQzSite.js b/src/main/resources/static/js/basic/lineManagement/child/addAndEditQzSite.js
index cec239f..dad3517 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/addAndEditQzSite.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/addAndEditQzSite.js
@@ -64,6 +64,7 @@ function setParams(params) {
form.on("submit(formData)", function (data) {
let formData = data.field;
formData.proId = proId;
+ formData.sourceType = "3";
saveData(formData);
});
});
@@ -151,7 +152,7 @@ function saveData2() {
// 保存数据
function saveData(data) {
if (!pointsStr) {
- return layer.msg("请配置索道口、中转口、索道终点经纬度", { icon: 7 });
+ return layer.msg("请配置千张场地，区域经纬度信息", { icon: 7 });
}
let loadingMsg = layer.msg("数据上传中,请稍候...", {
icon: 16,
@@ -225,8 +226,8 @@ function setLonAndLatData() {
obj.points = pointsStr;
openIframeByParamObj2(
"setLonAndLatData",
- "配置索道口、中转口、索道终点经纬度",
- "../../lineManagement/child/setLonAndLat.html",
+ "配置千张场地、区域经纬度",
+ "../../lineManagement/child/setQzSiteLonAndLat.html",
"92%",
"95%",
obj
diff --git a/src/main/resources/static/js/basic/lineManagement/child/highwayList.js b/src/main/resources/static/js/basic/lineManagement/child/highwayList.js
index 5f93508..97fc8f1 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/highwayList.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/highwayList.js
@@ -127,13 +127,13 @@ function initTable(dataList, limit, page) {
align: "center",
},
{
- field: "highwayWidth",
+ field: "cablewayWidth",
title: "宽度(m)",
unresize: true,
align: "center",
},
{
- field: "highwayLength",
+ field: "cablewayLength",
title: "长度(m)",
unresize: true,
align: "center",
@@ -191,6 +191,7 @@ function getReqParams(page, limit, type) {
limit: limit + "",
proId: idParam,
keyWord: $("#keyWord").val(),
+ sourceType: "2",
};
console.log("杆塔管理查询条件", obj);
obj = {
@@ -223,7 +224,7 @@ function addData(id) {
openIframe2(
"addDataRopeway",
title,
- "ropewayFormTemp.html",
+ "addAndEditHighway.html",
"1000px",
"625px",
param
diff --git a/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js b/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js
index ba61150..efed83f 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/qzSiteList.js
@@ -121,20 +121,20 @@ function initTable(dataList, limit, page) {
// align: "center",
// },
{
- field: "qzSiteName",
+ field: "name",
title: "名称",
unresize: true,
align: "center",
},
{
- field: "qzSiteLength",
- title: "长(m)",
+ field: "cablewayLength",
+ title: "长度(m)",
unresize: true,
align: "center",
},
{
- field: "highwayWidth",
- title: "宽(m)",
+ field: "cablewayWidth",
+ title: "宽度(m)",
unresize: true,
align: "center",
},
@@ -192,6 +192,7 @@ function getReqParams(page, limit, type) {
limit: limit + "",
proId: idParam,
keyWord: $("#keyWord").val(),
+ sourceType: "3",
};
console.log("杆塔管理查询条件", obj);
obj = {
@@ -224,7 +225,7 @@ function addData(id) {
openIframe2(
"addDataRopeway",
title,
- "ropewayFormTemp.html",
+ "addAndEditQzSite.html",
"1000px",
"625px",
param
diff --git a/src/main/resources/static/js/basic/lineManagement/child/ropewayList.js b/src/main/resources/static/js/basic/lineManagement/child/ropewayList.js
index e99cf7c..242874e 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/ropewayList.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/ropewayList.js
@@ -173,6 +173,7 @@ function getReqParams(page, limit, type) {
limit: limit + "",
proId: idParam,
keyWord: $("#keyWord").val(),
+ sourceType: "1",
};
console.log("杆塔管理查询条件", obj);
obj = {
diff --git a/src/main/resources/static/js/basic/lineManagement/child/setQzSiteLonAndLat.js b/src/main/resources/static/js/basic/lineManagement/child/setQzSiteLonAndLat.js
index 31a9fb7..c709f80 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/setQzSiteLonAndLat.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/setQzSiteLonAndLat.js
@@ -180,13 +180,13 @@ function initMap(list) {
let points = JSON.parse(objParams.points);
$.each(points, function (i, item) {
addMarker(item.lng, item.lat);
- viewPointLine();
});
+ viewPointLine();
} else {
- // 点击地图添加标记
- map.addEventListener("click", function (e) {
- addMarker(e.latlng.lng, e.latlng.lat);
- });
+ // // 点击地图添加标记
+ // map.addEventListener("click", function (e) {
+ // addMarker(e.latlng.lng, e.latlng.lat);
+ // });
}
}
@@ -340,6 +340,8 @@ function viewPointLine() {
map.removeOverlay(polylineView); // 移除旧的折线
polylineView = null;
}
+
+ console.log("markers", markers);
let points = [];
$.each(markers, function (index, item) {
points.push(item.point);
diff --git a/src/main/resources/static/pages/basic/lineManagement/child/addAndEditHighway.html b/src/main/resources/static/pages/basic/lineManagement/child/addAndEditHighway.html
index 57ec360..764afcb 100644
--- a/src/main/resources/static/pages/basic/lineManagement/child/addAndEditHighway.html
+++ b/src/main/resources/static/pages/basic/lineManagement/child/addAndEditHighway.html
@@ -95,7 +95,7 @@