diff --git a/src/view/dialog/diaLogTab.vue b/src/view/dialog/diaLogTab.vue index 03e6cd7..e41a7d8 100644 --- a/src/view/dialog/diaLogTab.vue +++ b/src/view/dialog/diaLogTab.vue @@ -59,7 +59,7 @@ > diff --git a/src/view/sy.vue b/src/view/sy.vue index f2a3957..db6a95c 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -877,21 +877,7 @@ const dataTab = reactive({ list1: [], list2: [], year: [], - columns: [ - { - label: "班次", - property: "cc", - }, - { - label: "始发站-终点站", - property: "qqz", - }, - { - label: "到达龙游站时间", - type: "slot", - property: "dd", - }, - ], + columns: [], data: [], }); @@ -1215,7 +1201,7 @@ const addThousandSeparator = (numberString) => { return parseInt(numberString.trim(), 10).toLocaleString("en-US"); }; const getData = async () => { - console.log ('更新成功'); + console.log("更新成功"); await http.get("/api/ggfwyth/index").then((res) => { if (res.code == 200) { // 民生福利 @@ -1369,7 +1355,6 @@ const getfw = async () => { return acc; }, []); // console.log(data.tableData); - } }); await http.get("/api/ggfwyth/getDataSharing").then((res) => { @@ -1518,90 +1503,306 @@ const showTab = (val) => { dataTab.times = res.data.times; } }); + dataTab.columns = [ + { + label: "路码", + property: "lm", + }, + { + label: "首末站", + property: "smz", + }, + { + label: "首站夏季首班时间", + property: "xjsbsj", + }, + { + label: "首站夏季末班时间", + property: "xjmbsj", + }, + { + label: "首站冬季首班时间", + property: "djsbsj", + }, + { + label: "首站冬季末班时间", + property: "djmbsj", + }, + { + label: "日总班次", + property: "cc", + }, + ]; dataTab.data = [ { - cc: "201A", - qqz: "龙游公交中心—湖镇车站", - dd: "06:56", - kd: "07:10", - ts: "14", + lm: "1路", + smz: "客运中心—士元", + xjsbsj: "6:00", + xjmbsj: "17:05", + djsbsj: "6:00", + djmbsj: "17:05", + cc: "24", }, { - cc: "201B", - qqz: "龙游公交中心—湖镇车站", - dd: "07:30", - kd: "07:45", - ts: "15", + lm: "2路", + smz: "客运中心—东日农批", + xjsbsj: "6:30", + xjmbsj: "17:40", + djsbsj: "6:30", + djmbsj: "17:20", + cc: "36", }, { - cc: "203", - qqz: "龙游公交中心—地圩", - dd: "08:00", - kd: "08:20", - ts: "20", + lm: "3路", + smz: "龙三中—东日农批", + xjsbsj: "6:30", + xjmbsj: "17:40", + djsbsj: "6:30", + djmbsj: "17:20", + cc: "30", }, { - cc: "301", - qqz: "湖镇车站—十里坪", - dd: "08:45", - kd: "09:00", - ts: "15", + lm: "4路", + smz: "客运中心—后方", + xjsbsj: "6:30", + xjmbsj: "16:30", + djsbsj: "6:30", + djmbsj: "16:30", + cc: "8", }, { - cc: "302", - qqz: "湖镇车站—大坪", - dd: "09:15", - kd: "09:30", - ts: "15", + lm: "5路", + smz: "客运中心—城南首末站", + xjsbsj: "6:40", + xjmbsj: "17:40", + djsbsj: "6:40", + djmbsj: "17:20", + cc: "18", }, { - cc: "307", - qqz: "湖镇车站—蒲塘", - dd: "10:00", - kd: "10:20", - ts: "20", + lm: "6路", + smz: "客运中心—姜席堰", + xjsbsj: "6:55", + xjmbsj: "16:30", + djsbsj: "6:55", + djmbsj: "16:30", + cc: "7", }, { - cc: "308", - qqz: "湖镇车站—童村", - dd: "10:45", - kd: "11:00", - ts: "15", + lm: "7路", + smz: "客运中心—汽车北站", + xjsbsj: "6:10", + xjmbsj: "17:40", + djsbsj: "6:00", + djmbsj: "17:20", + cc: "49", }, { - cc: "304", - qqz: "湖镇车站—青塘坞", - dd: "11:15", - kd: "11:30", - ts: "15", + lm: "8路", + smz: "客运中心—年年红", + xjsbsj: "6:35", + xjmbsj: "17:05", + djsbsj: "6:35", + djmbsj: "17:05", + cc: "15", }, { - cc: "206", - qqz: "龙游公交中心—上堤", - dd: "12:00", - kd: "12:20", - ts: "20", + lm: "9路", + smz: "夜班环线(A线:客运中心—太平路—客运中心,B线:客运中心—荣昌路—客运中心)", + xjsbsj: "A线18:20 B线19:40", + xjmbsj: "A线18:40 B线20:00", + djsbsj: "A线18:20 B线19:40", + djmbsj: "A线18:40 B线20:00", + cc: "6", }, { - cc: "205", - qqz: "龙游公交中心—源头", - dd: "12:45", - kd: "13:00", - ts: "15", + lm: "10路", + smz: "客运中心—孝福", + xjsbsj: "6:30", + xjmbsj: "16:30", + djsbsj: "6:30", + djmbsj: "16:30", + cc: "8", }, { - cc: "305", - qqz: "湖镇车站—上堤", - dd: "13:15", - kd: "13:30", - ts: "15", + lm: "11路", + smz: "詹家—城东(人民医院)", + xjsbsj: "", + xjmbsj: "", + djsbsj: "6:30", + djmbsj: "16:50", + cc: "12", }, { - cc: "306", - qqz: "湖镇车站—源头", - dd: "14:00", - kd: "14:20", - ts: "20", + lm: "12路", + smz: "客运中心—城东新城-士元", + xjsbsj: "6:30", + xjmbsj: "17:35", + djsbsj: "6:30", + djmbsj: "17:20", + cc: "8", + }, + { + lm: "16路", + smz: "客运中心—城东新城-东华街道", + xjsbsj: "6:20", + xjmbsj: "17:20", + djsbsj: "6:20", + djmbsj: "17:10", + cc: "18", + }, + { + lm: "旅游专线", + smz: "龙游客运中心-衢州旅游集散中心", + xjsbsj: "", + xjmbsj: "", + djsbsj: "7:00", + djmbsj: "14:00", + cc: "2", + }, + { + lm: "201A", + smz: "龙游—湖镇", + xjsbsj: "6:10", + xjmbsj: "17:40", + djsbsj: "6:20", + djmbsj: "17:20", + cc: "44", + }, + { + lm: "201B", + smz: "龙游—城东新城—湖镇", + xjsbsj: "7:00", + xjmbsj: "17:10", + djsbsj: "7:00", + djmbsj: "17:00", + cc: "8", + }, + { + lm: "202", + smz: "龙游—周家", + xjsbsj: "6:40", + xjmbsj: "16:20", + djsbsj: "6:40", + djmbsj: "16:20", + cc: "4", + }, + { + lm: "203", + smz: "龙游—地圩—湖镇", + xjsbsj: "", + xjmbsj: "", + djsbsj: "9:00", + djmbsj: "16:30", + cc: "3", + }, + { + lm: "204", + smz: "龙游—社阳", + xjsbsj: "6:20", + xjmbsj: "16:00", + djsbsj: "6:20", + djmbsj: "16:00", + cc: "15", + }, + { + lm: "205", + smz: "龙游—上堤", + xjsbsj: "6:25", + xjmbsj: "14:30", + djsbsj: "6:25", + djmbsj: "14:30", + cc: "3", + }, + { + lm: "206", + smz: "龙游—源头", + xjsbsj: "6:40", + xjmbsj: "14:40", + djsbsj: "6:40", + djmbsj: "14:15", + cc: "3", + }, + { + lm: "221", + smz: "龙游—溪口", + xjsbsj: "6:00", + xjmbsj: "17:40", + djsbsj: "6:20", + djmbsj: "17:20", + cc: "68", + }, + { + lm: "222", + smz: "龙游—官潭—溪口", + xjsbsj: "6:40", + xjmbsj: "16:40", + djsbsj: "6:40", + djmbsj: "16:40", + cc: "12(11趟至溪口,1趟次溪口—石角调头)", + }, + { + lm: "223", + smz: "龙游—马戍口", + xjsbsj: "6:15", + xjmbsj: "16:30", + djsbsj: "6:20", + djmbsj: "16:30", + cc: "12", + }, + { + lm: "224", + smz: "龙游—芰塘金—岭根", + xjsbsj: "6:10", + xjmbsj: "15:50", + djsbsj: "6:10", + djmbsj: "15:50", + cc: "8", + }, + { + lm: "225", + smz: "龙游—姜家(廖家)", + xjsbsj: "7:05", + xjmbsj: "16:45", + djsbsj: "6:40", + djmbsj: "16:45", + cc: "8", + }, + { + lm: "226", + smz: "龙游—六春湖", + xjsbsj: "6:30", + xjmbsj: "14:20", + djsbsj: "6:30", + djmbsj: "14:20", + cc: "6", + }, + { + lm: "301", + smz: "龙游—金村", + xjsbsj: "7:30", + xjmbsj: "14:30", + djsbsj: "7:30", + djmbsj: "14:30", + cc: "6", + }, + { + lm: "302", + smz: "龙游—南溪", + xjsbsj: "6:50", + xjmbsj: "14:40", + djsbsj: "6:50", + djmbsj: "14:40", + cc: "6", + }, + { + lm: "303", + smz: "龙游—徐坞", + xjsbsj: "6:50", + xjmbsj: "14:50", + djsbsj: "6:50", + djmbsj: "14:50", + cc: "6", }, ]; dialogShowTab.value = true; @@ -1613,115 +1814,87 @@ const showTab = (val) => { dataTab.times = res.data.times; } }); - // dataTab.list1 = [ - // 97, 57, 37, 46, 46, 54, 40, 46, 37, 48, 39, 48, 48, 31, 43, - // ]; - // dataTab.times = [ - // "14", - // "15", - // "16", - // "17", - // "18", - // "19", - // "20", - // "21", - // "22", - // "23", - // "24", - // "25", - // "26", - // "27", - // "28", - // ]; + dataTab.columns = [ + { + label: "线路名称", + property: "xl", + }, + { + label: "发车时间", + property: "fcsj", + }, + ]; dataTab.data = [ { - cc: "303", - qqz: "湖镇车站—马家", - dd: "08:00", - kd: "08:30", - ts: "30", + xl: "杭州普客定制线", + fcsj: "7:10", }, { - cc: "202", - qqz: "龙游公交中心—周家", - dd: "09:15", - kd: "09:45", - ts: "30", + xl: "杭州定制线", + fcsj: "8:20", }, { - cc: "204", - qqz: "龙游公交中心—社阳", - dd: "10:30", - kd: "11:00", - ts: "30", + xl: "杭州线", + fcsj: "14:05", }, { - cc: "221", - qqz: "龙游公交中心—溪口车站", - dd: "11:45", - kd: "12:15", - ts: "30", + xl: "宁波定制线", + fcsj: "8:40", }, { - cc: "222", - qqz: "龙游公交中心—官潭—溪口车站", - dd: "13:00", - kd: "13:30", - ts: "30", + xl: "宁波线", + fcsj: "14:00", }, { - cc: "325", - qqz: "溪口车站—大街", - dd: "14:15", - kd: "14:45", - ts: "30", + xl: "德兴线", + fcsj: "12:20", }, { - cc: "322", - qqz: "溪口车站—坑头", - dd: "15:30", - kd: "16:00", - ts: "30", + xl: "路桥线", + fcsj: "9:30", }, { - cc: "326", - qqz: "大街—方坦—横坑—岭脚", - dd: "16:45", - kd: "17:15", - ts: "30", + xl: "富阳线", + fcsj: "9:40", }, { - cc: "328", - qqz: "溪口车站—合坑源", - dd: "18:00", - kd: "18:30", - ts: "30", + xl: "遂昌线", + fcsj: "9:50 15:40", }, { - cc: "329", - qqz: "溪口车站—际上", - dd: "19:15", - kd: "19:45", - ts: "30", + xl: "石浦线", + fcsj: "10:00", }, { - cc: "330", - qqz: "溪口车站—毛连里", - dd: "20:30", - kd: "21:00", - ts: "30", + xl: "瑞安线", + fcsj: "10:05", }, { - cc: "327", - qqz: "长山桥—后山", - dd: "21:45", - kd: "22:15", - ts: "30", + xl: "慈溪线", + fcsj: "10:20", + }, + { + xl: "普陀线", + fcsj: "10:50", }, ]; dialogShowTab.value = true; break; case "高铁": + dataTab.columns = [ + { + label: "班次", + property: "cc", + }, + { + label: "始发站-终点站", + property: "qqz", + }, + { + label: "到达龙游站时间", + property: "dd", + }, + ]; getTableTab("/api/ggfwyth/lyzlcskList", pagination.currentPage); http.get(`/api/ggfwyth/lckll`).then((res) => { if (res.code == 200) { @@ -1831,7 +2004,6 @@ const autoScroll = () => { } }; onBeforeMount(async () => { - getData(); getfw(); setTimeout(() => { @@ -3445,4 +3617,4 @@ table { background: rgba(255, 255, 255, 0.14); border: 1px solid #6bade1; } - \ No newline at end of file + diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index ea30ace..08d2a62 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -264,7 +264,7 @@ /> { } else { zyysCenter.length = 0; zyysDk.length = 0; - await get_dk_zyys(polygon.fgfwrs,polygon.lb,polygon.ssly); + await get_dk_zyys(polygon.fgfwrs, polygon.lb, polygon.ssly); xr_dk_center_zyys(); } @@ -3003,7 +3003,7 @@ const loadCs_zyys = async (name) => { } } }; -const get_dk_zyys = async (sj,xd,ssly) => { +const get_dk_zyys = async (sj, xd, ssly) => { zyys_dk.value.length = 0; zyys_center.value.length = 0; zyys_data.value.point.length = 0; @@ -3020,10 +3020,10 @@ const get_dk_zyys = async (sj,xd,ssly) => { sj.forEach((item, index) => { zyysDk.forEach((dk) => { if (item.committee == dk.name) { - let a={ + let a = { ...dk, - zt:item.zt - } + zt: item.zt, + }; zyys_data.value.point.push(a); } }); @@ -3045,9 +3045,9 @@ const get_dk_zyys = async (sj,xd,ssly) => { //资源要素(渲染地块) const xr_dk_center_zyys = async () => { zyys_data.value.point.map((item, index) => { - let color="blue"; - if(item.zt>0){ - color="green"; + let color = "blue"; + if (item.zt > 0) { + color = "green"; } let points = []; item.point[0].map((p) => points.push(new BMapGL.Point(...p))); @@ -3055,7 +3055,7 @@ const xr_dk_center_zyys = async () => { //创建面 zyys_dk.value[index] = new BMapGL.Polygon(points, { strokeColor: "blue", - strokeWeight: 2, + strokeWeight: 0.1, strokeOpacity: 0.8, fillColor: color, fillOpacity: 0.3, @@ -3095,8 +3095,11 @@ const Xr_zyysNum = (polygon, indexx) => { div.style.cursor = "pointer"; div.style.padding = "5px"; div.style.minWidth = "60px"; - div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`; - div.style.transform = "translateY(50px)"; + div.style.borderRadius = "12px"; + // div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`; + div.style.background = "linear-gradient(90deg, rgba(146,151,217,1) 0%, rgba(236,236,236,1) 100%)"; + div.style.transform = "translate(50px, 26px)"; + // div.style.transform = "translateY(50px)"; div.setAttribute("name", this.properties.title); var title = document.createElement("div"); @@ -3144,14 +3147,14 @@ const Xr_zyysNum = (polygon, indexx) => { tableType.columns = table_column_list.zxs; zyys_table.town = polygon.town; zyys_table.committee = polygon.committee; - console.log(222222222,polygon); - - if(polygon.ssly=="教育"){ - zyys_table.xd = polygon.xd; - }else{ + console.log(222222222, polygon); + + if (polygon.ssly == "教育") { + zyys_table.xd = polygon.xd; + } else { zyys_table.xd = ""; } - + open_detail_zyys(); }); };