Merge branch 'feature-2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-front into feature-2.0

src/components/Mine.vue

@@ -3,24 +3,24 @@
     <!--    <div id="myChart" style="width: 100%;height: 200px;padding-top: 40px"></div>-->
     <div class="project-statistics">
       <el-card shadow="hover" v-if="showAcceptData" class="project-statistics-card">
-        <div class="project-statistics-card-title">已完成任务数量</div>
-        <div class="project-statistics-card-number">{{statisticData.finishedTaskCount || 0}}</div>
+        <div class="project-statistics-card-title">未完成任务数</div>
+        <div class="project-statistics-card-number">{{statisticData.unfinishedTaskCount || 0}}</div>
       </el-card>
       <el-card shadow="hover" v-if="showAcceptData" class="project-statistics-card">
-        <div class="project-statistics-card-title">未完成任务数量</div>
-        <div class="project-statistics-card-number">{{statisticData.unfinishedTaskCount || 0}}</div>
+        <div class="project-statistics-card-title">已完成任务数</div>
+        <div class="project-statistics-card-number">{{statisticData.finishedTaskCount || 0}}</div>
       </el-card>
       <el-card shadow="hover" v-if="showCreateData" class="project-statistics-card">
-        <div class="project-statistics-card-title">我的项目数量</div>
+        <div class="project-statistics-card-title">我的项目数</div>
         <div class="project-statistics-card-number">{{statisticData.myProjectCount || 0}}</div>
       </el-card>
       <el-card shadow="hover" v-if="showCreateData" class="project-statistics-card">
-        <div class="project-statistics-card-title">可接收项目数量</div>
-        <div class="project-statistics-card-number">{{statisticData.acceptableProjectCount || 0}}</div>
+        <div class="project-statistics-card-title">处理中项目数</div>
+        <div class="project-statistics-card-number">{{statisticData.handlingProjectCount || 0}}</div>
       </el-card>
       <el-card shadow="hover" v-if="showCreateData" class="project-statistics-card">
-        <div class="project-statistics-card-title">处理中项目数量</div>
-        <div class="project-statistics-card-number">{{statisticData.handlingProjectCount || 0}}</div>
+        <div class="project-statistics-card-title">可接收项目数</div>
+        <div class="project-statistics-card-number">{{statisticData.acceptableProjectCount || 0}}</div>
       </el-card>
     </div>
     <div class="mine-body" style="text-align: center;">

src/components/authen/AuthenticationManage.vue

@@ -289,7 +289,7 @@
         methods: {
             init () {
                 this.getHandlingAuthList()
-                this.getHandledAuthList()
+                // this.getHandledAuthList()
             },
             //获取所有未认证信息
             getHandlingAuthList () {

src/pages/Homepage/InstitutionCard.vue

@@ -53,11 +53,15 @@
           </div>
         </el-col>
         <el-col :span="8">
-          <div class="insititution-block">
-            <div class="single-title">
-              上海计算机软件技术开发中心
+          <div class="iscas-block insititution-block">
+            <img src="../../assets/img/shanghairuanjian.jpeg"
+                 alt="logo-institution"
+                 class="insititution-logo">
+            <div class="iscas-info">
+              <div class="iscas-title single-title" >
+                上海计算机软件技术开发中心
+              </div>
             </div>
-
           </div>
         </el-col>
         <el-col :span="7">