fix

src/components/MapView/index.tsx

@@ -56,7 +56,7 @@ export default defineComponent({
         url: 'http://10.11.208.13:30080/tles-hcdp-web/#/HCdpView',
       },
       {
-        name: '港行运行监测',
+        name: '港航运行监测',
         image: icon_sys_ghyxjc,
         url: 'http://sqpchd.xt.wenhq.top:8083/#/home',
       },

src/components/MarkerMap/index.tsx

@@ -566,8 +566,6 @@ export default defineComponent({
         if (carry.length === 0) return next;
         var x = Math.min(carry[0], next[0]);
         var y = Math.max(carry[1], next[1]);
-        console.log(x)
-        console.log(y);
 
         return [x<118?118:x, y>35?35:y<30?30:y];
       }, []);

src/views/IncidentDetail/ExecutionLogCard/index.tsx

@@ -69,6 +69,7 @@ export default defineComponent({
               }`}>
               <div class="pcontent">
                 <div class="ptime">
+                  <div class="ptime-bg"></div>
                   <span>
                     {moment(item.createTime).format('YYYY-MM-DD HH:mm')}
                   </span>

src/views/IncidentDetail/index.scss

@@ -70,12 +70,14 @@
     
     .event-list-c {
         position: absolute;
-        top: px2rem(76px * 2);
-        left: px2rem(30px * 2);
-        width: px2rem(861px * 2);
+        // top: px2rem(76px * 2);
+        top: 0;
+        left: 0;
+        // left: px2rem(30px * 2);
+        width: px2rem(961px * 2);
         height: px2rem(475px * 2);
         background-color: red;
-        z-index: 1;
+        z-index: 100;
         background: url("../../assets/card-bg/frame_sjlb@2x.png");
         background-size: 100% 100%;
         .elc-back {
@@ -95,7 +97,7 @@
         .elc-content {
             // font-size: 3rem;
             height: px2rem(475px * 2)- px2rem(55px * 4);
-            width: px2rem(861px * 2) - px2rem(27px * 4);
+            width: px2rem(961px * 2) - px2rem(27px * 4);
             top: px2rem(79px * 2);
             left: px2rem(27px * 2);
             position: absolute;
@@ -714,28 +716,35 @@
                             }
                         }
                     }
+                    .ptime-bg {
+                        width: px2rem(43px * 2);
+                        height: px2rem(43px * 2);
+                        background-size: 100% 100%;
+                        display: inline-block;
+                        vertical-align: middle;
+                    }
                     .pitem3 {
-                        .ptime {
+                        .ptime-bg {
                             background-image: url("../../assets/card-bg/dispose@2x.png") !important;
                         }
                     }
                     .pitem1 {
-                        .ptime {
+                        .ptime-bg {
                             background-image: url("../../assets/card-bg/warning@2x.png") !important;
                         }
                     }
                     .pitem2 {
-                        .ptime {
+                        .ptime-bg {
                             background-image: url("../../assets/card-bg/send@2x.png") !important;
                         }
                     }
                     .pitem4 {
-                        .ptime {
+                        .ptime-bg {
                             background-image: url("../../assets/card-bg/archive@2x.png") !important;
                         }
                     }
                     .pitem5 {
-                        .ptime {
+                        .ptime-bg {
                             background-image: url("../../assets/card-bg/neglect@2x.png") !important;
                         }
                     }
@@ -746,8 +755,8 @@
                             width: px2rem(14px * 2);
                             height: 100%;
                             background: #112692;
-                            left: px2rem(17px * 2);
-                            top: 0;
+                            left: px2rem(14px * 2);
+                            top: px2rem(5px * 2);
                             z-index: 0;
                             border: none;
                         }
@@ -796,11 +805,16 @@
                                 background-repeat: no-repeat;
                                 background-size: 100% 100%;
                                 line-height: px2rem(48px * 2);
-                                text-align: right;
-                                font-size: px2rem(21px * 2);
+                                font-size: px2rem(19px * 2);
                                 font-weight: 500;
                                 span {
-                                    padding-right: px2rem(40px * 2);
+                                    margin-left: px2rem(10px * 2);
+                                    padding-right: px2rem(17px * 2);
+                                    padding-left: px2rem(38px * 2);
+                                    padding-top: px2rem(9px * 2);
+                                    padding-bottom: px2rem(9px * 2);
+                                    border-radius: px2rem(30px * 2);
+                                    background-color: #112692;
                                 }
                             }
                         }

src/views/IncidentDetail/index.tsx

@@ -101,6 +101,10 @@ export default defineComponent({
     
 
     onMounted(async () => {
+      store.getIncidentList({
+         // 事件等级1,2的事件
+         level: 1,
+       });
       commonStore.getGlobalDict('zhdd_incident_type');
       commonStore.getGlobalDict('zhdd_incident_source');
       commonStore.getGlobalDict('zhdd_org_upload');
@@ -126,6 +130,54 @@ export default defineComponent({
         <div class="incident-detail-page-container">
           {
             <div class="detail-left">
+              <div class="event-list-c" v-show={mainStore.isshoweventlist}>
+                <div class="elc-back" onClick={docloseeventlist}>
+                  <img src={Iconback} /> 返回
+                </div>
+                <div class="elc-content">
+                  {store.incidents.data?.map((item, idx) => (
+                    <a
+                      onClick={async (e) => {
+                        e.preventDefault();
+                        // @ts-ignore
+                        markerStore.currentIncident = item;
+                        item.id && (await store.getIncidentItem(item.id));
+                        docloseeventlist();
+                        router.push(`/incidentDetail?id=${item.id}`);
+                      }}>
+                      <div class="message-item">
+                        <div class="title">
+                          <span class="index">{idx + 1}、</span>
+                          <span>
+                            {item.createTime +
+                              '，在' +
+                              item.addr +
+                              '处发生了' +
+                              (commonStore.globalDict[
+                                'zhdd_incident_type'
+                              ]?.find(
+                                (i) =>
+                                  i.dictValue.toString() === `${item.type}`,
+                              )?.dictLabel ?? '预警') +
+                              '事件'}
+                          </span>
+                        </div>
+                        <div class="desc">
+                          来源：
+                          {
+                            commonStore.globalDict[
+                              'zhdd_incident_source'
+                            ]?.find(
+                              (i) =>
+                                i.dictValue.toString() === `${item.source}`,
+                            )?.dictLabel
+                          }
+                        </div>
+                      </div>
+                    </a>
+                  ))}
+                </div>
+              </div>
               <IncidentInfoCard />
               <LiveMonitoringCard />
               {/* <IncidentPlanCard /> */}
@@ -169,49 +221,6 @@ export default defineComponent({
             </div>
           </div>
         )}
-        <div class="event-list-c" v-show={mainStore.isshoweventlist}>
-          <div class="elc-back" onClick={docloseeventlist}>
-            <img src={Iconback} /> 返回
-          </div>
-          <div class="elc-content">
-           
-              {store.incidents.data?.map((item, idx) => (
-                <a
-                  onClick={async (e) => {
-                    e.preventDefault();
-                    // @ts-ignore
-                    markerStore.currentIncident = item;
-                    item.id && (await store.getIncidentItem(item.id));
-                    router.push(`/incidentDetail?id=${item.id}`);
-                  }}>
-                  <div class="message-item">
-                    <div class="title">
-                      <span class="index">{idx + 1}、</span>
-                      <span>
-                        {item.createTime +
-                          '，在' +
-                          item.addr +
-                          '处发生了' +
-                          (commonStore.globalDict['zhdd_incident_type']?.find(
-                            (i) => i.dictValue.toString() === `${item.type}`,
-                          )?.dictLabel ?? '预警') +
-                          '事件'}
-                      </span>
-                    </div>
-                    <div class="desc">
-                      来源：
-                      {
-                        commonStore.globalDict['zhdd_incident_source']?.find(
-                          (i) => i.dictValue.toString() === `${item.source}`,
-                        )?.dictLabel
-                      }
-                    </div>
-                  </div>
-                </a>
-              ))}
-      
-          </div>
-        </div>
       </>
     );
   },