修改

src/App.vue

@@ -2,6 +2,7 @@
   <div class="page">
       <el-header v-if="$route.meta.isAuth">
         <img src="./assets/img/sclogo3.png" alt="">
+        <!-- <img src="@/assets/img/szjsxy.png" alt=""> -->
         <div class="homeExitContent">
           <div>{{ $store.state.userInfo.tname }}</div>
           <div class="homeExit" @click="homeExit">退出</div>
@@ -45,7 +46,7 @@
     width: 100%;
     background: #e6eaf0;
     img{
-      height: 40px;
+      height: 60px;
     }
     .el-header {    //顶部退出区域
         background-color: #3d67bc;
@@ -54,6 +55,7 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+        min-height: 70px;
         .homeExitContent{
           color: #fff;
           display: flex;

src/views/echarts/components/HorizontalChart.vue

@@ -42,11 +42,11 @@ import * as echarts from 'echarts';
                   axisLabel:{
                     inside:true,
                     margin:4,
-                    formatter: function (value) {
-                      const vl = Math.floor(value.length/2);
-                      let newText = value.slice(0,vl)+'\n'+value.slice(vl)
-                      return newText;
-                  },
+                  //   formatter: function (value) {
+                  //     const vl = Math.floor(value.length/2);
+                  //     let newText = value.slice(0,vl)+'\n'+value.slice(vl)
+                  //     return newText;
+                  // },
                   color:function(value,index){
                     const textWidth = option['dataset']['source'][option['dataset']['source'].length-1][1]/6/2;
                     const vl = option['dataset']['source'][index+1][1]

src/views/echarts/components/topData.vue

@@ -1,5 +1,12 @@
 <template>
-    <div class="topDataBlock">    
+    <div class="topDataBlock">
+      <div class="topData">
+          <div class="DataTitle">学院目前资金总预算</div>
+          <div class="topData_value">
+            <span>{{ data.budget }}</span>
+            <span>（千万）</span>
+          </div>
+        </div>  
         <div class="topData">
           <div class="DataTitle">创客项目人数</div>
           <div class="topData_value">
@@ -19,13 +26,6 @@
             <span>{{ data.activity }}</span>
           </div>
         </div>
-        <div class="topData">
-          <div class="DataTitle">学院目前资金总预算</div>
-          <div class="topData_value">
-            <span>{{ data.budget }}</span>
-            <span>（千万）</span>
-          </div>
-        </div>
         <div class="topData">
           <div class="DataTitle">已支出预算</div>
           <div class="topData_value">

src/views/home.vue

@@ -65,7 +65,7 @@
         height:  calc(100% - 60px);
         width: 100%;
       .homeBody{
-          margin: 20px 20px;
+          margin: 20px 20px 30px 20px;
           .aside{
               background-color: #fff;
               color: #909399;

src/views/projectManage/ProjectManagement.vue

@@ -97,27 +97,27 @@
             <div class="classBlock2">{{ item.title }}</div>
             <div class="classBlock3">
               <div><span style="color: #000;">创建日期:</span>{{ item.time }}</div>
-              <!-- <div>{{ item.pro_leader }}</div>
-              <div>{{ item.name }}</div> -->
             </div>
-            <div class="classBlock3 classBlock4">
+            <div class="classBlock3">
               <div><span style="color: #000;">修改日期:</span>{{ item.updateTime}}</div>
-              <!-- <div style="color:#9e9e9e">{{ item.typeName }}</div>
-              <div>项目编号{{ index }}</div> -->
             </div>
         </div>
 
             <div class="classBlockBtn">
-              <el-button type="primary" class="bt1" size="mini" @click="scheduleDetail(item.courseId)">进度详情</el-button>
+              <span @click="scheduleDetail(item.courseId)">进度详细</span>
+              <span @click="fundStatus(item.courseId)">资金情况</span>
+              <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span>
+              <span v-show="item.isupload==1 && (item.endFile==null)"  @click="finish(item.courseId,item.title)">结项</span>
+              <span v-show="item.isupload==1 && (item.endFile!=null)"  @click="finish(item.courseId,item.title)" >修改结项</span>
+              <span v-show="item.isupload==2" style="color: gray;cursor: no-drop;">已结项</span>
+              <!-- <el-button type="primary" class="bt1" size="mini" @click="scheduleDetail(item.courseId)">进度详情</el-button>
               <el-button type="primary" class="bt1" size="mini" @click="fundStatus(item.courseId)">资金情况</el-button>
 
               <el-button type="primary" v-show="item.isupload==0"  class="bt1" @click="$message.error('请先进行项目立项审核')" size="mini">结项</el-button>
               
-              <!-- <el-button type="primary" v-show="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button> -->
-
               <el-button type="primary" v-show="item.isupload==1 && (item.endFile==null)" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
               <el-button type="primary" v-show="item.isupload==1 && (item.endFile!=null)" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">修改结项</el-button>
-              <el-button type="primary" v-show="item.isupload==2" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"   size="mini">已结项</el-button>
+              <el-button type="primary" v-show="item.isupload==2" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"   size="mini">已结项</el-button> -->
                           
             </div>
        
@@ -207,7 +207,7 @@ import beUpload from '../../components/tool/beUpload'
           items:[],      //项目列表数据
           table:{         // 分页数据
             total:0,
-            packageSize:8,
+            packageSize:5,
             currentPage:1
           }, 
           progress:{     //进度条
@@ -390,9 +390,10 @@ import beUpload from '../../components/tool/beUpload'
           position: relative;
           margin-right: 20px;
           margin-bottom: 5px;
-          width: 320px;height: 260px;
+          width: 250px;
+          height: 300px;
           background-color: rgb(255, 255, 255);
-          box-shadow: 1px 2px 3px #ccc;
+          // box-shadow: 1px 2px 3px #ccc;
           border: 1px solid #ccc;
           border-radius: 5px;
           display: flex;
@@ -414,7 +415,8 @@ import beUpload from '../../components/tool/beUpload'
             // font-size: 14px;
           }
           img{
-            width: 100%;height: 125px;
+            width: 100%;
+            height: 140px;
             object-fit: cover;
           }
 
@@ -423,13 +425,16 @@ import beUpload from '../../components/tool/beUpload'
             margin-top: 0px;
             box-sizing: border-box;
             padding: 0 5px;
-           
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-around;
             .classBlock2{   //项目名称
               margin-left: 5px;
               margin-bottom: 4px;
               margin-top: 4px;
               text-align: left;
-              font-size: 18px;
+              font-size: 16px;
             }
             .classBlock3{   //学校、姓名
               box-sizing: border-box;
@@ -453,9 +458,20 @@ import beUpload from '../../components/tool/beUpload'
             display: flex;
             flex: 1;
             width: 100%;
-            justify-content: center;
+            max-height: 40px;
+            justify-content: space-around;
             align-items: center;
             background-color:#F5F4F4 ;
+            span{
+              font-size: 14px;
+              color: black;
+              transition: .1s;
+              cursor: pointer;
+              &:hover{
+                color: #79a2ff;
+              }
+            }
+
             .bt1{
               width: 100px;
               height: 35px;