Merge remote-tracking branch 'origin/03/08IndexAtten'

src/views/main/baseinfo/business.vue

@@ -104,7 +104,7 @@ export default {
             return [
               item[0].axisValueLabel,
               ...item.map(
-                (d) => `<br/>${d.marker}${d.seriesName}: ${d.value} %`
+                (d) => `<br/>${d.marker}${d.seriesName}: ${d.value[1]} %`
               ),
             ].join("");
           },

src/views/main/baseinfo/curriculum.vue

@@ -165,7 +165,7 @@ export default {
             return [
               item[0].axisValueLabel,
               ...item.map(
-                (d) => `<br/>${d.marker}${d.seriesName}: ${d.value} %`
+                (d) => `<br/>${d.marker}${d.seriesName}: ${d.value[1]}节`
               ),
             ].join("");
           },

src/views/main/baseinfo/management.vue

@@ -30,7 +30,7 @@
           </el-tooltip>
         </span>
         <span>
-          <count-to :endVal="item.percent" :decimals="2" />
+          <count-to :endVal="item.percent" :decimals="2" />元
         </span>
       </statistic-item>
     </statistic>
@@ -118,7 +118,7 @@ export default {
               ...item.map((d) => {
                 return `<br/>${d.marker}${
                   d.seriesName
-                }: ${this.$helpers.numeral(d.value[1]).format("0,0.00")}`;
+                }: ${this.$helpers.numeral(d.value[1]).format("0,0.00")}元`;
               }),
             ].join("");
           },

src/views/main/baseinfo/student.vue

@@ -67,7 +67,7 @@ export default {
   props: ["data", "search"],
   components: {
     "ve-funnel": veFunnel,
-      "ve-line": veLine,
+    "ve-line": veLine,
     "count-to": countTo,
     searchHeader,
   },
@@ -92,17 +92,17 @@ export default {
     },
     chartExtend() {
       return {
-          yAxis: {
+        yAxis: {
           //纵轴标尺固定
-          minInterval:1,
+          minInterval: 1,
           type: "value",
           scale: true,
           min: 0,
-            axisLabel:{
-            formatter:'{value}人'
-          }
+          axisLabel: {
+            formatter: "{value}人",
+          },
         },
-          series: {
+        series: {
           smooth: false,
         },
         tooltip: {
@@ -112,6 +112,14 @@ export default {
               color: "rgba(150,150,150,0.2)",
             },
           },
+          formatter: (item) => {
+            return [
+              item[0].axisValueLabel,
+              ...item.map(
+                (d) => `<br/>${d.marker}${d.seriesName}: ${d.value[1]}人`
+              ),
+            ].join("");
+          },
         },
       };
     },
@@ -209,7 +217,8 @@ export default {
         const res = await getIndex({
           ...rest,
           ...getTimes(this.mdate, ["startDate", "endDate"]),
-           dataTypes:'ADD_STUDENT_REGISTRATION_NUM,MUSIC_GROUP_STUDENT,NEWLY_STUDENT_NUM,QUIT_MUSIC_GROUP_STUDENT_NUM,VIP_PRACTICE_STUDENT_NUM,VIP_PRACTICE_ADD_STUDENT_NUM'
+          dataTypes:
+            "ADD_STUDENT_REGISTRATION_NUM,MUSIC_GROUP_STUDENT,NEWLY_STUDENT_NUM,QUIT_MUSIC_GROUP_STUDENT_NUM,VIP_PRACTICE_STUDENT_NUM,VIP_PRACTICE_ADD_STUDENT_NUM",
         });
         for (const item of res.data) {
           // 再循环一遍

src/views/serverDetail/conponent/afterWork.vue

@@ -97,7 +97,7 @@ export default {
       this.getList();
     },
     async getList() {
-      console.log(this.detail)
+
       try {
       const dayjs = this.$helpers.dayjs
      const ruselt =  await getTeacherServeHomeworkDetail({

src/views/serverDetail/conponent/outWork.vue

@@ -69,7 +69,6 @@ export default {
       this.getList()
     },
     async getList() {
-      console.log(this.detail)
       try {
       const dayjs = this.$helpers.dayjs
      const ruselt =  await getTeacherServeExtraDetail({

src/views/serverDetail/conponent/serverMask.vue

@@ -18,7 +18,6 @@ export default {
     };
   },
   mounted(){
-    console.log(this.detail)
   }
 };
 </script>

src/views/serverDetail/index.vue

@@ -48,8 +48,8 @@
             clearable
             placeholder="是否异常"
           >
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="reminded">
@@ -267,7 +267,7 @@ export default {
       this.getDefaultTime();
       if (this.$route.query.searchType) {
         this.searchForm.organId = this.$route.query.organId * 1 || "";
-        this.searchForm.unDone = this.$route.query.unDone || ""
+        this.searchForm.unDone = this.$route.query.unDone+'' || ""
         const dayjs = this.$helpers.dayjs;
         let nowDate = dayjs(new Date()).format("YYYY-MM-DD");
         this.orderDate = [

src/views/teamDetail/components/modals/change-teacher.vue

@@ -71,7 +71,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.detail)
     const row = this.detail
     for (let i in row.classGroupTeacherMapperList) {
       if (row.classGroupTeacherMapperList[i].teacherRole == "BISHOP") {

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.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 测试服
-let target = 'http://47.114.176.40:8000' //开发环境
+let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://47.114.176.40:8000' //开发环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -64,7 +64,7 @@ module.exports = {
       // http://192.168.3.134
       // http://47.114.176.40:8000
       '/api-auth': {
-        target: 'http://192.168.3.134',
+        target: 'http://dev.dayaedu.com',
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''