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

src/view/dialog/diaLogTab.vue

@@ -100,25 +100,21 @@
         </div>
 
         <div v-if="data.tab == '0'" class="pagePart">
-          <el-pagination
+          <div v-if="title == '高铁'">
-            background
+            <el-pagination
-            layout="prev, pager, next,total"
+              background
-            :page-size="pagination.pageSize"
+              layout="prev, pager, next,total"
-            :total="pagination.total"
+              :page-size="pagination.pageSize"
-            prev-text="上一页"
+              :total="pagination.total"
-            next-text="下一页"
+              prev-text="上一页"
-            @current-change="handle"
+              next-text="下一页"
-            v-model:current-page="pagination.currentPage"
+              @current-change="handle"
-          />
+              v-model:current-page="pagination.currentPage"
+            />
+          </div>
         </div>
-        <div
+        <div v-if="data.tab == '1'" style="width: 100%; height: 550px">
-          v-if="data.tab == '1'"
+          <tL :list1="data.list1" :year="data.year"></tL>
-          style="width: 100%; height: 550px;"
-        >
-          <tL
-            :list1="data.list1"
-            :year="data.year"
-          ></tL>
         </div>
       </div>
     </el-dialog>

src/view/dialog/echarts/echartLine.vue

@@ -92,7 +92,7 @@ const getOption = () => {
         },
         nameTextStyle: {
           // 设置Y轴名称的样式
-          fontSize: 14, // 这里设置字体大小为20
+          fontSize: 16, // 这里设置字体大小为20
         },
         axisLabel: {
           //坐标轴刻度标签的相关设置
@@ -177,6 +177,7 @@ const getOption = () => {
         label: {
           show: true,
           color: "#ffffff",
+          fontSize: 16,
           formatter: function (data) {
             return data.value;
           },
@@ -199,6 +200,7 @@ const getOption = () => {
         label: {
           show: true,
           color: "#ffffff",
+          fontSize: 16,
           formatter: function (data) {
             return data.value;
           },
@@ -251,6 +253,7 @@ onBeforeMount(() => {
     data.list1 = props.list1;
     data.list2 = props.list2;
     data.year = props.year;
+    console.log(data.list1,data.list2,666);
     data.bg = [];
     data.year.forEach(() => {
       data.bg.push(0);

src/view/dialog/echarts/tabLine.vue

@@ -133,6 +133,7 @@ const getOption = () => {
         label: {
           show: true,
           color: "#ffffff",
+          fontSize: 16,
           formatter: function (data) {
             return data.value;
           },

src/view/sy.vue

@@ -569,16 +569,18 @@
         <div>
           {{ currentData.pxkssj.slice(0, 4) }}-{{
             currentData.pxkssj.slice(4, 6)
-          }}-{{ currentData.pxkssj.slice(6, 8) }}
+          }}-{{ currentData.pxkssj.slice(6, 8) }}/{{
+            currentData.pxjssj.slice(4, 6)
+          }}-{{ currentData.pxjssj.slice(6, 8) }}
         </div>
       </template>
-      <template #pxjssj="{ currentCol, currentData }">
+      <!-- <template #pxjssj="{ currentCol, currentData }">
         <div>
           {{ currentData.pxjssj.slice(0, 4) }}-{{
             currentData.pxjssj.slice(4, 6)
           }}-{{ currentData.pxjssj.slice(6, 8) }}
         </div>
-      </template>
+      </template> -->
     </Dialog>
     <DialogEc
       :dialogShowEc="dialogShowEc"
@@ -669,15 +671,20 @@ const columnss = reactive({
       property: "pxbmc",
     },
     {
-      label: "培训开始时间",
+      label: "培训时间",
       property: "pxkssj",
       type: "slot",
     },
-    {
+    // {
-      label: "培训结束时间",
+    //   label: "培训开始时间",
-      property: "pxjssj",
+    //   property: "pxkssj",
-      type: "slot",
+    //   type: "slot",
-    },
+    // },
+    // {
+    //   label: "培训结束时间",
+    //   property: "pxjssj",
+    //   type: "slot",
+    // },
   ],
   就业见习服务: [
     {
@@ -1047,7 +1054,7 @@ const data = reactive({
     {
       name: "公共自行车",
       key1: "骑行次数",
-      key1_value: "1172491",
+      key1_value: "117231",
       key2: "骑行时长",
       key2_value: "1283h",
       img: ggjtimg,
@@ -1352,8 +1359,10 @@ const showEc = (val) => {
   dataEc.list2 = [];
   switch (val) {
     case "公共自行车":
-      dataEc.list1 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 122];
+      dataEc.list1 = [63, 145, 123, 158, 76, 133, 95, 178, 154, 112, 67, 142]; // 骑行次数
-      dataEc.list2 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 112];
+      dataEc.list2 = [
+        3150, 6550, 4905, 7430, 3625, 5985, 3990, 8020, 6725, 5235, 3520, 6490,
+      ]; // 骑行时长（分钟）
       dataEc.times = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
       dialogShowEc.value = true;
       break;
@@ -1361,7 +1370,7 @@ const showEc = (val) => {
       http.get("/api/ggfwyth/ddcList").then((res) => {
         if (res.code == 200) {
           dataEc.list1 = res.data.qxcs;
-          dataEc.list2 = res.data.qxsc;
+          dataEc.list2 = res.data.qxsc.map((str) => parseInt(str));
           dataEc.times = res.data.times;
           dialogShowEc.value = true;
         }
@@ -1378,46 +1387,184 @@ const showTab = (val) => {
   dataTab.data = [];
   switch (val) {
     case "公共汽车":
-      dataTab.list1 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 122];
+      dataTab.list1 = [12, 15, 18, 22, 25, 30, 28, 35, 32, 40, 45, 50];
       dataTab.times = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
       dataTab.data = [
-        {
+      {
-          bc: "G13214",
+            cc: "201A",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—湖镇车站",
-          time: "2024-06-11",
+            dd: "06:56:00.000",
+            kd: "07:10:00.000",
+            ts: "14"
         },
         {
-          bc: "G13214",
+            cc: "201B",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—湖镇车站",
-          time: "2024-06-11",
+            dd: "07:30:00.000",
+            kd: "07:45:00.000",
+            ts: "15"
         },
         {
-          bc: "G13214",
+            cc: "203",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—地圩",
-          time: "2024-06-11",
+            dd: "08:00:00.000",
+            kd: "08:20:00.000",
+            ts: "20"
         },
+        {
+            cc: "301",
+            qqz: "湖镇车站—十里坪",
+            dd: "08:45:00.000",
+            kd: "09:00:00.000",
+            ts: "15"
+        },
+        {
+            cc: "302",
+            qqz: "湖镇车站—大坪",
+            dd: "09:15:00.000",
+            kd: "09:30:00.000",
+            ts: "15"
+        },
+        {
+            cc: "307",
+            qqz: "湖镇车站—蒲塘",
+            dd: "10:00:00.000",
+            kd: "10:20:00.000",
+            ts: "20"
+        },
+        {
+            cc: "308",
+            qqz: "湖镇车站—童村",
+            dd: "10:45:00.000",
+            kd: "11:00:00.000",
+            ts: "15"
+        },
+        {
+            cc: "304",
+            qqz: "湖镇车站—青塘坞",
+            dd: "11:15:00.000",
+            kd: "11:30:00.000",
+            ts: "15"
+        },
+        {
+            cc: "206",
+            qqz: "龙游公交中心—上堤",
+            dd: "12:00:00.000",
+            kd: "12:20:00.000",
+            ts: "20"
+        },
+        {
+            cc: "205",
+            qqz: "龙游公交中心—源头",
+            dd: "12:45:00.000",
+            kd: "13:00:00.000",
+            ts: "15"
+        },
+        {
+            cc: "305",
+            qqz: "湖镇车站—上堤",
+            dd: "13:15:00.000",
+            kd: "13:30:00.000",
+            ts: "15"
+        },
+        {
+            cc: "306",
+            qqz: "湖镇车站—源头",
+            dd: "14:00:00.000",
+            kd: "14:20:00.000",
+            ts: "20"
+        }
       ];
       dialogShowTab.value = true;
       break;
     case "长途汽车":
-      dataTab.list1 = [11, 21, 31, 4, 51, 6, 7, 81, 91, 10, 11, 122];
+      dataTab.list1 = [10, 12, 15, 20, 25, 18, 22, 30, 28, 35, 40, 45];
       dataTab.times = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
       dataTab.data = [
-        {
+      {
-          bc: "D6456",
+            cc: "303",
-          sfzd: "A-B",
+            qqz: "湖镇车站—马家",
-          time: "2024-06-11",
+            dd: "08:00:00.000",
+            kd: "08:30:00.000",
+            ts: "30"
         },
         {
-          bc: "D6456",
+            cc: "202",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—周家",
-          time: "2024-06-11",
+            dd: "09:15:00.000",
+            kd: "09:45:00.000",
+            ts: "30"
         },
         {
-          bc: "D6456",
+            cc: "204",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—社阳",
-          time: "2024-06-11",
+            dd: "10:30:00.000",
+            kd: "11:00:00.000",
+            ts: "30"
         },
+        {
+            cc: "221",
+            qqz: "龙游公交中心—溪口车站",
+            dd: "11:45:00.000",
+            kd: "12:15:00.000",
+            ts: "30"
+        },
+        {
+            cc: "222",
+            qqz: "龙游公交中心—官潭—溪口车站",
+            dd: "13:00:00.000",
+            kd: "13:30:00.000",
+            ts: "30"
+        },
+        {
+            cc: "325",
+            qqz: "溪口车站—大街",
+            dd: "14:15:00.000",
+            kd: "14:45:00.000",
+            ts: "30"
+        },
+        {
+            cc: "322",
+            qqz: "溪口车站—坑头",
+            dd: "15:30:00.000",
+            kd: "16:00:00.000",
+            ts: "30"
+        },
+        {
+            cc: "326",
+            qqz: "大街—方坦—横坑—岭脚",
+            dd: "16:45:00.000",
+            kd: "17:15:00.000",
+            ts: "30"
+        },
+        {
+            cc: "328",
+            qqz: "溪口车站—合坑源",
+            dd: "18:00:00.000",
+            kd: "18:30:00.000",
+            ts: "30"
+        },
+        {
+            cc: "329",
+            qqz: "溪口车站—际上",
+            dd: "19:15:00.000",
+            kd: "19:45:00.000",
+            ts: "30"
+        },
+        {
+            cc: "330",
+            qqz: "溪口车站—毛连里",
+            dd: "20:30:00.000",
+            kd: "21:00:00.000",
+            ts: "30"
+        },
+        {
+            cc: "327",
+            qqz: "长山桥—后山",
+            dd: "21:45:00.000",
+            kd: "22:15:00.000",
+            ts: "30"
+        }
       ];
       dialogShowTab.value = true;
       break;