表格数据

src/components/map/GisMap.vue

@@ -101,6 +101,7 @@ onMounted(() => {
             if (res.code == 200) {
               drawPointStore.currentSelectName = arg.data[key][0].name;
               drawPointStore.currentSelectId = arg.data[key][0].id;
+              drawPointStore.currentSelectCode = arg.data[key][0].code;
               drawPointStore.currentDrawPointList = res.data || [];
               drawPointStore.openBiddingTable = true;
             } else {

src/stores/drawPointManage.js

@@ -5,8 +5,9 @@ export const useDrawPointStore = defineStore('drawPointStore', () => {
   //当前患者绘制点位列表
   const currentDrawPointList = ref([]);
 
-  //当前选中点id
+  //当前选中点id,code
   const currentSelectId = ref('');
+  const currentSelectCode = ref('');
   const currentSelectName = ref('');
   //是否开始标会
   const drawStartStatus = ref(false);
@@ -45,8 +46,10 @@ export const useDrawPointStore = defineStore('drawPointStore', () => {
           return item.x && item.y;
         })
         .sort((pre, next) => new Date(pre.date) - new Date(next.date));
-      addPoint(pointList, 'drawPoint');
-      addPolyLine(pointList, 'drawLine');
+      if (pointList?.length > 0) {
+        addPoint(pointList, 'drawPoint');
+        addPolyLine(pointList, 'drawLine');
+      }
     },
     {
       deep: true
@@ -56,6 +59,7 @@ export const useDrawPointStore = defineStore('drawPointStore', () => {
     currentDrawPointList,
     infoBoxIndex,
     currentSelectId,
+    currentSelectCode,
     currentSelectName,
     setInfoBoxIndex,
     drawStartStatus,

src/stores/mapStore.js

@@ -131,14 +131,16 @@ export const useMapStore = defineStore('mapStore', () => {
           const allShowNoPoint = currentAllPointList.value.filter((item) => {
             return item?.x && item?.y && item?.ty == '无轨迹';
           });
-          addPoint(allShowHasPoint, 'hasPointView', {
-            color: 'rgba(0, 128, 255, 0.4)',
-            borderColor: 'rgba(0, 128, 255, 0.6)'
-          });
-          addPoint(allShowNoPoint, 'noPointView', {
-            color: 'rgba(255, 127, 0, 0.4)',
-            borderColor: 'rgba(255, 127, 0, 0.6)'
-          });
+          allShowHasPoint?.length > 0 &&
+            addPoint(allShowHasPoint, 'hasPointView', {
+              color: 'rgba(0, 128, 255, 0.4)',
+              borderColor: 'rgba(0, 128, 255, 0.6)'
+            });
+          allShowNoPoint?.length > 0 &&
+            addPoint(allShowNoPoint, 'noPointView', {
+              color: 'rgba(255, 127, 0, 0.4)',
+              borderColor: 'rgba(255, 127, 0, 0.6)'
+            });
           //无轨迹点
           break;
         }

src/utils/map/mapOperation.js

@@ -488,18 +488,20 @@ export function closeOutputPoint() {
 
 //定位
 export function gotoPosition(point, color) {
-  invokeParams('goToPosition', {
-    positon: point,
-    heading: 0,
-    tilt: 45,
-    hasImg: true,
-    marker: {
-      size: 16,
-      color: color || '#000fff'
-    },
-    zoom: 18,
-    isRotation360: false
-  });
+  if (point?.x && point?.y) {
+    invokeParams('goToPosition', {
+      positon: point,
+      heading: 0,
+      tilt: 45,
+      hasImg: true,
+      marker: {
+        size: 16,
+        color: color || '#000fff'
+      },
+      zoom: 18,
+      isRotation360: false
+    });
+  }
 }
 
 //区边界

src/views/DataCenterGis/components/LeftMap.vue

@@ -15,7 +15,7 @@
       >
         <div class="top-box">
           <span>患者: {{ drawPointStore.currentSelectName }}</span>
-          <span>编号: {{ drawPointStore.currentSelectId }}</span>
+          <span>编号: {{ drawPointStore.currentSelectCode }}</span>
           <div class="add-box">
             <el-button type="primary" @click="tableAdd">新增</el-button>
             <el-button type="primary" @click="tableClose">关闭</el-button>
@@ -249,6 +249,7 @@ const tableAdd = async () => {
   const newTime = new Date();
   const data = {
     id: drawPointStore.currentSelectId,
+    code: drawPointStore.currentSelectCode,
     x: '',
     y: '',
     date: formaData(newTime),

src/views/DataCenterGis/components/RightPanel.vue

@@ -233,7 +233,7 @@ const getBarData = async () => {
 const clickBlbh = async (scope) => {
   try {
     const row = scope.row;
-    const res = await getTrajectorPointOnPeopleById({
+    const res = await getCaseDetailsByBh({
       bh: row.blbh,
       type: row.type
     });
@@ -270,16 +270,26 @@ const handleDbView = async (row) => {
       let color = row.ty == '有轨迹' ? 'rgba(0, 128, 255, 0.8)' : 'rgba(255, 127, 0, 0.8)';
       gotoPosition(row, color);
     }
-    const res = await getTrajectorPointOnPeopleById({
-      id: row?.id
-    });
-    if (res.code == 200) {
+    //有轨迹就有id，无轨迹无id，此时将编号作为id
+    if (row?.id) {
+      const res = await getTrajectorPointOnPeopleById({
+        id: row?.id
+      });
+      if (res.code == 200) {
+        drawPointStore.currentSelectName = row.name;
+        drawPointStore.currentSelectId = row.id;
+        drawPointStore.currentSelectCode = row.code;
+        drawPointStore.currentDrawPointList = res.data || [];
+        drawPointStore.openBiddingTable = true;
+      } else {
+        console.log('获取病例轨迹数据错误');
+      }
+    } else {
       drawPointStore.currentSelectName = row.name;
-      drawPointStore.currentSelectId = row.id;
-      drawPointStore.currentDrawPointList = res.data || [];
+      drawPointStore.currentSelectId = row.blbh;
+      drawPointStore.currentSelectCode = row.blbh;
+      drawPointStore.currentDrawPointList = [];
       drawPointStore.openBiddingTable = true;
-    } else {
-      console.log('获取病例轨迹数据错误');
     }
   } catch (error) {
     console.log(error);