diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..872a580
Binary files /dev/null and b/dist.zip differ
diff --git a/src/view/analyze.vue b/src/view/analyze.vue
index e89d85a..7eadcc1 100644
--- a/src/view/analyze.vue
+++ b/src/view/analyze.vue
@@ -178,6 +178,14 @@
+
+
@@ -240,6 +250,7 @@ import {
onBeforeUnmount,
computed,
} from "vue";
+import personDetail from "./person/index.vue";
import Dialog from "./dialog/dialog.vue";
import DialogEnrol from "./dialog/dialogEnrol.vue";
import DialogElderly from "./dialog/diaLogElderlyData.vue";
@@ -268,6 +279,22 @@ import jypx1 from "@/assets/images/sjfx/pxrc.png";
import jypx2 from "@/assets/images/sjfx/gygws.png";
import tools from "@/utils/tools";
const showR = ref(false); //loading
+const personnelDetails = ref(false); //集聚类型分布人员详情
+//是否打开人物详情
+const openD = ref(false);
+const message = ref({});
+//打开人物详情页面
+const openMessage = (e) => {
+ // console.log("人物详情页面", e);
+
+ message.value = e;
+ openD.value = true;
+};
+//关闭人物详情页面
+const closeDetail = () => {
+ openD.value = false;
+};
+
// 入学分析数据
const dialogShowEnrol = ref(false);
const dialogShowElderly = ref(false);
@@ -621,6 +648,7 @@ const jsSj = (name, index) => {
getzrzc(name, 1);
}
tableType.columns = columns["聚集数据"].column;
+ personnelDetails.value = true;
dialogShow.value = true;
};
const getzrzc = (name, bq) => {
@@ -996,7 +1024,7 @@ const getData = async () => {
};
onMounted(() => {
- // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+ tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
startAutoSwitching();
});
@@ -1546,4 +1574,7 @@ onBeforeUnmount(() => {
:deep(.el-table .el-table__row) {
border-bottom: none;
}
+.detail {
+ z-index: 99999;
+}
diff --git a/src/view/dialog/dialog.vue b/src/view/dialog/dialog.vue
index d29948a..d907bd9 100644
--- a/src/view/dialog/dialog.vue
+++ b/src/view/dialog/dialog.vue
@@ -46,6 +46,7 @@
height="100%"
:key="tableKey"
:header-cell-style="{ background: '#008FCD' }"
+ @row-click="handleRowClick"
>
{
+ return false;
+ },
+ },
});
-const emit = defineEmits(["close", "handle"]);
+const emit = defineEmits(["close", "handle", "loadTables", "openMessage"]);
+
+const handleRowClick = (row, column, event) => {
+ if (props.dj) {
+ console.log(row, props.dj, "rwxq");
+ // router.push({
+ // path: `/home/index/person`,
+ // query: { identNo: row.identNo, type: "detail" },
+ // });
+ // row 是当前行的数据
+ emit("openMessage", { identNo: row.identNo });
+ }
+};
// 详情弹框
const dialogShow = ref();
@@ -168,6 +191,11 @@ watch(
tableKey.value = Math.random();
}
);
+// watch(
+// () => props.dj,
+// (newVal, oldVal) => {
+// }
+// );
// 使用生命钩子
onMounted(() => {
dialogShow.value = props.dialogShow;
diff --git a/src/view/echart_analyze/dialog_jjlxfb.vue b/src/view/echart_analyze/dialog_jjlxfb.vue
index 248e975..5d81268 100644
--- a/src/view/echart_analyze/dialog_jjlxfb.vue
+++ b/src/view/echart_analyze/dialog_jjlxfb.vue
@@ -38,7 +38,7 @@ const colors = [
const data = reactive({
list: [],
option: {},
- Max: 8000,
+ Max: 20000,
valueList: [
4504, 16086, 6130, 2844, 4967, 179, 1685, 5010, 633, 569, 219, 5152, 40,
631, 536,
diff --git a/src/view/echart_analyze/eP2.vue b/src/view/echart_analyze/eP2.vue
index 7903775..d02cd6e 100644
--- a/src/view/echart_analyze/eP2.vue
+++ b/src/view/echart_analyze/eP2.vue
@@ -67,7 +67,7 @@ const updateSeries = () => {
];
if (data.list.length > 0) {
- // if (!data.list) {
+ // if (!data.list) {
data.list.forEach((item, index) => {
const color = data.bgColor[index % data.bgColor.length];
data.series.push({
@@ -185,7 +185,11 @@ const getOption = () => {
};
const setChart = () => {
- const myChart = echarts.init(chart.value);
+ // const myChart = echarts.init(chart.value);
+ let myChart = echarts.getInstanceByDom(chart.value);
+ if (!myChart) {
+ myChart = echarts.init(chart.value);
+ }
if (clear.value) {
myChart.clear();
}
diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 54403f6..9c31441 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -1036,7 +1036,7 @@ watch(
}
);
onMounted(() => {
- // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+ tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
if (routers.query.type) {
errorMessage.value = "";
dataMyTag.identNo = routers.query.identNo;
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index fe536f4..ca177b8 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -821,7 +821,7 @@ const yaosuTotal = ref([
img: j7,
img_map: j7_map,
wz: false,
- tooltip:'name'
+ tooltip: "name",
},
{
id: 8,
@@ -842,7 +842,7 @@ const yaosuTotal = ref([
img: j10,
wz: true,
url: "/api/ggfwyth/ysyzt/getAeds",
- tooltip:'siteAddress'
+ tooltip: "siteAddress",
},
{
id: 11,
@@ -851,7 +851,7 @@ const yaosuTotal = ref([
img_map: j11_map,
wz: false,
url: "/api/ggfwyth/ysyzt/getJashsxt",
- tooltip:'sbmc'
+ tooltip: "sbmc",
},
]);
//选中的资源要素
@@ -2491,25 +2491,25 @@ const changeys = (name) => {
let url;
let img;
let img_map;
- let tooltip
+ let tooltip;
yaosuTotal.value.forEach((item, index) => {
if (item.name == name) {
url = item.url;
img = item.img;
img_map = item.img_map;
- tooltip=item.tooltip;
+ tooltip = item.tooltip;
}
});
if (name == "摄像头" || name == "AED") {
- getZyys(url, name, img, img_map,tooltip);
+ getZyys(url, name, img, img_map, tooltip);
}
if (name == "养老机构") {
- getZyys2(name, img, img_map,tooltip);
+ getZyys2(name, img, img_map, tooltip);
}
}
};
//线上接口资源要素
-const getZyys = (url, name, img, img_map,tooltip) => {
+const getZyys = (url, name, img, img_map, tooltip) => {
http.get(url).then((res) => {
if (res.code == 200) {
yaosuIcon.value[name].sj = res.data;
@@ -2537,13 +2537,13 @@ const getZyys = (url, name, img, img_map,tooltip) => {
// };
});
yaosuIcon.value[name].sj.forEach((itemm, indexx) => {
- createZyys(itemm, indexx, name,tooltip);
+ createZyys(itemm, indexx, name, tooltip);
});
}
});
};
//本地存储资源要素
-const getZyys2 = (name, img, img_map,tooltip) => {
+const getZyys2 = (name, img, img_map, tooltip) => {
if (name == "养老机构") {
yaosuIcon.value[name].sj = ylCount;
yaosuIcon.value[name].sj.forEach((item, index) => {
@@ -2552,13 +2552,13 @@ const getZyys2 = (name, img, img_map,tooltip) => {
item.overlay = null;
});
yaosuIcon.value[name].sj.forEach((itemm, indexx) => {
- createZyys(itemm, indexx, name,tooltip);
+ createZyys(itemm, indexx, name, tooltip);
});
}
};
// 添加资源要素的图标(overlay存放标记点)
-const createZyys = (polygon, indexx, name,tooltip) => {
+const createZyys = (polygon, indexx, name, tooltip) => {
function createLabelDOM() {
var content = document.createElement("div");
content.style.display = "flex";
@@ -2689,6 +2689,7 @@ const open_detail = () => {
age = "";
dialogShow.value = true;
person_detail2();
+ console.log("详情", choose.value.person);
} else if (
// choose.value.person == "残疾人" ||
// choose.value.person == "低边" ||
@@ -2709,11 +2710,9 @@ const open_detail = () => {
}
});
dialogShow.value = true;
-
person_detail(age, tagId);
} else {
dialogShow.value = true;
-
age = choose.value.person;
person_detail(age);
}