优化学情报告的显示

src/utils/fetch.js

@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
-      config.headers['token'] = '83C6DADDC9804239B226D5C86F156D58';
+      config.headers['token'] = 'EE215844495047A0ABFE62DEBF6D9CBA';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/utils/filter.js

@@ -430,6 +430,13 @@ const vueFilter = {
         } else if (value == 1) {
             return '已开通';
         }
+    },
+    replaceStr: (value) => {
+        if (value === '' || value === null) {
+            return '一'
+        } else {
+            return value
+        }
     }
 }
 export default vueFilter
\ No newline at end of file

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

@@ -35,17 +35,54 @@
         </el-radio-group>
         <div v-if="showRadioValue === 1" class="change-radio">{{ changeRadio[checkTime] }}</div>
         <el-table :data="tableDateTime" style="width: 100%">
-          <el-table-column prop="date" label="日期" align="center" min-width="100"></el-table-column>
-          <el-table-column prop="hospitalCount" label="应参与机构数" align="center"></el-table-column>
-          <el-table-column prop="hospitalJoinCount" label="已参与机构数" align="center"></el-table-column>
-          <el-table-column prop="doctorCount" label="应参与人数" align="center"></el-table-column>
-          <el-table-column prop="doctorJoinCount" label="已参与人数" align="center"></el-table-column>
-          <el-table-column prop="finishCount" :label="finishCountLabel" align="center"></el-table-column>
+          <el-table-column prop="date" label="日期" align="center" min-width="100">
+          </el-table-column>
+          <el-table-column prop="hospitalCount" label="应参与机构数" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.hospitalCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="hospitalJoinCount" label="已参与机构数" align="center">
+             <template slot-scope="scope">
+              <span>{{ scope.row.hospitalJoinCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="doctorCount" label="应参与人数" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.doctorCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="doctorJoinCount" label="已参与人数" align="center">
+             <template slot-scope="scope">
+              <span>{{ scope.row.doctorJoinCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="finishCount" :label="finishCountLabel" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.finishCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
 
-          <el-table-column v-if="gradeFlag[0] == true" prop="grade1Count" label="优秀" align="center"></el-table-column>
-          <el-table-column v-if="gradeFlag[1] == true" prop="grade2Count" label="良好" align="center"></el-table-column>
-          <el-table-column v-if="gradeFlag[2] == true" prop="grade3Count" label="及格" align="center"></el-table-column>
-          <el-table-column v-if="gradeFlag[3] == true" prop="grade4Count" label="不及格" align="center"></el-table-column>
+          <el-table-column v-if="gradeFlag[0] == true" prop="grade1Count" label="优秀" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.grade1Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="gradeFlag[1] == true" prop="grade2Count" label="良好" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.grade2Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="gradeFlag[2] == true" prop="grade3Count" label="及格" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.grade3Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="gradeFlag[3] == true" prop="grade4Count" label="不及格" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.grade4Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
           <div slot="empty">
             <div class="table-empty">
               <img src="../../assets/image/noData.png" />
@@ -58,7 +95,7 @@
             @size-change="handleSizeDwmy"
             @current-change="handleCurrentDwmy"
             :current-page="formDwmy.pageNo"
-            :page-sizes="[20, 30, 100 ,200]"
+            :page-sizes="[10]"
             :page-size="formDwmy.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="totalCount"
@@ -162,14 +199,42 @@
         <div v-if="showRadioValue === 1" class="change-radio">{{ changeRadio[checkTime] }}</div>
         <el-table :data="tableDateTime" style="width: 100%">
           <el-table-column prop="date" label="日期" align="center" min-width="100"></el-table-column>
-          <el-table-column prop="doctorCount" label="应参与人数" align="center"></el-table-column>
-          <el-table-column prop="doctorJoinCount" label="已参与人数" align="center"></el-table-column>
-          <el-table-column prop="finishCount" :label="finishCountLabel" align="center"></el-table-column>
+          <el-table-column prop="doctorCount" label="应参与人数" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.doctorCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="doctorJoinCount" label="已参与人数" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.doctorJoinCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="finishCount" :label="finishCountLabel" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.finishCount | replaceStr }}</span>
+            </template>
+          </el-table-column>
 
-          <el-table-column v-if="gradeFlag[0] == true" prop="grade1Count" label="优秀" align="center"></el-table-column>
-          <el-table-column v-if="gradeFlag[1] == true" prop="grade2Count" label="良好" align="center"></el-table-column>
-          <el-table-column v-if="gradeFlag[2] == true" prop="grade3Count" label="及格" align="center"></el-table-column>
-          <el-table-column v-if="gradeFlag[3] == true" prop="grade4Count" label="不及格" align="center"></el-table-column>
+          <el-table-column v-if="gradeFlag[0] == true" prop="grade1Count" label="优秀" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.grade1Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="gradeFlag[1] == true" prop="grade2Count" label="良好" align="center">
+             <template slot-scope="scope">
+              <span>{{ scope.row.grade2Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="gradeFlag[2] == true" prop="grade3Count" label="及格" align="center">
+             <template slot-scope="scope">
+              <span>{{ scope.row.grade3Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="gradeFlag[3] == true" prop="grade4Count" label="不及格" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.grade4Count | replaceStr }}</span>
+            </template>
+          </el-table-column>
           <div slot="empty">
             <div class="table-empty">
               <img src="../../assets/image/noData.png" />
@@ -182,7 +247,7 @@
             @size-change="handleSizeDwmy"
             @current-change="handleCurrentDwmy"
             :current-page="formDwmy.pageNo"
-            :page-sizes="[20, 30, 100 ,200]"
+            :page-sizes="[10]"
             :page-size="formDwmy.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="totalCount"
@@ -383,7 +448,7 @@ export default {
       totalRows: 0,
       formDwmy: {
         pageNo: 1,
-        pageSize: 20,
+        pageSize: 10,
       },
       formTable: {
         pageNo: 1,