Browse Source

Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

xuzhiheng 5 years ago
parent
commit
f553719689

+ 1 - 0
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/previewData.css

@@ -181,6 +181,7 @@ body{
     top: 0px;
     left: 0px;
     opacity: 0.5;
+	margin-top: 55px;
 }
 .fimg{
 	opacity: 0;

+ 1 - 9
src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -8,17 +8,9 @@
 		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css" />
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/preview_data.css">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/previewData.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/previewData.css?v={{Msg "seo" "version"}}1">
 		<script src="https://cdn.bootcss.com/js-polyfills/0.1.42/polyfill.min.js"></script>
 		<style>
-			@font-face {
-				font-style: normal;
-			    font-weight: normal;
-				font-family: 'MyNewFont';
-				src: url('/jyapp/fonts/ttf/{{.T.ttf}}.eot');  /* IE 9 - 11 */
-    			src: url('/jyapp/fonts/ttf/{{.T.ttf}}.eot?#iefix') format('embedded-opentype'), /* IE Fix for IE 6-8*/
-				url("/jyapp/fonts/ttf/{{.T.ttf}}.ttf") format("truetype");  /* chrome、firefox、opera、Safari, Android, iOS 4.2+ */
-			}
 			body .loading_ {
 			    height: 100%;
 			    width: 100%;

+ 2 - 1
src/web/staticres/dataExport/css/previewData.css

@@ -180,7 +180,8 @@ body{
     position: absolute;
     top: 0px;
     left: 0px;
-    opacity: 0.5;
+    opacity: 0.5;    
+	margin-top: 55px;
 }
 .fimg{
 	opacity: 0;