zjs_project 1 年之前
父节点
当前提交
a04d65049c
共有 5 个文件被更改,包括 10 次插入377 次删除
  1. 0 1
      src/assets/common.scss
  2. 0 241
      src/assets/css/common.css
  3. 0 132
      src/assets/css/style.css
  4. 2 2
      src/components/newBottomCom/viewMask/viewMask.vue
  5. 8 1
      src/utils/rem.js

+ 0 - 1
src/assets/common.scss

@@ -146,7 +146,6 @@ body,html{
     padding: 0;
     position: relative;
     background-color: #f4f4f4;
-    // font-size: 13px;
 }
 #app{
     width:100%;

+ 0 - 241
src/assets/css/common.css

@@ -67,245 +67,4 @@ body{
 	background: linear-gradient(90deg,#000000 1%, rgba(0,0,0,0.00));
 	z-index: -1;
 }
-.project-head{
-	width: 40rem;
-	height: 40rem;
-    line-height: 40rem;
-	background: rgba(0,0,0,0.00);
-	border: 1rem solid rgba(255,255,255,0.33);
-	border-radius: 50%;
-	margin-right: 8rem;
-    font-size: 18px;
-	font-family: Verdana, Verdana-Bold;
-	font-weight: 700;
-	text-align: center;
-	color: #ffffff;
-    object-fit: cover;
-}
-.project-name{
-	height: 28rem;
-	line-height: 28rem;
-	font-size: 20px;
-	font-family: Verdana, Verdana-Bold;
-	font-weight: 700;
-	text-align: left;
-	color: #ffffff;
-}
-.project-address{
-	height: 17rem;
-	line-height: 17rem;
-	opacity: 0.5;
-	font-size: 12px;
-	font-family: Verdana, Verdana-Bold;
-	font-weight: 400;
-	text-align: left;
-	color: #ffffff;
-}
-.project-tips{
-	width: 40rem;
-	height: 22rem;
-	background: rgba(255,255,255,0.2);
-	border-radius: 4rem;
-	font-size: 14px;
-	font-family: FontName, FontName-Regular;
-	font-weight: 400;
-	text-align: center;
-	color: #ffffff;
-	line-height: 22rem;
-	font-style: italic;
-	margin-left: 10rem;
-}
-.project-area{
-	margin-top: 6rem;
-	height: 20rem;
-	line-height: 20rem;
-	font-size: 14px;
-	font-family: Verdana, Verdana-Bold;
-	font-weight: 700;
-	text-align: left;
-	color: #ffffff;
-    overflow: hidden;
-}
-.project-footer{
-	position: relative;
-	width: 100%;
-	height: 10rem;
-	margin-top: 10rem;
-    overflow: hidden;
-}
-.project-footer-top{
-	width: 100%;
-	height: 4rem;
-	background: linear-gradient(90deg,var(--themeColor4) 1%, transparent);
-}
-.project-footer-left{
-	position: absolute;
-	top: 0rem;
-	border-width:10rem;
-	border-top-color: transparent;
-	border-right-color: transparent;
-	border-bottom-color: transparent;
-	border-left-color: var(--themeColor4);
-	border-style:solid;
-	border-left-width: 5rem;
-	border-top-width: 0rem;
-}
-.polyon-content{
-	float: left;
-	width: auto;
-	font-size: 14px;
-    white-space: nowrap;
-	font-family: Verdana, Verdana-Bold;
-	font-weight: 700;
-	text-align: center;
-	color: var(--themeColor1);
-	text-shadow: 0rem 0rem #000000;
-}
-.infoWindowUnSelected .project-head{
-	display: none;
-}
-.infoWindowUnSelected .project-name{
-    height: 20rem;
-	line-height: 20rem;
-    font-size: 14px;
-}
-.infoWindowSelected .project-tips,.infoWindowUnSelected .project-tips{
-	display: none;
-}
-.infoWindowHtml.infoWindowSelected{
-    z-index: 1001!important;
-}
-.infoWindowUnSelected .project-address{
-	display: none;
-}
-.infoWindowUnSelected .project-area{
-    height: 17rem;
-	line-height: 17rem;
-    opacity: 0.6;
-    font-size: 12px;
-	margin-top: 0rem;
-}
-.infoWindowUnSelected .project-footer{
-	margin-top: 8rem;
-}
-.competitionUnSelected .project-name{
-    height: 20rem;
-	line-height: 20rem;
-    font-size: 14px;
-}
-.competitionUnSelected .project-area{
-    display: none;
-}
-/* 项目竞品状态 */
-.competitionProject .project-name{
-    height: 20rem;
-	line-height: 20rem;
-    font-size: 14px;
-}
-.competitionProject .project-head,.competitionProject .project-area,.competitionProject .project-address{
-	display: none;
-}
-/* 圆柱样式 */
-.cricleColumn-view{
-	position: relative;
-	width: 90rem;
-	height: 152rem;
-    cursor: pointer;
-}
-.cricleColumn-img{
-	width: 90rem;
-	height: 152rem;
-}
-.cricleColumn-text{
-	position: absolute;
-	bottom: 0rem;
-	left: 0rem;
-	width: 100%;
-	height: 37rem;
-	font-size: 14px;
-	font-family: DIN Alternate, DIN Alternate-Bold;
-	font-weight: 700;
-	text-align: center;
-	color: #ffdf80;
-	line-height: 14rem;
-}
-.cricleColumn1-view{
-	position: relative;
-	width: 82rem;
-	height: 152rem;
-    cursor: pointer;
-}
-.cricleColumn1-img{
-	width: 82rem;
-	height: 152rem;
-}
-.cricleColumn1-text{
-	position: absolute;
-	bottom: 14rem;
-	left: 0rem;
-	width: 100%;
-	font-size: 14px;
-	font-family: DIN Alternate, DIN Alternate-Bold;
-	font-weight: 700;
-	text-align: center;
-	color: #fff;
-	line-height: 20rem;
-}
-
-.poi-view{
-	position: relative;
-	width: max-content;
-	height: 30rem;
-	background: rgba(255,255,255,0.2);
-	border-radius: 15rem;
-	backdrop-filter: blur(30rem);
-    cursor: pointer;
-}
-.poi-view-radius{
-	width: 24rem;
-	height: 24rem;
-	line-height: 22rem;
-	background: rgba(118,188,255,0.50);
-	border: 1px solid #76bcff;
-	border-radius: 50%;
-	font-size: 12px;
-	font-family: Verdana, Verdana-Regular;
-	font-weight: 400;
-	text-align: center;
-	color: #ffffff;
-	margin-left: 4rem;
-}
-.poi-view-text{
-	font-size: 14px;
-	font-family: Verdana, Verdana-Regular;
-	font-weight: 400;
-	text-align: left;
-	color: #ffffff;
-	margin-left: 5rem;
-	margin-right: 10rem;
-}
-.poiUnSelected .poi-view{
-	background:unset;
-	backdrop-filter:unset;
-}
-.poiUnSelected .poi-view-text{
-	opacity: 0;
-}
-.trafficPoint-view{
-    width: 24rem;
-    height: 24rem;
-    background: rgba(255,255,255,0.00);
-    border: 1px solid var(--themeColor2);
-    border-radius: 50%;
-    font-size: 12px;
-    font-family: Verdana, Verdana-Regular;
-    font-weight: 400;
-    color: var(--themeColor2);
-    text-align: center;
-    line-height: 24rem;
-}
-
-.auto-height{
-	height: auto;
-}
 

+ 0 - 132
src/assets/css/style.css

@@ -1,135 +1,3 @@
 div{
 	box-sizing: border-box;
 }
-.project-view{
-	position: absolute;
-	right: 0rem;
-	top: 0rem;
-	width: 690rem;
-	height: calc(100% - 50rem);
-	padding: 20rem 20rem 20rem 0;
-    transition: 0.3s;
-    transform: translateX(0rem);
-    z-index: 11 !important;
-}
-.project-view-content{
-    min-height: 240rem;
-	position: relative;
-	width: 100%;
-    height: calc(100% - 100rem);
-	border-radius: 10rem;
-	padding: 20rem;
-	backdrop-filter: blur(10.36rem);
-	color: azure;
-    margin-top: 20rem;
-}
-.project-view-content-scroll{
-    overflow:auto;
-}
-.competition-top{
-	color: #cccccc;
-}
-.competition-top-btnlist{
-	border-radius: 8rem;
-	border: #7FFFD4 1rem solid;
-	height: 30rem;
-	line-height: 30rem;
-	overflow: hidden;
-}
-.btn-item{
-	font-size: 13px;
-	padding: 0rem 10rem;
-	background-color: transparent;
-}
-.btn-item.active{
-	background-color: rgb(188,223,139);
-	color: white;
-}
-.competition-info{
-	margin-top: 60rem;
-}
-.info-item-text{
-	font-size: 24px;
-	color: rgb(188,223,139);
-}
-.chart-view{
-	position: relative;
-	margin-top: 20rem;
-	width: 100%;
-	height: 300rem;
-}
-.chart{
-	/* width: 100%; */
-	/* height: 100%; */
-    width: 570rem;
-    height: 300rem;
-}
-.change-echarts{
-	position: absolute;
-	right: 0rem;
-	top: 0rem;
-	height: 20rem;
-	line-height: 20rem;
-}
-.echarts-item{
-	position: relative;
-	color: #F0FFFF;
-	font-size: 12px;
-	margin-right: 20rem;
-	cursor: pointer;
-}
-
-.foot-view{
-    position: absolute;
-	bottom: 0rem;
-	width: 1400rem;
-	height: 40rem;
-    margin: 10rem 20rem;
-}
-
-.view-bg{
-	border-radius: 20rem;
-	padding: 20rem;;
-	box-shadow: 0rem 4rem 16rem 0rem rgba(255,177,136,0.30);
-	backdrop-filter: blur(10.36rem);
-	color: azure;
-}
-
-.point-circle{
-    width: 240rem;
-    height: 240rem;
-    border-radius: 50%;
-    background-color: #ffaa5199;
-    border: 1rem solid #ff7151;
-    align-items: center;
-    justify-content: center;
-}
-
-.point-img{
-    width:60rem;
-    height: 60rem;
-}
-.menceng{
-    position: absolute;
-    top:0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
-.pointer{
-    cursor:pointer
-}
-.custom-content-marker{
-	position: relative;
-	width: 206px;
-	height: 206px;
-	/*border-radius: 50%;*/
-	/*border: var(--themeColor3) solid 1px;*/
-	/*background: var(--themeColor3_2);*/
-	box-sizing: border-box;
-}
-.custom-content-img{
-	width: 32px;
-	height: 32px;
-}

+ 2 - 2
src/components/newBottomCom/viewMask/viewMask.vue

@@ -137,10 +137,10 @@
 			this.screenWidth = window.screen.width;
 			this.screenHeight = window.screen.height;
 			if(window.innerWidth && window.screen.width){
-				screenWidth = Math.min(window.innerWidth,window.screen.width)
+				this.screenWidth = Math.min(window.innerWidth,window.screen.width)
 			}
 			if(window.innerHeight && window.screen.height){
-				screenHeight = Math.min(window.innerHeight,window.screen.height)
+				this.screenHeight = Math.min(window.innerHeight,window.screen.height)
 			}
 		},
 		// 页面被展示时执行

+ 8 - 1
src/utils/rem.js

@@ -8,7 +8,14 @@
 			width = Math.min(window.innerWidth,window.screen.width)
 		}
 		var currentFontSize = (width/designWidth)*baseFontSize;
-		document.querySelector('html').style.fontSize = currentFontSize+'px';
+		// document.querySelector('html').style.fontSize = currentFontSize+'px';
+		document.documentElement.style.fontSize = currentFontSize+'px';
+		// const vp = document.createElement('meta');
+		// vp.name = 'viewport';
+		// vp.content = `initial-scale=${currentFontSize * baseFontSize}, user-scalable=no, width=device-width`;
+		// var m = document.getElementsByTagName('meta')[0];
+		// m.parentNode.insertBefore(vp, m);
+		// alert(width+"-"+currentFontSize+'-'+document.documentElement.style.fontSize)
 	}
 	// 页面大小发生变化时
 	window.onresize = function(){