From ce741772ba67423f835a1e0154582fef2514a1cc Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Mon, 15 Jul 2024 10:13:22 +0800
Subject: [PATCH] gx
---
src/view/echarts_work/eP4.vue | 6 +-
src/view/sy.vue | 108 ++++++++++++++++++----------------
src/view/work.vue | 14 +++--
3 files changed, 69 insertions(+), 59 deletions(-)
diff --git a/src/view/echarts_work/eP4.vue b/src/view/echarts_work/eP4.vue
index 37c1a41..32aeefa 100644
--- a/src/view/echarts_work/eP4.vue
+++ b/src/view/echarts_work/eP4.vue
@@ -133,7 +133,7 @@ const getOption = () => {
scale: true,
min: 0,
- name: "补贴金额/万",
+ name: data.list.name == "困难军人" ? "补贴金额/万" : "补贴金额/元",
splitLine: {
show: false,
lineStyle: {
@@ -309,6 +309,7 @@ watch(
setChart1();
getOption();
setChart();
+ console.log(data.list, data.list1, data.list2, "教育");
}
);
@@ -318,10 +319,9 @@ onBeforeMount(() => {
data.list = props.list;
if (Object.keys(data.list).length !== 0) {
setChart1();
- // console.log(data.list, data.list1, data.list2, "教育");
getOption();
setChart();
- };
+ }
}, 600);
});
diff --git a/src/view/sy.vue b/src/view/sy.vue
index 129931d..82ef6bd 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -599,7 +599,8 @@
>
- {{ currentData.dd.substring(0, currentData.dd.indexOf(".")) }}
+
+ {{ currentData.dd }}
@@ -1354,7 +1355,7 @@ const showEc = (val) => {
switch (val) {
case "公共自行车":
dataEc.list1 = [
- 1314, 3697, 4474, 4285, 4400, 4251, 4406, 4324, 4123, 3774, 3491, 4074,
+ 602,1314, 3697, 4474, 4285, 4400, 4251, 4406, 4324, 4123, 3774, 3491, 4074,
4546, 4287,
]; // 骑行次数
dataEc.list2 = [
@@ -1362,6 +1363,7 @@ const showEc = (val) => {
1411, 1232,
]; // 骑行时长（分钟）
dataEc.times = [
+ "26",
"27",
"29",
"30",
@@ -1400,10 +1402,11 @@ const showTab = (val) => {
switch (val) {
case "公共汽车":
dataTab.list1 = [
- 9616, 10360, 10206, 8970, 10442, 9988, 9487, 8380, 8371, 7984, 7574,
+ 8616,9616, 10360, 10206, 8970, 10442, 9988, 9487, 8380, 8371, 7984, 7574,
8647, 9515, 8974,
];
dataTab.times = [
+ "26",
"27",
"28",
"29",
@@ -1423,93 +1426,94 @@ const showTab = (val) => {
{
cc: "201A",
qqz: "龙游公交中心—湖镇车站",
- dd: "06:56:00.000",
- kd: "07:10:00.000",
+ dd: "06:56",
+ kd: "07:10",
ts: "14",
},
{
cc: "201B",
qqz: "龙游公交中心—湖镇车站",
- dd: "07:30:00.000",
- kd: "07:45:00.000",
+ dd: "07:30",
+ kd: "07:45",
ts: "15",
},
{
cc: "203",
qqz: "龙游公交中心—地圩",
- dd: "08:00:00.000",
- kd: "08:20:00.000",
+ dd: "08:00",
+ kd: "08:20",
ts: "20",
},
{
cc: "301",
qqz: "湖镇车站—十里坪",
- dd: "08:45:00.000",
- kd: "09:00:00.000",
+ dd: "08:45",
+ kd: "09:00",
ts: "15",
},
{
cc: "302",
qqz: "湖镇车站—大坪",
- dd: "09:15:00.000",
- kd: "09:30:00.000",
+ dd: "09:15",
+ kd: "09:30",
ts: "15",
},
{
cc: "307",
qqz: "湖镇车站—蒲塘",
- dd: "10:00:00.000",
- kd: "10:20:00.000",
+ dd: "10:00",
+ kd: "10:20",
ts: "20",
},
{
cc: "308",
qqz: "湖镇车站—童村",
- dd: "10:45:00.000",
- kd: "11:00:00.000",
+ dd: "10:45",
+ kd: "11:00",
ts: "15",
},
{
cc: "304",
qqz: "湖镇车站—青塘坞",
- dd: "11:15:00.000",
- kd: "11:30:00.000",
+ dd: "11:15",
+ kd: "11:30",
ts: "15",
},
{
cc: "206",
qqz: "龙游公交中心—上堤",
- dd: "12:00:00.000",
- kd: "12:20:00.000",
+ dd: "12:00",
+ kd: "12:20",
ts: "20",
},
{
cc: "205",
qqz: "龙游公交中心—源头",
- dd: "12:45:00.000",
- kd: "13:00:00.000",
+ dd: "12:45",
+ kd: "13:00",
ts: "15",
},
{
cc: "305",
qqz: "湖镇车站—上堤",
- dd: "13:15:00.000",
- kd: "13:30:00.000",
+ dd: "13:15",
+ kd: "13:30",
ts: "15",
},
{
cc: "306",
qqz: "湖镇车站—源头",
- dd: "14:00:00.000",
- kd: "14:20:00.000",
+ dd: "14:00",
+ kd: "14:20",
ts: "20",
},
];
dialogShowTab.value = true;
break;
case "长途汽车":
- dataTab.list1 = [57, 37, 46, 46, 54, 40, 46, 37, 48, 39, 48, 48, 31, 43];
+ dataTab.list1 = [97,57, 37, 46, 46, 54, 40, 46, 37, 48, 39, 48, 48, 31, 43];
dataTab.times = [
+ "26",
"27",
"28",
"29",
@@ -1529,85 +1533,85 @@ const showTab = (val) => {
{
cc: "303",
qqz: "湖镇车站—马家",
- dd: "08:00:00.000",
- kd: "08:30:00.000",
+ dd: "08:00",
+ kd: "08:30",
ts: "30",
},
{
cc: "202",
qqz: "龙游公交中心—周家",
- dd: "09:15:00.000",
- kd: "09:45:00.000",
+ dd: "09:15",
+ kd: "09:45",
ts: "30",
},
{
cc: "204",
qqz: "龙游公交中心—社阳",
- dd: "10:30:00.000",
- kd: "11:00:00.000",
+ dd: "10:30",
+ kd: "11:00",
ts: "30",
},
{
cc: "221",
qqz: "龙游公交中心—溪口车站",
- dd: "11:45:00.000",
- kd: "12:15:00.000",
+ dd: "11:45",
+ kd: "12:15",
ts: "30",
},
{
cc: "222",
qqz: "龙游公交中心—官潭—溪口车站",
- dd: "13:00:00.000",
- kd: "13:30:00.000",
+ dd: "13:00",
+ kd: "13:30",
ts: "30",
},
{
cc: "325",
qqz: "溪口车站—大街",
- dd: "14:15:00.000",
- kd: "14:45:00.000",
+ dd: "14:15",
+ kd: "14:45",
ts: "30",
},
{
cc: "322",
qqz: "溪口车站—坑头",
- dd: "15:30:00.000",
- kd: "16:00:00.000",
+ dd: "15:30",
+ kd: "16:00",
ts: "30",
},
{
cc: "326",
qqz: "大街—方坦—横坑—岭脚",
- dd: "16:45:00.000",
- kd: "17:15:00.000",
+ dd: "16:45",
+ kd: "17:15",
ts: "30",
},
{
cc: "328",
qqz: "溪口车站—合坑源",
- dd: "18:00:00.000",
- kd: "18:30:00.000",
+ dd: "18:00",
+ kd: "18:30",
ts: "30",
},
{
cc: "329",
qqz: "溪口车站—际上",
- dd: "19:15:00.000",
- kd: "19:45:00.000",
+ dd: "19:15",
+ kd: "19:45",
ts: "30",
},
{
cc: "330",
qqz: "溪口车站—毛连里",
- dd: "20:30:00.000",
- kd: "21:00:00.000",
+ dd: "20:30",
+ kd: "21:00",
ts: "30",
},
{
cc: "327",
qqz: "长山桥—后山",
- dd: "21:45:00.000",
- kd: "22:15:00.000",
+ dd: "21:45",
+ kd: "22:15",
ts: "30",
},
];
diff --git a/src/view/work.vue b/src/view/work.vue
index b6a5df4..67ca937 100644
--- a/src/view/work.vue
+++ b/src/view/work.vue
@@ -131,7 +131,7 @@
困难职工
-
+
@@ -224,6 +224,11 @@ const jzChange = (index, value) => {
3: data.needyWorkers,
};
data.list1 = listMap[value];
+ if (value == 2) {
+ data.list1.name = "困难军人";
+ } else if (value == 3) {
+ data.list1.name = "困难职工";
+ }
}
};
@@ -325,6 +330,7 @@ const data = reactive({
},
],
year: ["2019"],
+ name: "困难军人",
},
diversification: {
hszhxms: [
@@ -456,9 +462,9 @@ const startAutoSwitching = () => {
interval = setInterval(toggleShow, 6000); // 每6秒切换一次
};
onMounted(() => {
- setTimeout(()=>{
- startAutoScroll();
- },600)
+ setTimeout(() => {
+ startAutoScroll();
+ }, 600);
// startAutoSwitching();
});