bugfixed

src/views/menu1/index.vue

@@ -4,25 +4,33 @@
       <div class="left">
         <div class="leftTop">
           <div class="title">资源总数</div>
-          <div class="totalCnt">{{zytjData.all.total}}</div>
+          <div class="totalCnt">{{ zytjData.all.total }}</div>
           <div class="bottom">
             <div>
               <span class="title">作业资源</span>
-              <span class="cnt">{{zytjData.all.work}}</span>
+              <span class="cnt">{{ zytjData.all.work }}</span>
             </div>
             <div>
               <span class="title">考试资源</span>
-              <span class="cnt">{{zytjData.all.exam}}</span>
+              <span class="cnt">{{ zytjData.all.exam }}</span>
             </div>
           </div>
         </div>
         <div class="leftCenter">
           <span class="title">作业资源分布</span>
-          <pie1 :id="'pie1'" :data="pie1option" style="width:100%;height:100%"></pie1>
+          <pie1
+            :id="'pie1'"
+            :data="pie1option"
+            style="width: 100%; height: 100%"
+          ></pie1>
         </div>
         <div class="leftBottom">
           <span class="title">考试资源分布</span>
-          <pie2 :id="'pie2'" :data="pie2option" style="width:100%;height:100%"></pie2>
+          <pie2
+            :id="'pie2'"
+            :data="pie2option"
+            style="width: 100%; height: 100%"
+          ></pie2>
         </div>
       </div>
       <div class="center">
@@ -30,53 +38,69 @@
           <div class="iconBox">
             <div class="icon icon1"></div>
             <div class="title">学校总数</div>
-            <div class="cnt">{{countData.school}}</div>
+            <div class="cnt">{{ countData.school }}</div>
           </div>
           <div class="iconBox">
             <div class="icon icon2"></div>
             <div class="title">班级数量</div>
-            <div class="cnt">{{countData.class}}</div>
+            <div class="cnt">{{ countData.class }}</div>
           </div>
           <div class="iconBox">
             <div class="icon icon3"></div>
             <div class="title">教师数量</div>
-            <div class="cnt">{{countData.teacher}}</div>
+            <div class="cnt">{{ countData.teacher }}</div>
           </div>
           <div class="iconBox">
             <div class="icon icon4"></div>
             <div class="title">学生数量</div>
-            <div class="cnt">{{countData.student}}</div>
+            <div class="cnt">{{ countData.student }}</div>
           </div>
         </div>
-        <mapChart :id="'mapChart'" :data="mapOption" style="width:100%;height:650px"></mapChart>
+        <mapChart
+          :id="'mapChart'"
+          :data="mapOption"
+          style="width: 100%; height: 650px"
+        ></mapChart>
         <div class="centerBottom">
-          <line1 :id="'line1'" :data="lineOption" style="width:100%;height:100%"></line1>
+          <line1
+            :id="'line1'"
+            :data="lineOption"
+            style="width: 100%; height: 100%"
+          ></line1>
         </div>
       </div>
       <div class="right">
         <div class="rightTop">
           <div class="top">
             <span class="title">总阅卷任务</span>
-            <span class="cnt">{{yjrwData.work+yjrwData.exam}}</span>
+            <span class="cnt">{{ yjrwData.work + yjrwData.exam }}</span>
           </div>
           <div class="bottom">
             <span class="title">作业批阅</span>
-            <span class="cnt">{{yjrwData.work}}</span>
+            <span class="cnt">{{ yjrwData.work }}</span>
             <span class="title">考试批阅</span>
-            <span class="cnt">{{yjrwData.exam}}</span>
+            <span class="cnt">{{ yjrwData.exam }}</span>
             <span class="title">已完成</span>
-            <span class="cnt">{{yjrwData.completed}}</span>
+            <span class="cnt">{{ yjrwData.completed }}</span>
             <span class="title">批阅中</span>
-            <span class="cnt">{{yjrwData.ongoing}}</span>
+            <span class="cnt">{{ yjrwData.ongoing }}</span>
           </div>
         </div>
         <div class="rightCenter">
           <span class="title">学校阅卷任务TOP10</span>
-          <bar1 :id="'bar1'" :data="bar1Option" style="width:100%;height:100%"></bar1>
+          <bar1
+            :id="'bar1'"
+            :data="bar1Option"
+            style="width: 100%; height: 100%"
+          ></bar1>
         </div>
         <div class="rightBottom">
           <span class="title">阅卷任务学科TOP10</span>
-          <bar2 :id="'bar2'" :data="bar2Option" style="width:100%;height:100%"></bar2>
+          <bar2
+            :id="'bar2'"
+            :data="bar2Option"
+            style="width: 100%; height: 100%"
+          ></bar2>
         </div>
       </div>
     </div>
@@ -133,8 +157,8 @@ export default {
         },
         title: {
           text: "作业资源",
-          top: "42%",
-          left: "45%",
+          top: "46%",
+          left: "49%",
           subtext: 0,
           itemGap: 5,
           textStyle: {
@@ -162,7 +186,7 @@ export default {
           {
             type: "pie",
             radius: ["40%", "70%"],
-            center: ["45%", "50%"],
+            center: ["50%", "55%"],
             roseType: "area",
             itemStyle: {
               borderRadius: 0,
@@ -223,8 +247,8 @@ export default {
         },
         title: {
           text: "考试资源",
-          top: "42%",
-          left: "45%",
+          top: "46%",
+          left: "49%",
           subtext: "1,797,260",
           itemGap: 5,
           textStyle: {
@@ -253,40 +277,40 @@ export default {
           {
             type: "pie",
             radius: ["40%", "70%"],
-            center: ["45%", "50%"],
+            center: ["50%", "55%"],
             roseType: "area",
             itemStyle: {
               borderRadius: 0,
             },
             data: [
-              {
-                value: 30,
-                name: "学科1",
-              },
-              {
-                value: 40,
-                name: "学科2",
-              },
-              {
-                value: 48,
-                name: "学科3",
-              },
-              {
-                value: 28,
-                name: "学科4",
-              },
-              {
-                value: 49,
-                name: "学科5",
-              },
-              {
-                value: 58,
-                name: "学科6",
-              },
-              {
-                value: 45,
-                name: "学科7",
-              },
+              // {
+              //   value: 30,
+              //   name: "学科1",
+              // },
+              // {
+              //   value: 40,
+              //   name: "学科2",
+              // },
+              // {
+              //   value: 48,
+              //   name: "学科3",
+              // },
+              // {
+              //   value: 28,
+              //   name: "学科4",
+              // },
+              // {
+              //   value: 49,
+              //   name: "学科5",
+              // },
+              // {
+              //   value: 58,
+              //   name: "学科6",
+              // },
+              // {
+              //   value: 45,
+              //   name: "学科7",
+              // },
             ],
             label: {
               normal: {
@@ -903,9 +927,7 @@ export default {
             };
           }
         });
-        this.pie1option.title.subtext = this.zytjData.work_dist.filter(
-          (item) => item.sub == "总数"
-        )[0].count;
+        this.pie1option.title.subtext = this.zytjData.all.work;
 
         this.pie2option.series[0].data = this.zytjData.exam_dist.map((item) => {
           if (item.sub !== "总数") {
@@ -915,31 +937,43 @@ export default {
             };
           }
         });
-        this.pie2option.title.subtext = this.zytjData.exam_dist.filter(
-          (item) => item.sub == "总数"
-        )[0].count;
+        this.pie2option.title.subtext = this.zytjData.all.exam;
       });
       HomeApi.zyydData().then((res) => {
         this.zyydData = res.data;
         this.lineOption.xAxis[0].data = this.zyydData.map((item) => item.date);
-        this.lineOption.series[0].data = this.zyydData.map((item) => item.count);
+        this.lineOption.series[0].data = this.zyydData.map(
+          (item) => item.count
+        );
       });
       HomeApi.yjrwData().then((res) => {
         this.yjrwData = res.data;
       });
       HomeApi.top10school().then((res) => {
         this.schoolTop10 = res.data;
-        this.bar1Option.yAxis[0].data = this.schoolTop10.map((item) => item.key);
-        this.bar1Option.yAxis[1].data = this.schoolTop10.map((item) => item.val);
-        this.bar1Option.series[0].data = this.schoolTop10.map((item) => item.val);
+        this.bar1Option.yAxis[0].data = this.schoolTop10.map(
+          (item) => item.key
+        );
+        this.bar1Option.yAxis[1].data = this.schoolTop10.map(
+          (item) => item.val
+        );
+        this.bar1Option.series[0].data = this.schoolTop10.map(
+          (item) => item.val
+        );
         let max = Math.max.apply(Math, this.bar1Option.series[0].data);
         this.bar1Option.series[1].data = this.schoolTop10.map((item) => max);
       });
       HomeApi.top10subjects().then((res) => {
         this.subjectTop10 = res.data;
-        this.bar2Option.yAxis[0].data = this.subjectTop10.map((item) => item.key);
-        this.bar2Option.yAxis[1].data = this.subjectTop10.map((item) => item.val);
-        this.bar2Option.series[0].data = this.subjectTop10.map((item) => item.val);
+        this.bar2Option.yAxis[0].data = this.subjectTop10.map(
+          (item) => item.key
+        );
+        this.bar2Option.yAxis[1].data = this.subjectTop10.map(
+          (item) => item.val
+        );
+        this.bar2Option.series[0].data = this.subjectTop10.map(
+          (item) => item.val
+        );
         let max = Math.max.apply(Math, this.bar2Option.series[0].data);
         this.bar2Option.series[1].data = this.subjectTop10.map((item) => max);
       });