Merge branch '02/24resetMain' into test

src/permission.js

@@ -39,7 +39,7 @@ router.onError((error) => {
 });
 
 function getFirstMenu(routes) {
-  console.log(routes)
+  // console.log(routes)
   // let firstMenu = null
   // routes.forEach(item => {
   //   if(!firstMenu && item.children?.length > 0) {

src/store/modules/permission.js

@@ -178,7 +178,7 @@ function recursionPermission(arr) {
 }
 function setDetailRoute(accessedRoutes) {
   accessedRoutes.forEach(route => {
-    console.log(route.path)
+    // console.log(route.path)
     if (route.path == '/main') {
       route.children = route.children.concat([
         {
@@ -557,7 +557,7 @@ const actions = {
           // 生成异步路由表
           accessedRoutes = generateAsyncRouter(asyncRoutes, newData)
           accessedRoutes = setDetailRoute(accessedRoutes)
-          console.log('生成出来的异步路由', accessedRoutes)
+          // console.log('生成出来的异步路由', accessedRoutes)
           // var result = accessedRoutes.concat({ path: '*', redirect: '/404', hidden: true })
           commit('SET_ROUTES', accessedRoutes)
           // commit('SET_PERMISSION', recursionPermission(res.data).flat(Infinity))

src/views/main/baseinfo/business.vue

@@ -11,6 +11,7 @@
       />
     </div>
 
+    <div class="wall" style="height:68px;" v-if="JSON.stringify(items) == '{}'"></div>
     <statistic class="statistic" :cols="0">
       <statistic-item
         v-for="(item, key) in items"
@@ -32,7 +33,6 @@
             />
           </el-tooltip>
         </span>
-
         <span> <count-to :endVal="item.percent" :decimals="2" />% </span>
       </statistic-item>
     </statistic>
@@ -71,16 +71,26 @@ export default {
       };
     },
     items() {
-      //
-      return {
-        HOMEWORK_CREATE_RATE:  this.data["HOMEWORK_CREATE_RATE"] ||{},
+      let obj = {}
+      let arr = ["HOMEWORK_CREATE_RATE","HOMEWORK_SUBMIT_RATE","HOMEWORK_COMMENT_RATE"]
+      arr.forEach(str=>{
+        if(this.data[str]){
+          obj[str]=this.data[str]
+        }
+      })
+      /**
+       *  {
+        HOMEWORK_CREATE_RATE:this.data["HOMEWORK_CREATE_RATE"] || {},
         HOMEWORK_SUBMIT_RATE: this.data["HOMEWORK_SUBMIT_RATE"] || {},
         HOMEWORK_COMMENT_RATE: this.data["HOMEWORK_COMMENT_RATE"] || {},
       };
+       */
+      return obj
     },
     chartExtend() {
       return {
         series: {
+           type: 'line',
           smooth: false,
         },
         yAxis: {

src/views/main/baseinfo/curriculum.vue

@@ -74,13 +74,29 @@ export default {
       };
     },
     items() {
-      return {
+      let obj = {};
+      let arr = [
+        "MUSIC_GROUP_COURSE",
+        "VIP_GROUP_COURSE",
+        "VIP_GROUP_ONLINE_COURSE",
+        "VIP_GROUP_OFFLINE_COURSE",
+        "PRACTICE_GROUP_COURSE"
+      ];
+      arr.forEach((str) => {
+        if (this.data[str]) {
+          obj[str] = this.data[str];
+        }
+      });
+      /**
+       * {
         MUSIC_GROUP_COURSE: this.data["MUSIC_GROUP_COURSE"] || {},
         VIP_GROUP_COURSE: this.data["VIP_GROUP_COURSE"] || {},
         VIP_GROUP_ONLINE_COURSE: this.data["VIP_GROUP_ONLINE_COURSE"] || {},
         VIP_GROUP_OFFLINE_COURSE: this.data["VIP_GROUP_OFFLINE_COURSE"] || {},
         PRACTICE_GROUP_COURSE: this.data["PRACTICE_GROUP_COURSE"] || {},
       };
+       */
+      return obj
     },
     dataZoom() {
       return [
@@ -135,7 +151,7 @@ export default {
           }
         }
       }
-      console.log(Object.values(months));
+      // console.log(Object.values(months));
       return {
         columns: ["月份", ...values.map((item) => item.title)],
         rows: Object.values(months),
@@ -147,6 +163,7 @@ export default {
     chartExtend() {
       return {
         series: {
+          type: "line",
           smooth: false,
         },
         yAxis: {
@@ -265,7 +282,7 @@ export default {
       }
     },
     setVipMonthDetail() {
-      console.log("调用");
+      // console.log("调用");
       const vipdetail = {};
       let datas = this.items["VIP_GROUP_COURSE"]["indexMonthData"];
       datas.forEach((item) => {

src/views/main/baseinfo/hr.vue

@@ -7,7 +7,11 @@
         </div>
 
       </div>
+       <div class="wall" style="height:68px;" v-if="JSON.stringify(items) == '{}'">
+         暂无数据
+       </div>
     <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}}
@@ -43,12 +47,22 @@ export default {
   //     DIMISSION_NUM: this.data['DIMISSION_NUM'] || {},
   computed: {
     items() {
-      return {
+           let obj = {}
+      let arr = ["TEACHER_NUM","FULL_TIME_NUM","PART_TIME_NUM"]
+      arr.forEach(str=>{
+        if(this.data[str]){
+          obj[str]=this.data[str]
+        }
+      })
+      /**
+       * {
         TEACHER_NUM: this.data['TEACHER_NUM'] || {},
         FULL_TIME_NUM: this.data['FULL_TIME_NUM'] || {},
         PART_TIME_NUM: this.data['PART_TIME_NUM'] || {},
 
       }
+       */
+      return obj
     },
     chartExtend() {
       return {

src/views/main/baseinfo/index.vue

@@ -270,4 +270,12 @@ export default {
     background-color: #14928a;
   }
 }
+.wall {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+      color: #888;
+    font-size: 14px;
+}
 </style>

src/views/main/baseinfo/management.vue

@@ -9,6 +9,11 @@
         :endDate="endDate"
       />
     </div>
+    <div
+      class="wall"
+      style="height: 68px"
+      v-if="JSON.stringify(items) == '{}'"
+    ></div>
     <statistic :col="5" class="statistic" :cols="0">
       <statistic-item
         v-for="(item, key) in items"
@@ -92,12 +97,27 @@ export default {
       };
     },
     items() {
-      return {
+      let obj = {};
+      let arr = [
+        "TOTAL_AMOUNT",
+        "FINANCE_AMOUNT",
+        "FINANCE_BALANCE_AMOUNT",
+        "FINANCE_PAY"
+      ];
+      arr.forEach((str) => {
+        if (this.data[str]) {
+          obj[str] = this.data[str];
+        }
+      });
+      /**
+ * {
         TOTAL_AMOUNT: this.data["TOTAL_AMOUNT"] || {},
         FINANCE_AMOUNT: this.data["FINANCE_AMOUNT"] || {},
         FINANCE_BALANCE_AMOUNT: this.data["FINANCE_BALANCE_AMOUNT"] || {},
         FINANCE_PAY: this.data["FINANCE_PAY"] || {},
       };
+ */
+      return obj;
       //
     },
     chartExtend() {
@@ -120,7 +140,7 @@ export default {
           formatter: (item) => {
             return [
               item[0].axisValueLabel,
-               `<br/><span style="margin-right:5px;border-radius:10px;width:10px;height:10px;display:inline-block;"></span>总收入:${this.$helpers
+              `<br/><span style="margin-right:5px;border-radius:10px;width:10px;height:10px;display:inline-block;"></span>总收入:${this.$helpers
                 .numeral(item[0].value + item[1].value)
                 .format("0,0.00")}元`,
               ...item.map((d) => {
@@ -128,7 +148,6 @@ export default {
                   d.seriesName
                 }: ${this.$helpers.numeral(d.value).format("0,0.00")}元`;
               }),
-
             ].join("");
           },
         },

src/views/main/baseinfo/operate.vue

@@ -7,6 +7,9 @@
         </div>
 
       </div>
+             <div class="wall" style="height:68px;" v-if="JSON.stringify(items) == '{}'">
+         暂无数据
+       </div>
     <statistic class="statistic" :cols="0">
       <statistic-item v-for="(item, key) in items" :key="key" :class="{active: active === key}" @click="active = key">
         <span>
@@ -42,10 +45,20 @@ export default {
   },
   computed: {
     items() {
-      return {
+      let obj = {}
+      let arr = ["SCHOOL","PROGRESS_MUSIC_GROUP_NUM"]
+      arr.forEach(str=>{
+        if(this.data[str]){
+          obj[str]=this.data[str]
+        }
+      })
+      /**
+       * {
         SCHOOL: this.data['SCHOOL'] || {},
         PROGRESS_MUSIC_GROUP_NUM: this.data['PROGRESS_MUSIC_GROUP_NUM'] || {},
       }
+       */
+      return obj
     },
     chartExtend() {
       return {

src/views/main/baseinfo/student.vue

@@ -78,7 +78,22 @@ export default {
       };
     },
     items() {
-      return {
+      let obj = {};
+      let arr = [
+        "ADD_STUDENT_REGISTRATION_NUM",
+        "MUSIC_GROUP_STUDENT",
+        "NEWLY_STUDENT_NUM",
+        "QUIT_MUSIC_GROUP_STUDENT_NUM",
+        "VIP_PRACTICE_STUDENT_NUM",
+        "VIP_PRACTICE_ADD_STUDENT_NUM",
+      ];
+      arr.forEach((str) => {
+        if (this.data[str]) {
+          obj[str] = this.data[str];
+        }
+      });
+      /**
+       *  {
         ADD_STUDENT_REGISTRATION_NUM:
           this.data["ADD_STUDENT_REGISTRATION_NUM"] || {},
         MUSIC_GROUP_STUDENT: this.data["MUSIC_GROUP_STUDENT"] || {},
@@ -89,6 +104,8 @@ export default {
         VIP_PRACTICE_ADD_STUDENT_NUM:
           this.data["VIP_PRACTICE_ADD_STUDENT_NUM"] || {},
       };
+       */
+      return obj;
     },
     chartExtend() {
       return {
@@ -103,6 +120,7 @@ export default {
           },
         },
         series: {
+           type: 'line',
           smooth: false,
         },
         tooltip: {
@@ -164,7 +182,11 @@ export default {
             };
             months[key][item.title] = row.percent;
           } else {
-            if (months[key][item.title]&&item.dataType!='MUSIC_GROUP_STUDENT'&&item.dataType!='VIP_PRACTICE_STUDENT_NUM') {
+            if (
+              months[key][item.title] &&
+              item.dataType != "MUSIC_GROUP_STUDENT" &&
+              item.dataType != "VIP_PRACTICE_STUDENT_NUM"
+            ) {
               months[key][item.title] += parseFloat(row.percent);
             } else {
               months[key][item.title] = row.percent;

src/views/main/baseinfo/studentBaseinfo.vue

@@ -3,10 +3,16 @@
     <el-card>
       <div slot="header" class="clearfix">
         <div class="box">
-          <span class='shape'></span>
+          <span class="shape"></span>
           <span>学员数据</span>
         </div>
-
+      </div>
+      <div
+        class="wall"
+        style="height: 68px"
+        v-if="JSON.stringify(items) == '{}'&&!data['CHARGE_STUDENT_CHANGE_RATE']&&!data['ACTIVATION_RATE']"
+      >
+        暂无数据
       </div>
       <statistic :col="5" class="statistic" :cols="0">
         <statistic-item
@@ -29,12 +35,10 @@
               />
             </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"]'>
+        <statistic-item v-if="data['CHARGE_STUDENT_CHANGE_RATE']">
           <span>
             {{ data["CHARGE_STUDENT_CHANGE_RATE"].title }}
             <el-tooltip
@@ -53,7 +57,7 @@
             <count-to :endVal="data['CHARGE_STUDENT_CHANGE_RATE'].percent" />%
           </span>
         </statistic-item>
-           <statistic-item v-if='data["ACTIVATION_RATE"]'>
+        <statistic-item v-if="data['ACTIVATION_RATE']">
           <span>
             {{ data["ACTIVATION_RATE"].title }}
             <el-tooltip
@@ -68,9 +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>
@@ -85,7 +87,7 @@ export default {
   },
   data() {
     return {
-      active:''
+      active: "",
     };
   },
   computed: {
@@ -95,10 +97,17 @@ export default {
     //         CHARGE_STUDENT_CHANGE_RATE: this.data['CHARGE_STUDENT_CHANGE_RATE'] || {},
     //    ACTIVATION_RATE: this.data['ACTIVATION_RATE'] || {},
     items() {
-      return {
-        STUDENT_REGISTRATION_NUM: this.data['STUDENT_REGISTRATION_NUM'] || {},
-
-      }
+      let obj = {};
+      let arr = ["STUDENT_REGISTRATION_NUM",];
+      arr.forEach((str) => {
+        if (this.data[str]) {
+          obj[str] = this.data[str];
+        }
+      });
+      //  {
+      //  STUDENT_REGISTRATION_NUM: this.data["STUDENT_REGISTRATION_NUM"] || {},
+      //};
+      return obj
     },
   },
 };

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
-let target = 'https://test.dayaedu.com' //测试环境
+let target = 'http://dev.dayaedu.com' // 开发环境
+// let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {