Эх сурвалжийг харах

Merge branch 'pro' of http://git.xt.wenhq.top:8083/wimjiang/squi-HD into pro

Your Name 3 жил өмнө
parent
commit
6b02a47b61

+ 2 - 2
src/views/IncidentDetail/EmExCard/index.tsx

@@ -51,7 +51,7 @@ export default defineComponent({
                     <img src={IconStyle} />
                     {t.taskName}
                   </div>
-                  <div class="plan-c">
+                  {/*<div class="plan-c">
                     <div class="plan-comm">
                       <div class="pt">指挥:</div>
                       <div class="pc">
@@ -68,7 +68,7 @@ export default defineComponent({
                         ))}
                       </div>
                     </div>
-                  </div>
+                  </div>*/}
                 </div>
                 // <el-checkbox disabled class="plan-item" label={t.taskName} />
               ))}

+ 3 - 9
src/views/IncidentDetail/IncidentInfoCard/index.tsx

@@ -84,13 +84,7 @@ export default defineComponent({
             <div>
               上报单位:
               <span>
-                {commonStore.globalDict['zhdd_org_upload']?.find(
-                  (i) =>
-                    i.dictValue?.toString() ===
-                    (
-                      store.incidentDetail?.baseInfo?.createDept ?? ''
-                    ).toString(),
-                )?.dictLabel ?? '-'}
+                {store.incidentDetail?.baseInfo?.createDept ?? '-'}
               </span>
             </div>
             <div>
@@ -109,14 +103,14 @@ export default defineComponent({
       //   dict: 'zhdd_incident_level' as const,
       // },
     ]);
-    const showeventlist = () => { 
+    const showeventlist = () => {
       mainStore.setEventListshow(true);
     }
 
     // setTimeout(() => {
     //   console.log(store.incidentDetail?.baseInfo);
     // }, 2000);
-    
+
     // debugger
     return () => (
       <Card cardType="incident-info">

+ 2 - 2
src/views/IncidentDetail/IncidentPlanCard/index.tsx

@@ -31,7 +31,7 @@ export default defineComponent({
                 <img src={IconStyle} />
                 {t.taskName}
               </div>
-              <div class="plan-c">
+              {/*<div class="plan-c">
                 <div class="plan-comm">
                   <div class="pt">指挥:</div>
                   <div class="pc">
@@ -48,7 +48,7 @@ export default defineComponent({
                     ))}
                   </div>
                 </div>
-              </div>
+              </div>*/}
             </div>
             // <el-checkbox disabled class="plan-item" label={t.taskName} />
           ))}