From 2566b67acf159e03a4ea5c0df78f958d827eaaab Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Sat, 13 Jul 2024 13:37:35 +0800
Subject: [PATCH 1/2] gx

---
 src/view/echarts_education/edXS2.vue | 11 +++++++--
 src/view/echarts_education/pie.vue   |  1 +
 src/view/echarts_education/pie5.vue  |  2 ++
 src/view/education.vue               | 35 +++++++++++++++-------------
 src/view/sy.vue                      |  8 +------
 src/view/work.vue                    |  2 +-
 6 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/view/echarts_education/edXS2.vue b/src/view/echarts_education/edXS2.vue
index 32294c6..8967746 100644
--- a/src/view/echarts_education/edXS2.vue
+++ b/src/view/echarts_education/edXS2.vue
@@ -24,7 +24,7 @@ const data = reactive({
   option: {},
   bg: [],
 });
-
+const max=ref(100);
 const getOption = () => {
   data.option = {
     tooltip: {
@@ -62,6 +62,7 @@ const getOption = () => {
     },
     yAxis: {
       type: "value",
+      max:max,
       splitLine: {
         show: true,
         lineStyle: {
@@ -94,9 +95,10 @@ const getOption = () => {
         symbol: "emptyCircle",
 
         symbolSize: 10,
-              label: {
+            label: {
           show: true,
           color: "#ffffff",
+          fontSize:17,
          position:'top',
           formatter: function (data) {
             return data.value;
@@ -138,6 +140,9 @@ const getOption = () => {
     ],
   };
 };
+const  getMaxValue=(arr)=> {
+  return Math.max(...arr);
+}
 const setChart = () => {
   // Vue3中： 需要引入
   var myChart = echarts.init(chart.value);
@@ -150,6 +155,8 @@ onBeforeMount(() => {
   setTimeout(() => {
     data.list = props.list;
     data.year = props.month;
+    max.value=getMaxValue(data.list);
+    max.value=max.value+20;
     // console.log(data.list,props.month,'教育');
     data.year.forEach(() => {
       data.bg.push(0);
diff --git a/src/view/echarts_education/pie.vue b/src/view/echarts_education/pie.vue
index 60cc04a..4d1b8fc 100644
--- a/src/view/echarts_education/pie.vue
+++ b/src/view/echarts_education/pie.vue
@@ -157,6 +157,7 @@ const getOption = () => {
           show: true,
           position: "top",
           color: "#ffffff",
+          fontSize:'17',
           formatter: function (data) {
             return data.value;
           },
diff --git a/src/view/echarts_education/pie5.vue b/src/view/echarts_education/pie5.vue
index 7668c8e..eca87f8 100644
--- a/src/view/echarts_education/pie5.vue
+++ b/src/view/echarts_education/pie5.vue
@@ -121,6 +121,7 @@ const getOption = () => {
           show: true,
           position: "right",
           color: "#ffffff",
+          fontSize: 17,
           formatter: function (data) {
             return data.value;
           },
@@ -148,6 +149,7 @@ const getOption = () => {
           show: true,
           position: "right",
           color: "#ffffff",
+              fontSize: 17,
           formatter: function (data) {
             return data.value;
           },
diff --git a/src/view/education.vue b/src/view/education.vue
index d4e5e10..982826d 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -96,15 +96,15 @@
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">初中</span>
-                <span>{{ data.xxgk.czxxsl }}</span>
+                <span class="spot font" >初中</span>
+                <span class="font">{{ data.xxgk.czxxsl }}</span>
               </div>
               <div
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">高中</span>
-                <span>{{ data.xxgk.gzxxsl }}</span>
+                <span class="spot font">高中</span>
+                <span class="font">{{ data.xxgk.gzxxsl }}</span>
               </div>
             </div>
             <div class="grade">
@@ -112,15 +112,15 @@
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">小学</span>
-                <span>{{ data.xxgk.xxxxsl }}</span>
+                <span class="spot font">小学</span>
+                <span class="font">{{ data.xxgk.xxxxsl }}</span>
               </div>
               <div
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">中职</span>
-                <span>{{ data.xxgk.zzxxsl }}</span>
+                <span class="spot font">中职</span>
+                <span class="font">{{ data.xxgk.zzxxsl }}</span>
               </div>
             </div>
             <div class="grade grade1">
@@ -128,16 +128,16 @@
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">幼儿园</span>
-                <span>{{ data.xxgk.yeyxxsl }}</span>
+                <span class="spot font">幼儿园</span>
+                <span class="font">{{ data.xxgk.yeyxxsl }}</span>
               </div>
               <div class="schoolbs">
                 <span
-                  class="spot"
+                  class="spot font"
                   @click="showDialog('学校', '/api/ggfwyth/schoolList')"
                   >特殊教育</span
                 >
-                <span>{{ data.xxgk.tsjyxxsl }}</span>
+                <span class="font">{{ data.xxgk.tsjyxxsl }}</span>
               </div>
             </div>
           </div>
@@ -226,7 +226,7 @@
             <img src="@/assets/eduImg/jyImg10.png" alt="" />
             <img src="@/assets/eduImg/pp3.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg1">
-              <span>绿色预警</span>
+              <span style="fontSize:18px;">绿色预警</span>
             </div>
           </div>
           <div class="earlyWarning1">
@@ -236,7 +236,7 @@
             <img src="@/assets/eduImg/jyImg9.png" alt="" />
             <img src="@/assets/eduImg/pp2.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg2">
-              <span>黄色预警</span>
+              <span style="fontSize:18px;">黄色预警</span>
             </div>
           </div>
           <div class="earlyWarning1">
@@ -246,7 +246,7 @@
             <img src="@/assets/eduImg/jyImg8.png" alt="" />
             <img src="@/assets/eduImg/pp1.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg3">
-              <span>红色预警</span>
+              <span style="fontSize:18px;">红色预警</span>
             </div>
           </div>
         </div>
@@ -1819,7 +1819,9 @@ onMounted(() => {
     }
   }
 }
-
+.font{
+  font-size: 16px !important;
+}
 :deep(.el-table) {
   background: rgba(32, 64, 115, 1);
 
@@ -1867,4 +1869,5 @@ onMounted(() => {
     font-size: 18px !important;
   }
 }
+
 </style>
diff --git a/src/view/sy.vue b/src/view/sy.vue
index 8ffb515..d29f2aa 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -566,13 +566,7 @@
       @handle="handlePagination"
     >
       <template #pxkssj="{ currentCol, currentData }">
-        <div>
-          {{ currentData.pxkssj.slice(0, 4) }}-{{
-            currentData.pxkssj.slice(4, 6)
-          }}-{{ currentData.pxkssj.slice(6, 8) }}/{{
-            currentData.pxjssj.slice(4, 6)
-          }}-{{ currentData.pxjssj.slice(6, 8) }}
-        </div>
+        <div>{{ currentData.pxkssj }}/{{ currentData.pxjssj }}</div>
       </template>
       <!-- <template #pxjssj="{ currentCol, currentData }">
         <div>
diff --git a/src/view/work.vue b/src/view/work.vue
index 6417c15..b6a5df4 100644
--- a/src/view/work.vue
+++ b/src/view/work.vue
@@ -459,7 +459,7 @@ onMounted(() => {
    setTimeout(()=>{
  startAutoScroll();
   },600)
-  startAutoSwitching();
+  // startAutoSwitching();
 });
 
 onBeforeMount(() => {

From 15b4d2269e9ddd848869f7c92faaa8bf64b41d80 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Sat, 13 Jul 2024 14:36:34 +0800
Subject: [PATCH 2/2] gx

---
 src/view/analyze.vue               |  32 +++-
 src/view/dialog/dialogMap.vue      | 258 +++++++++++++++++++++++++++++
 src/view/echart_analyze/map.vue    |  12 +-
 src/view/echart_analyze/right2.vue |   5 +-
 src/view/education.vue             |   8 +-
 src/view/hygiene.vue               |  13 +-
 src/view/sy.vue                    |   6 +-
 7 files changed, 314 insertions(+), 20 deletions(-)
 create mode 100644 src/view/dialog/dialogMap.vue

diff --git a/src/view/analyze.vue b/src/view/analyze.vue
index f3bb002..84b9f33 100644
--- a/src/view/analyze.vue
+++ b/src/view/analyze.vue
@@ -106,7 +106,7 @@
             v-for="option in data.options"
             :key="option.value"
             :class="jz === option.value ? 'choose_1' : 'choose_2'"
-            @click="jzChange(option.value,option.label)"
+            @click="jzChange(option.value, option.label)"
             class="choose_0"
           >
             {{ option.label }}
@@ -144,6 +144,7 @@
         <!-- <img src="@/assets/images/sjfx/right3D.png" alt="" class="right3d" /> -->
         <right2
           :list="data.analysis.push"
+          @shuju="chooseXX"
           v-if="showEchart && tab_choose[0].choose == '信息推送'"
         ></right2>
         <ylXZZC
@@ -173,6 +174,12 @@
       @close="close"
     >
     </DialogEnrol>
+    <DialogMap
+      :dialogShowMap="dialogShowMap"
+      :title="mapTitle"
+      @close="close"
+    >
+    </DialogMap>
   </div>
 </template>
 
@@ -186,6 +193,7 @@ import {
   computed,
 } from "vue";
 import DialogEnrol from "./dialog/dialogEnrol.vue";
+import DialogMap from "./dialog/dialogMap.vue";
 import right2 from "./echart_analyze/right2.vue";
 import right1 from "./echart_analyze/right1.vue";
 import jypx from "./echart_analyze/jypx.vue";
@@ -206,10 +214,12 @@ import ViewDataimg2 from "@/assets/images/sjfx/sjfx2.png";
 import ViewDataimg3 from "@/assets/images/sjfx/sjfx3.png";
 import jypx1 from "@/assets/images/sjfx/pxrc.png";
 import jypx2 from "@/assets/images/sjfx/gygws.png";
-import Map from "./echart_analyze/map.vue";
+
 const showR = ref(false); //loading
 // 入学分析数据
 const dialogShowEnrol = ref(false);
+const dialogShowMap = ref(false);
+const mapTitle = ref("");
 const dataTab = reactive({
   url: "",
   title: "",
@@ -313,6 +323,7 @@ const showEnrol = () => {
 };
 const close = () => {
   dialogShowEnrol.value = false;
+  dialogShowMap.value = false;
 };
 
 //数据切换
@@ -330,6 +341,17 @@ const tab_change = (index, name) => {
     }
   }
 };
+const chooseXX = (name) => {
+  console.log(name);
+  if (name == "交通") {
+    mapTitle.value='交通';
+    dialogShowMap.value = true;
+  }
+  // tableType.title = village;
+  // tableType.columns = xz_column.value;
+  // tableType.url = "/api/ggfwyth/zcxxList";
+  // getTownDetail();
+};
 //就业培训
 const jypxList = reactive([
   {
@@ -345,9 +367,9 @@ const jypxList = reactive([
 ]);
 // 救助分析tap切换
 const jz = ref("1");
-const jzChange = (value,label) => {
+const jzChange = (value, label) => {
   jz.value = value;
-  data.jzfxName=label;
+  data.jzfxName = label;
   data.list = data.dataAnalysis[value - 1];
 };
 const showEchart = ref(false);
@@ -358,7 +380,7 @@ const data = reactive({
   },
   list1: {},
   list2: {},
-  jzfxName:'特困',
+  jzfxName: "特困",
   options: [
     { value: "1", label: "特困" },
     { value: "2", label: "低保" },
diff --git a/src/view/dialog/dialogMap.vue b/src/view/dialog/dialogMap.vue
new file mode 100644
index 0000000..3a359a8
--- /dev/null
+++ b/src/view/dialog/dialogMap.vue
@@ -0,0 +1,258 @@
+
+<template>
+  <div class="dialogPage">
+    <el-dialog
+      v-model="dialogShowMap"
+      width="80vw"
+      :show-close="false"
+      center
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <template #header="{ close, titleId, titleClass }">
+        <div class="my-header">
+          <el-icon
+            size="26"
+            color="#fff"
+            @click="closeDialog"
+          >
+            <CircleCloseFilled />
+          </el-icon>
+        </div>
+      </template>
+
+      <div class="tabelPart">
+        <div class="bo">
+          <div class="title">
+            <div class="title_top">
+              <img
+                src="@/assets/images/table_l.png"
+                alt=""
+                style="margin-right: 10px"
+              />
+              <div class="name">{{ title }}详情</div>
+              <img
+                src="@/assets/images/table_r.png"
+                alt=""
+                style="margin-left: 10px"
+              />
+            </div>
+            <img
+              class="title_botton"
+              src="@/assets/images/table_c.png"
+              alt=""
+            />
+          </div>
+        </div>
+        <div style="width: 100%; height: 600px">
+         <Map style="width:100%;height:100%;"></Map>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import {
+  onMounted,
+  reactive,
+  ref,
+  onBeforeMount,
+  defineProps,
+  watch,
+  nextTick,
+} from "vue";
+import { CircleCloseFilled } from "@element-plus/icons-vue";
+import Map from "../echart_analyze/map.vue";
+
+const props = defineProps({
+  dialogShowMap: {
+    type: Boolean,
+    default: () => {
+      return false;
+    },
+  },
+  title: {
+    type: String,
+    default: () => {
+      return "";
+    },
+  },
+  list1: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+  list2: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+  year: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+});
+const emit = defineEmits(["close"]);
+
+// 详情弹框
+const dialogShowMap = ref();
+const data = reactive({
+  title: "",
+  list1: [],
+  list2: [],
+  year: [],
+  option: {},
+  bg: [],
+});
+
+// 监听
+watch(
+  () => props.dialogShowMap,
+  (newVal, oldVal) => {
+    dialogShowMap.value = newVal;
+  }
+);
+watch(
+  () => props.list1,
+  (newVal, oldVal) => {
+    data.list1 = newVal;
+  }
+);
+watch(
+  () => props.list2,
+  (newVal, oldVal) => {
+    data.list2 = newVal;
+  }
+);
+watch(
+  () => props.year,
+  (newVal, oldVal) => {
+    data.year = newVal;
+  }
+);
+// 使用生命钩子
+onMounted(() => {
+  data.title = props.title;
+  data.list1 = props.list1;
+  data.list2 = props.list2;
+  data.year = props.year;
+});
+
+const closeDialog = () => {
+  dialogShowMap.value = false;
+  emit("close");
+};
+
+</script>
+<style lang="scss" scoped>
+:deep(.el-dialog) {
+  --el-dialog-bg-color: none;
+  --el-dialog-width: 76% !important;
+}
+
+.my-header {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+.tabelPart {
+  padding: 16px;
+  background: linear-gradient(
+      270deg,
+      rgba(0, 77, 131, 0.69) 0%,
+      rgba(0, 51, 83, 0.77) 50%,
+      rgba(0, 77, 131, 0.74) 100%
+    ),
+    radial-gradient(
+      66% 40% at 50% 0%,
+      rgba(1, 150, 243, 0.55) 0%,
+      rgba(0, 116, 255, 0) 100%
+    );
+  box-shadow: inset 0px 0px 56px 0px rgba(100, 191, 255, 0.5);
+  border: 2px solid;
+  border-image: linear-gradient(
+      180deg,
+      rgba(21, 150, 255, 1),
+      rgba(0, 157, 227, 0)
+    )
+    2 2;
+
+  :deep(.el-table) {
+    --el-table-bg-color: none;
+    --el-table-tr-bg-color: none;
+    --el-table-header-bg-color: none;
+    background: none;
+    border: none;
+    --el-table-text-color: #fff;
+    --el-table-header-text-color: #fff;
+  }
+}
+
+.pagePart {
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  :deep(.el-pagination) {
+    --el-pagination-button-disabled-bg-color: none;
+    --el-pagination-bg-color: none;
+    --el-pagination-button-bg-color: none;
+    --el-pagination-button-color: #fff;
+    color: #fff;
+  }
+
+  :deep(.el-pagination button:disabled) {
+    background-color: rgba(0, 116, 255, 0) !important;
+  }
+  :deep(.el-pagination > .is-last) {
+    color: #ffffff;
+  }
+}
+
+.bo {
+  width: 100%;
+  display: flex;
+}
+
+.title {
+  margin: 10px auto;
+  display: flex;
+  flex-direction: column;
+
+  &_top {
+    display: flex;
+    align-items: end;
+
+    img {
+      height: 33px;
+      width: 33px;
+    }
+
+    .name {
+      font-family: PangMenZhengDao, PangMenZhengDao;
+      font-weight: 600;
+      font-size: 33px;
+      color: #ffffff;
+      line-height: 38px;
+      text-align: center;
+      font-style: normal;
+      letter-spacing: 2px;
+      background: linear-gradient(180deg, #ffffff 0%, #51ffef 100%);
+      -webkit-background-clip: text;
+      /*将设置的背景颜色限制在文字中*/
+      -webkit-text-fill-color: transparent;
+      /*给文字设置成透明*/
+    }
+  }
+
+  &_botton {
+    margin-top: 5px;
+    height: 19px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/view/echart_analyze/map.vue b/src/view/echart_analyze/map.vue
index 7f5a2d7..9bad908 100644
--- a/src/view/echart_analyze/map.vue
+++ b/src/view/echart_analyze/map.vue
@@ -19,7 +19,12 @@ const init = () => {
     // 主题色
     mapStyle: "amap://styles/blue",
     // 地图层级
-    zoom: 12,
+    zoom: 12.5,
+    labelDefault:{
+      textStyle:{
+        color:'#fffff',
+      }
+    }
   });
   // 实时路况图层
   var trafficLayer = new AMap.TileLayer.Traffic({
@@ -41,5 +46,8 @@ onMounted(() => {
           bottom:-100px;
            display: none!important;;
     }  
-
+::v-deep .amap-container {
+  /* 调整区域的字体颜色 */
+  color: #ff0000; /* 红色 */
+}
 </style>
\ No newline at end of file
diff --git a/src/view/echart_analyze/right2.vue b/src/view/echart_analyze/right2.vue
index 2c3e005..eb9444f 100644
--- a/src/view/echart_analyze/right2.vue
+++ b/src/view/echart_analyze/right2.vue
@@ -6,7 +6,7 @@
 import { onMounted, onBeforeMount, reactive, ref } from "vue";
 // 局部引入echarts核心模块
 import * as echarts from "echarts";
-
+const emit = defineEmits(["shuju"]);
 const props = defineProps({
   list: {
     type: Array,
@@ -430,6 +430,9 @@ const getOption = () => {
 const setChart = () => {
   var myChart = echarts.init(chart.value);
   myChart.setOption(data.option);
+    myChart.on("click", function (params) {
+    emit('shuju',params.name);
+  });
 };
 const getMaxCeilingValue = (arr) => {
   let max = Math.max(...arr);// 找到数组中的最大值
diff --git a/src/view/education.vue b/src/view/education.vue
index 982826d..4eb1670 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -226,7 +226,7 @@
             <img src="@/assets/eduImg/jyImg10.png" alt="" />
             <img src="@/assets/eduImg/pp3.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg1">
-              <span style="fontSize:18px;">绿色预警</span>
+              <span style="fontSize:20px;">绿色预警</span>
             </div>
           </div>
           <div class="earlyWarning1">
@@ -236,7 +236,7 @@
             <img src="@/assets/eduImg/jyImg9.png" alt="" />
             <img src="@/assets/eduImg/pp2.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg2">
-              <span style="fontSize:18px;">黄色预警</span>
+              <span style="fontSize:20px;">黄色预警</span>
             </div>
           </div>
           <div class="earlyWarning1">
@@ -246,7 +246,7 @@
             <img src="@/assets/eduImg/jyImg8.png" alt="" />
             <img src="@/assets/eduImg/pp1.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg3">
-              <span style="fontSize:18px;">红色预警</span>
+              <span style="fontSize:20px;">红色预警</span>
             </div>
           </div>
         </div>
@@ -1262,7 +1262,7 @@ onMounted(() => {
     }
 
     .historyimg {
-      width: 133px;
+      width: 140px;
       height: 19px;
       background-repeat: no-repeat;
       background-size: 100% 100%;
diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue
index 740aa4c..c34ebac 100644
--- a/src/view/hygiene.vue
+++ b/src/view/hygiene.vue
@@ -122,7 +122,7 @@
           <div class="item">
             <img src="@/assets/images/hygiene/mjzrc.png" class="left" />
             <div class="right">
-              <div class="right_top">门急诊人次</div>
+              <div class="right_top font">门急诊人次</div>
               <img src="@/assets/images/hygiene/jt.png" class="right_center" />
               <div class="right_bottom">{{ data.mz.mjzrc }}</div>
             </div>
@@ -130,7 +130,7 @@
           <div class="item">
             <img src="@/assets/images/hygiene/zyrs.png" class="left" />
             <div class="right">
-              <div class="right_top">住院人数</div>
+              <div class="right_top font">住院人数</div>
               <img src="@/assets/images/hygiene/jt.png" class="right_center" />
               <div class="right_bottom">{{ data.mz.zyrs }}</div>
             </div>
@@ -159,7 +159,7 @@
                 src="@/assets/images/hygiene/jd.gif"
                 alt=""
               />
-              <div class="historyimg">建档份数</div>
+              <div class="historyimg font">建档份数</div>
             </div>
           </div>
           <div class="minTopPart2">
@@ -210,14 +210,14 @@
             <img src="@/assets/images/hygiene/fy.png" alt="" />
             <img src="@/assets/images/hygiene/fy1.png" alt="" class="fyMove" />
             <img src="@/assets/images/hygiene/fy.gif" class="historyMoveImg" />
-            <div class="historyimg">孕产妇系统管理人数</div>
+            <div class="historyimg font" >孕产妇系统管理人数</div>
           </div>
           <div class="history1">
             <div class="va">{{ data.fyglrs.etrs }}</div>
             <img src="@/assets/images/hygiene/fy.png" alt="" />
             <img src="@/assets/images/hygiene/fy2.png" alt="" class="fyMove" />
             <img src="@/assets/images/hygiene/fy.gif" class="historyMoveImg" />
-            <div class="historyimg">0-6岁儿童系统管理人数</div>
+            <div class="historyimg font" >0-6岁儿童系统管理人数</div>
           </div>
         </div>
       </div>
@@ -1304,4 +1304,7 @@ const getData = async () => {
   margin-top: 15px;
   margin-bottom: 10px;
 }
+.font{
+  font-size: 18px !important;
+}
 </style>
diff --git a/src/view/sy.vue b/src/view/sy.vue
index 15efc38..54265b0 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -565,9 +565,9 @@
       @close="close"
       @handle="handlePagination"
     >
-      <template #pxkssj="{ currentCol, currentData }">
+      <!-- <template #pxkssj="{ currentCol, currentData }">
         <div>{{ currentData.pxkssj }}/{{ currentData.pxjssj }}</div>
-      </template>
+      </template> -->
       <!-- <template #pxjssj="{ currentCol, currentData }">
         <div>
           {{ currentData.pxjssj.slice(0, 4) }}-{{
@@ -667,7 +667,7 @@ const columnss = reactive({
     {
       label: "培训时间",
       property: "pxkssj",
-      type: "slot",
+      // type: "slot",
     },
     // {
     //   label: "培训开始时间",