From 3a58e67845a1463120c0a6358e0dcde3bc5436e7 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Wed, 12 Jun 2024 09:02:50 +0800 Subject: [PATCH 1/6] 1 --- src/view/sy.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/view/sy.vue b/src/view/sy.vue index 4f5bcb9..b301cea 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -755,7 +755,7 @@ const showDialog = (title, url) => { tableType.title = title; tableType.url = url; tableType.columns = columnss[title]; - + getTable(url, pagination.currentPage); }; @@ -764,7 +764,8 @@ const close = () => { dialogShowEc.value = false; dialogShowTab.value = false; pagination.currentPage = 1; - pagination.total=100; + pagination.total = 100; + tableType.title = ""; }; //医疗卫生 const showDialog2 = (title, url) => { From 7c15dbe66a37fcf6131541e5b74ddac3abab5b71 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Wed, 12 Jun 2024 09:50:40 +0800 Subject: [PATCH 2/6] 1 --- src/view/echarts_sy/zwfw1.vue | 61 +++++++++++++++++------------------ src/view/echarts_sy/zwfw2.vue | 16 ++++----- src/view/echarts_sy/zwfw3.vue | 16 ++++----- src/view/sy.vue | 15 +++++---- 4 files changed, 55 insertions(+), 53 deletions(-) diff --git a/src/view/echarts_sy/zwfw1.vue b/src/view/echarts_sy/zwfw1.vue index 4814a54..5efefc9 100644 --- a/src/view/echarts_sy/zwfw1.vue +++ b/src/view/echarts_sy/zwfw1.vue @@ -11,17 +11,17 @@ const chart = ref(); // 创建DOM引用 const dataList = [ { name: "2.0收件数", - value: 90, + value: 33044, }, { name: "总收件数", - value: 100, + value: 33295, }, ]; //内圈数据 var data = [ { - value: 90, + value: dataList[0].value, name: "2.0收件数", itemStyle: { normal: { @@ -45,7 +45,7 @@ var data = [ }, }, { - value: 10, + value: dataList[1].value - dataList[0].value, name: "", itemStyle: { normal: { @@ -63,7 +63,7 @@ var data = [ }, }, { - value: 100, + value: dataList[1].value, name: "总收件数", itemStyle: { normal: { @@ -75,7 +75,7 @@ var data = [ //外圈数据 const data1 = [ { - value: 100, + value: dataList[1].value, name: "", itemStyle: { normal: { @@ -95,7 +95,7 @@ const data1 = [ }, }, { - value: 100, + value: dataList[1].value, name: "", itemStyle: { normal: { @@ -106,34 +106,33 @@ const data1 = [ ]; const option = { - legend: - { - selectedMode:false, - itemWidth: 10, - itemHeight: 10, - itemGap: 10, - icon: "circle", - data: ["2.0收件数","",'总收件数'], - bottom: "3%", - width: 380, - textStyle: { - color: "#ffffff", // 修改图例颜色为红色 - }, - formatter: function (params) { - var num = ""; - for (let i = 0; i < dataList.length; i++) { - if (dataList[i].name == params) { - num = dataList[i].value; - } - } - return params + " " + num; - }, + legend: { + selectedMode: false, + itemWidth: 10, + itemHeight: 10, + itemGap: 10, + icon: "circle", + data: ["2.0收件数", "", "总收件数"], + bottom: "3%", + width: 380, + textStyle: { + color: "#ffffff", // 修改图例颜色为红色 }, + formatter: function (params) { + var num = ""; + for (let i = 0; i < dataList.length; i++) { + if (dataList[i].name == params) { + num = dataList[i].value; + } + } + return params + " " + num; + }, + }, title: [ { - text: "90%", - right: "24%", + text: "99.25%", + right: "18%", bottom: "40%", textStyle: { color: "#ffffff", diff --git a/src/view/echarts_sy/zwfw2.vue b/src/view/echarts_sy/zwfw2.vue index bc12318..17fdc5f 100644 --- a/src/view/echarts_sy/zwfw2.vue +++ b/src/view/echarts_sy/zwfw2.vue @@ -11,16 +11,16 @@ const chart = ref(); // 创建DOM引用 const dataList = [ { name: "超期受理数", - value: 90, + value: 9, }, { name: "应受理数", - value: 100, + value: 32561, }, ]; var data = [ { - value: 90, + value: dataList[0].value, name: "超期受理数", itemStyle: { normal: { @@ -58,7 +58,7 @@ var data = [ }, }, { - value: 100, + value: dataList[1].value, name: "应受理数", itemStyle: { normal: { @@ -69,7 +69,7 @@ var data = [ ]; const data1 = [ { - value: 100, + value: dataList[1].value, name: "", itemStyle: { normal: { @@ -89,7 +89,7 @@ const data1 = [ }, }, { - value: 100, + value: dataList[1].value, name: "", itemStyle: { normal: { @@ -127,8 +127,8 @@ const option = { title: [ { - text: "90%", - right: "24%", + text: "0.03%", + right: "22%", bottom: "40%", textStyle: { color: "#ffffff", diff --git a/src/view/echarts_sy/zwfw3.vue b/src/view/echarts_sy/zwfw3.vue index 6b64bf3..b4c6030 100644 --- a/src/view/echarts_sy/zwfw3.vue +++ b/src/view/echarts_sy/zwfw3.vue @@ -11,16 +11,16 @@ const chart = ref(); // 创建DOM引用 const dataList = [ { name: "超期办理数", - value: 90, + value: 7, }, { name: "应办理数", - value: 100, + value: 31615, }, ]; var data = [ { - value: 90, + value: dataList[0].value, name: "超期办理数", itemStyle: { normal: { @@ -58,7 +58,7 @@ var data = [ }, }, { - value: 100, + value: dataList[1].value, name: "应办理数", itemStyle: { normal: { @@ -69,7 +69,7 @@ var data = [ ]; const data1 = [ { - value: 100, + value: dataList[1].value, name: "", itemStyle: { normal: { @@ -89,7 +89,7 @@ const data1 = [ }, }, { - value: 100, + value: dataList[1].value, name: "", itemStyle: { normal: { @@ -126,8 +126,8 @@ const option = { title: [ { - text: "90%", - right: "24%", + text: "0.02%", + right: "22%", bottom: "40%", textStyle: { color: "#ffffff", diff --git a/src/view/sy.vue b/src/view/sy.vue index b301cea..7fa56cf 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -745,11 +745,11 @@ const pagination = reactive({ }); const handlePagination = (current) => { pagination.currentPage = current; - if (tableType.title == "医院卫生院") { - getTable2(tableType.url, pagination.currentPage); - } else { + // if (tableType.title == "医院卫生院") { + // getTable2(tableType.url, pagination.currentPage); + // } else { getTable(tableType.url, pagination.currentPage); - } + // } }; const showDialog = (title, url) => { tableType.title = title; @@ -765,7 +765,6 @@ const close = () => { dialogShowTab.value = false; pagination.currentPage = 1; pagination.total = 100; - tableType.title = ""; }; //医疗卫生 const showDialog2 = (title, url) => { @@ -773,7 +772,8 @@ const showDialog2 = (title, url) => { tableType.title = title; tableType.url = url; tableType.columns = ylws_columns.value; - getTable2(url, pagination.currentPage); + dialogShow.value = true; + // getTable(url, pagination.currentPage); } }; @@ -2394,6 +2394,7 @@ const showTab = (val) => { margin-bottom: 20px; .choose { + cursor: pointer; text-align: center; line-height: 40px; width: 170px; @@ -2409,6 +2410,7 @@ const showTab = (val) => { } .noChoose { + cursor: pointer; text-align: center; line-height: 40px; width: 170px; @@ -2832,6 +2834,7 @@ table { .jtsyBoxtop1 { position: relative; display: flex; + overflow: hidden; .turn { width: 146px; height: 104px; From 4e7e00b234a9082e3062c6ccce84a296d3322b1d Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Wed, 12 Jun 2024 11:27:16 +0800 Subject: [PATCH 3/6] 1 --- src/view/echarts_sy/zwfw1.vue | 2 +- src/view/echarts_sy/zwfw2.vue | 5 +++-- src/view/echarts_sy/zwfw3.vue | 4 ++-- src/view/yl.vue | 38 ++++++++++++++++++++--------------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/view/echarts_sy/zwfw1.vue b/src/view/echarts_sy/zwfw1.vue index 5efefc9..575e62e 100644 --- a/src/view/echarts_sy/zwfw1.vue +++ b/src/view/echarts_sy/zwfw1.vue @@ -131,7 +131,7 @@ const option = { title: [ { - text: "99.25%", + text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`, right: "18%", bottom: "40%", textStyle: { diff --git a/src/view/echarts_sy/zwfw2.vue b/src/view/echarts_sy/zwfw2.vue index 17fdc5f..1666f73 100644 --- a/src/view/echarts_sy/zwfw2.vue +++ b/src/view/echarts_sy/zwfw2.vue @@ -127,8 +127,9 @@ const option = { title: [ { - text: "0.03%", - right: "22%", + // text: "0.03%", + text:`${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`, + right: "19%", bottom: "40%", textStyle: { color: "#ffffff", diff --git a/src/view/echarts_sy/zwfw3.vue b/src/view/echarts_sy/zwfw3.vue index b4c6030..b16cd5f 100644 --- a/src/view/echarts_sy/zwfw3.vue +++ b/src/view/echarts_sy/zwfw3.vue @@ -126,8 +126,8 @@ const option = { title: [ { - text: "0.02%", - right: "22%", + text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`, + right: "19%", bottom: "40%", textStyle: { color: "#ffffff", diff --git a/src/view/yl.vue b/src/view/yl.vue index e324d54..6159709 100644 --- a/src/view/yl.vue +++ b/src/view/yl.vue @@ -183,7 +183,10 @@
-
+
{{ data.yljgzlzx.yljg }}个
@@ -198,7 +201,12 @@
--> -
+
{{ data.yljgzlzx.zlzx }}个
@@ -345,15 +353,15 @@ const xz_column = ref([ const yl_column = ref([ { label: "机构名称", - property: "name", + property: "mc", }, { label: "机构地址", - property: "address", + property: "dz", }, { label: "老人数量", - property: "oldMan", + property: "rzlrsl", }, ]); // 表格分页 @@ -379,17 +387,15 @@ const showDialog = (title, url) => { }; //获取表格数据 const getTable = (url, currentPage) => { - dialogShow.value = true; - tableType.data = []; - // http - // .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`) - // .then((res) => { - // if (res.code == 200) { - // tableType.data = res.data; - // pagination.total = res.count; - // dialogShow.value = true; - // } - // }); + http + .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`) + .then((res) => { + if (res.code == 200) { + tableType.data = res.data; + pagination.total = res.count; + dialogShow.value = true; + } + }); }; const close = () => { dialogShow.value = false; From b92324704026682f84ed793ae5f97731b0fa6527 Mon Sep 17 00:00:00 2001 From: lnn19986213 <1667908750@qq.com> Date: Wed, 12 Jun 2024 13:06:44 +0800 Subject: [PATCH 4/6] gx --- src/view/sy.vue | 63 ++++--------------------------------------------- 1 file changed, 5 insertions(+), 58 deletions(-) diff --git a/src/view/sy.vue b/src/view/sy.vue index 4f5bcb9..bb87f0c 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -410,25 +410,6 @@
-
@@ -457,7 +438,7 @@
{{ data.jtsyList[1].key2 }}： - {{ data.jtsyList[1].key2_value }} + {{ data.jtsyList[1].key2_value }}h
@@ -1096,44 +1077,6 @@ const jysyList = ref([ }, ]); -const jtsyList = ref([ - { - name: "公共自行车", - key1: "骑行次数", - key1_value: "1172491", - key2: "骑行时长", - key2_value: "1283h", - }, - { - name: "电动单车", - key1: "骑行次数", - key1_value: "1172491", - key2: "骑行时长", - key2_value: "1283h", - }, - { - name: "公共汽车", - key1: "公交线路", - key1_value: "176", - key2: "乘坐人次", - key2_value: "239741", - }, - { - name: "长途汽车", - key1: "班车次数", - key1_value: "133", - key2: "客流量", - key2_value: "192874", - }, - { - name: "高铁", - key1: "列车班次", - key1_value: "23", - key2: "客流量", - key2_value: "113414", - }, -]); - // 县城学校师生比样式 const cs = computed(() => { let str = `--teacher: ${jysyList.value[0].teacher}; --total: ${ @@ -1297,6 +1240,10 @@ const getData = async () => { data.tysyList[index].value = res.data.whtysy[key]; }); // 交通事业 + data.jtsyList[1].key1_value = res.data.transportation.electricbicycle.cyclingFrequency + data.jtsyList[1].key2_value = res.data.transportation.electricbicycle.cyclingDduration + data.jtsyList[4].key1_value = res.data.transportation.highSpeedRail.trainSchedule + console.log(data.jtsyList[4].key1_value) } }); }; From 7169f404eaa6f89819963df9bbf59c8b3d69bc37 Mon Sep 17 00:00:00 2001 From: lnn19986213 <1667908750@qq.com> Date: Wed, 12 Jun 2024 13:07:26 +0800 Subject: [PATCH 5/6] gx --- src/view/dialog/diaLogTab.vue | 2 +- src/view/dialog/dialog.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/view/dialog/diaLogTab.vue b/src/view/dialog/diaLogTab.vue index 0f41ccf..917ffd4 100644 --- a/src/view/dialog/diaLogTab.vue +++ b/src/view/dialog/diaLogTab.vue @@ -240,7 +240,7 @@ onMounted(() => { data.list1 = props.list1; data.year = props.year; const paginationTotal = document.querySelector(".el-pagination__total"); - console.log(paginationTotal); + // console.log(paginationTotal); // paginationTotal.innerText = `总共 ${props.pagination.total} 组数据`; }); diff --git a/src/view/dialog/dialog.vue b/src/view/dialog/dialog.vue index 96f6242..f66faf4 100644 --- a/src/view/dialog/dialog.vue +++ b/src/view/dialog/dialog.vue @@ -177,7 +177,7 @@ onMounted(() => { data.title = props.title; data.tableData = props.tableData; const paginationTotal = document.querySelector(".el-pagination__total"); - console.log(paginationTotal); + // console.log(paginationTotal); // paginationTotal.innerText = `总共 ${props.pagination.total} 组数据`; }); From 8ebb9c31acd2b043724e9a7d40eee8425a3f019e Mon Sep 17 00:00:00 2001 From: lnn19986213 <1667908750@qq.com> Date: Thu, 13 Jun 2024 13:25:09 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/sy.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/sy.vue b/src/view/sy.vue index df891a6..488548b 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -1244,7 +1244,7 @@ const getData = async () => { data.jtsyList[1].key1_value = res.data.transportation.electricbicycle.cyclingFrequency data.jtsyList[1].key2_value = res.data.transportation.electricbicycle.cyclingDduration data.jtsyList[4].key1_value = res.data.transportation.highSpeedRail.trainSchedule - console.log(data.jtsyList[4].key1_value) + data.jtsyList[4].key2_value = res.data.transportation.highSpeedRail.passengerFlow } }); };