mo 3 роки тому
батько
коміт
ee70d7c8e8

+ 11 - 49
src/views/main/cloudDate/allDate.vue

@@ -1,21 +1,11 @@
 <template>
   <div>
-    <headers title="数据总览" />
     <el-card>
-      <div slot="header" class="clearfix">
-        <div class="box">
-          <span class="shape"></span>
-          <span>学员数据</span>
-        </div>
-      </div>
+      <headers title="数据总览" />
       <div
         class="wall"
         style="height: 68px"
-        v-if="
-          JSON.stringify(items) == '{}' &&
-          !data['CHARGE_STUDENT_CHANGE_RATE'] &&
-          !data['ACTIVATION_RATE']
-        "
+        v-if="JSON.stringify(items) == '{}'"
       >
         暂无数据
       </div>
@@ -42,43 +32,6 @@
           </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 + "(%)" }}
-            <el-tooltip
-              v-if="data['CHARGE_STUDENT_CHANGE_RATE'].desc"
-              :content="data['CHARGE_STUDENT_CHANGE_RATE'].desc"
-              :open-delay="0.3"
-              placement="top"
-            >
-              <i
-                style="margin-left: 5px; cursor: pointer"
-                class="el-icon-warning-outline"
-              />
-            </el-tooltip>
-          </span>
-          <span>
-            <count-to :endVal="data['CHARGE_STUDENT_CHANGE_RATE'].percent" />
-          </span>
-        </statistic-item>
-        <statistic-item v-if="data['ACTIVATION_RATE']">
-          <span>
-            {{ data["ACTIVATION_RATE"].title + "(%)" }}
-            <el-tooltip
-              v-if="data['ACTIVATION_RATE'].desc"
-              :content="data['ACTIVATION_RATE'].desc"
-              :open-delay="0.3"
-              placement="top"
-            >
-              <i
-                style="margin-left: 5px; cursor: pointer"
-                class="el-icon-warning-outline"
-              />
-            </el-tooltip>
-          </span>
-          <span> <count-to :endVal="data['ACTIVATION_RATE'].percent" /></span>
-        </statistic-item>
       </statistic>
     </el-card>
   </div>
@@ -86,13 +39,22 @@
 <script>
 import headers from "./modals/headers.vue";
 export default {
+  props: ["data"],
   components: {
     headers,
   },
   data() {
     return {};
   },
+  computed: {
+    items() {
+      return {};
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
+/deep/.el-card__body {
+  padding-top: 0!important;
+}
 </style>

+ 8 - 2
src/views/main/cloudDate/index.vue

@@ -1,13 +1,16 @@
 <template>
   <div>
-    <allDate />
+    <allDate class="allDate" />
+    <organDate />
   </div>
 </template>
 <script>
 import allDate from './allDate.vue'
+import organDate from './organDate.vue'
 export default {
   components:{
-    allDate
+    allDate,
+    organDate
   },
   data(){
     return{
@@ -17,5 +20,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.allDate {
+  margin-bottom: 20px;
+}
 
 </style>

+ 2 - 1
src/views/main/cloudDate/modals/headers.vue

@@ -6,6 +6,7 @@
     </div>
     <div class="right">
       <el-select
+      v-if="!hidenOrgan"
       size='mini'
         class="multiple"
         v-model.trim="organId"
@@ -25,7 +26,7 @@
 </template>
 <script>
 export default {
-  props: ["title"],
+  props: ["title",'hidenOrgan'],
   data() {
     return {
       organId: "",

+ 26 - 0
src/views/main/cloudDate/organDate.vue

@@ -0,0 +1,26 @@
+<template>
+  <div>
+    <el-card>
+      <headers title="分部数据" :hidenOrgan="true" />
+    </el-card>
+  </div>
+</template>
+<script>
+import headers from "./modals/headers.vue";
+export default {
+  components:{
+    headers
+  },
+  data() {
+
+    return {
+
+    };
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/.el-card__body {
+  padding-top: 0 !important;
+}
+</style>