feat: 数据可视化地图配置全屏打开

doc/待更新脚本.txt

@@ -21,4 +21,6 @@ insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde
 
 -- 2024.5.31
 alter table sys_menu add IsBlank tinyint(1);
-update sys_menu set IsBlank=1 where MenuNo='T011001';
+update sys_menu set IsBlank=1 where MenuNo='T011001';
+update sys_menu set IsBlank=1 where MenuNo='T011002';
+update sys_menu set IsBlank=1 where MenuNo='T011003';

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

@@ -157,7 +157,21 @@
             and jobuser.RegionCode = #{regionCode}
         </if>
         <if test="labelID != '' and labelID != null">
-            and labelList like Concat('%',#{labelID},'%')
+            and
+            (
+            SELECT
+            JSON_ARRAYAGG( JSON_OBJECT( 'labelID', labelTemp.LabelID ) )
+            FROM
+            (
+            SELECT
+            label.LabelID
+            FROM
+            pc_label label
+            LEFT JOIN pc_label_jobuser label_jobuser ON label.LabelID = label_jobuser.LabelID
+            WHERE
+            label_jobuser.JobuserID = jobuser.JobuserID
+            ) AS labelTemp
+            ) like Concat('%',#{labelID},'%')
         </if>
         <if test="minAge != null and maxAge == null">
             and

vue/src/router/outsideLayout.ts

@@ -22,4 +22,22 @@ export const companyDataMapRoute: RouteRecordRaw = {
   },
 };
 
-export default [LoginRoute, companyDataMapRoute];
+export const siteDataMapRoute: RouteRecordRaw = {
+  path: '/dataMap/siteDataMap',
+  name: 'dataMap_siteDataMap',
+  component: () => import('@/views/dataMap/siteDataMap.vue'),
+  meta: {
+    title: '惠州市就业驿站管理系统',
+  },
+};
+
+export const jobUserDataMapRoute: RouteRecordRaw = {
+  path: '/dataMap/jobUserDataMap',
+  name: 'dataMap_jobUserDataMap',
+  component: () => import('@/views/dataMap/jobUserDataMap.vue'),
+  meta: {
+    title: '惠州市就业驿站管理系统',
+  },
+};
+
+export default [LoginRoute, companyDataMapRoute, siteDataMapRoute, jobUserDataMapRoute];

vue/src/views/dataMap/companyDataMap.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="card-search">
+  <div>
     <div class="map-box">
       <!-- 地图 -->
       <div
@@ -700,8 +700,8 @@ export default {
 
 <style lang="less">
 .map-box {
-  width: 100%;
-  height: calc(100vh - 235px);
+  width: 100vw;
+  height: 100vh;
   position: relative;
   border: 1px rgba(173, 173, 173, 0.8) solid;
   box-sizing: border-box;

vue/src/views/dataMap/jobUserDataMap.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="card-search">
+  <div>
     <div class="map-box">
       <!-- 地图 -->
       <div
@@ -30,7 +30,7 @@
             </a-button>
           </div>
           <div style="width: 100%; margin-top: 2px;">
-            <a-button type="text" size="small" style="width: 46px">全部</a-button>
+            <a-button type="text" size="small" style="width: 46px  " @click="searchAll">全部</a-button>
             <a-select
               style="width: 42%;"
               v-model:value="searchParams.regionCode"
@@ -389,6 +389,16 @@ function ageBlur() {
   }
 }
 
+// 查询全部
+function searchAll() {
+  searchParams.pageIndex = 1
+  searchParams.pageSize = 100
+  searchParams.regionCode = null
+  searchParams.labelID = null
+  searchParams.minAge = null
+  searchParams.maxAge = null
+  onSearch();
+}
 onMounted(() => {
   initMap();
   getJobUserLabelDicList();
@@ -407,8 +417,8 @@ export default {
 
 <style lang="less" scoped>
 .map-box {
-  width: 100%;
-  height: calc(100vh - 235px);
+  width: 100vw;
+  height: 100vh;
   position: relative;
   border: 1px rgba(173, 173, 173, 0.8) solid;
   box-sizing: border-box;

vue/src/views/dataMap/siteDataMap.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="card-search">
+  <div>
     <div class="map-box">
       <!-- 地图 -->
       <div
@@ -265,8 +265,8 @@ export default {
 
 <style lang="less">
 .map-box {
-  width: 100%;
-  height: calc(100vh - 235px);
+  width: 100vw;
+  height: 100vh;
   position: relative;
   border: 1px rgba(173, 173, 173, 0.8) solid;
   box-sizing: border-box;