文案 颜色值问题

src/utils/filter.js

@@ -236,7 +236,7 @@ const vueFilter = {
     let s = parseInt(value),m = 0, h = 0;//秒，分，小时
 	if(s==NaN){//错误error
 		return '';
-	}
+    }
 	if(s > 60) { 
 		m = parseInt(s/60); 
 		s = parseInt(s%60); 
@@ -320,17 +320,23 @@ const vueFilter = {
   joinFlagValue: (value) => {
     if(value == 1) {
         return '已参与';
-    } else if(value == 2) {
+    } else if(value == 2 || value == 0) {
         return '未参与';
     } 
   },
   finishFlagValue: (value) => {
     if(value == 1) {
         return '已完成';
-    } else if(value == 2) {
+    } else if(value == 2 || value == 0) {
         return '未完成';
     } 
   },
+  departmentNameValue: (value) => {
+    if(value == '') {
+        return '-';
+    } 
+    return value;
+  },
   certGradeValue: (value) => {
     if(value == 1) {
         return '优秀';

src/utils/learning/chartData.js

@@ -364,8 +364,8 @@ export function educationEffect(xAxisData, seriesBefore, seriesAfter) {
       formatter: function (params) {
         let relVal = params[0].name + "";
         let divList = [];
-        divList[0] = "<div style='background: #5D7092;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
-        divList[1] = "<div style='background: #FFB01B;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
+        divList[0] = "<div style='background: #FEBB3C;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
+        divList[1] = "<div style='background: #39AF9A;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
         for (let j = 0; j <= params.length - 1; j++) {
           relVal +=
             "<br/>" + divList[j] +
@@ -454,8 +454,8 @@ export function knowledgeEffect(xAxisData, seriesBefore, seriesAfter) {
       formatter: function (params) {
         let relVal = params[0].name + "";
         let divList = [];
-        divList[0] = "<div style='background: #5D7092;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
-        divList[1] = "<div style='background: #FFB01B;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
+        divList[0] = "<div style='background: #FFB01B;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
+        divList[1] = "<div style='background: #5D7092;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
         for (let j = 0; j <= params.length - 1; j++) {
           relVal +=
             "<br/>" + divList[j] +

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

@@ -369,6 +369,7 @@ export default {
   // background: #fff;
   overflow: hidden;
   // padding: 10px;
+  overflow-x: auto;
   .header-title {
     padding: 10px 12px;
     font-size: 12px;

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

@@ -104,7 +104,7 @@
             <el-radio-button label="3">按参与人数排名</el-radio-button>
           </el-radio-group>
         </div>
-        <div v-if="showCertificateChart === true">
+        <div v-if="showCertificateChart === true" class="overflow-chart">
           <div class="chartCert" id="certificateChart" ref="certificateChart"></div>
         </div>
         <div v-if="showCertificateChart === false" class="empty-img">
@@ -112,7 +112,7 @@
         </div>
         <div class="spacing"></div>
         <div class="chart-title">在线培训完成时长情况</div>
-        <div v-if="showDurationChart === true">
+        <div v-if="showDurationChart === true" class="overflow-chart">
           <div class="chartDuration" id="durationChart" ref="durationChart"></div>
         </div>
         <div v-if="showDurationChart === false" class="empty-img">
@@ -200,7 +200,11 @@
                 <span>{{ scope.row.sex  | sexValue}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="departmentName" label="科室" align="center"></el-table-column>
+            <el-table-column prop="departmentName" label="科室" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.departmentName | departmentNameValue}}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="joinFlag" label="是否参与项目" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.joinFlag  | joinFlagValue}}</span>
@@ -255,7 +259,7 @@
                 <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"></el-table-column>
             <el-table-column prop="score" label="成绩" align="center"></el-table-column>
             <el-table-column prop="learnTime" min-width="150" label="学习时长" align="center">
               <template slot-scope="scope">

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

@@ -10,7 +10,7 @@
     </div>
     <div class="spacing"></div>
       <div class="chart-title">不同学历完成项目前后正确率对比</div>
-    <div v-if="showChartEdu === true">
+    <div v-if="showChartEdu === true" class="overflow-chart">
       <div class="chartEdu" ref="education"></div>
     </div>
     <div v-if="showChartEdu === false" class="empty-img">
@@ -19,7 +19,7 @@
     <div class="chart-remarks">注：本报表数据来源仅仅统计同时包含摸底考和正式考的课程培训。</div>
     <div class="spacing"></div>
     <div class="chart-title">培训前后知识点掌握情况</div>
-    <div v-if="showChartLearn === true">
+    <div v-if="showChartLearn === true" class="overflow-chart">
       <div class="chartLearn" ref="learning"></div>
     </div>
     <div v-if="showChartLearn === false" class="empty-img">

src/views/learning/name-list.vue

@@ -238,7 +238,7 @@ export default {
           },
           {
             value: 1,
-            label: "已经参"
+            label: "已参与"
           },
         ]
       }