Merge branch 'lifeline_develop_siping' of http://116.142.80.13:3000/sooka_onest/visu_lifeline into lifeline_develop_siping

src/views/SentryCockpit.vue

@@ -410,10 +410,10 @@
           xData.push(a.name);
           yData.push(a.value);
         });
-        var startColor = ["#0157be", "#7a18ed", "#00bbce", "#ea865a"];
-        var endColor = ["#0367d4", "#2743ed", "#00c4a5", "#ea2e41"];
-        var borderStartColor = ["#05acff", "#ee36ff", "#05fcfb", "#ffa597"];
-        var borderEndColor = ["#09c1ff", "#8171ff", "#05ffff", "#ff6584"];
+        var startColor = ["#0efeb6", "#7a18ed", "#00bbce", "#ea865a"];
+        var endColor = ["#204aa6", "#2743ed", "#00c4a5", "#ea2e41"];
+        var borderStartColor = ["#27867b", "#ee36ff", "#05fcfb", "#ffa597"];
+        var borderEndColor = ["#10deab", "#8171ff", "#05ffff", "#ff6584"];
         var RealData = [];
         var borderData = [];
         data.map((item, index) => {
@@ -474,7 +474,7 @@
             left: 'center',
             top: 'center',
             textStyle: {
-              color: "#f2f2f2",
+              color: "#0df2d8",
               fontSize: 12,
             },
           },
@@ -598,9 +598,9 @@
               },
             },
             series: [{
-              name: "访问来源",
+              name: "设备分析",
               type: "pie",
-              radius: "55%",
+              radius: "60%",
               center: ["50%", "50%"],
               color: ["rgb(131,249,103)", "#FBFE27", "#FE5050","#1DB7E5"], //'#FBFE27','rgb(11,228,96)','#FE5050'
               data: data.sort(function(a, b) {
@@ -613,13 +613,13 @@
                   formatter: ["{c|{c}}", "{b|{b}}"].join("\n"),
                   rich: {
                     c: {
-                      color: "rgb(241,246,104)",
+                      color: "rgb(31, 246, 232)",
                       fontSize: 20,
                       fontWeight: "bold",
                       lineHeight: 5,
                     },
                     b: {
-                      color: "rgb(98,137,169)",
+                      color: "rgb(123, 172, 212)",
                       fontSize: 15,
                       height: 40,
                     },
@@ -684,10 +684,10 @@
 					xData.push(a.name);
 					yData.push(a.value);
 				});
-				var startColor = ["#0157be", "#7a18ed", "#00bbce", "#ea865a"];
-				var endColor = ["#0367d4", "#2743ed", "#00c4a5", "#ea2e41"];
-				var borderStartColor = ["#05acff", "#ee36ff", "#05fcfb", "#ffa597"];
-				var borderEndColor = ["#09c1ff", "#8171ff", "#05ffff", "#ff6584"];
+				var startColor = ["#0157be", "#08e5d7", "#0dce34", "#ea865a"];
+				var endColor = ["#0d95d4", "#00836d", "#3c8a37", "#ea2e41"];
+				var borderStartColor = ["#05acff", "#39dbff", "#05fcfb", "#ffa597"];
+				var borderEndColor = ["#09c1ff", "#376d9e", "#05ffff", "#ff6584"];
 				var RealData = [];
 				var borderData = [];
 				data.map((item, index) => {
@@ -760,7 +760,7 @@
 						// 主要展示层的
 						{
 							radius: ["33%", "61%"],
-							center: ["50%", "50%"],
+							center: ["50%", "55%"],
 							type: "pie",
 							label: {
 								normal: {
@@ -784,7 +784,7 @@
 						// 边框的设置
 						{
 							radius: ["31%", "34%"],
-							center: ["50%", "50%"],
+							center: ["50%", "55%"],
 							type: "pie",
 							label: {
 								normal: {
@@ -811,7 +811,7 @@
 						// 中心的圆圈
 						{
 							radius: ["26%", "31%"],
-							center: ["50%", "50%"],
+							center: ["50%", "55%"],
 							type: "pie",
 							label: {
 								normal: {
@@ -1032,9 +1032,25 @@
 		background-color: rgba(20, 107, 115, 0.3);
 		color: #fff;
 	}
+	
+	.tc_div{
+		.scrollx{
+			margin-bottom: 10px;
+			.scroll-container{
+				.el-checkbox{
+					margin-right: 20px;
+				}
+				
+			}
+		}
+	
+	}
   .el-checkbox__label{
     color: #ffffff;
   }
+  .el-checkbox__input.is-checked+.el-checkbox__label{
+	  color: #40fff0;
+  }
 
 	.hz_body {
 		position: relative;
@@ -1050,7 +1066,7 @@
 	/*//头部通用*/
 	.s_header {
 		width: 100%;
-		height: 110px;
+		height: 95px;
 		position: absolute;
 		top: 0px;
 		left: 0px;
@@ -1088,6 +1104,7 @@
 
 	.s_header .head_btn {
 		width: 316px;
+		padding-top: 0;
 	}
 
 	.s_header .head_tx {
@@ -1133,8 +1150,9 @@
 		left: 30px;
 		top: 100px;
 		width: 320px;
-		background: rgba(0, 0, 0, 0.55);
+		background: rgba(16, 43, 32, 0.6);
 		padding: 0px 10px 20px 10px !important;
+		border-radius: 10px;
 	}
 
 	.con_right {
@@ -1143,8 +1161,9 @@
 		right: 30px;
 		top: 100px;
 		width: 320px;
-		background: rgba(0, 0, 0, 0.55);
+		background: rgba(16, 43, 32, 0.6);
 		padding: 0px 10px 20px 10px !important;
+		border-radius: 10px;
 
 		.list_tit {
 			background: url("../assets/images/sentinel/hz_list_tit.png") no-repeat center;
@@ -1484,7 +1503,7 @@
 	//图表设备分析
 	.cd_fx {
 		width: 100%;
-		height: 18vh;
+		height: 19vh;
 	}
 	//图表设备分析
 	.sb_fx {
@@ -1582,11 +1601,13 @@
       display: inline-block;
       background: url("../assets/images/sixZ/sixzbtn1.png") no-repeat center;
       background-size: 100% 100%;
-      padding: 8px 20px;
+      padding: 3px 20px;
       margin: 8px 8px 8px 0px;
       font-size: 14px;
       color: #fff;
       cursor: pointer;
+	  filter: hue-rotate(-50deg);
+	  border: none;
     }
 
     .map_btn button.on {
@@ -1608,6 +1629,7 @@
     .map_clear:hover {
       background: #0a5184;
     }
+	
   }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>

src/views/SentryEmergencyCenter.vue

@@ -7,7 +7,7 @@
 <template>
 	<div class="visual-con hz_body">
 		<!--主体-->
-		<div class="con_left" style="height: 83%;top: 141px;">
+		<div class="con_left" style="height: 82%;top: 141px;">
 			<!-- 全年应急事件总数 -->
 			<div class="eventTotalYear_contain">
 				<div>全年应急事件总数 <span>{{ eventTotalCountYear }}</span> </div>
@@ -254,7 +254,7 @@
                      :accordion="true" empty-text="加载中，请稍候" :props="defaultProps"></el-tree>
 					</el-form-item>
 					<el-form-item label="图片" prop="fileList" style="width: 1200px;height: 40px;">
-						<ImageUpload :fileType="['jpg', 'png','jpeg']" :limit="5" :value="fileList"  @input="getUrl"></ImageUpload>
+						<ImageUpload :fileType="['jpg', 'png','jpeg']" :limit="5" :value="fileList"  @input="getUrl" class="sj-img-up"></ImageUpload>
 					     <template #label></template>
      				</el-form-item>
 					<el-form-item label="事件描述" prop="eventDescription" style="width: 1000px;height: 100px;margin-top: 9%;">
@@ -1525,6 +1525,13 @@
 			margin-top:1%;
 		}
 	}
+	.sj-img-up{
+		.el-upload--picture-card{
+			    background-color: rgba(20, 107, 115, 0.3);
+			    border: 1px dashed #3bb8a4;
+				i{color:#93c8ba}
+		}
+	}
 
 
 </style>