Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/guide.vue

@@ -11,7 +11,7 @@
         <div class="rightPage"></div>
         <div class="btnPage"></div>
         <div class="btnPp"></div>
-        <div class="wall">
+        <div class="wall" @click="toPage(tabData.PageUrl)">
           <!-- 旋转ring的dom元素实现整个照片墙的偏转 -->
           <div
             class="ring"
@@ -143,6 +143,7 @@ window.addEventListener("resize", function () {
 // 底部数据
 const tabData = reactive({
   tabNum: 0,
+  PageUrl: "/home/index/table",
   tabList: [
     {
       name: "评估模型",
@@ -214,6 +215,7 @@ const tabData = reactive({
 });
 
 const changeTab = (val) => {
+  tabData.PageUrl = tabData.scenList[val].url;
   transTime.value = 0.8;
   tabData.tabNum = val;
   rotateY.value = 360 - 45 * val;
@@ -343,6 +345,7 @@ body {
   margin: auto;
   margin-top: 190px;
   pointer-events: all;
+  cursor: pointer;
 }
 
 .ring {
@@ -575,5 +578,4 @@ body {
     }
   }
 }
- 
 </style>

src/view/sy.vue

@@ -487,7 +487,7 @@
                 <div class="jtsyname">{{ data.jtsyList[0].name }}</div>
                 <div class="jtsytext">
                   {{ data.jtsyList[0].key1 }}：
-                  <span>{{ data.jtsyList[0].key1_value }}</span>
+                  <span>{{ data.jtsyList[0].key1_value }}人次</span>
                 </div>
                 <div>
                   {{ data.jtsyList[0].key2 }}：
@@ -502,11 +502,11 @@
                 <div class="jtsyname">{{ data.jtsyList[1].name }}</div>
                 <div class="jtsytext">
                   {{ data.jtsyList[1].key1 }}：
-                  <span>{{ data.jtsyList[1].key1_value }}</span>
+                  <span>{{ data.jtsyList[1].key1_value }}人次</span>
                 </div>
                 <div>
                   {{ data.jtsyList[1].key2 }}：
-                  <span>{{ data.jtsyList[1].key2_value }}h</span>
+                  <span>{{ data.jtsyList[1].key2_value }}时</span>
                 </div>
               </div>
             </div>
@@ -519,7 +519,7 @@
                 <div class="jtsyname">{{ data.jtsyList[2].name }}</div>
                 <div class="jtsytext">
                   {{ data.jtsyList[2].key1 }}：
-                  <span>{{ data.jtsyList[2].key1_value }}</span>
+                  <span>{{ data.jtsyList[2].key1_value }}条</span>
                 </div>
                 <div>
                   {{ data.jtsyList[2].key2 }}：
@@ -534,7 +534,7 @@
                 <div class="jtsyname">{{ data.jtsyList[3].name }}</div>
                 <div class="jtsytext">
                   {{ data.jtsyList[3].key1 }}：
-                  <span>{{ data.jtsyList[3].key1_value }}</span>
+                  <span>{{ data.jtsyList[3].key1_value }}次</span>
                 </div>
                 <div>
                   {{ data.jtsyList[3].key2 }}：
@@ -549,11 +549,11 @@
                 <div class="jtsyname">{{ data.jtsyList[4].name }}</div>
                 <div class="jtsytext">
                   {{ data.jtsyList[4].key1 }}：
-                  <span>{{ data.jtsyList[4].key1_value }}</span>
+                  <span>{{ data.jtsyList[4].key1_value }}次</span>
                 </div>
                 <div>
                   {{ data.jtsyList[4].key2 }}：
-                  <span>{{ data.jtsyList[4].key2_value }}</span>
+                  <span>{{ data.jtsyList[4].key2_value }}人次</span>
                 </div>
               </div>
             </div>
@@ -1075,40 +1075,45 @@ const data = reactive({
       name: "公共自行车",
       key1: "骑行次数",
       key1_value: "117231",
+      dw:"人次",
       key2: "骑行时长",
-      key2_value: "1283h",
+      key2_value: "1283时",
       img: ggjtimg,
     },
     {
       name: "电动单车",
       key1: "骑行次数",
       key1_value: "1172491",
+      dw:"人次",
       key2: "骑行时长",
-      key2_value: "1283h",
+      key2_value: "1283时",
       img: ggjtimg1,
     },
     {
       name: "公共汽车",
       key1: "公交线路",
       key1_value: "176",
+      dw:"条",
       key2: "乘坐人次",
-      key2_value: "239741",
+      key2_value: "239741人次",
       img: ggjtimg2,
     },
     {
       name: "长途汽车",
       key1: "班车次数",
       key1_value: "133",
+      dw:"次",
       key2: "客流量",
-      key2_value: "192874",
+      key2_value: "192874人次",
       img: ggjtimg3,
     },
     {
       name: "高铁",
       key1: "列车班次",
       key1_value: "23",
+      dw:"次",
       key2: "客流量",
-      key2_value: "113414",
+      key2_value: "113414人次",
       img: ggjtimg4,
     },
   ],

src/view/sy_map.vue

@@ -199,6 +199,7 @@ const csh = () => {
 //选中社区
 const chooseCsList = ref([]);
 const unChooseList = ref([]);
+const sqname = ref();
 //中心点坐标
 const center_now = ref([]);
 const center_center = ref([119.178783, 29.034583]);
@@ -366,14 +367,22 @@ const xkzCenter = reactive([
 var map = null;
 // 鼠标点击添加点位
 let currentMarker = null; // 用于保存当前标记的引用
-const BMAP = () => {
+const BMAP = (name) => {
+  // console.log(name, 666);
   // 添加鼠标点击事件监听器
   map.addEventListener("click", function (e) {
+    // console.log(e.latlng, name, 777);
+    xkzCenter.forEach((item, index) => {
+      if (item.name == name) {
+        item.center = [e.latlng.lng, e.latlng.lat];
+      }
+    });
+    // console.log(xkzCenter,888);
+    // addCs();
     // 检查并移除当前标记
     if (currentMarker !== null) {
       map.removeOverlay(currentMarker);
     }
-
     // 创建新标记
     let icons = new BMapGL.Icon(AED, new BMapGL.Size(24, 62));
     var marker = new BMapGL.Marker(
@@ -386,6 +395,7 @@ const BMAP = () => {
     // 将新标记添加到地图中并更新当前标记引用
     map.addOverlay(marker);
     currentMarker = marker;
+    // addCs();
   });
 };
 
@@ -400,7 +410,7 @@ const initMap = () => {
   //渲染地块
   addPolygonCounty();
   //添加街道名
-  BMAP();
+  // BMAP();
   addJd();
 };
 const loadTown = () => {
@@ -445,7 +455,7 @@ const addPolygonCounty = () => {
 
       map.addOverlay(polygon);
       polygon.addEventListener("click", () => {
-        console.log(item.name);
+        // console.log(11111, item.name);
 
         // if(item.name !== "溪口镇"){
         //   jrcs.value=false;
@@ -458,9 +468,9 @@ const addPolygonCounty = () => {
 
         // jrcs.value=true;
         if (item.name == cfjiedao.value) {
-          console.log(2222);
+          // console.log(2222);
         } else {
-          console.log(111);
+          // console.log(111);
           cfjiedao.value = item.name;
           let jdCenter = [];
           if (item.name == "溪口镇") {
@@ -567,7 +577,7 @@ const addPolygonCountyCs = () => {
       });
       map.addOverlay(cs_qk_arr.value[index]);
       cs_qk_arr.value[index].addEventListener("click", () => {
-        console.log(item.name);
+        console.log(66666666, item.name);
         console.log(111, xkzDk);
         xkzCenter.forEach((a, b) => {
           if (a.name == item.name) {
@@ -607,7 +617,9 @@ const addPolygonCountyCs = () => {
 //添加选中社区
 const addCsChoose = () => {
   chooseCsList.value.map((item, index) => {
-    console.log("item", item);
+    console.log("item11", item.name);
+    sqname.value = item.name;
+    BMAP(item.name);
     let fillColor = "blue";
     //地区的坐标范围
     let points = [];