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

src/view/dialog/diaLogTab.vue

@@ -42,19 +42,19 @@
         <div class="tabChoose">
           <div
             :class="data.tab == '0' ? 'choosed' : 'tabs'"
-            style="margin-right: -35px"
+            style="margin-left: -35px"
           >
-            <span @click="changeTab('0')">路线</span>
+            <span @click="changeTab('0')">乘坐人次趋势</span>
           </div>
           <div
             :class="data.tab == '1' ? 'choosed' : 'tabs'"
-            style="margin-left: -35px"
+            style="margin-right: -35px"
           >
-            <span @click="changeTab('1')">乘坐人次趋势</span>
+            <span @click="changeTab('1')">路线</span>
           </div>
         </div>
         <div
-          v-if="data.tab == '0'"
+          v-if="data.tab == '1'"
           style="width: 100%; height: calc(100% - 110px)"
         >
           <el-table
@@ -98,8 +98,10 @@
             </template>
           </el-table>
         </div>
-
-        <div v-if="data.tab == '0'" class="pagePart">
+        <div v-if="data.tab == '0'" style="width: 100%; height: 550px">
+          <tL :list1="data.list1" :year="data.year"></tL>
+        </div>
+        <div v-if="data.tab == '1'" class="pagePart">
           <div v-if="title == '高铁'">
             <el-pagination
               background
@@ -113,9 +115,6 @@
             />
           </div>
         </div>
-        <div v-if="data.tab == '1'" style="width: 100%; height: 550px">
-          <tL :list1="data.list1" :year="data.year"></tL>
-        </div>
       </div>
     </el-dialog>
   </div>

src/view/sy.vue

@@ -1353,11 +1353,23 @@ const showEc = (val) => {
   dataEc.list2 = [];
   switch (val) {
     case "公共自行车":
-      dataEc.list1 = [63, 145, 123, 158, 76, 133, 95, 178, 154, 112, 67, 142]; // 骑行次数
+      dataEc.list1 = [
+        4080, 4564, 2995, 4654, 2197, 3930, 1076, 2712, 1538, 3937, 3845, 3212,
+        1982, 945, 1598, 1314, 3697, 4474, 4285, 4400, 4251, 4406, 4324, 4123,
+        3774, 3491, 4074, 4546, 4287, 4445,
+      ]; // 骑行次数
       dataEc.list2 = [
-        3150, 6550, 4905, 7430, 3625, 5985, 3990, 8020, 6725, 5235, 3520, 6490,
+        1200, 1342, 953, 1302, 602, 873, 521, 698, 732, 913, 892, 1023, 821,
+        453, 732, 695, 892, 1265, 1178, 1246, 1206, 1361, 1323, 1231, 893, 1032,
+        1196, 1411, 1232, 1364,
       ]; // 骑行时长（分钟）
-      dataEc.times = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+      dataEc.times = [
+        20240612, 20240613, 20240614, 20240615, 20240616, 20240617, 20240618,
+        20240619, 20240620, 20240621, 20240622, 20240623, 20240624, 20240625,
+        20240626, 20240627, 20240629, 20240630, 20240701, 20240702, 20240703,
+        20240704, 20240705, 20240706, 20240707, 20240708, 20240709, 20240710,
+        20240711,
+      ];
       dialogShowEc.value = true;
       break;
     case "电动单车":