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

fix 指挥体系 总指挥

wenhongquan 3 жил өмнө
parent
commit
cd61f7e6ed

+ 10 - 9
src/api/incident.ts

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 import { BaseResponse } from './type';
 
 export interface IncidentItem {
-  id?: string; // 
+  id?: string; //
   type?: number; //  事件类型
   level?: number; //  事件等级
   addr?: string; //  地址
@@ -12,15 +12,16 @@ export interface IncidentItem {
   des?: string; //  事件描述
   pic?: string; //  图片
   video?: string; //  视频
-  expr1?: null; // 
-  expr2?: null; // 
-  exprJson?: null; // 
-  name?: string; // 
+  expr1?: null; //
+  expr2?: null; //
+  exprJson?: null; //
+  name?: string; //
   status?: number; //  状态
-  madinDept?: string; // 
-  assistDept?: string; // 
-  createBy?: string; // 
-  createTime?: string; // 
+  madinDept?: string; //
+  assistDept?: string; //
+  createBy?: string; //
+  createTime?: string; //
+  commanderText?:string;
 }
 
 export interface IncidentListResponse extends BaseResponse {

BIN
src/assets/icons/detail/leaders@2x.png


+ 34 - 1
src/views/IncidentDetail/CommandChainCard/index.tsx

@@ -10,6 +10,14 @@ import host from '@/assets/icons/detail/host@2x.png';
 import main_organized from '@/assets/icons/detail/department@2x.png';
 // @ts-ignore
 import co_organizer from '@/assets/icons/detail/co_organizer@2x.png';
+
+
+// @ts-ignore
+import command_icon from '@/assets/icons/detail/leaders@2x.png';
+
+
+
+
 // @ts-ignore
 import bg_zbm from '@/assets/card-bg/bg_zbm@2x.png';
 
@@ -69,6 +77,30 @@ export default defineComponent({
           </div>
         </div> */}
         <div class="command-chain-container" id="ss" style="position:relative">
+          
+          {store.incidentDetail?.baseInfo?.commanderText ? 
+            <>
+              <div class="main-dept command">
+                <div>
+                  <div class="dept" id="11" datatype="3">
+                    <img src={command_icon} />
+                    总指挥
+                  </div>
+                  <div class="deptline"></div>
+                </div>
+
+                <div class="dept-list">
+                  <div class="dept-name" id="22">
+                    <div></div>
+                    {store.incidentDetail?.baseInfo?.commanderText}
+                  </div>
+                </div>
+              </div>
+            </>
+          : 
+            ''
+          }
+          
           <div class="main-dept">
             <div>
               <div class="dept" id="11" datatype="1">
@@ -88,7 +120,8 @@ export default defineComponent({
           <div
             class="main-dept"
             v-show={
-              (store?.incidentDetail?.baseInfo?.assistDept?.split(',') ?? []).length!=0
+              (store?.incidentDetail?.baseInfo?.assistDept?.split(',') ?? [])
+                .length != 0
             }>
             <div>
               <div class="dept" datatype="2">

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

@@ -402,6 +402,9 @@
                             width: 38%;
                         }
                     }
+                    .command {
+                        margin-bottom: px2rem(30px * 2);
+                    }
                     .deptline {
                         position: absolute;
                         background: white;
@@ -468,6 +471,10 @@
                             background-image: url('../../assets/card-bg/bg_xbbm@2x.png');
                             color: #fff75b;
                         }
+                        &[datatype='3'] {
+                            background-image: url('../../assets/card-bg/bg_zbldbm@2x.png');
+                            color: #C497FF;
+                        }
                         img {
                             width: px2rem(18px * 2);
                             height: px2rem(18px * 2);