图表样式、逻辑修改等

components/bussiness/charts/chart-column-horizontal-tc-long.vue

@@ -100,8 +100,8 @@ export default {
         },
         grid: {
           top: "3%",
-          left: "3%",
-          right: "3%",
+          left: "5%",
+          right: "5%",
           bottom: "3%",
           containLabel: true,
           borderWidth: 0
@@ -153,7 +153,7 @@ export default {
               color: "#676869",
               width: 0
             }
-          }
+          },
         },
         series: [
           {

components/bussiness/charts/chart-column-horizontal-tc.vue

@@ -39,7 +39,7 @@ export default {
       handler(newVal) {
         let yAxisData = [], series0Data = [], series1Data = []
         yAxisData = newVal.map( item => {
-          return item.classifyName;
+          return this.shortName(item.classifyName)
           // return (item.classifyName || 0).toFixed(0) * 100 + '%'
         })
         series0Data = this.dataList.map( item => {
@@ -115,7 +115,16 @@ export default {
               color: "#efefef",
               width: 1
             }
-          }
+          },
+          //设置网格线颜色
+          splitLine: {
+            show: true,
+            lineStyle:{
+              color: ['#efefef'],
+              width: 1,
+              type: 'solid'
+            }
+      　　 }
         },
         yAxis: {
           axisTick: false,
@@ -173,7 +182,14 @@ export default {
         ]
       };
       chartColumn.setOption(options);
-    }
+    },
+    shortName: function (value, length = 5, append = '...') {
+      if (value && value.length > length) {
+        return value.substring(0, length) + append
+      } else {
+        return value
+      }
+    },
   }
 };
 </script>

components/bussiness/charts/chart-column-vertical-score.vue

@@ -75,7 +75,16 @@ export default {
               color: "#efefef",
               width: 1
             }
-          }
+          },
+          //设置网格线颜色
+          splitLine: {
+            show: true,
+            lineStyle:{
+              color: ['#efefef'],
+              width: 1,
+              type: 'solid'
+            }
+      　　 }
         },
         xAxis: {
           axisTick: false,
@@ -97,7 +106,7 @@ export default {
               color: "#efefef",
               width: 1
             }
-          }
+          },
         },
         series: [
           {

components/bussiness/charts/chart-column-vertical-tc.vue

@@ -48,7 +48,7 @@ export default {
       handler(newVal) {
         let yAxisData = [], series0Data = [], series1Data = []
         yAxisData = newVal.map( item => {
-          return item.classifyName
+          return this.shortName(item.classifyName)
         })
         series0Data = this.dataList.map( item => {
           return ((item.beforeRate|| 0) * 100).toFixed(0);
@@ -114,7 +114,16 @@ export default {
               color: "#efefef",
               width: 1
             }
-          }
+          },
+          //设置网格线颜色
+          splitLine: {
+            show: true,
+            lineStyle:{
+              color: ['#efefef'],
+              width: 1,
+              type: 'solid'
+            }
+      　　 }
         },
         xAxis: {
           axisTick: false,
@@ -156,7 +165,14 @@ export default {
         ]
       };
       chartColumn.setOption(options);
-    }
+    },
+    shortName: function (value, length = 5, append = '...') {
+      if (value && value.length > length) {
+        return value.substring(0, length) + append
+      } else {
+        return value
+      }
+    },
   }
 };
 </script>

components/bussiness/charts/chart-column-vertical-times.vue

@@ -77,7 +77,16 @@ export default {
               color: "#efefef",
               width: 1
             }
-          }
+          },
+          //设置网格线颜色
+          splitLine: {
+            show: true,
+            lineStyle:{
+              color: ['#efefef'],
+              width: 1,
+              type: 'solid'
+            }
+      　　 }
         },
         xAxis: {
           axisTick: false,
@@ -99,7 +108,7 @@ export default {
               color: "#efefef",
               width: 1
             }
-          }
+          },
         },
         series: [
           {

components/bussiness/charts/chart-pie-edu.vue

@@ -23,7 +23,7 @@ export default {
   },
   data() {
     return {
-      chartWidth: '300px',
+      chartWidth: '320px',
       pieId: 'eduPieId',
       chartHeight: "1000px",
       handledData: {},

components/bussiness/charts/chart-pie-title.vue

@@ -30,7 +30,7 @@ export default {
   },
   data() {
     return {
-      chartWidth: '300px',
+      chartWidth: '320px',
       pieId: "titlePieId",
       chartHeight: "1000px",
       handledData: {},

components/bussiness/tips-info.vue

 <template>
   <div class="tips-info-wrapper">
-    <span>报表数据来源包括用户参加正式考试，不包含摸底考试</span>
+    <span>{{content}}</span>
   </div>
 </template>
+<script>
+  export default {
+    props: {
+      content: {
+        type: String,
+        default: '报表数据来源包括用户参加正式考试，不包含摸底考试'
+      }
+    }
+  }
+</script>
 <style lang="less" scoped>
   .tips-info-wrapper {
     height: 44px;

components/common/common-area-select.vue

@@ -39,6 +39,7 @@ export default {
       areaDegree: 'areaDegree'
     }),
     isNotVisible() {
+      console.log('this.areaDegree', this.areaDegree)
       if(this.orgList.length == 0 || this.areaDegree == 0 || this.areaDegree == 1 || this.areaDegree == 2) {
       // if(this.areaDegree == 0 || this.areaDegree == 1 || this.areaDegree == 2) {
         return true;

components/common/pica-area.vue

@@ -130,7 +130,8 @@ export default {
         provinceName: "",
         townId: "",
         townName: "",
-        regionId: ""
+        regionId: "",
+        areaDegree: 0
       },
       isDisabled: true,
       isShowProvince: true,
@@ -300,7 +301,8 @@ export default {
       // 当前选中的样式
       this.areaList.provinceList.map(a => (a.selected = false));
       this.areaList.provinceList[idx].selected = true;
-      this.setAreaDegree(item.degree)
+      // this.setAreaDegree(item.degree)
+      this.value.areaDegree = item.degree;
       if(item.degree == 0){
         return;
       }
@@ -339,7 +341,8 @@ export default {
       // 当前选中的样式
       this.areaList.cityList.map(a => (a.selected = false));
       this.areaList.cityList[idx].selected = true;
-      this.setAreaDegree(item.degree)
+      // this.setAreaDegree(item.degree)
+      this.value.areaDegree = item.degree;
       if(item.degree == 0){
         return;
       }
@@ -373,7 +376,8 @@ export default {
       // 当前选中的样式
       this.areaList.countyList.map(a => (a.selected = false));
       this.areaList.countyList[idx].selected = true;
-      this.setAreaDegree(item.degree)
+      // this.setAreaDegree(item.degree)
+      this.value.areaDegree = item.degree;
       if(item.degree == 0){
         return;
       }
@@ -402,7 +406,8 @@ export default {
       this.queryParams.regionId = item.id;
       this.value.townName = item.label;
       this.value.patientAddress = `${this.value.provinceName}${this.value.cityName}${this.value.countyName}${this.value.townName}`;
-      this.setAreaDegree(item.degree)
+      // this.setAreaDegree(item.degree)
+      this.value.areaDegree = item.degree;
       if(item.degree == 0){
         return;
       }

pages/index.vue

@@ -526,6 +526,8 @@ export default {
       this.CNTParams.regionId = selData.regionId;
       this.getHospitalsCNT(this.CNTParams);
       this.isShowArea = false;
+      this.setAreaDegree(selData.areaDegree);
+      // orgConfirm
       if(selData.townName || selData.countyName || selData.cityName || selData.provinceName) {
         this.areaName = selData.townName || selData.countyName || selData.cityName || selData.provinceName
       }
@@ -650,7 +652,8 @@ export default {
       setProvinceList: "setProvinceList",
       setExamTimesList: "setExamTimesList",
       setExamScoreList: "setExamScoreList",
-      setOrgList: "setOrgList"
+      setOrgList: "setOrgList",
+      setAreaDegree: "setAreaDegree"
     })
   }
 };

pages/klg-point.vue

 <template>
   <section>
     <CommonHeader title="培训前后知识点掌握情况"></CommonHeader>
+    <TipsInfo :content="tipsContent"></TipsInfo>
     <TitleKLGPoint :title="title"></TitleKLGPoint>
     <ChartColumnHorizontalTCLong :dataList="knowledgeEffectList" class="mt-10"></ChartColumnHorizontalTCLong>
     <CommonNoMore></CommonNoMore>
@@ -13,6 +14,7 @@ import { getStudyEffect } from "@/service";
 import CommonHeader from "@/components/common/common-header";
 import TitleKLGPoint from "@/components/bussiness/title-klg-point";
 import CommonNoMore from "@/components/common/common-no-more";
+import TipsInfo from '@/components/bussiness/tips-info'
 import ChartColumnHorizontalTCLong from "@/components/bussiness/charts/chart-column-horizontal-tc-long";
 
 export default {
@@ -36,6 +38,7 @@ export default {
           type: 1
         }
       },
+      tipsContent: '报告数据来源仅包含摸底考和正式考的课程培训',
       knowledgeEffectList: []
     };
   },