sumyangyang 1 年之前
父节点
当前提交
8a9e8a1318

+ 45 - 3
zhsq_qk-ui/src/assets/images/qkq_body.css

@@ -364,12 +364,13 @@ body {
 .qkq_tit{
 	background: url(qkq_titbg1.png) no-repeat top left;
     color: #d0e3fd;
-    font-size: 16px;
+    font-size: 18px;
     height: 30px;
-    padding: 10px 0px 0px 31px;
+    padding: 10px 0px 0px 25px;
     margin-bottom: 10px;
     background-size: 100% 100%;
-	position: relative;
+	position: relative;
+	text-shadow: 0px 0px 5px #00ffff;
 }
 .qkq_tit select{
 	float:right;
@@ -461,3 +462,44 @@ color: #fff;
 	z-index: 1;
 	min-height: 51px;
 }
+
+
+/* 搜索 */
+.qkq_ss{
+	position: relative;
+	width: 100%;
+	height: 36px;
+	line-height: 36px;
+}
+.qkq_ss input.inp_ss{
+	position: absolute;
+	width: 100%;
+	top:0px;
+	left: 0px;
+	background: #001339;
+	border: 1px solid #1162bd;
+	outline: 0px;
+	border-radius: 5px;
+	padding-left: 10px;
+	height: 34px;
+	line-height: 34px;
+	color: #fff;
+}
+.qkq_ss input.inp_btn{
+	position: absolute;
+	width: 20%;
+	top:0px;
+	right: 0px;
+	background: #1162bd;
+	border: 1px solid #1162bd;
+	outline: 0px;
+	border-radius: 5px;
+	height: 34px;
+	line-height: 34px;
+	color: #fff;
+	font-size: 14px;
+}
+
+.scrollbar{
+	overflow-y: scroll;
+}

+ 9 - 5
zhsq_qk-ui/src/assets/images/qkq_index.css

@@ -36,11 +36,13 @@
 .qkq_tdzy .dt_txt h4{
 	font-size: 14px;
 	color: #fff;
-	margin-bottom: 8px;
+	margin-bottom: 8px;
+	text-shadow: 0px 0px 5px #6affff;
 }
 .qkq_tdzy .dt_txt h5{
 	font-size: 10px;
-	color: #fff;
+	color: #fff;
+	text-shadow: 0px 0px 5px #6affff;
 }
 .qkq_tdzy .dt_con{
 	background: url(qkq_tdzybg.png) no-repeat center;
@@ -96,7 +98,8 @@
 	color: #fff;
 	line-height: 22px;
 	position: relative;
-	padding-left: 13px;
+	padding-left: 13px;
+	text-shadow: 0px 0px 5px #6affff;
 }
 .qkq_yshj_con .qkq_yshj_list p:after{
 	content: " ";
@@ -199,7 +202,8 @@
 	color: #fff;
 	display: inline-block;
 	height: 30px;
-	line-height: 30px;
+	line-height: 30px;
+	text-shadow: 0px 0px 5px #6affff;
 }
 .qkq_jjyx_list dt span:nth-child(1),.qkq_jjyx_list dd span:nth-child(1){
 	width: 41%;
@@ -218,7 +222,7 @@
 	background-size: 100% auto;
 	text-align: center;
 	font-size: 10px;
-	color: #0f81ec;
+	color: #e1e4ec;
 }
 
 

+ 2 - 1
zhsq_qk-ui/src/assets/images/qkq_sprh.css

@@ -114,7 +114,8 @@
 
   .accordion {
     width: 99%;
-    margin: 0 auto;
+    margin: 0 auto;
+	height: 100%;
 }
 
 .accordion .link {

+ 15 - 8
zhsq_qk-ui/src/views/fusion/index.vue

@@ -224,14 +224,21 @@ export default {
         tooltip: {},
 
         radar: {
-          radius: "65%", //大小
+          radius: "55%", //大小
           nameGap: 1, // 图中工艺等字距离图的距离
           center: ["40%", "40%"], // 图的位置
           name: {
             textStyle: {
               color: "rgba(175, 190, 211, 1)",
               fontSize: 10
-            },
+            },
+			textStyle: {
+			      color: '#fff',
+			  textShadowColor: 'rgba(0, 255, 255, 1)',
+						            textShadowBlur: 5,
+						            textShadowOffsetX: 0,
+						            textShadowOffsetY: 0
+						        },
             formatter: function (name) {
               return name;
             }
@@ -260,7 +267,7 @@ export default {
           axisLine: {
             lineStyle: {
 
-              color: "rgba(2, 96, 176, 0.8)"
+              color: "rgba(1, 118, 214, 0.8)"
             }
           },
           splitArea: {
@@ -273,7 +280,7 @@ export default {
             show: true,
             lineStyle: {
               width: 1,
-              color: "rgba(2, 96, 176, 0.8)" // 设置网格的颜色
+              color: "rgba(1, 135, 244, 0.8)" // 设置网格的颜色
             }
           }
         },
@@ -294,12 +301,12 @@ export default {
             symbolSize: 5,
             value: [70, 42, 63, 84, 75, 34],
             areaStyle: {
-              color: "rgba(2, 96, 176, 0.8)"
+              color: "rgba(1, 132, 238, 0.8)"
             },
             itemStyle: {
               normal: {
                 borderWidth: 1,
-                color: "RGBA(0, 34, 66, 1)",
+                color: "rgba(0, 62, 120, 1.0)",
                 borderColor: "rgba(2, 96, 176, 1)"
               }
             },
@@ -449,7 +456,7 @@ export default {
             normal: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                 offset: 0,
-                color: 'rgba(39,116,212,1)'
+                color: 'rgba(37, 215, 255, 1.0)'
               }, {
                 offset: 1,
                 color: 'rgba(1,23,60,1)'
@@ -458,7 +465,7 @@ export default {
             emphasis: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                 offset: 0,
-                color: 'rgba(39,116,212,1)'
+                color: 'rgba(43, 129, 234, 1.0)'
               }, {
                 offset: 1,
                 color: 'rgba(1,23,60,1)'

+ 15 - 6
zhsq_qk-ui/src/views/fusion/jtzl.vue

@@ -30,26 +30,35 @@
           <a>单屏</a>
           <a>电视墙</a>
         </div>
-        <div class="clear"></div>
+        <div class="clear"></div>
+		<form class="qkq_ss">
+			<input type="text" placeholder="请输入搜索词" class="inp_ss"/>
+			<input type="button" class="inp_btn" value="搜索"/>
+		</form>
         <div class="tab_cont">
           <div class="qkq_tdzy">
             <div class="qkq_tit ">设备列表</div>
             <div class="selectDate">
               <span class="_selectData">锦程街道</span>
               <a class="icon_more" @click="toggleDropdown($event)"><img src="@/assets/images/down.png"/></a>
-              <div class="_moreMenu" v-if="dropdownVisible">
+              <div class="_moreMenu" v-if="dropdownVisible">
+				  
                 <ul>
                   <li class="change">东风街道</li>
                   <li>锦程街道</li>
-                </ul>
+                </ul>
+			
               </div>
             </div>
-          </div>
-          <ul id="accordion" class="accordion">
+          </div>
+		  <div class="scrollbar" style="height: 510px;">
+          <ul id="accordion" class="accordion">
+			  
             <li v-for="(camera, index) in cameras" :key="index">
               <div class="link">{{ camera.cameraName }}</div>
             </li>
-          </ul>
+          </ul>
+		  	</div>
         </div>
         <div class="tab_cont"></div>
       </div>