wangzhe 1 год назад
Родитель
Сommit
08c46e0cf7
3 измененных файлов с 37 добавлено и 36 удалено
  1. 19 18
      src/components/Btmbutton.vue
  2. 13 13
      src/components/Cjmsbtm.vue
  3. 5 5
      src/components/Cjmsheader.vue

+ 19 - 18
src/components/Btmbutton.vue

@@ -1,11 +1,11 @@
 <template>
 	  <div>
   <div class="btmbuttonbg">
-	 
+
 	  <div class="btmbutton">
-		  
+
 		  <div class="btmbutton-con">
-			  <div class="yj-name">张三</div>
+			  <div class="yj-name" style="text-indent: 1em">张雨晴</div>
 			  <div class="model-tab">
 				  <button class="on" @click="goJiaShi">驾驶模式</button>
 				  <button @click="goChenJin">沉浸模式</button>
@@ -53,11 +53,11 @@
 					  <span>摄像头</span>
 				  </div>
 			  </div>
-			 
+
 		  </div>
-		 
+
 	  </div>
-	  
+
   </div>
   <div class="btm-left-btn">
   	<a class="btm-btn">值班信息</a>
@@ -82,7 +82,7 @@ export default {
 	  }
   },
   props: {
-	  
+
   },
    mounted () {
          this.timerOneScondRun(); //执行日期函数
@@ -95,7 +95,7 @@ export default {
                 clearInterval(this.newTimer);
                 next();
             },
-   
+
   methods: {
          //获取时间
                 timerOneScondRun() {
@@ -119,11 +119,12 @@ export default {
         	            ":" +
         	            (date.getSeconds() >= 10 ? date.getSeconds() : "0" + date.getSeconds());
                 },
-				
+
 		// 跳转沉浸模式
 		goChenJin(){
 			this.$router.push( '/YjCjms');
 		},
+	  	// 跳转驾驶模式
 		goJiaShi(){
 			// this.$router.push( '/index');
 		}
@@ -204,9 +205,9 @@ export default {
 	}
 	.btm-con h2{
 		font-size: 55px;
-		background-image:-webkit-linear-gradient(top,#fff,#6a6a6a); 
-		-webkit-background-clip:text; 
-		-webkit-text-fill-color:transparent; 
+		background-image:-webkit-linear-gradient(top,#fff,#6a6a6a);
+		-webkit-background-clip:text;
+		-webkit-text-fill-color:transparent;
 		text-align: center;
 		margin-top: 50px;
 		font-family: myfont3;
@@ -220,9 +221,9 @@ export default {
 	}
 	.btm-con .yj-sjs b{
 		font-size: 28px;
-		background-image:-webkit-linear-gradient(top,#fff,#6a6a6a); 
-		-webkit-background-clip:text; 
-		-webkit-text-fill-color:transparent; 
+		background-image:-webkit-linear-gradient(top,#fff,#6a6a6a);
+		-webkit-background-clip:text;
+		-webkit-text-fill-color:transparent;
 		text-align: center;
 		display: block;
 		font-family: myfont3;
@@ -312,9 +313,9 @@ export default {
 	}
 	.btm-cs b{
 		font-size: 50px;
-		background-image:-webkit-linear-gradient(top,#fff,#6a6a6a); 
-		-webkit-background-clip:text; 
-		-webkit-text-fill-color:transparent; 
+		background-image:-webkit-linear-gradient(top,#fff,#6a6a6a);
+		-webkit-background-clip:text;
+		-webkit-text-fill-color:transparent;
 		text-align: center;
 		display: block;
 		font-family: myfont3;

+ 13 - 13
src/components/Cjmsbtm.vue

@@ -40,7 +40,7 @@
 				              </div>
 				            </div>
 				          </div>
-				  
+
 				          <div :class="noScrollRight ? 'arrow' : 'arrow arrowOpacity'" @click="fnNext(activeName)">
 				            <img :src="arrowR" alt="" />
 				          </div>
@@ -52,11 +52,11 @@
 				  <p class="on"><i class="iconfont yj-icon-wulianwang"></i>物联网</p>
 				  <p><i class="iconfont yj-icon-shilianwang"></i>视联网</p>
 			  </div>
-			 
+
 		  </div>
-		  
+
 	  </div>
- 
+
 </div>
 </template>
 <script>
@@ -64,7 +64,7 @@
 	import arrowR from '@/assets/images/yj-cjmsbtnright.png';
 	import icon from '@/assets/images/yj-cjmsimg.png';
 	import iconArrow from '@/assets/images/yj-navimg2.png';
-	
+
 export default {
   name: 'Cjmscon',
   data(){
@@ -72,7 +72,7 @@ export default {
 		nowdate : '', //日期
 		nowtime : '', //时间
 		newTimer : '', //定时器
-		
+
 		progressList: [
 		        { type: '1' },
 		        { type: '2' },
@@ -115,7 +115,7 @@ export default {
                 clearInterval(this.newTimer);
                 next();
             },
-   
+
   methods: {
          //获取时间
                 timerOneScondRun() {
@@ -139,7 +139,7 @@ export default {
         	            ":" +
         	            (date.getSeconds() >= 10 ? date.getSeconds() : "0" + date.getSeconds());
                 },
-				
+
 		//初始化判断是否可以向右滚动
 		    initgoRightArrow() {
 		      const currentScrollWidth = this.$refs[`fixedBox`].clientWidth;
@@ -195,10 +195,10 @@ export default {
 			// this.$router.push('/YjCjms');
 		},
 		goJiaShi(){
-			this.$router.push('/');
+			this.$router.push('/index');
 		}
 
-		
+
 
   	}
 }
@@ -295,12 +295,12 @@ export default {
 	.cjms-btmbtn p:nth-child(2){
 		margin-left: 0px;
 	}
-	
+
 	.processBox {
 	  display: flex;
 	  align-items: center;
 	  justify-content: space-between;
-	
+
 	}
 	.processBox .arrow {
 	  width: 30px;
@@ -324,7 +324,7 @@ export default {
 	.processBox .centerScroll .signleTab {
 	  width: 120px;
 	  position: relative;
-	 
+
 	}
 	.processBox .centerScroll .signleTab img{
 	  width:103px;

+ 5 - 5
src/components/Cjmsheader.vue

@@ -4,9 +4,9 @@
 		<div class="header">
 			  <p>延吉市数字应急自然灾害综合风险监管平台</p>
 		</div>
-		<div class="yj-name">张三</div>
+		<div class="yj-name" style="text-indent: 1em">张雨晴</div>
 	</div>
-  
+
 </template>
 
 <script>
@@ -20,7 +20,7 @@ export default {
  	  }
    },
    props: {
- 	  
+
    },
     mounted () {
           this.timerOneScondRun(); //执行日期函数
@@ -33,7 +33,7 @@ export default {
                  clearInterval(this.newTimer);
                  next();
              },
-    
+
    methods: {
           //获取时间
                  timerOneScondRun() {
@@ -57,7 +57,7 @@ export default {
          	            ":" +
          	            (date.getSeconds() >= 10 ? date.getSeconds() : "0" + date.getSeconds());
                  },
- 				
+
    	}
  }
 </script>