1

src/views/echarts/components/topData.vue

@@ -8,10 +8,10 @@
           </div>
         </div>   -->
         <div class="topData">
-          <div class="DataTitle">创客项目人数</div>
+          <div class="DataTitle">创客项目人数<span style="font-size: 14px;position: relative;top: 5px;">（人）</span></div>
           <div class="topData_value">
             <span>{{ data.people }}</span>
-            <span>（人）</span>
+            
           </div>
         </div> 
         <div class="topData">
@@ -29,10 +29,10 @@
           </div>
         </div> 
         <div class="topData">
-          <div class="DataTitle">已支出预算</div>
+          <div class="DataTitle">已支出预算<span style="font-size: 14px;position: relative;top: 5px;">（万）</span></div>
           <div class="topData_value">
             <span>{{ data.isPay }}</span>
-            <span>（万）</span>
+            <!-- <span>（万）</span> -->
           </div>
         </div> 
         <!-- <div class="topData">
@@ -78,11 +78,14 @@
     height: 130px;
     // background: #b65f5f;
     display: flex;
-    justify-content:space-between;
+    // justify-content:space-between;
+    // margin-right: 30px;
+    justify-content: flex-start;
     align-items: center;
     .topData{
       width: 19%;
       height: 94%;
+      margin-right: 3%;
       border-radius: 5px;
       box-sizing: border-box;
       position: relative;

src/views/echarts/echarts.vue

@@ -182,6 +182,7 @@
       height: 95%;
       width: 49%;
       padding: 20px;
+      padding-left: 0;
       box-sizing: border-box;
       background: #f3f6f7;
       overflow: hidden;
@@ -191,7 +192,7 @@
   .histogram{       //柱状图
     margin-top: 20px;
     box-sizing: border-box;
-    padding: 20px;
+    // padding: 20px;
     min-width: 90%;
     max-width: 100%;
     height: 400px;

src/views/projectApply/projectApplication.vue

@@ -240,70 +240,70 @@
 
               <el-button
                 type="primary"
-                v-show="scope.row.isupload == 0"
+                v-show="scope.row.isupload == 0 && $store.state.userInfo.type!=0"
                 @click="audit(scope.row, 0)"
                 >提交</el-button
               >
               <!--0申请人审核 -->
               <el-button
                 type="primary"
-                v-show="scope.row.isupload == 1"
+                v-show="scope.row.isupload == 1&& $store.state.userInfo.type!=0"
                 class="disa"
                 >已提交</el-button
               >
               <el-button
                 type="primary"
-                v-show="scope.row.isupload == 2"
+                v-show="scope.row.isupload == 2&& $store.state.userInfo.type!=0"
                 class="disa"
                 size="mini"
                 >已审核</el-button
               >
               <el-button
                 type="primary"
-                v-show="scope.row.isupload == 3"
+                v-show="scope.row.isupload == 3&& $store.state.userInfo.type!=0"
                 class="disa"
                 size="mini"
                 >待结项</el-button
               >
               <el-button
                 type="primary"
-                v-show="scope.row.isupload == 4"
+                v-show="scope.row.isupload == 4&& $store.state.userInfo.type!=0"
                 class="disa"
                 size="mini"
                 >已结项</el-button
               >
 
               <el-button
-                v-show="scope.row.isupload == 0"
+                v-show="scope.row.isupload == 0 && $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
-                >审核1</el-button
+                >管理员审核</el-button
               >
               <!--1管理员审核 -->
               <el-button
-                v-show="scope.row.isupload == 1"
+                v-show="scope.row.isupload == 1 && $store.state.userInfo.type==0"
                 type="primary"
                 size="mini"
                 @click="audit(scope.row, 1)"
-                >审核1</el-button
+                >管理员审核</el-button
               >
               <el-button
-                v-show="scope.row.isupload == 2"
+                v-show="scope.row.isupload == 2 && $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
                 >已审核1</el-button
               >
               <el-button
-                v-show="scope.row.isupload == 3"
+                v-show="scope.row.isupload == 3&& $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
                 >待结项1</el-button
               >
               <el-button
-                v-show="scope.row.isupload == 4"
+                v-show="scope.row.isupload == 4&& $store.state.userInfo.type==0"
                 type="primary"
                 class="disa"
                 size="mini"
@@ -780,6 +780,8 @@ export default {
     //跳转到此页面立刻获取数据
     this.getData(); //获取表格数据
     // this.getUser();
+    console.log(this.$store.state.userInfo.type);
+
   },
 };
 </script>