Merge remote-tracking branch 'origin/lifeline_develop_siping' into lifeline_develop_siping

src/views/SenEquipmentCenter.vue

@@ -187,6 +187,7 @@
 								label: {
 									show: true,
 									fontSize: 14,
+									color:'#fff',
 									fontWeight: 'bold',
 									formatter: '{b}:{c} \n {d}%'
 								}
@@ -575,7 +576,7 @@
 	//图表设备分析
 	.company_fx {
 		width: 100%;
-		height: 200px;
+		height: 180px;
 	}
 
 	.company_fx_text {

src/views/SentryEmergencyCenter.vue

@@ -21,15 +21,15 @@
             </el-input>
 			<dl class="sp_list">
 				<dt>
-					<span style="width: 40px;text-align: center;">序号</span>
-					<span style="width: 128px;text-indent: 20px;">事件名称</span>
+					<span style="width: 40px;text-align: center;padding-left: 1%;">类型</span>
+					<span style="width: 128px;text-indent: 20px;padding-left: 3%;">事件名称</span>
 					<span style="width: 128px;text-align: center;">事件描述</span>
 				</dt>
 				<div class="hei_scroll hei56">
 					<dd v-for="(e,idx) in deviceListSearch" :key="idx" @click="getEventDetail(e.eventId,e.latitude,e.longitude)">
-						<span style="width: 40px;text-align: center;">{{ idx + 1 }}</span>
-						<span style="width: 128px;text-wrap: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="e.eventTitle">{{ e.eventTitle }}</span>
-						<span style="width: 128px;text-wrap: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="e.eventDescription">
+						<img :src="e.eventSource == 'artificial' ? require('@/assets/images/artificialIcon.png') : require('@/assets/images/deviceIcon.png') " style="display: inline-block;margin: 3% 0% 0% 4%;;width: 20px;height: 20px;">
+						<span style="width: 128px;text-wrap: nowrap;overflow: hidden;text-overflow: ellipsis;padding-left: 3%;" :title="e.eventTitle">{{ e.eventTitle }}</span>
+						<span style="width: 128px;text-wrap: nowrap;overflow: hidden;text-overflow: ellipsis;padding-left: 4%;" :title="e.eventDescription">
 							{{ e.eventDescription }}
 						</span>
 					</dd>

src/views/SentryPage.vue

@@ -22,7 +22,7 @@
               <i>设备中心</i>
           </div>
       </div>
-      <div class="header_tit"><i>{{title}}</i></div>
+      <div class="header_tit"><i><img src="../assets/images/lt-logo.png" width="40px" height="40px"/>{{title}}</i></div>
       <div class="head_btn">
 		    <div @click="jumpTo('/SenWarningCenter',4)" :class="routerIdx == 4 ? 'on' : ''">
             <i>预警中心</i>
@@ -740,8 +740,13 @@
 		color: transparent;
 		mix-blend-mode: screen;
 		/*text-shadow: 3px 5px 0px rgba(17, 20, 22, 0.22);*/
-		display: block;
+		display: flex !important;
+		justify-content: center;
+		align-items: center;
 		text-align: center;
+		img{
+			margin-right: 5px;
+		}
 	}
 
 	.s_header .head_btn {