diff --git a/src/router/index.js b/src/router/index.js index bbf2f54..23b4de6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,7 +53,7 @@ const router = createRouter({ { name: '首页地图', path: '/home/index/map', - component: () => import('../view/sy_mapcopy.vue'), + component: () => import('../view/sy_map.vue'), }, { name: '首页表格', diff --git a/src/view/analyze.vue b/src/view/analyze.vue index bbba965..6e56cda 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -72,7 +72,7 @@
集聚类型分布
@@ -90,7 +90,7 @@
就业培训
-
+
{{ item.name }}
@@ -183,7 +183,7 @@ @@ -191,20 +191,20 @@ + +
@@ -228,6 +239,7 @@ import { onBeforeUnmount, computed, } from "vue"; +import Dialog from "./dialog/dialog.vue"; import DialogEnrol from "./dialog/dialogEnrol.vue"; import DialogElderly from "./dialog/diaLogElderlyData.vue"; import DialogMap from "./dialog/dialogMap.vue"; @@ -253,7 +265,6 @@ import ViewDataimg2 from "@/assets/images/sjfx/sjfx2.png"; import ViewDataimg3 from "@/assets/images/sjfx/sjfx3.png"; import jypx1 from "@/assets/images/sjfx/pxrc.png"; import jypx2 from "@/assets/images/sjfx/gygws.png"; - const showR = ref(false); //loading // 入学分析数据 const dialogShowEnrol = ref(false); @@ -261,6 +272,7 @@ const dialogShowElderly = ref(false); const dialogShowMap = ref(false); const dialogShowEcTy = ref(false); const dialogShowEcTy1 = ref(false); +const dialogShow = ref(false); const mapTitle = ref(""); const dataTab = reactive({ url: "", @@ -507,11 +519,55 @@ const dataEc = reactive({ title: "", }); const nlfb = reactive({ - year: [2022, 2023, 2024, 2025, 2026,2027], - list1: [709, 3424, 2064, 0, 0,0], - list2: [1548, 5895, 2753, 0, 0,0], - list3: [180, 930, 632, 0, 0,0], + year: [2022, 2023, 2024, 2025, 2026, 2027], + list1: [709, 3424, 2064, 2980, 1790, 3100], + list2: [1548, 5895, 2753, 4602, 2030, 3900], + list3: [180, 930, 632, 780, 520, 600], }); +//表格column列表 +const columns = reactive({ + 聚集数据: { + column: [ + { + label: "姓名", + property: "name", + }, + { + label: "出生日期", + property: "date", + }, + { + label: "性别", + property: "sex", + }, + { + label: "迁出地址", + property: "qcaddress", + }, + { + label: "地址", + property: "address", + }, + ], + }, + 培训: { + column: [ + { + label: "姓名", + property: "name", + }, + { + label: "培训机构名称", + property: "mc", + }, + { + label: "培训项目", + property: "xm", + }, + ], + }, +}); + const showEnrol = () => { dialogShowEnrol.value = true; }; @@ -520,13 +576,15 @@ const close = () => { dialogShowMap.value = false; dialogShowEcTy.value = false; dialogShowEcTy1.value = false; + dialogShowElderly.value = false; }; +const closeJj=()=>{ + dialogShow.value = false; + pagination.currentPage=1; +} const showEnrol1 = () => { dialogShowElderly.value = true; }; -const close1 = () => { - dialogShowElderly.value = false; -}; const showEchartTy = (name) => { dataEc.title = name; if (name == "年龄分布") { @@ -535,6 +593,43 @@ const showEchartTy = (name) => { dialogShowEcTy.value = true; } }; +//---------表格弹框------- +const tableType = reactive({ + url: "", + title: "", + columns: [], + data: [], +}); +//转入转出 +const jsSj = (name, index) => { + if (index == 0 || index == 2) { + tableType.title = `${name}转入人数`; + } else { + tableType.title = `${name}转出人数`; + } + tableType.columns=columns["聚集数据"].column; + dialogShow.value = true; +}; +//培训+公益岗位数 +const showPx =(name)=>{ + if(name=='培训人次'){ + tableType.title = `培训详情`; + tableType.columns=columns["培训"].column; + dialogShow.value = true; + }else{ + + } +} +// 表格分页 +const pagination = reactive({ + total: 100, + pageSize: 10, + currentPage: 1, +}); +const handlePagination = (current) => { + pagination.currentPage = current; +}; +//---------表格弹框------- //数据切换 const tab_choose = ref([ { @@ -1331,6 +1426,7 @@ onBeforeUnmount(() => { flex-direction: column; margin-left: 35px; .jypx_right_item { + cursor: pointer; display: flex; align-items: center; img { diff --git a/src/view/dialog/dialog.vue b/src/view/dialog/dialog.vue index 7a6b140..961ebb9 100644 --- a/src/view/dialog/dialog.vue +++ b/src/view/dialog/dialog.vue @@ -10,11 +10,7 @@ >