Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/components/markerFundWord.vue

@@ -525,6 +525,8 @@
         },
         mounted(){
           this.getProjectDepartmentData()
+
+          console.log(1)
         }
       };
     </script>

src/components/studentProjectWord.vue

@@ -846,7 +846,7 @@ import {getNowDate} from '@/components/tool/Date.js'
           height: 50px;
           text-align: center;
           line-height: 30px;
-          width: 14%;
+          width: 14.3%;
           p{
             font-weight: 600;
           }
@@ -867,6 +867,7 @@ import {getNowDate} from '@/components/tool/Date.js'
             font-size: 16px;
           }
         }
+        
     }
     .notes{
       width: 100%;
@@ -876,5 +877,21 @@ import {getNowDate} from '@/components/tool/Date.js'
     
 }
    
+.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>

src/views/Word.vue

@@ -2,6 +2,14 @@
     <!-- 测试上传组件 -->
     <div v-loading="loading" id="test">
       <div id="word">
+         <!-- 学生项目立项 -->
+        <studentProjectWord />   
+
+         <!-- 创客专项资金及项目申请表（个人创客） -->
+        <!-- <markerFundWord/>         -->
+
+         <!-- 创客专项资金及项目申请表（创客活动） -->
+        <!-- <markeractivityWord/>              -->
         <!-- <studentProjectWord />  -->   <!-- 学生项目立项 -->
         <markerFundWord/>         <!-- 创客专项资金及项目申请表（个人创客） -->
         <markeractivityWord/>              <!--创客专项资金及项目申请表（创客活动）-->
@@ -110,12 +118,12 @@
     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;
-              }
+    //去除input number样式
+  input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+  }
+  input[type="number"]{
+      -moz-appearance: textfield;
+  }
   </style>