数据监测

src/views/echarts.vue

@@ -5,8 +5,105 @@
         <div class="pAHeader1">数据监测</div>
       </div>
       <hr />
-  
+      <!-- 顶部展示信息区开始 -->
+      <div class="topDataBlock">    
+        <div class="topData" style="background-image: linear-gradient(100deg, #3caef5 60%,#497df5);">
+        
+        </div>
+        <div class="topData" style="background-image: linear-gradient(100deg, #fcb871 60%,#f77c5f);">
+        
+        </div>
+        <div class="topData" style="background-image: linear-gradient(100deg, #3ce0ea 60%,#29bfa3);">
+        
+        </div>
+        <div class="topData" style="background-image: linear-gradient(100deg, #3caef5 60%,#497df5);">
+        
+        </div>
+        <div class="topData" style="background-image: linear-gradient(100deg, #fcb871 60%,#f77c5f);">
+        
+        </div>
+        
+      </div>
+      <!-- 顶部展示信息区结束 -->
+
+      <!-- 中部大饼区开始 -->
+     <div class="midBlock">
+        <div class="mid" style="background: ;"></div>
+        <div class="mid"></div>
+     </div>
+      <!-- 中部大饼区结束 -->
+
+      <!-- 柱状图区域开始 -->
+      <div class="histogram">
+        
+      </div>
+      <!-- 柱状图区域结束 -->
+
+      <!-- 底部表格区域开始 -->
+      <div class="tabTit">
+          <div>
+              <p>项目排名</p>
+          </div>
+      </div>
+
+      <div class="projectBlock" style="padding-bottom: 60px;">
+      <el-table
+      :data="tableData"
+      tooltip-effect="dark"
+      stripe
+      style="height: 500px;"
+      class="fontSize"
+      :header-cell-style="{ background: '#3867d6',color:'#fff' }"
+      >
      
+      <el-table-column
+        prop="title"
+        label="排名"
+        align="center"
+        min-width="25%">
+      </el-table-column>
+
+      <el-table-column
+        prop="tname"
+        label="项目名称"
+        align="center"
+        min-width="20%">
+      </el-table-column>
+
+      <el-table-column
+        prop="create_at"
+        label="项目负责人"
+        align="center"
+        min-width="25%">
+      </el-table-column>
+
+      <el-table-column
+        prop="create_at"
+        label="创客类型"
+        align="center"
+        min-width="25%">
+      </el-table-column>
+
+      <el-table-column
+        prop="create_at"
+        label="活跃度"
+        align="center"
+        min-width="25%">
+      </el-table-column>
+
+      <el-table-column
+        prop="create_at"
+        label="所属学院"
+        align="center"
+        min-width="25%">
+      </el-table-column>
+     
+    </el-table>
+    </div>
+<!-- 通知表格结束-->
+      <!-- 底部表格区域结束 -->
+
+
     </div>
   </template>
     
@@ -16,7 +113,7 @@
    
     data() {
       return {
-       
+        tableData: []
       };
     },
     methods: {
@@ -26,5 +123,42 @@
   </script>
     
 <style lang="less">
-  
+  .topDataBlock{
+    margin-top: 20px;
+    width: 95%;
+    height: 130px;
+    // background: #b65f5f;
+    display: flex;
+    justify-content:space-between;
+    align-items: center;
+    .topData{
+      width: 19%;
+      height: 94%;
+      background: #fff;
+      border-radius: 5px;
+    }
+  }
+  .midBlock{     //中部大饼
+    width: 95%;
+    height: 300px;
+    margin-top: 20px;
+    // background: #ce7070;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .mid{
+      height: 95%;
+      width: 49%;
+      background: #f3f6f7;
+    }
+  }
+
+  .histogram{       //柱状图
+    margin-top: 20px;
+    width: 95%;
+    height: 270px;
+    background: #f3f6f7;
+  }
+
+
 </style>

src/views/fundManage/makerfund.vue

@@ -156,7 +156,7 @@
                         <el-button type="primary" v-show="scope.row.state==0" style="width: 74px;" class="bt1" size="mini" @click="Audit(scope.row)">审核</el-button>
                         <el-button type="primary" disabled v-show="scope.row.state==1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" class="bt1" size="mini">已审核</el-button>
                         <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.id,scope.row.status)">申请表</el-button>
-                        <el-button type="primary" class="bt1" size="mini">完结</el-button>
+                        <el-button @click="endDialogShow" type="primary" class="bt1" size="mini">完结</el-button>
               </div>
           </template>
         </el-table-column>
@@ -401,7 +401,7 @@
       <div class="addDialogLogo">LOGO</div>
       <span class="deleteContent">确定完结?</span>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="confirmDel" >确认删除</el-button>
+        <el-button type="primary" @click="confirmEnd" >确认完结</el-button>
         <el-button @click="dialogVisible1=false"  >取消</el-button>
       </span>
     </el-dialog>
@@ -474,6 +474,27 @@
         }
       },
       methods:{
+        confirmEnd(){     //确定完结
+          let param={
+            uid:this.$store.state.userInfo.userid,
+          }
+          this.ajax
+              .post(this.$store.state.api+"/",param)
+              .then(res=>{
+                  // console.log(res);
+                  this.dialogVisible1=false;
+                  if (res.data) {
+                      this.$message.success('已完结')
+                    }else{
+                      this.$message.error('完结失败')
+                    }
+              },err=>{
+                console.log(err);
+              })
+        },
+        endDialogShow(){      //完结对话框显示
+            this.dialogVisible1=true
+        },
         handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
           // console.log(`当前页: ${val}`);
           this.table.currentPage=val
@@ -507,21 +528,21 @@
         edit(){
 
         },
-        handleSelectionChange(val) {
-          this.multipleSelection = val;
-        },
-        apply(){
+        // handleSelectionChange(val) {     //批量选择
+        //   this.multipleSelection = val;
+        // },
+        apply(){              //创客资金申请跳转界面
           this.$router.push('/makerfundApply')
         },
-        init(){
+        init(){         
           this.dialogVisible=false
         },
-        Audit(val){
+        Audit(val){          //显示审核对话框
           console.log(val);
           this.ProjectFundData=val;
           this.dialogVisible=true;
         },
-        details(Id){
+        details(Id){       //跳转详情页面
           this.$router.push(`/makerfundDetails?Id=${Id}`)
         }
       },