wenhongquan 3 years ago
parent
commit
b951a5d881

+ 1 - 1
src/views/HomePage/index.scss

@@ -7,7 +7,7 @@
     position: relative;
     position: relative;
     background: #f6f7fb;
     background: #f6f7fb;
     .home-content {
     .home-content {
-        margin-top: 60px;
+        // margin-top: 60px;
         .incident-item {
         .incident-item {
             border-radius: 8px;
             border-radius: 8px;
             padding: 15px;
             padding: 15px;

+ 2 - 1
src/views/HomePage/index.tsx

@@ -142,13 +142,14 @@ export default defineComponent({
           title="应急处置"
           title="应急处置"
           left-arrow
           left-arrow
           fixed
           fixed
+          placeholder={true}
           onClickRight={() =>
           onClickRight={() =>
             router.push(`/status/${route.params.status}/report`)
             router.push(`/status/${route.params.status}/report`)
           }
           }
           v-slots={{ right: () => <Icon name="plus" /> }}
           v-slots={{ right: () => <Icon name="plus" /> }}
           style={{ zIndex: 2 }}
           style={{ zIndex: 2 }}
         />
         />
-        <div style={{ position: 'sticky', top: '46px', zIndex: 1 }}>
+        <div style={{ position: 'sticky', zIndex: 1 }}>
           <DropdownMenu>
           <DropdownMenu>
             <DropdownItem
             <DropdownItem
               v-model={incidentType.value}
               v-model={incidentType.value}

+ 16 - 0
src/views/IncidentManagementDetail/index.scss

@@ -15,4 +15,20 @@
         height: 20px;
         height: 20px;
         margin-right: 8px;
         margin-right: 8px;
     }
     }
+    .cz-item {
+        background: #F6F7FB;
+        border-radius: 8px;
+        margin-bottom: 15px;
+        .van-cell__title {
+            font-size: 16px;
+            color: #0B33A8;
+        }
+        .zl {
+            color: #333333;
+        }
+        div {
+            background: rgba(0, 0, 0, 0);
+            color: #666666
+        }
+    }
 }
 }

+ 36 - 10
src/views/IncidentManagementDetail/index.tsx

@@ -122,27 +122,53 @@ export default defineComponent({
             </p>
             </p>
             <p>事件时间:{store.incidentDetail?.baseInfo?.createTime}</p>
             <p>事件时间:{store.incidentDetail?.baseInfo?.createTime}</p>
             <p>地点:{store.incidentDetail?.baseInfo?.addr}</p>
             <p>地点:{store.incidentDetail?.baseInfo?.addr}</p>
-            <p>事件来源:{ commonStore.globalDict["zhdd_incident_source"]?.find(
-                      (i) =>
-                        i.dictValue?.toString() ===
-                        (
-                          store.incidentDetail?.baseInfo["source"]
-                        )?.toString()
-                    )?.dictLabel ?? "-" }</p>
+            <p>
+              事件来源:
+              {commonStore.globalDict['zhdd_incident_source']?.find(
+                (i) =>
+                  i.dictValue?.toString() ===
+                  store.incidentDetail?.baseInfo['source']?.toString(),
+              )?.dictLabel ?? '-'}
+            </p>
           </CollapseItem>
           </CollapseItem>
           <CollapseItem
           <CollapseItem
             title="应急预案"
             title="应急预案"
             name="应急预案"
             name="应急预案"
             v-slots={{ icon: <img class="icon-i" src={icon_yjya} /> }}>
             v-slots={{ icon: <img class="icon-i" src={icon_yjya} /> }}>
-            {planOptions.value?.map((d,index) => (
-              <p>{ index+1 }、{d}</p>
+            {planOptions.value?.map((d, index) => (
+              <p>
+                {index + 1}、{d}
+              </p>
             ))}
             ))}
           </CollapseItem>
           </CollapseItem>
           <CollapseItem
           <CollapseItem
             title="处置方案"
             title="处置方案"
             name="处置方案"
             name="处置方案"
             v-slots={{ icon: <img class="icon-i" src={icon_plan} /> }}>
             v-slots={{ icon: <img class="icon-i" src={icon_plan} /> }}>
-            123
+            {store.incidentDetail.task?.map((i) => (
+              <div class="cz-item">
+            
+                <CollapseItem title={i.taskName} name={i.taskName}>
+                  <div>
+                    指挥:
+                    {i.taskPersonVos?.map((p) => (
+                      <div>
+                        {p.person}
+                        {p.position}
+                      </div>
+                    ))}
+                  </div>
+                  <div>
+                    <div class="zl">指令</div>
+                    {i.taskCommandVos.map((c, index) => (
+                      <div>
+                        {index + 1}、{c.command}
+                      </div>
+                    ))}
+                  </div>
+                </CollapseItem>
+              </div>
+            ))}
           </CollapseItem>
           </CollapseItem>
           <CollapseItem
           <CollapseItem
             title="处置详情"
             title="处置详情"