Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/analyze.vue

@@ -178,6 +178,14 @@
         <!-- <Map class="map"></Map> -->
       </div>
     </div>
+    <!-- 人物详情 -->
+    <personDetail
+      class="detail"
+      style="width: 1920px; height: 1080px; position: absolute; top: 15px"
+      v-show="openD"
+      :message="message"
+      @closeDetail="closeDetail"
+    ></personDetail>
     <DialogEnrol
       :dialogShowEnrol="dialogShowEnrol"
       :dataEnrol="dataEnrol"
@@ -224,8 +232,10 @@
       :tableData="tableType.data"
       :pagination="pagination"
       :showXq="false"
+      :dj="personnelDetails"
       @close="closeJj"
       @handle="handlePagination"
+      @openMessage="openMessage"
     >
     </Dialog>
   </div>
@@ -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) => {
@@ -1546,4 +1574,7 @@ onBeforeUnmount(() => {
 :deep(.el-table .el-table__row) {
   border-bottom: none;
 }
+.detail {
+  z-index: 99999;
+}
 </style>

src/view/dialog/dialog.vue

@@ -46,6 +46,7 @@
             height="100%"
             :key="tableKey"
             :header-cell-style="{ background: '#008FCD' }"
+            @row-click="handleRowClick"
           >
             <template v-for="item in data.columns">
               <el-table-column
@@ -102,6 +103,10 @@ import {
   nextTick,
 } from "vue";
 import { CircleCloseFilled } from "@element-plus/icons-vue";
+import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
+const routers = useRoute();
+
 const props = defineProps({
   dialogShow: {
     type: Boolean,
@@ -137,8 +142,26 @@ const props = defineProps({
       return true;
     },
   },
+  dj: {
+    type: Boolean,
+    default: () => {
+      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;

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,

src/view/echart_analyze/eP2.vue

@@ -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();
   }

src/view/sy_map.vue

@@ -2747,6 +2747,7 @@ const open_detail = () => {
     age = "";
     dialogShow.value = true;
     person_detail2();
+    console.log("详情", choose.value.person);
   } else if (
     // choose.value.person == "残疾人" ||
     // choose.value.person == "低边" ||
@@ -2767,11 +2768,9 @@ const open_detail = () => {
       }
     });
     dialogShow.value = true;
-
     person_detail(age, tagId);
   } else {
     dialogShow.value = true;
-
     age = choose.value.person;
     person_detail(age);
   }