Merge branch '0526ResetUnit' into 03/03GRADE

src/App.vue

@@ -120,6 +120,10 @@ input[type="number"] {
 .el-select {
   width: 180px !important;
 }
+
+.el-input__count{
+  background-color: transparent!important;
+}
 .multiple.el-select {
   width: 180px !important;
 }

src/views/main/baseinfo/business.vue

@@ -20,7 +20,7 @@
         @click="active = key"
       >
         <span>
-          {{ item.title }}
+          {{ item.title+'(%)'}}
           <el-tooltip
             v-if="item.desc"
             :content="item.desc"
@@ -33,7 +33,7 @@
             />
           </el-tooltip>
         </span>
-        <span> <count-to :endVal="item.percent" :decimals="2" />% </span>
+        <span> <count-to :endVal="item.percent" :decimals="2" /></span>
       </statistic-item>
     </statistic>
     <!--   :data-zoom="dataZoom" -->

src/views/main/baseinfo/curriculum.vue

@@ -18,7 +18,7 @@
         @click="active = key"
       >
         <span>
-          {{ item.title }}
+          {{ item.title+"(节 )" }}
           <el-tooltip
             v-if="item.desc"
             :content="item.desc"
@@ -31,7 +31,7 @@
             />
           </el-tooltip>
         </span>
-        <span> <count-to :endVal="item.percent" />节 </span>
+        <span> <count-to :endVal="item.percent" /></span>
       </statistic-item>
     </statistic>
     <div class="wrap">

src/views/main/baseinfo/hr.vue

@@ -14,13 +14,13 @@
 
       <statistic-item v-for="(item, key) in items" :key="key" :class="{active: active === key}" @click="active = key">
         <span>
-          {{item.title}}
+          {{item.title+"(人)"}}
           <el-tooltip v-if="item.desc" :content="item.desc" :open-delay=".3" placement="top">
             <i style="margin-left: 5px;cursor: pointer;" class="el-icon-warning-outline"/>
           </el-tooltip>
         </span>
         <span>
-          <count-to :endVal="item.percent"/>人
+          <count-to :endVal="item.percent"/>
         </span>
       </statistic-item>
     </statistic>

src/views/main/baseinfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="container main">
     <save-form
       inline
       :model="search"
@@ -43,13 +43,13 @@
     <!-- 这里显示选项卡 -->
     <empty desc="暂无统计数据" v-if="isEmpty" />
     <el-row v-else class="rows" :gutter="20">
-      <el-col :xs="24" :sm="24" :md="24" :lg="9" :xl="9">
+      <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
         <studentbaseinfo :data="dataInfo" />
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="6" :xl="6">
+      <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
         <operate :data="dataInfo" />
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="9" :xl="9">
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8">
         <hrdata :data="dataInfo" />
       </el-col>
       <!-- <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
@@ -221,20 +221,18 @@ export default {
       }
     },
     resetDate(data) {
-      let arr = null
-      for(let item in data){
+      let arr = null;
+      for (let item in data) {
         // console.log(item)
-        if(item =='VIP_GROUP_COURSE'){
-          console.log(data[item])
-          arr = data[item].indexMonthData
+        if (item == "VIP_GROUP_COURSE") {
+          console.log(data[item]);
+          arr = data[item].indexMonthData;
         }
-        this.dataInfo[item] = data[item]
-
+        this.dataInfo[item] = data[item];
       }
 
-
       // console.log(this.dataInfo)
-      this.dataInfo = {...this.dataInfo};
+      this.dataInfo = { ...this.dataInfo };
     },
   },
 };
@@ -257,6 +255,18 @@ export default {
 }
 </style>
 <style lang="scss">
+.main {
+  .statistic {
+    .statistic-content > span {
+      font-size: 22px !important;
+     &:first-child{
+         font-size: 14px !important;
+     }
+    }
+
+  }
+}
+
 .box {
   display: flex;
   flex-direction: row;
@@ -275,7 +285,7 @@ export default {
   flex-direction: row;
   align-items: center;
   justify-content: center;
-      color: #888;
-    font-size: 14px;
+  color: #888;
+  font-size: 14px;
 }
 </style>

src/views/main/baseinfo/management.vue

@@ -22,7 +22,7 @@
         @click="active = key"
       >
         <span>
-          {{ item.title }}
+          {{ item.title+"(元)" }}
           <el-tooltip
             v-if="item.desc"
             :content="item.desc"
@@ -35,7 +35,8 @@
             />
           </el-tooltip>
         </span>
-        <span> <count-to :endVal="item.percent" :decimals="2" />元 </span>
+        <!--  12345678901.23 -->
+        <span> <count-to :endVal="item.percent" :decimals="2" /></span>
       </statistic-item>
     </statistic>
     <!-- 按月/按天 -->

src/views/main/baseinfo/operate.vue

@@ -13,13 +13,13 @@
     <statistic class="statistic" :cols="0">
       <statistic-item v-for="(item, key) in items" :key="key" :class="{active: active === key}" @click="active = key">
         <span>
-          {{item.title}}
+          {{item.title+"(个)"}}
           <el-tooltip v-if="item.desc" :content="item.desc" :open-delay=".3" placement="top">
             <i style="margin-left: 5px;cursor: pointer;" class="el-icon-warning-outline"/>
           </el-tooltip>
         </span>
         <span>
-          <count-to :endVal="item.percent"/>个
+          <count-to :endVal="item.percent"/>
         </span>
       </statistic-item>
     </statistic>

src/views/main/baseinfo/student.vue

@@ -19,7 +19,7 @@ v-loading="loading"
         @click="active = key"
       >
         <span>
-          {{ item.title }}
+          {{ item.title+"(人)" }}
           <el-tooltip
             v-if="item.desc"
             :content="item.desc"
@@ -32,7 +32,7 @@ v-loading="loading"
             />
           </el-tooltip>
         </span>
-        <span> <count-to :endVal="item.percent" />人 </span>
+        <span> <count-to :endVal="item.percent" /> </span>
       </statistic-item>
     </statistic>
     <div class="wrap">

src/views/main/baseinfo/studentBaseinfo.vue

@@ -22,7 +22,7 @@
           @click="active = key"
         >
           <span>
-            {{ item.title }}
+            {{ item.title+"(人)" }}
             <el-tooltip
               v-if="item.desc"
               :content="item.desc"
@@ -35,12 +35,12 @@
               />
             </el-tooltip>
           </span>
-          <span> <count-to :endVal="item.percent" />人 </span>
+          <span> <count-to :endVal="item.percent" /> </span>
         </statistic-item>
 
         <statistic-item v-if="data['CHARGE_STUDENT_CHANGE_RATE']">
           <span>
-            {{ data["CHARGE_STUDENT_CHANGE_RATE"].title }}
+            {{ data["CHARGE_STUDENT_CHANGE_RATE"].title+"(%)" }}
             <el-tooltip
               v-if="data['CHARGE_STUDENT_CHANGE_RATE'].desc"
               :content="data['CHARGE_STUDENT_CHANGE_RATE'].desc"
@@ -54,12 +54,12 @@
             </el-tooltip>
           </span>
           <span>
-            <count-to :endVal="data['CHARGE_STUDENT_CHANGE_RATE'].percent" />%
+            <count-to :endVal="data['CHARGE_STUDENT_CHANGE_RATE'].percent" />
           </span>
         </statistic-item>
         <statistic-item v-if="data['ACTIVATION_RATE']">
           <span>
-            {{ data["ACTIVATION_RATE"].title }}
+            {{ data["ACTIVATION_RATE"].title+"(%)" }}
             <el-tooltip
               v-if="data['ACTIVATION_RATE'].desc"
               :content="data['ACTIVATION_RATE'].desc"
@@ -72,7 +72,7 @@
               />
             </el-tooltip>
           </span>
-          <span> <count-to :endVal="data['ACTIVATION_RATE'].percent" />% </span>
+          <span> <count-to :endVal="data['ACTIVATION_RATE'].percent" /></span>
         </statistic-item>
       </statistic>
     </el-card>

src/views/main/baseinfo/surplusCourse.vue

@@ -16,7 +16,7 @@
           @click="active = key"
         >
           <span>
-            {{ item.title }}
+            {{ item.title+"(节)" }}
             <el-tooltip
               v-if="item.desc"
               :content="item.desc"
@@ -30,7 +30,7 @@
             </el-tooltip>
           </span>
           <span>
-            <count-to :endVal="item.percent" />节
+            <count-to :endVal="item.percent" />
           </span>
         </statistic-item>
       </statistic>

src/views/main/baseinfo/useCourse.vue

@@ -16,7 +16,7 @@
           @click="active = key"
         >
           <span>
-            {{ item.title }}
+            {{ item.title+"(节)" }}
             <el-tooltip
               v-if="item.desc"
               :content="item.desc"
@@ -30,7 +30,7 @@
             </el-tooltip>
           </span>
           <span>
-            <count-to :endVal="item.percent" />节
+            <count-to :endVal="item.percent" />
           </span>
         </statistic-item>
       </statistic>