公路，千张场地，接口调试完成

2025-06-10 17:09:25 +08:00 · 2025-06-10 17:09:25 +08:00 · da3ed2a248
parent 303327cfae
commit da3ed2a248
9 changed files with 39 additions and 33 deletions
--- 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 += `<option value="${item.id}">${item.towerName}</option>`;
            });
            $('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
--- 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
--- 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
--- 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
--- 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 = {
--- 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();
-        });
    } 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);
--- 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 @@
            <div class="layui-form-item" style="margin-top: 2%;">
                <label class="layui-form-label"><span class="required-mark">*</span>公路所在杆塔:</label>
                <div class="layui-input-inline">
-                    <select name="highwayTowerId" lay-verify="required" lay-filter="highwayTowerSelect">
+                    <select name="towerId" lay-verify="required" lay-filter="towerSelect">
                        <option value="">选择杆塔</option>
                    </select>
                </div>
@ -103,14 +103,14 @@
            <div class="layui-form-item">
                <label class="layui-form-label"><span class="required-mark">*</span>宽度（m）:</label>
                <div class="layui-input-inline">
-                    <input type="text" name="highwayWidth" lay-verify="required|number" autocomplete="off"
+                    <input type="text" name="cablewayWidth" lay-verify="required|number" autocomplete="off"
                        placeholder="请输入" class="layui-input" maxlength="10">
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label"><span class="required-mark">*</span>长度（m）:</label>
                <div class="layui-input-inline">
-                    <input type="text" name="highwayLength" lay-verify="required|number" autocomplete="off"
+                    <input type="text" name="cablewayLength" lay-verify="required|number" autocomplete="off"
                        placeholder="请输入" class="layui-input" maxlength="10">
                </div>
            </div>
--- a/src/main/resources/static/pages/basic/lineManagement/child/addAndEditQzSite.html
+++ b/src/main/resources/static/pages/basic/lineManagement/child/addAndEditQzSite.html
@ -95,22 +95,21 @@
            <div class="layui-form-item" style="margin-top: 2%;">
                <label class="layui-form-label"><span class="required-mark">*</span>名称:</label>
                <div class="layui-input-inline">
-                    <select name="highwayTowerId" lay-verify="required" lay-filter="highwayTowerSelect">
-                        <option value="">选择杆塔</option>
-                    </select>
+                    <input type="text" name="name" lay-verify="required" autocomplete="off" placeholder="请输入"
+                        class="layui-input" maxlength="10">
                </div>
            </div>
            <div class="layui-form-item">
-                <label class="layui-form-label"><span class="required-mark">*</span>长（m）:</label>
+                <label class="layui-form-label"><span class="required-mark">*</span>长度（m）:</label>
                <div class="layui-input-inline">
-                    <input type="text" name="highwayLength" lay-verify="required|number" autocomplete="off"
+                    <input type="text" name="cablewayLength" lay-verify="required|number" autocomplete="off"
                        placeholder="请输入" class="layui-input" maxlength="10">
                </div>
            </div>
            <div class="layui-form-item">
-                <label class="layui-form-label"><span class="required-mark">*</span>宽（m）:</label>
+                <label class="layui-form-label"><span class="required-mark">*</span>宽度（m）:</label>
                <div class="layui-input-inline">
-                    <input type="text" name="highwayWidth" lay-verify="required|number" autocomplete="off"
+                    <input type="text" name="cablewayWidth" lay-verify="required|number" autocomplete="off"
                        placeholder="请输入" class="layui-input" maxlength="10">
                </div>
            </div>
@ -133,6 +132,6 @@
 <script src="../../../../js/ajaxRequest.js"></script>
 <script src="../../../../js/my/aes.js"></script>
 <script src="../../../../js/openIframe.js"></script>
-<script src="../../../../js/basic/lineManagement/child/addAndEditHighway.js"></script>
+<script src="../../../../js/basic/lineManagement/child/addAndEditQzSite.js"></script>

 </html>
--- a/src/main/resources/static/pages/basic/lineManagement/child/qzSiteList.html
+++ b/src/main/resources/static/pages/basic/lineManagement/child/qzSiteList.html
@ -23,7 +23,7 @@
                    <div class="layui-inline" style="padding: 0 0 0 10px;">
                        <div class="layui-input-inline">
                            <input type="text" id="keyWord" name="keyWord" maxlength="30" class="layui-input"
-                                autocomplete="off" placeholder="请输入杆塔号">
+                                autocomplete="off" placeholder="请输入千张场地名称">
                        </div>
                    </div>