Browse Source

fix 应急车辆

wenhongquan 2 năm trước cách đây
mục cha
commit
fab079817c
2 tập tin đã thay đổi với 16 bổ sung15 xóa
  1. 13 15
      src/components/MarkerMap/dialog.ts
  2. 3 0
      src/components/MarkerMap/index.tsx

+ 13 - 15
src/components/MarkerMap/dialog.ts

@@ -167,15 +167,15 @@ export const GET_VEHICLES_DIALOG_HTML = (item: ResourceItemDetail) => {
   const el = document.createElement('div');
   el.innerHTML = `
     <div>
-      <div class="title">应急车辆信息</div>
-      <div class="content">
-        <div><span>车牌号:</span><span>${item.name ?? '-'}</span></div>
-        <div><span>管理单位:</span><span>${item.manageUnit ?? '-'}</span></div>
-        <div><span>车辆类型:</span><span>${item.carType ?? '-'}</span></div>
-      </div>
-      <i class="card-border-bottom-left"></i>
-      <i class="card-border-bottom-right"></i>
+    <div class="title">应急车辆信息</div>
+    <div class="content">
+     <div><span>管理单位:</span><span>${item.manageUnit ?? '-'}</span></div>
+     <div><span>地点:</span><span>${item.address ?? '-'}</span></div>
+     <div><span>车船数:</span><span>${item.num ?? '-'}</span></div>
+    <div><span>联系人:</span><span>${item.contactName ?? '-'}</span></div>
+    <div><span>联系方式:</span><span>${item.contactPhone ?? '-'}</span></div>
     </div>
+  </div>
   `;
   return el;
 };
@@ -193,16 +193,14 @@ export const GET_TEAM_DIALOG_HTML = (item: ResourceItemDetail) => {
   el.innerHTML = `
 <div>
   <div class="title">应急队伍信息</div>
-  <div class="content">
-    <div><span>队伍名称:</span><span>${item.name ?? '-'}</span></div>
+<div class="content">
     <div><span>管理单位:</span><span>${item.manageUnit ?? '-'}</span></div>
-    <div><span>携带物资:</span><span>${item.carryGoods ?? '-'}</span></div>
-    <div><span>人数:</span><span>${item.num ?? '-'}</span></div>
+    <div><span>队伍名称:</span><span>${item.name ?? '-'}</span></div>
+    <div><span>地点:</span><span>${item.address ?? '-'}</span></div>
+     <div><span>人数:</span><span>${item.num ?? '-'}</span></div>
     <div><span>联系人:</span><span>${item.contactName ?? '-'}</span></div>
     <div><span>联系方式:</span><span>${item.contactPhone ?? '-'}</span></div>
-  </div>
-  <i class="card-border-bottom-left"></i>
-  <i class="card-border-bottom-right"></i>
+</div>
 </div>
   `;
   return el;

+ 3 - 0
src/components/MarkerMap/index.tsx

@@ -896,6 +896,9 @@ export default defineComponent({
         if(type==="单兵"){
           i.name = i.userName;
         }
+          if (type === '应急车辆') {
+            i.name = i.manageUnit+'应急车船';
+          }
 
         imagep.onmouseover = ()=>{
           //console.log(222)