Selaa lähdekoodia

Merge branch 'Inspection' into online

wolyshaw 4 vuotta sitten
vanhempi
commit
c22bfd7c4b

+ 1 - 1
src/views/main/baseinfo/curriculum.vue

@@ -33,7 +33,7 @@ export default {
       return {
         columns: ['月份', data.title],
         rows: (data.indexMonthData || []).map(item => ({
-          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.activateNum,
+          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.percent,
         }))
       }
     }

+ 1 - 1
src/views/main/baseinfo/hr.vue

@@ -34,7 +34,7 @@ export default {
       return {
         columns: ['月份', data.title],
         rows: (data.indexMonthData || []).map(item => ({
-          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.activateNum,
+          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.percent,
         }))
       }
     }

+ 1 - 1
src/views/main/baseinfo/management.vue

@@ -35,7 +35,7 @@ export default {
       return {
         columns: ['月份', data.title],
         rows: (data.indexMonthData || []).map(item => ({
-          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.activateNum,
+          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.percent,
         }))
       }
     }

+ 1 - 1
src/views/main/baseinfo/operate.vue

@@ -34,7 +34,7 @@ export default {
       return {
         columns: ['月份', data.title],
         rows: (data.indexMonthData || []).map(item => ({
-          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.activateNum,
+          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.percent,
         }))
       }
     }

+ 2 - 2
src/views/main/baseinfo/student.vue

@@ -4,7 +4,7 @@
       <statistic-item v-for="(item, key) in items" :key="key" :class="{active: active === key}" @click="active = key">
         <span>{{item.title}}</span>
         <span>
-          <count-to :endVal="item.percent"/>
+          <count-to :endVal="item.percent"/>{{key === 'STUDENT_CONVERSION' ? '%' : ''}}
         </span>
       </statistic-item>
     </statistic>
@@ -33,7 +33,7 @@ export default {
       return {
         columns: ['月份', data.title],
         rows: (data.indexMonthData || []).map(item => ({
-          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.activateNum,
+          '月份': this.$helpers.dayjs(item.month).month() + 1 + '月', [data.title]: item.percent,
         }))
       }
     }