diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue index 9de880b..5aad1b2 100644 --- a/src/view/dialog/dialogRW.vue +++ b/src/view/dialog/dialogRW.vue @@ -50,6 +50,7 @@
确定要上报吗?
+
注:工作日早上8:30,自动推送
上报
取消
@@ -144,7 +145,8 @@ import lamp7 from "../../assets/sy-table/lampGreen3.png"; import lamp8 from "../../assets/sy-table/lampRed3.png"; import lamp9 from "../../assets/sy-table/lampYellow3.png"; import { ElMessage } from "element-plus"; - +import http from "@/utils/request.js"; +import { reRendering } from "element-plus/es/components/watermark/src/utils.mjs"; const router = useRouter(); const routers = useRoute(); const props = defineProps({ @@ -203,13 +205,28 @@ const escalation = () => { } console.log(clicked.value); }; + const confirmEvent = () => { - console.log("confirm!"); - ElMessage.success({ - message: `上报成功`, - offset: 100, // 距离窗口顶部的偏移量 + console.log("confirm!", data.character); + let ReportedDto = { + name: data.character.xm, + address: data.character.dz, + phone: "", + type: data.character.id, + }; + http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => { + if (res.code == 200) { + ElMessage.success({ + message: `上报成功`, + }); + clicked.value = false; + }else{ + ElMessage.error({ + message: res.message, + }); + clicked.value = false; + } }); - clicked.value = false; }; const cancelEvent = () => { clicked.value = false; @@ -348,7 +365,7 @@ const handle = (current) => { .lampTitle { text-align: center; // padding-top: 33px; - margin: 33px 0 30px 0; + margin: 28px 0 10px 0; font-size: 16px; font-weight: 500; font-family: PingFangSC, PingFang SC; @@ -356,6 +373,17 @@ const handle = (current) => { line-height: 22px; letter-spacing: 1px; } + .lampMessage { + text-align: center; + // padding-top: 33px; + margin: 10px 0 14px 0; + font-size: 14px; + font-weight: 500; + font-family: PingFangSC, PingFang SC; + color: red; + line-height: 22px; + letter-spacing: 1px; + } .lampBtn { display: flex; align-items: center; diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 244f9d8..95e5fb5 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -2389,6 +2389,7 @@ const statusDetails = (val) => { tableType.character = { ...val, age: val.nl, + id: routers.query.id, // dz: val.address, titleName: formData.name, }; @@ -2631,9 +2632,9 @@ const updateFormDataAndTable = (formDataName, tableData) => { data.column_2 = tableData.column_2; data.tableData = tableData.tableData1; //列表1 data.tableData1 = tableData.tableData2; //列表2 - data.tableData3 = tableData.tableData3; //列表3 状态假数据 - pagination1.total = tableData.tableData2.length; //中间数据总数 - handlePagination1(1); //中间分页的数据截取 + data.tableData3 = tableData.tableData3; //列表3 状态假数据(全部未筛选) + pagination1.total = tableData.tableData2.length; + handlePagination1(1); if (formDataName == "低保") { selectedLamp1.red = true; selectedLamp.value = 1; diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 41b64cb..9528ce4 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -4057,7 +4057,7 @@ const reset_font2 = () => { "scale(" + width / 1920 + "," + height / 1080 + ")"; }; onMounted(async () => { - // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); loadingss.value = true; reset_font(); await getXzsj(); diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index e21f2b0..00de2d5 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -196,10 +196,10 @@ const goto = (val) => { ]; // 检查数组val.name中是否存在availableRoutes。 if (availableRoutes.includes(val.name)) { - // router.push({ - // path: "/home/index/table/details", - // query: { name: val.name }, - // }); + router.push({ + path: "/home/index/table/details", + query: { name: val.name, id: val.id }, + }); } else { ElMessage.warning({ message: `${val.name}暂无数据!`, @@ -642,7 +642,7 @@ const getData = async (name, fullName) => { res.data.forEach((item, index) => { const imageIndex = index % data.Bj.length; data.tabPublicService.push({ - id: index, + id: item.id, Bj: data.Bj[imageIndex], name: item.sx, text: item.bmfxqk, @@ -983,16 +983,16 @@ onMounted(() => { }