whao 2 jaren geleden
bovenliggende
commit
d9a9474ea3

BIN
src/assets/images/integrated/btm-light.png


BIN
src/assets/images/integrated/light.png


BIN
src/assets/images/visual/header.png


+ 15 - 15
src/assets/styles/base.scss

@@ -4,7 +4,7 @@ $fontLED: led;
 
 //颜色
 $white: #fff;
-$inBlue: #2bacf7;
+$inBlue: #25bdcb;
 $subtitle: #638395;
 $inBlueHover: #07ffc1;
 $inYellow: #ffd014;
@@ -12,43 +12,43 @@ $deepBlue: #0b293a;
 $listText: #1a7988;
 $textGray: #ccc;
 $grayBlue: #5685a0;
-$tipHover: #2082ba;
+$tipHover: #23b8ba;
 $eventBG: #0b284e;
 
 
 //渐变
-$GradualGreen: 180deg, rgba($color: #124799, $alpha: .8),
+$GradualGreen: 180deg, rgba($color: #138399, $alpha: .8),
 rgba($color: #04151e, $alpha: .8);
 
-$conBg: 180deg, rgba($color: #0f162c, $alpha: 1),
-rgba($color: #040b1f, $alpha: 1);
+$conBg: 180deg, rgba($color: #0f282c, $alpha: 1),
+rgba($color: #051216, $alpha: 1);
 
-$btmMemu: 180deg, rgba($color: #0d1620, $alpha: 1),
-rgba($color: #020f2a, $alpha: 1);
+$btmMemu: 180deg, rgba($color: #0a1f20, $alpha: 1),
+rgba($color: #011d2a, $alpha: 1);
 
 $boxBG: 180deg, rgba($color: #0d2760, $alpha: 1),
 rgba($color: #081a41, $alpha: 1);
 
 //内阴影
 $shadowList: 0 0 1rem 0 rgba($color: #0b1b25, $alpha: .8);
-$shadowTitle: 0 -0.2rem .5rem 0.3rem rgba($color: #0dc0db, $alpha: .09) inset;
-$shadowListHover: rgba($color: #0567c2, $alpha: .7) 0px 0px 50px inset;
+$shadowTitle: 0 -0.2rem .5rem 0.3rem rgba($color: #15dbb4, $alpha: .09) inset;
+$shadowListHover: rgba($color: #1cbfc2, $alpha: .7) 0px 0px 50px inset;
 $shadowListHoverI: 0 0 3px rgba($color: #41ff84, $alpha: .5), -0 -0 10px rgba($color: #41fff8, $alpha: .9);
-$shadowTip: 0 0 1rem 0 rgba($color: #387ee7, $alpha: .8) inset;
+$shadowTip: 0 0 1rem 0 rgba($color: #34c7e7, $alpha: .8) inset;
 $shadowCount: 0 0 .5rem 0 rgba($color: #00c8ff, $alpha: 1) inset;
 
 //可视化 数字林业
-$fBlue: #03c6e2;
+$fBlue: #0bb3c2;
 $fBlueHover: #07ffc1;
 $fBlueG: #0bf3f7;
-$fListTitle: #2bacf7;
-$barBgc: rgba($color: #051520, $alpha: .9);
+$fListTitle: #0fc4d4;
+$barBgc: rgba($color: #102127, $alpha: .9);
 $barShadow: rgba($color: #078ad1, $alpha: .8) 0px 0px 18px inset;
 $barBorder: solid rgba($color: #33467f, $alpha: .7);
 $tableBorder: solid rgba($color: #33467f, $alpha: .7);
 $countBorder: solid rgba($color: #00aeff, $alpha: .9);
-$searchBorder: solid rgba($color: #33467f, $alpha: 1);
-$searchBG: #101527;
+$searchBorder: solid rgba($color: #33727f, $alpha: 1);
+$searchBG: #102127;
 $deepBG: #09192f;
 //icon
 $iconBg: #f5ad1b, #58b35d, #0FA2FF, #da8ec5, #78bfc2, #a28e52, #ff6063, #96bd5b, #f5ad1b, #da8ec5, #5f89ce, #78bfc2, #bec278, #f07779;

+ 3 - 3
src/components/v-fastmenu.vue

@@ -7,7 +7,7 @@
 			<a  @click="backToMainPage" class="header-right">
 				<span><i class="el-icon-monitor"></i>管理端</span>
 			</a> -->
-			<el-popover placement="top-start" trigger="hover" width="300px">
+			<el-popover placement="top-start" trigger="click" width="300px">
 				<div class="user-tip">
 					<div class="u-tip-1">
 						<img src="@/assets/images/user-photo.png" />
@@ -196,8 +196,8 @@ import { getUserProfile } from "@/api/system/user";
 
 	}
 	.el-popover{
-		background:#0c1327;
-		border:1px solid #334780;
+		background:$searchBG;
+		border:1px $barBorder;
 		box-shadow:$shadowListHover;
 		border-radius: 1rem;
 	}

+ 3 - 3
src/components/v-header.vue

@@ -12,12 +12,12 @@
 		
 		<!--中间导航-->
 		<div class="bignav">
-			<img src="@/assets/images/integrated/bigdata-header-nav-left.png" />
+			<img src="@/assets/images/integrated/bigdata-header-nav-left2.png" />
 			<router-link v-for="(navbar,index) in navbar" :key="index+'1'" :to="navbar.path"  class="bignav-list"
 				exact>
 				<a>{{navbar.meta.title}}</a>
 			</router-link>
-			<img src="@/assets/images/integrated/bigdata-header-nav-right.png" />
+			<img src="@/assets/images/integrated/bigdata-header-nav-right2.png" />
 		</div>
 		<!-- 右侧5个中心 -->
 		<VfastMenu></VfastMenu>
@@ -104,7 +104,7 @@
 			align-items: center;
 	
 			.bignav-list {
-				background: url(../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
+				background: url(../assets/images/integrated/bigdata-header-nav-re2.png) repeat-x center;
 				float: left;
 				display: flex;
 				justify-content: cetner;

+ 1 - 1
src/components/vBottomMenu.vue

@@ -1046,7 +1046,7 @@ export default {
       button {
         padding: 0 .3rem;
         height: 1.5rem;
-        background-color: #112543;
+        background-color: $searchBG;
         color: $inBlue;
         border: 1px $searchBorder;
       }

+ 9 - 9
src/views/forest.vue

@@ -9,7 +9,7 @@
       <div class="leftbar" ref="left">
         <!-- 1 基本情况 -->
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>基本情况</span>
@@ -26,7 +26,7 @@
         </div>
         <!-- 2 事件统计-->
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-29-5">
               <div class="d-l-con">
@@ -81,7 +81,7 @@
         </div>
         <!-- 3 组织机构 -->
         <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-27" style="padding-left: 1rem;">
               <el-collapse accordion>
@@ -112,7 +112,7 @@
         <div class="right-item1">
           <!-- 天气 -->
           <div class="forthis">
-            <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)">
+             <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)"  :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="i-list-con small-bottom-margin h-18">
                 <el-row :gutter="20" v-if="todatWeather">
@@ -236,7 +236,7 @@
           </div>
           <!-- 曝光台 -->
           <div class="forthis">
-            <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>曝光台</span>
@@ -262,7 +262,7 @@
           </div>
           <!-- 事件列表 -->
           <div class="forthis">
-            <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>事件列表</span>
@@ -343,7 +343,7 @@
         <div class="right-item2">
           <!-- 日历 -->
           <div class="forthis">
-            <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="i-list-con small-bottom-margin h-30">
                 <dateChoose @selectDay="selectDay"></dateChoose>
@@ -352,7 +352,7 @@
           </div>
           <!-- 事件分类 -->
           <div class="forthis">
-            <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>事件分类</span>
@@ -366,7 +366,7 @@
           </div>
           <!-- 上报排行 -->
           <div class="forthis">
-            <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>上报排行</span>