Merge branch 'master' of http://61.139.16.27:26684/DEV_ZZ/rsxm-master

src/views/mapCount/components/echartsMap copy.vue

@@ -48,9 +48,9 @@ import { onMounted, onUnmounted, reactive, ref } from 'vue';
 const list = ref([
   { label: '就业服务站', value: 40, dw: '个' },
   { label: '服务一体机', value: 40, dw: '个' },
-  { label: '劳务经纪人', value: 118, dw: '人' },
+  { label: '劳务经纪人', value: 178, dw: '人' },
-  { label: '招聘岗位', value: 9637, dw: '个' },
+  // { label: '招聘岗位', value: 9637, dw: '个' },
-  { label: '成功入职', value: 1305, dw: '个' },
+  // { label: '成功入职', value: 1305, dw: '个' },
 ])
 const dataForm = ref({})
 const baseList = ref([])

src/views/mapCount/components/echartsMap.vue

@@ -49,9 +49,9 @@ import { onMounted, onUnmounted, nextTick , ref } from 'vue';
 const list = ref([
   { label: '就业服务站', value: 40, dw: '个' },
   { label: '服务一体机', value: 40, dw: '个' },
-  { label: '劳务经纪人', value: 118, dw: '人' },
+  { label: '劳务经纪人', value: 178, dw: '人' },
-  { label: '招聘岗位', value: 9637, dw: '个' },
+  // { label: '招聘岗位', value: 9637, dw: '个' },
-  { label: '成功入职', value: 1305, dw: '人' },
+  // { label: '成功入职', value: 1305, dw: '人' },
 ])
 const dataForm = ref({})
 const baseList = ref([])

src/views/mapCount/components/echartsMap2.vue

@@ -51,9 +51,9 @@ import { onMounted, onUnmounted, nextTick, ref } from 'vue';
 const list = ref([
   { label: '就业服务站', value: 40, dw: '个' },
   { label: '服务一体机', value: 40, dw: '个' },
-  { label: '劳务经纪人', value: 118, dw: '人' },
+  { label: '劳务经纪人', value: 178, dw: '人' },
-  { label: '招聘岗位', value: 9637, dw: '个' },
+  // { label: '招聘岗位', value: 9637, dw: '个' },
-  { label: '成功入职', value: 1305, dw: '人' },
+  // { label: '成功入职', value: 1305, dw: '人' },
 ])
 const dataForm = ref({})
 const baseList = ref([])

src/views/portraitScreen/components/pxkcjh.vue

@@ -17,11 +17,6 @@
 import { ref, onMounted, onBeforeUnmount } from "vue";
 
 const tableData = ref([
-  {
-    name: "人社局劳务经纪人培训",
-    starTime: "2025/09/24",
-    endTime: "2025/09/26"
-  },
   {
     name: "退役军人适应性培训",
     starTime: "2025/10/16",
@@ -33,45 +28,50 @@ const tableData = ref([
     endTime: "2025/10/17"
   },
   {
-    name: "电工",
+    name: "人社局劳务经纪人培训",
-    starTime: "2025/05/12",
+    starTime: "2025/9/24",
-    endTime: "2025/06/06"
+    endTime: "2025/9/26"
   },
   {
-    name: "焊工",
+    name: "学生就业指导",
-    starTime: "2025/05/19",
+    starTime: "2025/9/1",
-    endTime: "2025/06/13"
+    endTime: "2025/9/1"
   },
   {
-    name: "钳工",
+    name: "高空作业",
-    starTime: "2025/05/26",
+    starTime: "2025/8/18",
-    endTime: "2025/06/20"
+    endTime: "2025/9/12"
   },
   {
-    name: "人工智能训练师",
+    name: "机械木工-拼缝接合",
-    starTime: "2025/06/02",
+    starTime: "2025/8/4",
-    endTime: "2025/06/27"
+    endTime: "2025/10/17"
   },
   {
     name: "无人机飞手",
-    starTime: "2025/06/16",
+    starTime: "2025/6/16",
-    endTime: "2025/07/11"
+    endTime: "2025/7/11"
+  },
+  {
+    name: "人工智能训练师",
+    starTime: "2025/6/2",
+    endTime: "2025/6/27"
+  },
+  {
+    name: "钳工",
+    starTime: "2025/5/26",
+    endTime: "2025/6/20"
+  },
+  {
+    name: "焊工",
+    starTime: "2025/5/19",
+    endTime: "2025/6/13"
+  },
+  {
+    name: "电工",
+    starTime: "2025/5/12",
+    endTime: "2025/6/6"
   }
-  // {
-  //   name: "手工木工",
-  //   starTime: "2025/7/14",
-  //   endTime: "2025/8/8"
-  // },
-  // {
-  //   name: "高空作业",
-  //   starTime: "2025/8/18",
-  //   endTime: "2025/9/12"
-  // }
-  // {
-  //   name: "学生就业指导",
-  //   starTime: "2025/9/1",
-  //   endTime: "2025/9/1"
-  // }
 ]);
 </script>
 

src/views/portraitScreen/components/top10.vue

@@ -26,11 +26,11 @@ const rankData = ref([
   { name: "电工培训", count: "120" },
   { name: "焊工培训", count: "100" },
   { name: "食品安全管理师培训", count: "95" },
-  { name: "无人机驾驶员培训", count: "40" },
+  { name: "无人机驾驶员培训", count: "78" },
   { name: "公共营养师培训", count: "72" },
   { name: "医疗护理员培训", count: "63" },
   { name: "人工智能训练师培训", count: "48" },
-  { name: "机械木工", count: "78" },
+  { name: "机械木工", count: "40" },
   { name: "高处安装维护拆除作业培训", count: "32" },
   { name: "登高架设培训", count: "29" }
 ]);
@@ -54,16 +54,18 @@ onMounted(() => {
 ul.rankList {
   width: 100%;
   margin: 0 auto;
+
   li {
     margin: 0 100px;
     height: 85px;
-    background: url("~@/assets/images/largeScreen/rankList-bg.png") no-repeat 0
+    background: url("~@/assets/images/largeScreen/rankList-bg.png") no-repeat 0 0;
-      0;
     background-size: 100% 100%;
     margin: 40px 0 0 0;
     position: relative;
+
     .left {
       float: left;
+
       .sequence {
         position: absolute;
         text-align: right;
@@ -75,16 +77,20 @@ ul.rankList {
         color: #0a9eb5;
         font-weight: bold;
         font-size: 40px;
+
         &.red {
           color: #ff0000;
         }
+
         &.orange {
           color: #ffa500;
         }
+
         &.yellow {
           color: #ffd700;
         }
       }
+
       .name {
         font-size: 50px;
         margin: 0 0 0 200px;
@@ -92,6 +98,7 @@ ul.rankList {
         height: 60px;
       }
     }
+
     .right {
       float: right;
       height: 60px;
@@ -103,19 +110,19 @@ ul.rankList {
       -webkit-text-fill-color: transparent;
       font-weight: 400;
     }
+
     .jdtBox {
       position: absolute;
       top: 0px;
       left: 194px;
       right: 0px;
       height: 4px;
+
       .jdt {
         height: 4px;
-        background: linear-gradient(
+        background: linear-gradient(90deg,
-          90deg,
             rgba(53, 168, 235, 0) 0%,
-          #00ddff 100%
+            #00ddff 100%);
-        );
         border-radius: 4px 4px 4px 4px;
       }
     }