数据空处理 文案问题

src/utils/filter.js

@@ -233,6 +233,9 @@ const vueFilter = {
     return avgTime;
   },
   learnTimeValue: (value) => {
+    if(value === null || value === '') {
+        return '-';
+    }
     let s = parseInt(value),m = 0, h = 0;//秒，分，小时
 	if(s==NaN){//错误error
 		return '';
@@ -314,7 +317,7 @@ const vueFilter = {
     } else if(value == 2) {
         return '女';
     } else if(value == 0) {
-        return '未知';
+        return '-';
     }
   },
   joinFlagValue: (value) => {
@@ -337,7 +340,7 @@ const vueFilter = {
     } 
     return value;
   },
-  scoreValue: (value) => {
+  nullOfValue: (value) => {
     if(value === null || value === '') {
         return '-';
     } 

src/utils/learning/chartData.js

@@ -20,7 +20,7 @@ export function dustributeOption(legendData, seriesData) {
     legend: {
       orient: "horizontal",
       top: "",
-      left: "0%",
+      // left: "0%",
       data: legendData
     },
     series: [

src/views/layout/slidebar.vue

@@ -139,7 +139,7 @@
                 index: 'report-list'
               },
               {
-                title: '导出下载',
+                title: '任务列表',
                 icon: 'el-icon-document',
                 index: 'export-download'
               }

src/views/learning/item-crowd-analysis.vue

@@ -8,6 +8,7 @@
     <div v-show="!showData" class="empty">
       <p>"没有相关数据，请重新选择查询范围"</p>
     </div>
+    <div>
     <div class="chart" v-show="showData">
       <div v-if="showEducation === true">
         <div class="item" id="education" ref="education"></div>
@@ -24,6 +25,8 @@
         <img src="../../assets/image/noData.png" />
       </div>
     </div>
+    </div>
+    <div>
     <div class="chart" v-show="showData">
       <div class="item">
         <div class="title">人员性别分布</div>
@@ -47,6 +50,7 @@
         <img src="../../assets/image/noData.png" />
       </div>
     </div>
+    </div>
   </div>
 </template>
 <script>

src/views/learning/item-data-all.vue

@@ -82,6 +82,7 @@
       </div>
       <div class="spacing"></div>
       <div class="chart-title">证书级别按学历发布情况</div>
+      <div >
       <div v-if="showRecordChart === true" class="chart-recordChart">
         <div class="recordChart" id="recordChart" ref="recordChart"></div>
         <div class="data-text">
@@ -90,6 +91,7 @@
           </div>
         </div>
       </div>
+      </div>
       <div v-if="showRecordChart === false" class="empty-img">
         <img src="../../assets/image/noData.png" />
       </div>
@@ -220,10 +222,14 @@
                 <span>{{ scope.row.certGrade | certGradeValue}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="finishDate" label="完成项目日期" align="center"></el-table-column>
+            <el-table-column prop="finishDate" label="完成项目日期" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.finishDate | nullOfValue}}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="score" label="成绩" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.score | scoreValue}}</span>
+                <span>{{ scope.row.score | nullOfValue}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="learnTime" min-width="150" label="学习时长" align="center">
@@ -266,10 +272,14 @@
                 <span>{{ scope.row.certGrade | certGradeValue}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="finishDate" label="完成项目日期" align="center"></el-table-column>
+            <el-table-column prop="finishDate" label="完成项目日期" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.finishDate | nullOfValue}}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="score" label="成绩" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.score | scoreValue}}</span>
+                <span>{{ scope.row.score | nullOfValue}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="learnTime" min-width="150" label="学习时长" align="center">

src/views/learning/item-learning-effect.vue

@@ -25,7 +25,7 @@
     <div v-if="showChartLearn === false" class="empty-img">
       <img src="../../assets/image/noData.png" />
     </div>
-    <div class="chart-remarks">注：本报表数据来源仅包括有摸底考的课程培训。</div>
+    <div class="chart-remarks">注：本报表数据来源仅仅统计同时包含摸底考和正式考的课程培训。</div>
   </div>
 </template>