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

This commit is contained in:
lnn19986213 2024-06-12 13:06:47 +08:00
commit edbb1cb7cc
5 changed files with 80 additions and 70 deletions

View File

@ -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: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
right: "18%",
bottom: "40%",
textStyle: {
color: "#ffffff",

View File

@ -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,9 @@ const option = {
title: [
{
text: "90%",
right: "24%",
// text: "0.03%",
text:`${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
right: "19%",
bottom: "40%",
textStyle: {
color: "#ffffff",

View File

@ -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: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
right: "19%",
bottom: "40%",
textStyle: {
color: "#ffffff",

View File

@ -726,17 +726,17 @@ 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;
tableType.url = url;
tableType.columns = columnss[title];
getTable(url, pagination.currentPage);
};
@ -745,7 +745,7 @@ const close = () => {
dialogShowEc.value = false;
dialogShowTab.value = false;
pagination.currentPage = 1;
pagination.total=100;
pagination.total = 100;
};
//
const showDialog2 = (title, url) => {
@ -753,7 +753,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);
}
};
@ -2340,6 +2341,7 @@ const showTab = (val) => {
margin-bottom: 20px;
.choose {
cursor: pointer;
text-align: center;
line-height: 40px;
width: 170px;
@ -2355,6 +2357,7 @@ const showTab = (val) => {
}
.noChoose {
cursor: pointer;
text-align: center;
line-height: 40px;
width: 170px;
@ -2778,6 +2781,7 @@ table {
.jtsyBoxtop1 {
position: relative;
display: flex;
overflow: hidden;
.turn {
width: 146px;
height: 104px;

View File

@ -183,7 +183,10 @@
</div>
</div>
<div class="history">
<div class="history1" @click="showDialog('养老机构', '')">
<div
class="history1"
@click="showDialog('养老机构', '/api/ggfwyth/yljghmcList')"
>
<div>
<span>{{ data.yljgzlzx.yljg }}<span class="unit"></span></span>
</div>
@ -198,7 +201,12 @@
<img src="@/assets/YLimg/ylimg3.png" alt="" />
<img class="historyimg" src="@/assets/YLimg/ylimg6.png" alt="" />
</div> -->
<div class="history1" @click="showDialog('居家养老服务照料中心', '')">
<div
class="history1"
@click="
showDialog('居家养老服务照料中心', '/api/ggfwyth/yljgzlzxList')
"
>
<div>
<span>{{ data.yljgzlzx.zlzx }}<span class="unit"></span></span>
</div>
@ -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;