wenhongquan 3 vuotta sitten
vanhempi
commit
e43e8f9375

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

@@ -29,14 +29,14 @@ export default defineComponent({
             onClick={() => {
               activeindex.value = 1;
             }}>
-            <img src={Iconyjya} />
+            <img src={Iconczfa} />
           </div>
           <div
             class={`czfa ${activeindex.value == 2 ? 'active' : ''}`}
             onClick={() => {
               activeindex.value = 2;
             }}>
-            <img src={Iconczfa} />
+            <img src={Iconyjya} />
           </div>
         </div>
         <div class="content-c">
@@ -81,7 +81,7 @@ export default defineComponent({
             <div class="plan-container">
               <div class="toph">
                 <div class="djcc">
-                  <div class="dj">等级</div>
+                  <div class="dj">等级:</div>
                   <div class="djc">
                     {commonStore.globalDict['zhdd_incident_level']?.find(
                       (i) =>

+ 1 - 1
src/views/IncidentDetail/IncidentInfoCard/index.tsx

@@ -81,7 +81,7 @@ export default defineComponent({
               上报人员:{store.incidentDetail?.baseInfo?.createBy ?? ''}
             </div>
             <div>
-              上报人员:{store.incidentDetail?.baseInfo?.expr1 ?? '-'}
+              联系方式:{store.incidentDetail?.baseInfo?.expr1 ?? '-'}
             </div>
             <div>
               上报单位:

+ 4 - 4
src/views/IncidentDetail/WzCard/index.tsx

@@ -31,20 +31,20 @@ export default defineComponent({
       <Card cardType="wz-all">
         <div class="content">
           <div class="header">
-            <div style="flex-basis: 25%;">物资名称</div>
+            <div style="flex-basis: 34%;">物资名称</div>
             <div style="flex-basis: 18%;">仓储总数</div>
             <div style="flex-basis: 18%;">可用总数</div>
-            <div style="flex-basis: 39%;text-align: left;">更新时间</div>
+            <div style="flex-basis: 30%;text-align: left;">更新时间</div>
           </div>
           <div class="body">
             {store.incidentDetail.resource?.map((i) => (
               <div class="line">
-                <div style="flex-basis: 25%;color:#39D6FE" class="wzname" onClick={() => { 
+                <div style="flex-basis: 34%;color:#39D6FE" class="wzname" onClick={() => { 
                   searchwz(i.name);
                 }}>{i.name}</div>
                 <div style="flex-basis: 18%;">{i.num}</div>
                 <div style="flex-basis: 18%;">{i.availablenum}</div>
-                <div style="flex-basis: 39%;text-align: left;">{i.time}</div>
+                <div style="flex-basis: 30%;text-align: left;">{i.time}</div>
               </div>
             ))}
           </div>

+ 16 - 11
src/views/IncidentDetail/index.scss

@@ -392,6 +392,7 @@
                         }
                     }
                     .main-dept {
+                        margin-top: px2rem(6px * 2);
                         margin-bottom: px2rem(24px * 2);
                         >div {
                             display: table-cell;
@@ -411,8 +412,8 @@
                         display: table-cell;
                         padding-left: px2rem(20px * 2);
                         .leftline {
-                            top: px2rem(50px);
-                            bottom: px2rem(50px);
+                            top: px2rem(32px);
+                            bottom: px2rem(32px);
                         }
                     }
                     text-align: right;
@@ -423,17 +424,17 @@
                             background: white;
                             left: px2rem(20px * -2);
                             width: px2rem(20px * 2);
-                            top: px2rem(50px);
+                            top: px2rem(32px);
                         }
                         position: relative;
                         background-image: url('../../assets/card-bg/bg_zbm@2x.png');
-                        width: px2rem(241px * 2);
-                        height: px2rem(50px * 2);
+                        width: px2rem(226px * 2);
+                        height: px2rem(32px * 2);
                         background-size: 100% 100%;
                         background-position: center;
                         background-repeat: no-repeat;
                         text-align: center;
-                        line-height: px2rem(50px * 2);
+                        line-height: px2rem(32px * 2);
                         font-size: px2rem(14px * 2);
                         &[datatype='0'] {
                             margin-bottom: px2rem(10px * 2);
@@ -452,6 +453,7 @@
                         font-weight: 700;
                         // float: left;
                         margin: 0;
+                        // margin-top: px2rem(18px * 2);
                         position: absolute;
                         top: 50%;
                         left: 50%;
@@ -1151,16 +1153,18 @@
                             display: inline-block;
                         }
                         .dj {
-                            width: px2rem(184px * 2);
+                            width: px2rem(102px * 2);
                             height: px2rem(30px * 2);
-                            border: px2rem(1px * 2) solid #007dff;
+                            background: #0A1C72;
+                            // border: px2rem(1px * 2) solid #007dff;
                             border-radius: px2rem(5px * 2);
                             margin-top: px2rem(5px * 2);
                             padding-left: px2rem(20px * 2);
                             line-height: px2rem(30px * 2);
                         }
                         .djc {
-                            background: url("../../assets/card-bg/img_blue@2x.png");
+                            // background: url("../../assets/card-bg/img_blue@2x.png");
+                            color: #39D6FE;
                             background-repeat: no-repeat;
                             background-size: 100% 100%;
                             width: px2rem(104px * 2);
@@ -1169,8 +1173,9 @@
                             position: absolute;
                             text-align: center;
                             margin-top: px2rem(-35px * 2);
-                            right: px2rem(5px * 2);
-                            font-size: px2rem(20px * 2);
+                            // right: px2rem(5px * 2);
+                            padding-left: px2rem(25px * 2);
+                            font-size: px2rem(21px * 2);
                             ;
                         }
                         .dl {