merge master

src/assets/js/httpApi.js

@@ -566,7 +566,7 @@ var reqApis = function(){
 				Dict: {
 					baseInfo: {
 						"companyName": {name:"企业名称", must:true },
-						"incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
+						// "incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
 						"technicalField": {name:"所属技术领域", must:true, 'type':'select', key:'name', },
 
 						"entryDate": {
@@ -855,7 +855,7 @@ var reqApis = function(){
 							}
 						},
 						{
-							type: 'primary', icon: 'el-icon-folder-add', name: '导入企业经营信息', showYN: !Tools.isHighTech(), 'callback':function(){
+							type: 'primary', icon: 'el-icon-folder-add', name: '导入企业经营信息', 'callback':function(){
 								var m = this;
 								m.uploadView = qf.UI.popWindow({
 									cover:true,
@@ -1160,7 +1160,7 @@ var reqApis = function(){
 				Dict: {
 					baseInfo: {
 						"mentorName": {name:"导师姓名", must:true},
-						"incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
+						// "incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
 						"education": {name:"学历", must:true },
 						"graduationSchool": {name:"毕业学校",  },
 						"contactPhone": {name:"联系电话",  },

src/views/Screen/index.vue

@@ -100,37 +100,37 @@
 		</section>
 	  </div>
 	</div>
-</template>
+  </template>
   
-<script>
-import { Highchart } from "@/assets/js/chartTemplates.js";
-import cuAmap from "@/components/AMap";
-import request from "@/utils/request";
+  <script>
+  import { Highchart } from "@/assets/js/chartTemplates.js";
+  import cuAmap from "@/components/AMap";
+  import request from "@/utils/request";
   
   
-let resizeTimeout;
-window.addEventListener('resize', function() {
+  let resizeTimeout;
+  window.addEventListener('resize', function() {
 	  clearTimeout(resizeTimeout);
 	  resizeTimeout = setTimeout(function() {
 		location.reload();
 		  // 执行响应逻辑
 	  }, 200); // 200毫秒后执行
-});
+  });
   
-function getPxByRem(remValue){// 传入要转换的 rem 值
-// 获取 html 元素
-const htmlElement = document.documentElement;
+  function getPxByRem(remValue){// 传入要转换的 rem 值
+  // 获取 html 元素
+  const htmlElement = document.documentElement;
   
-// 获取 html 元素的 font-size
-const fontSize = parseFloat(getComputedStyle(htmlElement).fontSize);
+  // 获取 html 元素的 font-size
+  const fontSize = parseFloat(getComputedStyle(htmlElement).fontSize);
   
-// 将 rem 转换为 px
-let pxValue = remValue * fontSize;
+  // 将 rem 转换为 px
+  let pxValue = remValue * fontSize;
 	return pxValue
-}
+  }
   
   
-export default {
+  export default {
 	data() {
 	  return {
 		// isTechUser: localStorage.getItem('groupIdByloginType')*1===2,
@@ -867,39 +867,39 @@ export default {
 		});
 	  },
 	},
-};
-</script>
+  };
+  </script>
   
-<style lang="scss" scope>
-.amap-icon {
+  <style lang="scss" scope>
+  .amap-icon {
 	// 高德地图样式覆盖
 	img {
 	  width: 0.52rem !important;
 	  height: 0.52rem !important;
 	}
-}
+  }
   
-#container {
+  #container {
 	height: 100%;
 	width: 100%;
 	background-color: #29557a;
-}
-@font-face {
+  }
+  @font-face {
 	font-family: "diget year";
 	src: url("~@/assets/fonts/DS-Digital.ttf");
-}
-@font-face {
+  }
+  @font-face {
 	font-family: "ShuHei";
 	src: url("~@/assets/fonts/AlimamaShuHeiTi-Bold.ttf");
-}
-.font_digit {
+  }
+  .font_digit {
 	font-family: diget year;
-}
-.font_ShuHei {
+  }
+  .font_ShuHei {
 	font-family: ShuHei;
-}
+  }
   
-.Screen {
+  .Screen {
 	position: relative;
 	height: 100%;
 	width: 100%;
@@ -1890,10 +1890,10 @@ export default {
   
 	  //a{text-decoration:none;}
 	}
-}
+  }
   
-/* 登录 */
-.login-ctn {
+  /* 登录 */
+  .login-ctn {
 	user-select: none;
 	background: no-repeat top left url("/static/images/login-min.jpg");
 	background-size: 100% 100%;
@@ -2005,18 +2005,18 @@ export default {
 		}
 	  }
 	}
-}
+  }
   
-@keyframes rotate {
+  @keyframes rotate {
 	0% {
 	  transform: rotate(0);
 	}
 	100% {
 	  transform: rotate(360deg);
 	}
-}
+  }
   
-@keyframes loader-1-outter {
+  @keyframes loader-1-outter {
 	0% {
 	  -webkit-transform: rotate(0deg);
 	  transform: rotate(0deg);
@@ -2025,8 +2025,8 @@ export default {
 	  -webkit-transform: rotate(360deg);
 	  transform: rotate(360deg);
 	}
-}
-@keyframes loader-1-inner {
+  }
+  @keyframes loader-1-inner {
 	0% {
 	  -webkit-transform: rotate(0deg);
 	  transform: rotate(0deg);
@@ -2035,5 +2035,6 @@ export default {
 	  -webkit-transform: rotate(-360deg);
 	  transform: rotate(-360deg);
 	}
-}
-</style>
\ No newline at end of file
+  }
+  </style>
+