#

src/components/markerFundWord.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="MakerSpaceWord">
+    <div id="markerFundWord">
         <div id="title">
             <div class="school">深圳技师学院</div>
             <div class="wordTitle">创客专项资金及项目申请表（个人创客）</div>
@@ -622,8 +622,6 @@
         margin: 0;
         padding:100px;
         box-sizing:border-box;
-    
-    }
         #title{
             width: 100%;
             display: flex;
@@ -650,10 +648,61 @@
                 font-weight: bold;
             }
         }
-      .notes{
-        width: 100%;
-        display: flex;
-        flex-direction:column;
-      }
+        .table{
+            border: none;
+            border-top: solid 1px black;
+            // border-right:  solid 1px black;
+            // border-left:  solid 1px black;
+            .textLeft{
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: left !important;
+                font-size: 16px;
+              }
+            }
+
+            tr td{
+              border: none;
+              border-bottom: solid 1px black;
+              // border-left: solid 1px black;
+              border-right: solid 1px black;
+              height: 50px;
+              text-align: center;
+              line-height: 30px;
+              width: 80px !important;
+
+              &:nth-child(1){
+                border-left:  solid 1px black;
+              }
+              p{
+                font-weight: 600;
+              }
+              :deep(.el-select .el-input .el-select__caret){
+                display: none;
+              }
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+              :deep(.el-input__inner){
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+            }
+          }
+        .notes{
+          width: 100%;
+          display: flex;
+          flex-direction:column;
+        }
+    }
+        
     
     </style>

src/components/markeractivityWord.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="MakerSpaceWord">
+    <div id="MarkeractivityWord">
         <div id="title">
             <div class="school">深圳技师学院</div>
             <div class="wordTitle">创客专项资金及项目申请表（创客活动）</div>
@@ -524,87 +524,10 @@
       };
     </script>
       
-    <style lang="less" scope>
-            .textLeft{
-              .el-textarea__inner{
-                // padding: 0;
-                border: none ;
-                border-radius: 0px;
-                text-align: left !important;
-                font-size: 16px;
-              }
-            }
-          .table{
-            border: none;
-            border-top: solid 1px black;
-            // border-right:  solid 1px black;
-            // border-left:  solid 1px black;
-
+    <style lang="less" scoped>
 
-            tr td{
-              border: none;
-              border-bottom: solid 1px black;
-              // border-left: solid 1px black;
-              border-right: solid 1px black;
-              height: 50px;
-              text-align: center;
-              line-height: 30px;
-              width: 80px;
-              &:nth-child(1){
-                border-left:  solid 1px black;
-              }
-              p{
-                font-weight: 600;
-              }
-              .el-select .el-input .el-select__caret{
-                display: none;
-              }
-              .el-textarea__inner{
-                // padding: 0;
-                border: none ;
-                border-radius: 0px;
-                text-align: center;
-                font-size: 16px;
-              }
-              .el-input__inner{
-                border: none ;
-                border-radius: 0px;
-                text-align: center;
-                font-size: 16px;
-              }
-            }
-          }
-          .twoCol{
-            column-span: 2;
-          }
-          .operate{
-                right:-85px;
-                width:85px;
-                height: 50px;
-                display:flex;
-                justify-content:space-between;
-                align-items:center;
-                position:absolute;
-                .el-button{
-                  max-width:10px;
-                  display:flex;
-                  justify-content:center;
-                  align-items:center;
-                  margin-left:10px;
-                }
-              }
     
-              //在style里面添加此段代码即可
-     
-              input::-webkit-outer-spin-button,
-                  input::-webkit-inner-spin-button {
-                  -webkit-appearance: none;
-              }
-              input[type="number"]{
-                  -moz-appearance: textfield;
-              }
-    
-    #MakerSpaceWord{
+    #MarkeractivityWord{
         width: 100%;
         display: flex;
         flex-direction: column;
@@ -613,8 +536,6 @@
         margin: 0;
         padding:100px;
         box-sizing:border-box;
-    
-    }
         #title{
             width: 100%;
             display: flex;
@@ -641,10 +562,58 @@
                 font-weight: bold;
             }
         }
-      .notes{
-        width: 100%;
-        display: flex;
-        flex-direction:column;
-      }
-    
+        .table{
+            border: none;
+            border-top: solid 1px black;
+           
+            tr td{
+              border: none;
+              border-bottom: solid 1px black;
+              border-right: solid 1px black;
+              height: 50px;
+              text-align: center;
+              line-height: 30px;
+              width: 80px;
+              &:nth-child(1){
+                border-left:  solid 1px black;
+              }
+              p{
+                font-weight: 600;
+              }
+              :deep(.el-select .el-input .el-select__caret){
+                display: none;
+              }
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+              :deep(.el-input__inner){
+                border: none ;
+                
+                border-radius: 0px;
+                text-align: center;
+                font-size: 16px;
+              }
+
+            }
+            .textLeft{
+              :deep(.el-textarea__inner){
+                // padding: 0;
+                border: none ;
+                border-radius: 0px;
+                text-align: left !important;
+                font-size: 16px;
+              }
+            }
+          }
+        .notes{
+          width: 100%;
+          display: flex;
+          flex-direction:column;
+        }
+    }
+
     </style>

src/components/studentMakerProjectPreview.vue

@@ -665,7 +665,7 @@ export default {
         }
       }
     }
-    .member{
+    .member{          //学生老师成员样式
       display: flex;
       .memberLabel{
         // flex:1;
@@ -710,7 +710,7 @@ export default {
         }
       }
     }
-    .chapters{
+    .chapters{           //项目介绍样式
       display: flex;
       .chaptersLabel{
         // flex:1;
@@ -743,7 +743,7 @@ export default {
         }
       }
     }
-    .fund{
+    .fund{     //经费样式
       display: flex;
       .fundTitle{
         // flex:1;
@@ -797,7 +797,7 @@ export default {
             }
           }
         }
-        .fundData{
+        .fundData{       
           display: flex;
           .fundDataLabel{
             flex:1;
@@ -836,7 +836,7 @@ export default {
         }
       }
     }
-    .opinion{
+    .opinion{         //领导部门签字
       display: flex;
       .opinionLabel{
         // flex:1;

src/components/studentProjectWord.vue

@@ -1,5 +1,5 @@
 <template>
-<div id="MakerSpaceWord">
+<div id="studentProjectWord">
     <div id="title">
         <div class="school">深圳技师学院</div>
         <div class="wordTitle">学 生 创 客 项 目 申 报 书</div>
@@ -791,82 +791,8 @@ import {getNowDate} from '@/components/tool/Date.js'
   };
 </script>
   
-<style lang="less" scope>
-        .textLeft{
-          .el-textarea__inner{
-            // padding: 0;
-            border: none ;
-            border-radius: 0px;
-            text-align: left !important;
-            font-size: 16px;
-          }
-        }
-      .table{
-        border: none;
-        border-top: solid 1px black;
-        border-right:  solid 1px black;
-        tr td{
-          // padding: 10px;s
-          border: none;
-          border-bottom: solid 1px black;
-          border-left: solid 1px black;
-          height: 50px;
-          text-align: center;
-          line-height: 30px;
-          // min-width: 60%;
-          width: 14.3%;
-          p{
-            font-weight: 600;
-          }
-          .el-select .el-input .el-select__caret{
-            display: none;
-          }
-          .el-textarea__inner{
-            // padding: 0;
-            border: none ;
-            border-radius: 0px;
-            text-align: center;
-            font-size: 16px;
-          }
-          .el-input__inner{
-            border: none ;
-            border-radius: 0px;
-            text-align: center;
-            font-size: 16px;
-          }
-        }
-      }
-      .twoCol{
-        column-span: 2;
-      }
-      .operate{
-            right:-85px;
-            width:85px;
-            height: 50px;
-            display:flex;
-            justify-content:space-between;
-            align-items:center;
-            position:absolute;
-            .el-button{
-              max-width:10px;
-              display:flex;
-              justify-content:center;
-              align-items:center;
-              margin-left:10px;
-            }
-          }
-
-          //在style里面添加此段代码即可
- 
-          input::-webkit-outer-spin-button,
-              input::-webkit-inner-spin-button {
-              -webkit-appearance: none;
-          }
-          input[type="number"]{
-              -moz-appearance: textfield;
-          }
-
-#MakerSpaceWord{
+<style lang="less" scoped>
+#studentProjectWord{
     width: 100%;
     display: flex;
     flex-direction: column;
@@ -875,8 +801,6 @@ import {getNowDate} from '@/components/tool/Date.js'
     margin: 0;
     padding:100px;
     box-sizing:border-box;
-
-}
     #title{
         width: 100%;
         display: flex;
@@ -903,10 +827,54 @@ import {getNowDate} from '@/components/tool/Date.js'
             font-weight: bold;
         }
     }
-  .notes{
-    width: 100%;
-    display: flex;
-    flex-direction:column;
-  }
+    .table{
+        border: none;
+        border-top: solid 1px black;
+        border-right:  solid 1px black;
+        .textLeft{
+          :deep(.el-textarea__inner){
+            border: none ;
+            border-radius: 0px;
+            text-align: left !important;
+            font-size: 16px;
+          }
+        }
+        tr td{
+          border: none;
+          border-bottom: solid 1px black;
+          border-left: solid 1px black;
+          height: 50px;
+          text-align: center;
+          line-height: 30px;
+          width: 14%;
+          p{
+            font-weight: 600;
+          }
+          :deep(.el-select .el-input .el-select__caret){
+            display: none;
+          }
+          :deep(.el-textarea__inner){
+            // padding: 0;
+            border: none ;
+            border-radius: 0px;
+            text-align: center;
+            font-size: 16px;
+          }
+          :deep(.el-input__inner){
+            border: none ;
+            border-radius: 0px;
+            text-align: center;
+            font-size: 16px;
+          }
+        }
+    }
+    .notes{
+      width: 100%;
+      display: flex;
+      flex-direction:column;
+    }
+    
+}
+   
 
 </style>

src/views/Word.vue

@@ -2,9 +2,20 @@
     <!-- 测试上传组件 -->
     <div v-loading="loading" id="test">
       <div id="word">
+<<<<<<< HEAD
         <!-- <studentProjectWord />  -->   <!-- 学生项目立项 -->
         <markerFundWord/>         <!-- 创客专项资金及项目申请表（个人创客） -->
         <markeractivityWord/>              <!--创客专项资金及项目申请表（创客活动）-->
+=======
+         <!-- 学生项目立项 -->
+        <!-- <studentProjectWord />    -->
+
+         <!-- 创客专项资金及项目申请表（个人创客） -->
+        <!-- <markerFundWord/>         -->
+
+         <!-- 创客专项资金及项目申请表（创客活动） -->
+        <markeractivityWord/>             
+>>>>>>> 64f6569010a823bfa9365914959f0d0b05a7c23d
       </div>
       <!-- <div>
         <BeUpload
@@ -28,7 +39,7 @@
   import getExcel from "@/components/tool/getExcel";
   import studentProjectWord from '@/components/studentProjectWord.vue'
   import markerFundWord from '../components/markerFundWord.vue';
-import markeractivityWord from '../components/markeractivityWord.vue';
+  import markeractivityWord from '../components/markeractivityWord.vue';
   export default {
     components: {
       BeUpload,
@@ -100,7 +111,7 @@ import markeractivityWord from '../components/markeractivityWord.vue';
   };
   </script>
   
-  <style lang="less" scoped>
+  <style lang="less">
   #test{
     width: 100vw;
     display: flex;
@@ -110,4 +121,12 @@ import markeractivityWord from '../components/markeractivityWord.vue';
     width: 1350px;
     height: auto;
   }
+                  //去除input number样式
+                  input::-webkit-outer-spin-button,
+                input::-webkit-inner-spin-button {
+                -webkit-appearance: none;
+              }
+              input[type="number"]{
+                  -moz-appearance: textfield;
+              }
   </style>