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

.hbuilderx/launch.json

@@ -0,0 +1,14 @@
+{
+    "configurations": [
+        {
+            "mode": "debug",
+            "name": "自定义调试文件",
+            "program": "${workspaceFolder}/index.js",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node"
+        }
+    ],
+    "version": "0.1"
+}

src/views/SenEventCenter.vue

@@ -7,7 +7,7 @@
 					v-model="dataValue"
 					type="date"
           @change="updateDataValue"
-					placeholder="选择日期">
+					placeholder="选择日期" class="spsb-picker">
 			</el-date-picker>
 		</div>
 		<div class="con_left">
@@ -427,8 +427,11 @@
 	.spsb_down{
 		position: absolute;
 		top:52px;
-		left: 30px;
+		left: 43px;
 		z-index: 999;
+		.spsb-picker{
+			width: 296px;
+		}
 		.el-input__inner{
 			background: linear-gradient(to right, rgb(37,50,54) 0%, rgb(43,140,152) 100%);
 			border: 1px solid;

src/views/SenWarningCenter.vue

@@ -7,11 +7,10 @@
 
 <template>
     <div>
-	 <div class="con_left">
+	 <div class="con_left" style="background: none !important ;">
       <div class="warning_left" :class="'warning_'+index" v-for="(item,index) in option" >
         <h4>{{item.typeName}}</h4>
         <h2>{{item.count}}</h2>
-        <img src="@/assets/images/warningBg.png">
       </div>
 	  </div>
       <div class="con_right con_left_js" :class="'warning_'+index" v-for="(item,index) in option" >
@@ -105,15 +104,17 @@ export default {
         // position: absolute;
         z-index: 99;
         left: 30px;
+		height:120px;
         top: 100px;
         margin-top: 1%;
         text-align: center;
-        padding: 0px 10px 20px 10px!important;
+        padding: 0px 10px 38px 10px!important;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 		margin-top: 20px;
+		background: url(../assets/images/warningBg.png) center no-repeat;
 		img{
 			 width: 122px;
 			 height: 67px;

src/views/SentryEmergencyCenter.vue

@@ -220,10 +220,10 @@
 										<h3>各部门在线情况</h3>
 										<h4 style="margin-top: 4%;"></h4>
 										<div v-for="(e,idx) in emergencyEventDetails.deptList ? emergencyEventDetails.deptList : [] " :key="idx" class="planItem"
-												 style="display: flex;border: 1px solid #50A09E;width: 96%;height: 40px !important;">
-											<img src="@/assets/images/planIcon.png"
-													 style="width: 30px; height:30px; position: relative;top: -22%;left: -5%;">
-											<div style="position: relative;left: -5%; bottom: 7%;">{{ e.mapDeptName || '' }}</div>
+											 style="border-left: none; display: flex; align-items: center;"	>
+											<img src="@/assets/images/online-img.png"
+													 style="width: 30px; height:30px; margin:0 5px 0 0 ;">
+											<div style="margin-top: 0 !important;">{{ e.mapDeptName || '' }}</div>
 										</div>
 									</div>
                     <div class="transferBg pics">
@@ -1996,4 +1996,5 @@
 			}
 		}
 	}
+	
 </style>