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

This commit is contained in:
duanxiaohai 2024-06-11 11:11:31 +08:00
commit 31b48b3543
2 changed files with 164 additions and 77 deletions

View File

@ -92,32 +92,32 @@
<div class="schoolb"> <div class="schoolb">
<img src="../assets/eduImg/xxgkTop.png" class="gkTop" alt="" /> <img src="../assets/eduImg/xxgkTop.png" class="gkTop" alt="" />
<div class="grade"> <div class="grade">
<div class="schoolbs"> <div class="schoolbs" @click="showDialog('学校','')">
<span class="spot">初中</span> <span class="spot">初中</span>
<span>{{ data.xxgk.czxxsl }}</span> <span>{{ data.xxgk.czxxsl }}</span>
</div> </div>
<div class="schoolbs"> <div class="schoolbs" @click="showDialog('学校','')">
<span class="spot">高中</span> <span class="spot">高中</span>
<span>{{ data.xxgk.gzxxsl }}</span> <span>{{ data.xxgk.gzxxsl }}</span>
</div> </div>
</div> </div>
<div class="grade"> <div class="grade">
<div class="schoolbs"> <div class="schoolbs" @click="showDialog('学校','')">
<span class="spot">小学</span> <span class="spot">小学</span>
<span>{{ data.xxgk.xxxxsl }}</span> <span>{{ data.xxgk.xxxxsl }}</span>
</div> </div>
<div class="schoolbs"> <div class="schoolbs" @click="showDialog('学校','')">
<span class="spot">中职</span> <span class="spot">中职</span>
<span>{{ data.xxgk.zzxxsl }}</span> <span>{{ data.xxgk.zzxxsl }}</span>
</div> </div>
</div> </div>
<div class="grade grade1"> <div class="grade grade1">
<div class="schoolbs"> <div class="schoolbs" @click="showDialog('学校','')">
<span class="spot">幼儿园</span> <span class="spot">幼儿园</span>
<span>{{ data.xxgk.yeyxxsl }}</span> <span>{{ data.xxgk.yeyxxsl }}</span>
</div> </div>
<div class="schoolbs"> <div class="schoolbs">
<span class="spot">特殊教育</span> <span class="spot" @click="showDialog('学校','')">特殊教育</span>
<span>{{ data.xxgk.tsjyxxsl }}</span> <span>{{ data.xxgk.tsjyxxsl }}</span>
</div> </div>
</div> </div>
@ -260,6 +260,16 @@
<!-- <eBubble></eBubble> --> <!-- <eBubble></eBubble> -->
</div> </div>
</div> </div>
<Dialog
:dialogShow="dialogShow"
:columns="tableType.columns"
:title="tableType.title"
:tableData="tableType.data"
:pagination="pagination"
@close="close"
@handle="handlePagination"
>
</Dialog>
</div> </div>
</template> </template>
@ -281,7 +291,7 @@ import ePie4 from "./echarts_education/pie4.vue";
import ePieRose from "./echarts_education/pieRose.vue"; import ePieRose from "./echarts_education/pieRose.vue";
import eP1 from "./echarts_education/eP1.vue"; import eP1 from "./echarts_education/eP1.vue";
import http from "@/utils/request.js"; import http from "@/utils/request.js";
import Dialog from "./dialog/dialog.vue";
const selectData = reactive({ const selectData = reactive({
value1: "111", value1: "111",
value2: "tes1", value2: "tes1",
@ -379,31 +389,66 @@ var roseData3 = ref([
value: 78, value: 78,
}, },
]); ]);
// var schoolData = ref([ //
// { name: "", value: 44 }, const dialogShow = ref(false);
// { name: "", value: 22 }, const tableType = reactive({
// { name: "", value: 11 }, url: "",
// { name: "", value: 12 }, title: "",
// { name: "", value: 54 }, columns: [
// { name: "", value: 74 }, {
// ]); label: "学校",
// var schoolData1 = ref([ property: "school",
// { name: "", value: 11 }, },
// { name: "", value: 22 }, {
// { name: "", value: 11 }, label: "教师数",
// { name: "", value: 12 }, property: "teacher",
// { name: "", value: 22 }, },
// { name: "", value: 74 }, {
// ]); label: "学生数",
// var schoolData2 = ref([ property: "student",
// { name: "", value: 22 }, },
// { name: "", value: 22 }, {
// { name: "", value: 11 }, label: "班级数",
// { name: "", value: 33 }, property: "banji",
// { name: "", value: 54 }, },
// { name: "", value: 74 }, ],
// ]); data: [],
});
//
const pagination = reactive({
total: 100,
pageSize: 10,
currentPage: 1,
});
const handlePagination = (current) => {
pagination.currentPage = current;
getTable(tableType.url, pagination.currentPage);
};
const showDialog = (title, url) => {
tableType.title = title;
tableType.url = url;
pagination.currentPage = 1;
dialogShow.value = true;
// getTable(url, pagination.currentPage);
};
//
const getTable = (url, currentPage) => {
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;
};
//----
const selectChange1 = () => { const selectChange1 = () => {
if (selectData.value1 == "111") { if (selectData.value1 == "111") {
selectData.list = roseData1.value; selectData.list = roseData1.value;

View File

@ -183,7 +183,7 @@
</div> </div>
</div> </div>
<div class="history"> <div class="history">
<div class="history1"> <div class="history1" @click="showDialog('养老机构', '')">
<div> <div>
<span>{{ data.yljgzlzx.yljg }}<span class="unit"></span></span> <span>{{ data.yljgzlzx.yljg }}<span class="unit"></span></span>
</div> </div>
@ -198,7 +198,7 @@
<img src="@/assets/YLimg/ylimg3.png" alt="" /> <img src="@/assets/YLimg/ylimg3.png" alt="" />
<img class="historyimg" src="@/assets/YLimg/ylimg6.png" alt="" /> <img class="historyimg" src="@/assets/YLimg/ylimg6.png" alt="" />
</div> --> </div> -->
<div class="history1"> <div class="history1" @click="showDialog('居家养老服务照料中心', '')">
<div> <div>
<span>{{ data.yljgzlzx.zlzx }}<span class="unit"></span></span> <span>{{ data.yljgzlzx.zlzx }}<span class="unit"></span></span>
</div> </div>
@ -294,52 +294,68 @@ const showR = ref(false);
// //
const dialogShow = ref(false); const dialogShow = ref(false);
const tableType = reactive({ const tableType = reactive({
url: "",
title: "", title: "",
columns: [ columns: [],
{
label: "照料中心",
property: "sdailycarecentername",
width: "160",
},
{
label: "老人名称",
property: "scustomername",
width: "120",
},
{
label: "就餐/送餐订单",
property: "iordertype",
width: "140",
type: "slot",
},
{
label: "早、中、晚餐",
property: "itimetype",
width: "140",
type: "slot",
},
{
label: "菜品信息",
property: "dishesmealnames",
width: "160",
},
{
label: "订单金额",
property: "totalprice",
width: "120",
},
{
label: "实际支付金额",
property: "actualprice",
width: "120",
},
{
label: "订单结束时间",
property: "dtfinishtime",
},
],
data: [], data: [],
}); });
const xz_column = ref([
{
label: "照料中心",
property: "sdailycarecentername",
width: "160",
},
{
label: "老人名称",
property: "scustomername",
width: "120",
},
{
label: "就餐/送餐订单",
property: "iordertype",
width: "140",
type: "slot",
},
{
label: "早、中、晚餐",
property: "itimetype",
width: "140",
type: "slot",
},
{
label: "菜品信息",
property: "dishesmealnames",
width: "160",
},
{
label: "订单金额",
property: "totalprice",
width: "120",
},
{
label: "实际支付金额",
property: "actualprice",
width: "120",
},
{
label: "订单结束时间",
property: "dtfinishtime",
},
]);
const yl_column = ref([
{
label: "机构名称",
property: "name",
},
{
label: "机构地址",
property: "address",
},
{
label: "老人数量",
property: "oldMan",
},
]);
// //
const pagination = reactive({ const pagination = reactive({
total: 100, total: 100,
@ -351,15 +367,41 @@ const change = (name, index) => {
}; };
const chooseVillage = (village) => { const chooseVillage = (village) => {
tableType.title = village; tableType.title = village;
tableType.columns = xz_column.value;
tableType.url = "/api/ggfwyth/zcxxList";
getTownDetail(); getTownDetail();
}; };
const showDialog = (title, url) => {
tableType.title = title;
tableType.url = url;
tableType.columns = yl_column.value;
getTable(url, pagination.currentPage);
};
//
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;
// }
// });
};
const close = () => { const close = () => {
dialogShow.value = false; dialogShow.value = false;
pagination.currentPage = 1; pagination.currentPage = 1;
}; };
const handlePagination = (current) => { const handlePagination = (current) => {
pagination.currentPage = current; pagination.currentPage = current;
getTownDetail(); if (tableType.url == "/api/ggfwyth/zcxxList") {
getTownDetail();
} else {
getTable(tableType.url, pagination.currentPage);
}
}; };
const getTownDetail = () => { const getTownDetail = () => {
let params = { let params = {