人群分析UI

src/utils/operation.js

@@ -369,8 +369,9 @@ export function getPicOption(title, legendData, colorData, seriesData) {
   let option = {
     title: {
       text: title,
-      x: "center",
-      top: "3%",
+      x: "left",
+      left: '20px',
+      top: "20px",
     },
     tooltip: {
       trigger: 'item',
@@ -379,7 +380,7 @@ export function getPicOption(title, legendData, colorData, seriesData) {
     legend: {
       orient: "vertical",
       top: "3%",
-      left: "left",
+      right: "right",
       data: legendData
     },
     grid: {
@@ -389,13 +390,13 @@ export function getPicOption(title, legendData, colorData, seriesData) {
       containLabel: true
     },
     color: colorData,
-    backgroundColor: '#F3F3F3',
+    backgroundColor: '#FFFFFF',
     series: [
       {
         name: "",
         type: "pie",
         radius: "55%",
-        center: ["60%", "65%"],
+        center: ["50%", "55%"],
         data: seriesData,
       }
     ]

src/views/learning/item-course-analysis.vue

@@ -146,18 +146,17 @@ export default {
         originalFlag: vm.formInline.checked == false ? 0 : 1,
         regionId: vm.formInline.region[vm.formInline.region.length - 1],
         timeFlag: vm.formInline.timeFlag,
-        pageNo: vm.pageNo,
-        pageSize: vm.pageSize
       };
       // console.log("3 req", req);
       openLoading(vm);
-      vm.POST("stats/report/course", req).then(res => {
+      vm.POST("stats/report/course/"+vm.pageNo+'/'+vm.pageSize, req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           if (type !== 2) {
             vm.setCardData(res.data);
           }
           vm.tableData = res.data.pCourseList;
+          vm.totalRows = res.data.totalSize;
         } else {
           // vm.$message(res.message);
         }

src/views/learning/item-crowd-analysis.vue

@@ -188,13 +188,12 @@ export default {
       let seriesData = [];
       let colorData = ["#7453FF", "#3BA0FF", "#5D7092", "#39AF9A", "#FFBC3D", "#FF9A4B", "#8A2BE2"];
 
-      // legendData = ['博士后','博士','硕士','本科','大专','中专及以下','其他'];
       for (let i = 0; i < educationList.length; i++) {
         legendData[i] = educationList[i].name;
-        seriesData[i] = educationList[i].value;
+        seriesData[i] = educationList[i];
       }
       let option = operationData.getPicOption(
-        "用户学历分布",
+        "人员学历发布",
         legendData,
         colorData,
         seriesData
@@ -251,9 +250,9 @@ export default {
 </script>
 <style lang="scss">
 .crowd-analysis-wrap {
-  background: #fff;
+  // background: #fff;
   overflow: hidden;
-  padding: 10px;
+  // padding: 10px;
   .header-title {
     padding: 10px 12px;
     font-size: 12px;
@@ -281,18 +280,18 @@ export default {
   .chart {
     position: relative;
     margin: 20px auto 0 auto;
-    width: 900px;
+    width: 1124px;
+    // background: #F0F2F5;
     overflow-x: hidden;
     .item {
       position: relative;
       float: left;
       margin-top: 20px;
-      margin-right: 100px;
+      margin-right: 20px;
       padding: 0;
       // width: 48%;
-      width: 400px;
-      // height: 20vw;
-      height: 350px;
+      width: 552px;
+      height: 360px;
       border: 1px solid #dedede;
       .title {
         position: relative;
@@ -307,7 +306,7 @@ export default {
         left: 0;
         .sex-item {
           float: left;
-          height: 350px;
+          height: 360px;
           width: 33.3%;
           .sex-img {
             margin: 0 auto;