wenhongquan 3 jaren geleden
bovenliggende
commit
b7d5e0d78a
3 gewijzigde bestanden met toevoegingen van 25 en 7 verwijderingen
  1. 19 7
      src/components/MarkerMap/dialog.ts
  2. 4 0
      src/components/MarkerMap/index.scss
  3. 2 0
      src/views/IncidentDetail/index.scss

+ 19 - 7
src/components/MarkerMap/dialog.ts

@@ -106,17 +106,29 @@ export const GET_WAREHOUSE_DIALOG_HTML = (item: ResourceItemDetail) => {
   <div class="ckbg">
     <div class="title">应急仓库信息</div>
     <div class="content">
-      <div><span>仓库名称:</span><span>${item.name ?? '-'}</span></div>
-      <div><span>地点:</span><span>${item.address ?? '-'}</span></div>
-      <div><span>管理单位:</span><span>${item.manageUnit ?? '-'}</span></div>
-      <div><span>联系人:</span><span>${item.contactName ?? '-'}</span></div>
-      <div><span>更新时间:</span><span>${item.updateTime ?? '-'}</span></div>
-      <div><span>联系方式:</span><span>${item.contactPhone ?? '-'}</span></div>
+      <div><span>仓库名称:</span><span style='overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 150px;'>${
+        item.name ?? '-'
+      }</span></div>
+      <div><span>地点:</span><span style='overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 150px;'>${
+        item.address ?? '-'
+      }</span></div>
+      <div><span>管理单位:</span><span style='overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 150px;'>${
+        item.manageUnit ?? '-'
+      }</span></div>
+      <div><span>联系人:</span><span style='overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 150px;'>${
+        item.contactName ?? '-'
+      }</span></div>
+      <div><span>更新时间:</span><span style='overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 150px;'>${
+        item.updateTime ?? '-'
+      }</span></div>
+      <div><span>联系方式:</span><span style='overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 150px;'>${
+        item.contactPhone ?? '-'
+      }</span></div>
     </div>
     <div class="wz">
        <table id="tbl-${item.id}">
          <tr>
-        ${ header.map((i) => '<th>' + i + '</th>').join("")}
+        ${header.map((i) => '<th>' + i + '</th>').join('')}
        </tr>
 
        </table>

+ 4 - 0
src/components/MarkerMap/index.scss

@@ -250,6 +250,10 @@
                         order: 2;
                         flex: 0 0 50%;
                     }
+                    span:hover {
+                        overflow: visible !important;
+                        white-space: normal !important;
+                    }
                 }
             }
             .content {

+ 2 - 0
src/views/IncidentDetail/index.scss

@@ -292,6 +292,8 @@
                 margin-right: px2rem(21px * 2);
                 .command-chain-container {
                     position: relative;
+                    margin-right: -15px;
+                    padding-right: 15px;
                     .chain-item {
                         position: absolute;
                         left: 50%;