yuanyiming 2 rokov pred
rodič
commit
8bcb23a707

+ 15 - 9
src/App.vue

@@ -124,12 +124,14 @@
       color: #fff !important;
       display: flex;
       position: absolute;
-      top: -3px;
+      top: -6px;
       right: 0;
+      border-radius: 5px;
+      box-sizing: border-box;
+      padding: 8px 0;
       justify-content: center;
       font-size: 16px;
       width: 100px;
-      height: 30px;
       align-items: center;
     }
   }
@@ -143,6 +145,7 @@
         margin-bottom: 15px;
         display: flex;
         text-align: end;
+        border-radius: 5px;
         position: relative;
         justify-content: space-between;
         div{
@@ -161,11 +164,13 @@
           display: flex;
           position: absolute;
           right: 0;
-          top: -3px;
+          top: -4px;
+          box-sizing: border-box;
+          padding: 8px 0;
           justify-content: center;
           font-size: 16px;
           width: 100px;
-          height: 30px;
+          border-radius: 5px;
           align-items: center;
         }
     }
@@ -207,6 +212,7 @@
   .select{ //活动申请填写信息区域
           width: 100%;
           box-sizing: border-box;
+          margin-top: 16px;
           .label{   //label标签
             min-width: 98px;
             margin-right: 5px;
@@ -230,14 +236,14 @@
 
           .selectMid{
             display: flex;
-            margin-top: 20px;
+            margin-top: 16px;
 
             .selectLeft{
               width: 30%;
               display: flex;
               flex-direction: column;
               margin-right: 70px;
-              
+              // align-items: center;              
             }
             .selectRight{
               width: 29%;
@@ -305,10 +311,10 @@
         }
       }
   .baseBtn{     //所有页面底部按钮框
-    width: 100%;
+    width:100%;
     display: flex;
     justify-content: flex-end;
-    margin: 30px 0;
+    margin: 10px 0;
     .blockWidth{
       display: flex;
       justify-content:space-between;
@@ -392,7 +398,7 @@
       margin-top: 20px;
       display: flex;
       flex-wrap: wrap;
-      margin-bottom: 20px;
+      margin-bottom: 20px 0 10px;
       .selectsBlock{
         display: flex;
         margin-right: 30px;

+ 2 - 3
src/views/ProjectManagement1.vue

@@ -133,7 +133,7 @@
     <div class="pmProgressTextArea">
       <el-input
         type="textarea"
-        :rows="6"
+        :rows="5"
         class="textArea"
         resize="none"
         placeholder="请输入内容"
@@ -212,8 +212,7 @@
       width: 100%;
       display: flex;
       justify-content: flex-end;
-      margin-top: 30px;
-      margin-bottom: 10px;
+      margin-top: 20px;
       height: 50px;
       
       .backBtn{

+ 1 - 1
src/views/ProjectManagement2.vue

@@ -172,7 +172,7 @@
             text-align: left;
             font-size: 18px;
             font-weight: 550;
-            margin-bottom: 10px;
+            margin-bottom: 15px;
             color: #2387ff;
         }
         .PA2textAreaTit2{

+ 1 - 0
src/views/home.vue

@@ -104,6 +104,7 @@
               color: #333;
               text-align: center;
               margin-left: 20px;
+              border-radius: 5px;
             }
         }
     }

+ 12 - 6
src/views/makerActvityApplyMain.vue

@@ -71,20 +71,25 @@ import makerActvityApply2 from './makerActvityApply2.vue';
             padding-bottom: 30px;
             .left{
             width: 10%;
+            min-width: 130px;
             height: 800px;
             background: #32455b;
             display: flex;
+            border-radius: 5px;
             justify-content: center;
             margin-right: 2%;
             .leftTits{
                 display: flex;
                 flex-direction: column;
-                margin: 50px 0 0 15px;
+                margin: 47px 0 0 15px;
                 span{
                     cursor: pointer;
                     color: #fff;
                     margin-bottom: 30px;
                 }
+                span:hover{
+                    color: #ccc;
+                }
             }
             .sx{
                 margin-top: 50px;
@@ -96,7 +101,7 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 height: 10px;
                 background: #fff;
                 border-radius: 50px;
-                margin-left: -4px;
+                margin-left: -4.5px;
                 }
             }
             }
@@ -106,15 +111,16 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 box-sizing: border-box;
                 padding: 20px 20px;
                 margin-bottom: 30px; 
+                border-radius: 5px;
                 .pAHeader{
                     width: 85%;
                     display: flex;
                     justify-content:space-between;
                     .pAHeader1{
-                    width: 200px;
-                    font-weight: 600;
-                    font-size: 22px;
-                    flex-shrink: 0;
+                        width: 200px;
+                        font-weight: 600;
+                        font-size: 22px;
+                        flex-shrink: 0;
                     }
                     .pAHeader2{
                     padding-top: 15px;

+ 2 - 2
src/views/projectApplication.vue

@@ -160,7 +160,7 @@
       <el-dialog
         title="立项撤回提交"
         :visible.sync="dialogVisible1"
-        :modal="false"
+        :modal="true"
         width="700px"
         :close-on-click-modal="true"
         class="dialogWidth"
@@ -216,7 +216,7 @@
       <el-dialog
           title="立项审核"
           :visible.sync="dialogVisible"
-          :modal="false"
+          :modal="true"
           class="dialogWidth"
           :close-on-click-modal="true"
           :before-close="init">

+ 10 - 20
src/views/projectApplicationApply.vue

@@ -16,8 +16,8 @@
         
 
   <!-- 右边填写信息区域开始 -->
-        <div class="right">
-            <div id="one" class="vfpHeader">
+        <div id="one" class="right">
+            <div  class="vfpHeader">
               <div class="titleOne">项目立项申请</div>
               <div class="smallTitle">申请开放时间为2023年××月××日9:00 &nbsp;  截止时间为2023年××月××日18:00</div>
               <el-button @click="backBtn1" type="primary" size="mini">返回</el-button>
@@ -149,15 +149,17 @@
                 v-model="data.textarea">
               </el-input>
   <!-- 项目简介结束 -->
-
-  <!-- 结束按钮开始 -->
-            <div id="four" class="baseBtn">
+ <!-- 结束按钮开始 -->
+         <div id="four" class="baseBtn">
               <div class="blockWidth">
                 <el-button type="primary"  @click="backBtn1" size:small>上一步</el-button>
                 <el-button type="primary"  @click="backBtn" size:small>下一步</el-button>
               </div>
             </div>
   <!-- 结束按钮结束 -->
+
+
+ 
         </div>
   <!-- 右边填写信息区域结束 -->
 
@@ -165,8 +167,8 @@
       <el-dialog
           title="添加成员"
           :visible.sync="addMemberDialog"
-          :modal="false"
-          :close-on-click-modal="false"
+          :modal="true"
+          :close-on-click-modal="true"
           class="AddMember"
           :before-close="init">
 
@@ -196,7 +198,7 @@
             </div>
       </el-dialog>
       <!--添加成员dialog对话框结束 -->
-
+         
 
     </div>
   
@@ -270,13 +272,6 @@
     display: flex;
     justify-content: center;
 
-
-    .right{
-        width: 83%;
-        background: #fff;
-        box-sizing: border-box;
-        padding: 10px 20px;
-        margin-bottom: 20px;
         // 右边栏标题
         .projectApplicationApplypAHeader{
             width: 100%;
@@ -309,10 +304,5 @@
               align-items: center;
             }
         }
-       
-
-
-
-    }
 }
 </style>

+ 3 - 9
src/views/projectApplicationApply2.vue

@@ -103,24 +103,18 @@
       }
   </script>
   
-  <style lang="less" scoped>
+  <style lang="less">
   .projectApplicationApply2{
     margin-top: 30px;
     width: 100%;
     display: flex;
     justify-content: center;
-    
+    margin-bottom: 100px;
 
     .item {
       margin: 4px;
     }
-    .right{
-      width: 83%;
-      background: #fff;
-      box-sizing: border-box;
-      padding: 10px 20px;
-      margin-bottom: 20px;
-    }
+    
   }
 
 

+ 7 - 18
src/views/projectApplicationApply3.vue

@@ -133,7 +133,7 @@
               :data="data.tableData2"
               tooltip-effect="dark"
               stripe
-              height="250px"
+              height="320px"
               class="fontSize"
               :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
               >
@@ -298,10 +298,8 @@ import { VueEditor } from "vue2-editor";
 <style lang="less">
 //对话框样式
 
-.fundDetail{
-
-
-  .el-dialog__title{    //经费明细添加对话框,防止冲突
+.fundDetail{ //经费明细添加对话框,防止冲突
+  .el-dialog__title{    
     font-size: 22px;
     font-weight: 600;
   }
@@ -359,21 +357,12 @@ import { VueEditor } from "vue2-editor";
     }
   }
   .pAmid3{
-  margin-top: 30px;
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  box-sizing: border-box;
-  padding-bottom: 20px;
-
-  .right{
-    width: 83%;
-    background: #fff;
+    margin-top: 30px;
+    width: 100%;
+    display: flex;
+    justify-content: center;
     box-sizing: border-box;
-    padding: 10px 20px;
-    position: relative;
   }
-}
 
 .btn5{
   width: 130px;

+ 24 - 6
src/views/projectApplicationApplyMain.vue

@@ -243,10 +243,10 @@
   // 顶部导航区开始
   .PAheader{
     width: 90%;
-    height: 110px;
+    height: 70px;
     position: relative;
     top: 15px;
-    // border-radius: 10px;
+    border-radius: 5px;
     background: #ffffff;
     display: flex;
     justify-content: center;
@@ -254,8 +254,8 @@
  
       .PAheaderBlock{
         background: #4a83d0;
-        width: 14%;
-        height: 60%;
+        width: 16%;
+        height: 80%;
         border-radius: 10px;
         display: flex;
         justify-content: center;
@@ -265,7 +265,7 @@
         cursor: pointer;
       }
       .PAheaderBlock:nth-of-type(2){
-        margin: 5%;
+        margin: 10%;
       }
   }  
   // 顶部导航区结束
@@ -345,9 +345,23 @@
    //提交对话框结束
 
 
+   .right{
+        width: 83%;
+        background: #fff;
+        box-sizing: border-box;
+        padding: 10px 20px;
+        min-height: 740px;
+        margin-bottom: 60px;
+        border-radius: 5px;
+   }
+
+
+
+
   // 左边栏开始
   .left{
       width: 10%;
+      min-width: 110px;
       height: 740px;
       background: #32455b;
       display: flex;
@@ -355,10 +369,11 @@
       margin-right: 2%;
       box-sizing: border-box;
       padding: 0 10px;
+      border-radius: 5px;
       .leftTits{
         display: flex;
         flex-direction: column;
-        margin: 30px 0 0 10px;
+        margin: 27px 0 0 10px;
         div{
           width: 97px;
           color: #fff;
@@ -371,6 +386,9 @@
           }
         }
       }
+      div:hover{
+        color: #ccc;
+      }
       .sx{
         margin-top: 30px;
         margin-left: 8px;