fix: 就业困难人员查询全体区县

src/main/resources/mapping/cquery/StatisticsCQuery.xml

@@ -234,15 +234,15 @@
 
     <select id="findJobUserByRegionAndStatus" resultType="com.hz.employmentsite.vo.statistics.jobUser.RegionJobUserCount">
         SELECT
-            site.RegionCode,
-            area.`name` AS RegionName,
-            COUNT(1) AS jobUserCount
+            area.`code` AS regionCode,
+            area.`name` AS regionName,
+            COUNT( jobUser.JobuserID ) AS jobUserCount
         FROM
-            pc_jobuser jobUser
-                LEFT JOIN pc_site site ON jobUser.SiteID = site.SiteID
-                LEFT JOIN area_code area ON site.RegionCode = area.`code`
+            area_code area
+                LEFT JOIN pc_site site ON area.`code` = site.RegionCode
+                LEFT JOIN pc_jobuser jobUser ON site.SiteID = jobUser.SiteID
         WHERE
-            1=1
+            area.lv = 3
             <if test="year!='' and year!=null">
                 and YEAR(jobUser.CreateTime) = #{year}
             </if>
@@ -258,15 +258,16 @@
 
     <select id="findJobUserByRegionAndPersonType" resultType="com.hz.employmentsite.vo.statistics.jobUser.RegionJobUserCount">
         SELECT
-            site.RegionCode,
-            area.`name` AS RegionName,
-            COUNT(1) AS jobUserCount
+            area.`code` AS regionCode,
+            area.`name` AS regionName,
+            COUNT( jobUser.JobuserID ) AS jobUserCount
         FROM
-            pc_jobuser jobUser
-                LEFT JOIN pc_site site ON jobUser.SiteID = site.SiteID
-                LEFT JOIN area_code area ON site.RegionCode = area.`code`
+            area_code area
+                LEFT JOIN pc_site site ON area.`code` = site.RegionCode
+                LEFT JOIN pc_jobuser jobUser ON site.SiteID = jobUser.SiteID
         WHERE
-            jobUser.KeyPersonTypeID IN (13,14,15,16,17,18,19,20,21,22,23,24)
+            area.lv = 3
+            AND jobUser.KeyPersonTypeID IN (13,14,15,16,17,18,19,20,21,22,23,24)
             <if test="year!='' and year!=null">
                 and YEAR(jobUser.CreateTime) = #{year}
             </if>

vue/src/views/dataScreen/echarts.ts

@@ -61,8 +61,9 @@ export function initLineImageTable(xTitleList: any, seriesList: any, legendList:
  * @param dataSetSource 数据集数据
  * @param seriesList 柱形图表样式定义
  * @param domId 目标DOM元素ID
+ * @param showTextLength X轴坐标刻度每行最大显示字数
  */
-export function initDataSetBarImageTable(dataSetSource: any, seriesList: any, domId: any) {
+export function initDataSetBarImageTable(dataSetSource: any, seriesList: any, domId: any, showTextLength: any) {
   const chartDom = document.getElementById(domId);
   const myChart = echarts.init(chartDom);
   let option = {
@@ -94,7 +95,23 @@ export function initDataSetBarImageTable(dataSetSource: any, seriesList: any, do
     xAxis: {
       type: 'category',
       axisLabel: {
-        color: '#69859b'
+        color: '#69859b',
+        formatter: function (params: any) {
+          let newParamsName = '';
+          const paramsNameNumber = params.length; // 文字总长度
+          const rowNumber = Math.ceil(paramsNameNumber / showTextLength);
+          if (paramsNameNumber > showTextLength) {
+            for (let p = 0; p < rowNumber; p++) {
+              const start = p * showTextLength;
+              const end = start + showTextLength;
+              const tempStr = p === rowNumber - 1 ? params.substring(start, paramsNameNumber) : params.substring(start, end) + '\n';
+              newParamsName += tempStr;
+            }
+          } else {
+            newParamsName = params;
+          }
+          return newParamsName;
+        },
       }
     },
     yAxis: {

vue/src/views/dataScreen/html/index.vue

@@ -203,7 +203,11 @@ const searchParams = reactive({
 const yearSystemDataCountList = ref([]);
 // 全市数据情况
 const allSystemDataCountList = ref({
-  count: {},
+  count: {
+    companyCount: 0,
+    postCount: 0,
+    jobUserCount: 0
+  },
   list: []
 });
 // 普通求职者与就业困难人员
@@ -404,12 +408,13 @@ function loadDifficultyUser() {
         arr.push([item.regionName, item.jobUserCount, item.difficultyCount]);
       }
     })
+    console.log(arr);
 
-    initDataSetBarImageTable(arr, [{type: 'bar', barMaxWidth: '15px', color: "#0062cc"}, {
+    initDataSetBarImageTable(arr, [{type: 'bar', barMaxWidth: '10px', color: "#0062cc"}, {
       type: 'bar',
-      barMaxWidth: '15px',
+      barMaxWidth: '10px',
       color: '#73ecf3'
-    }], 'ordinaryDifficultyCountBox')
+    }], 'ordinaryDifficultyCountBox', 3)
   })
 }
 
@@ -432,7 +437,7 @@ function loadAllData() {
         {type: 'bar', barMaxWidth: '15px', color: "#0062cc"},
         {type: 'bar', barMaxWidth: '15px', color: '#73ecf3'},
         {type: 'bar', barMaxWidth: '15px', color: '#67ca00'},
-      ], 'allSystemDatBox')
+      ], 'allSystemDatBox', 6)
   })
 }