sk 1 vuosi sitten
vanhempi
commit
75447a01cb

+ 12 - 9
app/src/views/PoliceSituation/components/MobilizeStrength.vue

@@ -35,9 +35,9 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 				<div class="wenshuTxt">最新文书</div>
 				<img src="../../../assets/images/img14.png" />
 			</div>
-			<div class="content" v-if="hcws1">
-				<div>
-					<div style="">
+			<div class="content">
+				<div style="height: 100px;">
+					<div style="" v-if="hcws1">
 						<div class="contFlex">
 							<div class="contType">{{hcws1.jqzt}}</div>
 							<div class="conTime">{{hcws1.gxsj}}</div>
@@ -53,7 +53,7 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 				<div class="wenshuTxt">历史文书</div>
 				<img src="../../../assets/images/img14.png" />
 			</div>
-			<div class="content on" >
+			<div class="content on">
 				<div v-for="(item,index) in hcws" :key="index">
 					<div style="">
 						<div class="contFlex">
@@ -78,7 +78,7 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 				checked: 0,
 			}
 		},
-		props: ['list', 'zlxx', 'hcws','hcws1'],
+		props: ['list', 'zlxx', 'hcws', 'hcws1'],
 		// props: {
 		// 	list: {
 		// 		type: Array,
@@ -122,14 +122,16 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 
 <style scoped lang='less'>
 	::-webkit-scrollbar {
-			border-radius: 3px;
+		border-radius: 3px;
 		width: 8px;
 		height: 8px;
 		background: rgba(0, 213, 255, 0.3);
 	}
+
 	::-webkit-scrollbar-thumb {
-	    background: rgba(0, 213, 255, 0.3);
+		background: rgba(0, 213, 255, 0.3);
 	}
+
 	.writ {
 		width: 521px;
 	}
@@ -155,7 +157,8 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 		box-sizing: border-box;
 		background: linear-gradient(180deg, rgba(49, 121, 173, 0.5) 0%, rgba(43, 101, 142, 0.245) 100%);
 	}
-	.content.on{
+
+	.content.on {
 		height: 100px;
 		overflow: auto;
 	}
@@ -300,4 +303,4 @@ white-space: nowrap;">{{ item.yjddsj || '-'}}</span>
 			}
 		}
 	}
-</style>
+</style>

+ 4 - 4
app/src/views/PoliceSituation/components/UnitInfo.vue

@@ -13,8 +13,8 @@
 			</div>
 		</div>
 		<div class="paet">隐患部位</div>
-		<div class="paetCont" v-if="fxxxList">
-			<div class="paetBox">
+		<div class="paetCont">
+			<div class="paetBox" v-if="fxxxList">
 				<div class="pael">
 					<div class="wier">1</div>
 					<div class="hidTxt">隐患部位:</div>
@@ -25,7 +25,7 @@
 					<div class="hidTxt on">{{fxxxList.yhyy1 || '-'}}</div>
 				</div>
 			</div>
-			<div class="paetBox">
+			<div class="paetBox" v-if="fxxxList">
 				<div class="paer">
 					<div class="wier">2</div>
 					<div class="hidTxt">位置:</div>
@@ -40,7 +40,7 @@
 		<div class="paet">历史火灾处置情况:</div>
 		<div class="maintenance-supervision" style="margin: 0 15px;" v-if="lshzList">
 			<div>
-				<div class="row header">
+				<div class="row header" >
 					<span class="time">起火时间</span>
 					<span class="person">人员伤亡数量</span>
 					<span class="result">财产损失</span>

+ 1 - 1
app/src/views/PoliceSituation/index.vue

@@ -5,7 +5,7 @@
 				<Alaem :list="bjxxList" v-if="bjxxList && bjxxList.length > 0" @callback="callback" :pId="pId" />
 			</border-panel>
 			<border-panel height="620px" width="540px" style="margin-bottom: 6px" :headerType="3" title="出动力量">
-				<MobilizeStrength :list="cdxxList" :zlxx="zlxx" :hcws="hcws" />
+				<MobilizeStrength :list="cdxxList" :zlxx="zlxx" :hcws="hcws"  />
 			</border-panel>
 		</div>
 		<div style="width: 1000px; padding-bottom: 6px;">