瀏覽代碼

Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

qinzhipeng_v 5 年之前
父節點
當前提交
950a2e24dd

+ 1 - 2
src/views/Platform/presentation/ResultPageyL.vue

@@ -370,11 +370,10 @@ export default {
     margin: 1% 0;
   }
   .reportContent {
-    margin:20px 0;
+    padding: 2%;
   }
   .eleStyle {
     width: 80%;
-    padding: 0 2%;
     height:100%;
     display: inline-block;
     font-size: 14px;

+ 4 - 0
src/views/Platform/presentation/Templates/DailyReport.vue

@@ -193,6 +193,10 @@ export default {
   color: #333B4A;
   font-size: 16pt
 }
+.descr {
+  width: 78%;
+  margin: auto;
+}
 .descr::-webkit-scrollbar{
   width:0;
 }

+ 2 - 3
src/views/Platform/presentation/acceptTheReport.vue

@@ -176,14 +176,13 @@ export default {
 
 <style scoped lang="scss">
   .reportContent {
-    margin:20px 0;
+    padding: 2%;
   }
   .marage {
-    margin: 1.5% 0;
+    padding: 2%;
   }
   .eleStyle_one {
     width: 80%;
-    padding: 0 2%;
     height:100%;
     display: inline-block;
     font-size: 14px;

+ 7 - 2
src/views/Platform/presentation/testPresenyL.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 日报预览 -->
   <div>
-    <el-form :model="fromCreat" style="margin:3% 12%">
+    <el-form :model="fromCreat" class="from-creat">
       <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
         <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ fromCreat.reportName }}</span>
         <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ fromCreat.ownner }}</span>
@@ -98,7 +98,12 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+  .from-creat {
+    margin: 3% auto;
+    padding: 0 2%;
+    width: 100%;
+  }
   .titleStyle {
     color: #333B4A;
     margin: 1% 0 1% 0;