Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/dialog/dialog.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="dialogPage">
-    <el-dialog
+    <el-dialog v-model="dialogShow" width="80vw" :show-close="false" center :close-on-click-modal="false"
-      v-model="dialogShow"
+      :close-on-press-escape="false">
-      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">
@@ -20,23 +14,16 @@
         <div class="bo">
           <div class="title">
             <div class="title_top">
-              <img src="@/assets/images/table_l.png" alt="" style="margin-right:10px;"/>
+              <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;"/>
+              <img src="@/assets/images/table_r.png" alt="" style="margin-left:10px;" />
             </div>
-            <img
+            <img class="title_botton" src="@/assets/images/table_c.png" alt="" />
-              class="title_botton"
-              src="@/assets/images/table_c.png"
-              alt=""
-            />
           </div>
         </div>
-        <el-table
+        <div style="width: 100%; height: calc(100% - 110px);">
-          :data="data.tableData"
+          <el-table :data="data.tableData" height="100%" :header-cell-style="{ background: '#008FCD' }">
-          height="calc(100% - 110px)"
+            <!-- <el-table-column
-          :header-cell-style="{ background: '#008FCD' }"
-        >
-          <!-- <el-table-column
             v-for="(item, index) in data.columns"
             :key="index"
             :property="item.property"
@@ -44,44 +31,23 @@
             :width="item.width"
             align="center"
           /> -->
-          <template v-for="item in data.columns">
+            <template v-for="item in data.columns">
-            <el-table-column
+              <el-table-column :key="item.label" v-if="item.type === 'slot'" :width="item.width" :label="item.label"
-              :key="item.label"
+                :property="item.property" align="center">
-              v-if="item.type === 'slot'"
+                <template #default="scope">
-              :width="item.width"
+                  <slot :name="item.property" :currentCol="item" :currentData="scope.row"></slot>
-              :label="item.label"
+                </template>
-              :property="item.property"
+              </el-table-column>
-              align="center"
+              <el-table-column :key="item.label" :property="item.property" :label="item.label" :width="item.width"
-            >
+                align="center" v-else />
-              <template #default="scope">
+            </template>
-                <slot
+          </el-table>
-                  :name="item.property"
+        </div>
-                  :currentCol="item"
+
-                  :currentData="scope.row"
-                ></slot>
-              </template>
-            </el-table-column>
-            <el-table-column
-              :key="item.label"
-              :property="item.property"
-              :label="item.label"
-              :width="item.width"
-              align="center"
-              v-else
-            />
-          </template>
-        </el-table>
         <div class="pagePart">
-          <el-pagination
+          <el-pagination background layout="prev, pager, next" :page-size="pagination.pageSize"
-            background
+            :total="pagination.total" prev-text="上一页" next-text="下一页" @current-change="handle"
-            layout="prev, pager, next"
+            v-model:current-page="pagination.currentPage" />
-            :page-size="pagination.pageSize"
-            :total="pagination.total"
-            prev-text="上一页"
-            next-text="下一页"
-            @current-change="handle"
-            v-model:current-page="pagination.currentPage"
-          />
         </div>
       </div>
     </el-dialog>
@@ -145,11 +111,16 @@ watch(
   () => props.dialogShow,
   (newVal, oldVal) => {
     dialogShow.value = newVal;
-    data.tableData = props.tableData;
+    // data.tableData = props.tableData;
     data.columns = props.columns;
   }
 );
-
+watch(
+ () => props.tableData,
+(newVal, oldVal) => {
+ data.tableData = props.tableData;
+ }
+);
 // 使用生命钩子
 onMounted(() => {
   dialogShow.value = props.dialogShow;
@@ -180,25 +151,18 @@ const handle = (current) => {
 .tabelPart {
   height: 80vh;
   padding: 16px;
-  background: linear-gradient(
+  background: linear-gradient(270deg,
-      270deg,
       rgba(0, 77, 131, 0.69) 0%,
       rgba(0, 51, 83, 0.77) 50%,
-      rgba(0, 77, 131, 0.74) 100%
+      rgba(0, 77, 131, 0.74) 100%),
-    ),
+    radial-gradient(66% 40% at 50% 0%,
-    radial-gradient(
-      66% 40% at 50% 0%,
       rgba(1, 150, 243, 0.55) 0%,
-      rgba(0, 116, 255, 0) 100%
+      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(
+  border-image: linear-gradient(180deg,
-      180deg,
       rgba(21, 150, 255, 1),
-      rgba(0, 157, 227, 0)
+      rgba(0, 157, 227, 0)) 2 2;
-    )
-    2 2;
 
   :deep(.el-table) {
     --el-table-bg-color: none;
@@ -216,6 +180,7 @@ const handle = (current) => {
   display: flex;
   align-items: center;
   justify-content: center;
+
   :deep(.el-pagination) {
     --el-pagination-button-disabled-bg-color: none;
     --el-pagination-bg-color: none;
@@ -223,22 +188,26 @@ const handle = (current) => {
     --el-pagination-button-color: #fff;
     color: #fff;
   }
+
   :deep(.el-pagination button:disabled) {
     background-color: rgba(0, 116, 255, 0) !important;
   }
 }
+
 .bo {
   width: 100%;
   display: flex;
-  // align-items: center;
 }
+
 .title {
   margin: 10px auto;
   display: flex;
   flex-direction: column;
+
   &_top {
     display: flex;
     align-items: end;
+
     img {
       height: 33px;
       width: 33px;
@@ -254,10 +223,13 @@ const handle = (current) => {
       font-style: normal;
       letter-spacing: 2px;
       background: linear-gradient(180deg, #ffffff 0%, #51ffef 100%);
-      -webkit-background-clip: text; /*将设置的背景颜色限制在文字中*/
+      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent; /*给文字设置成透明*/
+      /*将设置的背景颜色限制在文字中*/
+      -webkit-text-fill-color: transparent;
+      /*给文字设置成透明*/
     }
   }
+
   &_botton {
     margin-top: 5px;
     height: 19px;

src/view/echarts_yl/ylXZZC.vue

@@ -13,7 +13,7 @@ import {
 } from "vue";
 // 局部引入echarts核心模块
 import * as echarts from "echarts";
-
+const emit = defineEmits(["village"]);
 const props = defineProps({
   list1: {
     type: Array,
@@ -217,11 +217,11 @@ const getOption = () => {
         },
         label: {
           show: true,
-          position: 'right',
+          position: "right",
-          color: '#ffffff',
+          color: "#ffffff",
           formatter: function (data) {
-            return data.value
+            return data.value;
-          }
+          },
         },
       },
     ],
@@ -261,10 +261,9 @@ const setChart = () => {
   var myChart = echarts.init(chart.value);
   // 使用刚指定的配置项和数据显示图表。
   myChart.setOption(data.option);
-  myChart.on('click', function (params) {
+  myChart.on("click", function (params) {
-    console.log('params',params)
+    emit('village',params.name);
-  })
+  });
-
 };
 // 使用生命钩子
 onBeforeMount(() => {

src/view/sy.vue

@@ -161,15 +161,24 @@
       <div class="flex1" style="margin-top: 10px">
         <div class="yd_title left_3"></div>
         <div class="left_3_1">
-          <div class="left_3_1_item" @click="showDialog('就业培训')">
+          <div
+            class="left_3_1_item"
+            @click="showDialog('就业培训', '/api/ggfwyth/jypxList')"
+          >
             <div>{{ data.employmentService.jypx }}</div>
             <div>就业培训</div>
           </div>
-          <div class="left_3_1_item" @click="showDialog('就业见习服务')">
+          <div
+            class="left_3_1_item"
+            @click="showDialog('就业见习服务', '/api/ggfwyth/jyjxfwList')"
+          >
             <div>{{ data.employmentService.jyjxfw }}</div>
             <div>就业见习服务</div>
           </div>
-          <div class="left_3_1_item" @click="showDialog('就业援助')">
+          <div
+            class="left_3_1_item"
+            @click="showDialog('就业援助', '/api/ggfwyth/jyyzList')"
+          >
             <div>{{ data.employmentService.jyyz }}</div>
             <div>就业援助</div>
           </div>
@@ -434,8 +443,19 @@
       @close="close"
       @handle="handlePagination"
     >
-      <template #yxstatus="{ currentCol, currentData }">
+      <template #pxkssj="{ currentCol, currentData }">
-        <div>-------------</div>
+        <div>
+          {{ currentData.pxkssj.slice(0, 4) }}-{{
+            currentData.pxkssj.slice(4, 6)
+          }}-{{ currentData.pxkssj.slice(6, 8) }}
+        </div>
+      </template>
+      <template #pxjssj="{ currentCol, currentData }">
+        <div>
+          {{ currentData.pxjssj.slice(0, 4) }}-{{
+            currentData.pxjssj.slice(4, 6)
+          }}-{{ currentData.pxjssj.slice(6, 8) }}
+        </div>
       </template>
     </Dialog>
   </div>
@@ -472,209 +492,138 @@ const columnss = reactive({
   就业培训: [
     {
       label: "姓名",
-      property: "name",
+      property: "xm",
     },
     {
       label: "单位",
-      property: "name",
+      property: "szdw",
     },
     {
       label: "职业",
-      property: "name",
+      property: "zy",
     },
     {
       label: "承办机构",
-      property: "name",
+      property: "pxcbjg",
     },
     {
       label: "培训班名称",
-      property: "name",
+      property: "pxbmc",
     },
     {
       label: "培训开始时间",
-      property: "name",
+      property: "pxkssj",
+      type: "slot",
     },
     {
       label: "培训结束时间",
-      property: "name",
+      property: "pxjssj",
+      type: "slot",
     },
   ],
   就业见习服务: [
     {
       label: "见习岗位名称",
-      property: "name",
+      property: "jxgwmc",
-      width: "150",
     },
     {
       label: "单位名称",
-      property: "name",
+      property: "dwmc",
-      width: "150",
     },
     {
       label: "岗位类型",
-      property: "name",
+      property: "gwlx",
-      width: "150",
     },
     {
       label: "接受人数",
-      property: "name",
+      property: "kjsrs",
-      width: "150",
     },
     {
       label: "见习地点",
-      property: "name",
+      property: "jxszd",
-      width: "150",
     },
     {
       label: "见习月数",
-      property: "name",
+      property: "njxys",
-      width: "150",
     },
     {
       label: "学历要求",
-      property: "name",
+      property: "xlyq",
-      width: "150",
     },
     {
       label: "专业",
-      property: "name",
+      property: "zy",
-      width: "150",
     },
     {
       label: "有效状态",
-      property: "yxstatus",
+      property: "yxzt",
-      type: "slot",
     },
   ],
   就业援助: [
     {
       label: "姓名",
-      property: "name",
+      property: "xm",
-      width: "150",
     },
     {
       label: "人员类别",
-      property: "name",
+      property: "rylb",
-      width: "150",
     },
     {
       label: "就失业状态",
-      property: "name",
+      property: "jsyzt",
-      width: "150",
     },
     {
       label: "优先指数",
-      property: "name",
+      property: "yxzs",
-      width: "150",
     },
     {
       label: "是否已帮扶",
-      property: "name",
+      property: "sfybf",
-      width: "150",
     },
     {
       label: "失业登记时间",
-      property: "name",
+      property: "sydjsj",
-      width: "150",
     },
     {
       label: "失业登记管辖地",
-      property: "name",
+      property: "sydjgxd",
-      width: "150",
     },
     {
       label: "户籍地",
-      property: "name",
+      property: "hjd",
     },
     {
       label: "居住地",
-      property: "name",
+      property: "jzd",
     },
     {
       label: "帮扶时间",
-      property: "name",
+      property: "bfsj",
     },
   ],
 });
 const tableType = reactive({
+  url: "",
   title: "",
   columns: [],
-  data: [
+  data: [],
-    {
-      date: "2016-05-02",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-01",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-03",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
-});
-const tabledata = reactive({
-  就业培训: [
-    {
-      date: "2016-05-02",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "John Smith",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
-  就业见习服务: [
-    {
-      date: "2016-05-02",
-      name: "张三",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "李四",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
-  就业援助: [
-    {
-      date: "2016-05-02",
-      name: "1",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-    {
-      date: "2016-05-04",
-      name: "2",
-      address: "No.1518,  Jinshajiang Road, Putuo District",
-    },
-  ],
 });
 // 表格分页
 const pagination = reactive({
   total: 100,
-  pageSize: 20,
+  pageSize: 10,
   currentPage: 1,
 });
 const handlePagination = (current) => {
-  console.log(current);
+  pagination.currentPage = current;
+  getTable(tableType.url, pagination.currentPage);
 };
-const showDialog = (title) => {
+const showDialog = (title, url) => {
-  dialogShow.value = true;
   tableType.title = title;
-  tableType.data = tabledata[title];
+  tableType.url = url;
   tableType.columns = columnss[title];
   pagination.currentPage = 1;
+  getTable(url, pagination.currentPage);
 };
 
 const close = () => {
@@ -1175,6 +1124,18 @@ const getData = async () => {
     }
   });
 };
+//获取表格数据
+const getTable = (url, currentPage) => {
+  http
+    .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
+    .then((res) => {
+      if (res.code == 200) {
+        tableType.data = res.data;
+        pagination.total = res.count;
+        dialogShow.value = true;
+      }
+    });
+};
 onBeforeMount(async () => {
   getData();
 });
@@ -2176,17 +2137,16 @@ onBeforeMount(async () => {
   --el-table-border-color: none;
   border: 1px solid #7aceff;
 }
-.table{
+.table {
-:deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
+  :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
-  border: none !important;
+    border: none !important;
-  padding-left: 10px !important;
+    padding-left: 10px !important;
-}
+  }
 
-:deep(.el-table td.el-table__cell) {
+  :deep(.el-table td.el-table__cell) {
-  padding-left: 10px;
+    padding-left: 10px;
+  }
 }
-}
-
 
 ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
   background-color: #2f4b74;

src/view/work.vue

@@ -3,10 +3,8 @@
     <div class="displayFlex left_bg">
       <div class="flex1">
         <div
-          class="yd_title"
+          class="yd_title left_1"
-          :class="zxjz ? 'left_1' : 'left_1_1'"
+
-          @click="zxjzChange()"
-          style="cursor: pointer"
         ></div>
         <div class="choose">
           <div
@@ -345,7 +343,7 @@ onMounted(() => {
 }
 
 .left_1 {
-  background-image: url(@/assets/images/work/new_zxjz.png);
+  background-image: url(@/assets/images/work/zxjz.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }

src/view/yl.vue

@@ -44,7 +44,10 @@
           :year="data.leftTopYear"
         ></ePie2>
       </div>
-      <div class="flex1" style="margin-top: 10px">
+      <div
+        class="flex1"
+        style="margin-top: 10px"
+      >
         <div class="yd_title left_2">
           <span class="text">
             <img
@@ -86,7 +89,10 @@
           :year="data.leftCenterYear"
         />
       </div>
-      <div class="flex1" style="margin-top: 10px">
+      <div
+        class="flex1"
+        style="margin-top: 10px"
+      >
         <div class="yd_title left_3">
           <span class="text">
             <img
@@ -158,8 +164,15 @@
             <div>
               <span>{{ data.yljgzlzx.yljg }}<span class="unit">个</span></span>
             </div>
-            <img src="@/assets/YLimg/ylimg11.png" alt="" />
+            <img
-            <img class="historyimg" src="@/assets/YLimg/ylimg5.png" alt="" />
+              src="@/assets/YLimg/ylimg11.png"
+              alt=""
+            />
+            <img
+              class="historyimg"
+              src="@/assets/YLimg/ylimg5.png"
+              alt=""
+            />
           </div>
           <!-- <div class="history1">
             <div>
@@ -172,8 +185,15 @@
             <div>
               <span>{{ data.yljgzlzx.zlzx }}<span class="unit">个</span></span>
             </div>
-            <img src="@/assets/YLimg/ylimg12.png" alt="" />
+            <img
-            <img class="historyimg" src="@/assets/YLimg/ylimg10.png" alt="" />
+              src="@/assets/YLimg/ylimg12.png"
+              alt=""
+            />
+            <img
+              class="historyimg"
+              src="@/assets/YLimg/ylimg10.png"
+              alt=""
+            />
           </div>
         </div>
       </div>
@@ -182,13 +202,25 @@
         <div class="serviceBox">
           <div class="serviceTop">
             <div class="visit">
-              <img class="serviceimg" src="@/assets/YLimg/ylimg8.png" alt="" />
+              <img
+                class="serviceimg"
+                src="@/assets/YLimg/ylimg8.png"
+                alt=""
+              />
               <ylSMFW></ylSMFW>
             </div>
             <div class="medicalService">
-              <img class="serviceimg" src="@/assets/YLimg/ylimg9.png" alt="" />
+              <img
+                class="serviceimg"
+                src="@/assets/YLimg/ylimg9.png"
+                alt=""
+              />
               <div class="medicalServiceTop">
-                <img class="ylimg" src="@/assets/YLimg/ylimg1.png" alt="" />
+                <img
+                  class="ylimg"
+                  src="@/assets/YLimg/ylimg1.png"
+                  alt=""
+                />
                 <span>36,234</span>
               </div>
             </div>
@@ -203,9 +235,32 @@
             alt=""
           />
         </div>
-        <ylXZZC :list1="data.zccs1" :list2="data.zccs2"></ylXZZC>
+        <ylXZZC
+          :list1="data.zccs1"
+          :list2="data.zccs2"
+          @village='chooseVillage'
+        ></ylXZZC>
       </div>
     </div>
+    <Dialog
+      :dialogShow="dialogShow"
+      :columns="tableType.columns"
+      :title="tableType.title"
+      :tableData="tableType.data"
+      :pagination="pagination"
+      @close="close"
+      @handle="handlePagination"
+    >
+      <template #iordertype="{ currentCol, currentData }">
+        <div v-if="currentData.iordertype == '1'">就餐订单</div>
+        <div v-else-if="currentData.iordertype == '2'">送餐订单</div>
+      </template>
+      <template #itimetype="{ currentCol, currentData }">
+        <div v-if="currentData.itimetype == '0'">早餐</div>
+        <div v-else-if="currentData.itimetype == '1'">中餐</div>
+        <div v-else-if="currentData.itimetype == '2'">晚餐</div>
+      </template>
+    </Dialog>
   </div>
 </template>
 
@@ -221,6 +276,7 @@ import ePie3d from "./echarts_yl/pie3d.vue";
 import ylJHSY from "./echarts_yl/ylJHSY.vue";
 import ylSMFW from "./echarts_yl/ylSMFW.vue";
 import ylXZZC from "./echarts_yl/ylXZZC.vue";
+import Dialog from "./dialog/dialog.vue";
 import { ref, onMounted, onBeforeMount, reactive } from "vue";
 import http from "@/utils/request.js";
 const leftchoose = ref({
@@ -228,9 +284,89 @@ const leftchoose = ref({
   second: "1",
   third: "1",
 });
+// 详情弹框
+const dialogShow = ref(false);
+const tableType = reactive({
+  title: "",
+  columns: [
+    {
+      label: "照料中心",
+      property: "sdailycarecentername",
+      width: '160'
+    },
+    {
+      label: "老人名称",
+      property: "scustomername",
+      width: '120'
+    },
+    {
+      label: "就餐/送餐订单",
+      property: "iordertype",
+      width: '140',
+      type: "slot",
+    },
+    {
+      label: "早、中、晚餐",
+      property: "itimetype",
+      width: '140',
+      type: "slot",
+    },
+    {
+      label: "菜品信息",
+      property: "dishesmealnames",
+      width: '160',
+    },
+    {
+      label: "订单金额",
+      property: "totalprice",
+      width: '120'
+    },
+    {
+      label: "实际支付金额",
+      property: "actualprice",
+      width: '120'
+    },
+    {
+      label: "订单结束时间",
+      property: "dtfinishtime",
+    },
+  ],
+  data: [],
+});
+// 表格分页
+const pagination = reactive({
+  total: 100,
+  pageSize: 20,
+  currentPage: 1,
+});
 const change = (name, index) => {
   leftchoose.value[name] = index;
 };
+const chooseVillage = (village) => {
+  tableType.title = village
+  getTownDetail()
+}
+const close = () => {
+  dialogShow.value = false;
+};
+const handlePagination = (current) => {
+  pagination.currentPage = current
+  getTownDetail()
+};
+const getTownDetail = () => {
+  let params = {
+    scasecadebareaname: tableType.title,
+    page: pagination.currentPage,
+    size: pagination.pageSize
+  }
+  http.get("/api/ggfwyth/zcxxList", params).then((res) => {
+    if (res.code == 200) {
+      pagination.total = res.count
+      tableType.data = res.data
+      dialogShow.value = true;
+    }
+  });
+}
 const data = reactive({
   leftTop1: [],
   leftTop2: [],
@@ -859,4 +995,31 @@ const getData = async () => {
     color: #ffffff;
   }
 }
+:deep(.el-table) {
+  background: rgba(32, 64, 115, 1);
+
+  --el-table-border-color: none;
+  border: 1px solid #7aceff;
+}
+.table {
+  :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
+    border: none !important;
+    padding-left: 10px !important;
+  }
+
+  :deep(.el-table td.el-table__cell) {
+    padding-left: 10px;
+  }
+}
+::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
+  background-color: #2f4b74;
+}
+
+::v-deep .el-table__empty-block {
+  background-color: #122560;
+}
+
+:deep(.el-table .el-table__row) {
+  border-bottom: none;
+}
 </style>