yuanyiming 1 ano atrás
pai
commit
eabd9f7c4a

+ 33 - 102
src/components/markerFundWord.vue

@@ -87,7 +87,7 @@
             <tr>
                 <td colspan="2" :rowspan="wordData['member'].length+1"><p>项</p> <p>目</p> <p>组</p> <p>成</p> <p>员</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="10">项目分工</td>
             </tr>
-            <tr v-for="(item,index) in wordData.member" :key="index">
+            <tr style="position: relative;" v-for="(item,index) in wordData.member" :key="index">
                 <td colspan="2" style="border-left: none;">
                     <el-input
                         type="textarea"
@@ -531,91 +531,9 @@
       };
     </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;
-
-          tr{
-            position: relative;
-            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{
+    <style lang="less" scoped>
+  
+    #markerFundWord{
         width: 100%;
         display: flex;
         flex-direction: column;
@@ -653,28 +571,15 @@
         .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;
-
+              width: 80px;
               &:nth-child(1){
                 border-left:  solid 1px black;
               }
@@ -693,10 +598,21 @@
               }
               :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{
@@ -705,6 +621,21 @@
           flex-direction:column;
         }
     }
-        
+    .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>

+ 16 - 1
src/components/markeractivityWord.vue

@@ -615,5 +615,20 @@
           flex-direction:column;
         }
     }
-
+    .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>

+ 4 - 65
src/views/Word.vue

@@ -3,30 +3,15 @@
     <div v-loading="loading" id="test">
       <div id="word">
          <!-- 学生项目立项 -->
-        <studentProjectWord />   
+        <!-- <studentProjectWord />    -->
 
          <!-- 创客专项资金及项目申请表(个人创客) -->
         <!-- <markerFundWord/>         -->
 
          <!-- 创客专项资金及项目申请表(创客活动) -->
-        <!-- <markeractivityWord/>              -->
-        <!-- <studentProjectWord />  -->   <!-- 学生项目立项 -->
-        <markerFundWord/>         <!-- 创客专项资金及项目申请表(个人创客) -->
-        <markeractivityWord/>              <!--创客专项资金及项目申请表(创客活动)-->
+        <markeractivityWord/>
       </div>
-      <!-- <div>
-        <BeUpload
-          @getFile="getFile"
-          :navName="'测试按钮'"
-          :accept="accept"
-        ></BeUpload>
-      </div>
-      <div style="background: blue">
-        <div style="width:300px;height:100%">
-          <img src="../assets/img/sclogo3.png" alt="" style="width:300px;height:100%"/>
-        </div>
-      </div>
-      <el-button @click="Excel()">Excel文件测试按钮</el-button> -->
+     
     </div>
   </template>
   
@@ -48,53 +33,7 @@
       return {
         accept: "*",
         loading:false,
-        // wordContent:{
-        //   projectName:'',
-        //   radio: '',
-        //   checkList: [],
-        //   schoolRadio:'',
-        //   applyParsonRadio:'',
-        //   applyParsonName:'',
-        //   college:'',
-        //   tel:'',
-        //   beginTime:'',
-        //   endTime:'',
-        //   studentS:[
-        //     {name:'',collage:'',work:''},
-        //     {name:'',collage:'',work:''},
-        //     {name:'',collage:'',work:''},
-        //     {name:'',collage:'',work:''},
-        //     {name:'',collage:'',work:''},
-        //   ],
-        //   teacherS:[
-        //     {name:'',collage:'',work:''},
-        //     {name:'',collage:'',work:''},
-        //   ],
-        //   brief:'',
-        //   introduce:{
-        //     back:'',
-        //     innovate:'',
-        //     path:'',
-        //     scene:'',
-        //     worth:'',
-        //     team:'',
-        //     cost:'',
-        //     expectResults:'',
-        //     expectResultsTeacher:'',
-        //     expectConversion:'',
-        //     plan:''
-        //   },
-        //   fund:{
-        //     facility:'',
-        //     materials:'',
-        //     process:'',
-        //     assist:'',
-        //     authenticate:'',
-        //     match:'',
-        //     activity:'',
-        //     affair:''
-        //   }
-        // }
+
       };
     },
     methods: {