gx

src/view/sy_details.vue

@@ -122,7 +122,7 @@
               体检记录
             </div>
           </div>
-          <div v-if="data.name == '老年人福利补贴'" class="lampState">
+          <div v-else class="lampState">
             <div>
               <img
                 :src="
@@ -135,7 +135,9 @@
                 :style="{
                   cursor: selectedLamp1.green ? 'not-allowed' : 'pointer',
                 }"
-                @click="selectedLamp1.green ? null : lampScreen(1)"
+                @click="
+                  selectedLamp1.green ? null : lampScreen(1, data.tableData2)
+                "
               />
               <img
                 :src="
@@ -148,7 +150,9 @@
                 :style="{
                   cursor: selectedLamp1.red ? 'not-allowed' : 'pointer',
                 }"
-                @click="selectedLamp1.red ? null : lampScreen(2)"
+                @click="
+                  selectedLamp1.red ? null : lampScreen(2, data.tableData2)
+                "
               />
               <img
                 :src="
@@ -161,11 +165,13 @@
                 :style="{
                   cursor: selectedLamp1.yellow ? 'not-allowed' : 'pointer',
                 }"
-                @click="selectedLamp1.yellow ? null : lampScreen(3)"
+                @click="
+                  selectedLamp1.yellow ? null : lampScreen(3, data.tableData2)
+                "
               />
             </div>
           </div>
-          <span class="text" v-else-if="data.tabelshow">
+          <!-- <span class="text" v-else-if="data.tabelshow">
             <img
               v-if="data.first"
               src="@/assets/sy-table/sy_details4.png"
@@ -180,8 +186,9 @@
               style="width: 350px"
               @click="change"
             />
-          </span>
+          </span> -->
-          <div v-else class="text_1">未享受对象</div>
+
+          <!-- <div v-else class="text_1">未享受对象</div> -->
         </div>
       </div>
       <div style="width: 97.5%; position: relative">
@@ -251,15 +258,16 @@ import http from "@/utils/request.js";
 import { useRouter, useRoute } from "vue-router";
 import { ElMessage } from "element-plus";
 import tools from "@/utils/tools";
-import lamp1 from "../assets/sy-table/lampGreen1.png";
+import lamp1 from "../assets/sy-table/green.gif";
-import lamp2 from "../assets/sy-table/lampRed1.png";
+import lamp2 from "../assets/sy-table/red.gif";
-import lamp3 from "../assets/sy-table/lampYellow1.png";
+import lamp3 from "../assets/sy-table/yellow.gif";
-import lamp4 from "../assets/sy-table/lampGreen2.png";
+import lamp4 from "../assets/sy-table/green1.gif";
-import lamp5 from "../assets/sy-table/lampRed2.png";
+import lamp5 from "../assets/sy-table/red1.gif";
-import lamp6 from "../assets/sy-table/lampYellow2.png";
+import lamp6 from "../assets/sy-table/yellow1.gif";
 import lamp7 from "../assets/sy-table/lampGreen3.png";
 import lamp8 from "../assets/sy-table/lampRed3.png";
 import lamp9 from "../assets/sy-table/lampYellow3.png";
+
 const router = useRouter();
 const routers = useRoute();
 const mxbtabelshow = ref(true);
@@ -1232,7 +1240,7 @@ const formData = reactive({
       },
     ],
     resultsList: [],
-    resultsList1: [],
+    tableData2: [],
   },
   shbz_knxs_TableData: {
     url: "",
@@ -1285,6 +1293,13 @@ const formData = reactive({
         property: "xm",
         width: "90",
       },
+      {
+        label: "状态",
+        property: "zt",
+        width: "90",
+        align: "center",
+        type: "slot",
+      },
       {
         label: "学校",
         property: "xx",
@@ -1430,6 +1445,98 @@ const formData = reactive({
         subsidyType: "",
       },
     ],
+    tableData2: [
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+    ],
   },
   yygs_knxs_TableData: {
     url: "",
@@ -1475,29 +1582,35 @@ const formData = reactive({
     column_2: [
       {
         label: "姓名",
-        property: "fullName",
+        property: "xm",
         width: "90",
       },
       {
-        label: "地址",
+        label: "状态",
-        property: "address",
+        property: "zt",
+        width: "90",
+        align: "center",
+        type: "slot",
       },
       {
-        label: "年龄",
+        label: "学校",
-        property: "age",
+        property: "xx",
-        width: "60",
       },
       {
         label: "补助类型",
-        property: "subsidyType",
+        property: "bzlx",
       },
+      // {
+      //   label: "身份证号码",
+      //   property: "ident_no",
+      // },
     ],
     tableData: [
       {
         SerialNumber: "01",
         SubsidyType: "义务教育家庭经济困难学生生活补助",
         SubsidRecipients:
-          "本人及其家庭的经济能力准以满足其在校（或幼儿园）期间的学习和生活基本支出的在籍学生。(一）特殊群体主要包括城市低保家庭学生、特因供养学生、弧儿、烈士子女、持正武疾学生、城市低保边缘家庭学生、低收入农户家庭学生、档立卡贫困家庭学生等，（二）其他群体 1.因遭受自然灾言、意外事件、重大疾病等突发情况导致家庭经济困难的学生2.学校结合家庭经济因素、地区经济社会发层水平通过家访、个别访谈、信函索证、大数摆分析、民主评议等方式，根据实事求是的原则认定需要资助的学生，",
+          "本人及其家庭的经济能力准以满足其在校（或幼儿园）期间的学习和生活基本支出的在籍学生。(一）特殊群体主要包括城市低保家庭学生、特因供养学生、弧儿、烈士子女、持正武疾学生、城市低保边缘家庭学生、低收入农户家庭学生、档立卡贫困家庭学生等，（二）其他群体 '1'.因遭受自然灾言、意外事件、重大疾病等突发情况导致家庭经济困难的学生2.学校结合家庭经济因素、地区经济社会发层水平通过家访、个别访谈、信函索证、大数摆分析、民主评议等方式，根据实事求是的原则认定需要资助的学生，",
         SubsidyStandards:
           "家庭经济困难寄宿生生活费补助标准：小学生每人1250元年，初中生1500元年：家庭经济困难非寄宿生生活补助按寄宿自生生活国家基础标准的50%核定。",
         ProcessingMethod: "每学明初申请学校认定、公示后给予安助",
@@ -1624,6 +1737,98 @@ const formData = reactive({
         subsidyType: "",
       },
     ],
+    tableData2: [
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '1',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '2',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+      {
+        xm: "何*媱",
+        zt: '3',
+        xx: "寺后小学",
+        bzlx: "原外地建档",
+      },
+    ],
   },
 });
 // 表格分页1、2、3
@@ -1765,26 +1970,35 @@ const selectedLamp1 = reactive({
   red: false,
   yellow: false,
 });
-const lampScreen = (val) => {
+const lampScreen = (val, data) => {
   if (selectedLamp.value === val) {
     return;
   }
   selectedLamp.value = val;
-  const filteredData = formData.hjlnrTableData.tableData2.filter(
-    (element) => element.zt === val
-  );
-  data.tableData2 = filteredData;
 
-  selectedLamp1.green = !formData.hjlnrTableData.tableData2.some(
+  console.log(222,data.tableData2,data);
-    (element) => element.zt === 1
+  const filteredData = data.filter((element) => element.zt === val);
-  );
+  data.tableData2 = filteredData;
-  selectedLamp1.red = !formData.hjlnrTableData.tableData2.some(
+  console.log(333,data.tableData2,data);
-    (element) => element.zt === 2
+  selectedLamp1.green = !data.some((element) => element.zt === 1);
-  );
+  selectedLamp1.red = !data.some((element) => element.zt === 2);
-  selectedLamp1.yellow = !formData.hjlnrTableData.tableData2.some(
+  selectedLamp1.yellow = !data.some((element) => element.zt === 3);
-    (element) => element.zt === 3
+
-  );
+  // const filteredData = formData.hjlnrTableData.tableData2.filter(
-  console.log(111, selectedLamp1, val);
+  //   (element) => element.zt === val
+  // );
+  // data.tableData2 = filteredData;
+
+  // selectedLamp1.green = !formData.hjlnrTableData.tableData2.some(
+  //   (element) => element.zt === 1
+  // );
+  // selectedLamp1.red = !formData.hjlnrTableData.tableData2.some(
+  //   (element) => element.zt === 2
+  // );
+  // selectedLamp1.yellow = !formData.hjlnrTableData.tableData2.some(
+  //   (element) => element.zt === 3
+  // );
+  console.log(111,data.tableData2, selectedLamp1, val);
 };
 
 const getTable = (pagination) => {
@@ -1922,8 +2136,11 @@ const updateFormDataAndTable = (formDataName, tableData) => {
   data.column_2 = tableData.column_2;
   data.tableData = tableData.resultsList;
   data.tableData1 = tableData.tableData;
-  data.tableData2 = tableData.resultsList1;
+  data.tableData2 = tableData.tableData2;
   pagination1.total = tableData.tableData.length;
+  console.log(6666, data.tableData2);
+
+  lampScreen(1, data.tableData2);
   handleCurrentChange(1);
 };
 
@@ -1946,7 +2163,7 @@ const listAssignment = () => {
       pagination2.url = "/api/ggfwyth/pg/ylzlFlbt";
       getServiceList(pagination, 1);
       //假数据
-      data.tableData2 = formData.hjlnrTableData.tableData2;
+      // data.tableData2 = formData.hjlnrTableData.tableData2;
       // getServiceList(pagination2, 0);
       break;
     case "慢性病患者健康管理":
@@ -1955,17 +2172,21 @@ const listAssignment = () => {
       pagination.url = "/api/ggfwyth/pg/ggwsMxbFwdx";
       pagination2.url = "/api/ggfwyth/pg/ggwsMxbSfjl";
       getTable(pagination);
-      getTable1(pagination2);
+      // getTable1(pagination2);
       break;
     case "义务教育学生生活补助":
       updateFormDataAndTable("困难学生", formData.shbz_knxs_TableData);
       pagination.url = "/api/ggfwyth/pg/ywjyShbz";
       getTable(pagination);
+      //假数据
+      // data.tableData2 = formData.shbz_knxs_TableData.tableData2;
       break;
     case "义务教育学生营养改善计划":
       updateFormDataAndTable("困难学生", formData.yygs_knxs_TableData);
       pagination.url = "/api/ggfwyth/pg/ywjyShbz";
       getTable(pagination);
+      //假数据
+      // data.tableData2 = formData.hjlnrTableData.tableData2;
       break;
     default:
       break;
@@ -1976,9 +2197,9 @@ onMounted(() => {
   if (routers.query.name) {
     data.name = routers.query.name;
     listAssignment();
-    if (data.name == "老年人福利补贴") {
+    // if (data.name == "老年人福利补贴") {
-      lampScreen(1);
+    // lampScreen(1);
-    }
+    // }
   }
 });
 </script>

src/view/table_gk/gk_yl.vue

@@ -182,10 +182,10 @@
           <ePie3d v-if="showEchart" :list="data.rkgk"></ePie3d>
           <div class="btList" ref="mainRef">
             <div class="btListding">
-              <span>各年龄段</span>
+              <span>年龄段</span>
-              <span>总数/人</span>
+              <span>总数</span>
-              <span>男性人数/人</span>
+              <span>男性人数</span>
-              <span>女性人数/人</span>
+              <span>女性人数</span>
             </div>
             <div class="btList_item" v-for="(item, index) in btList">
               <div class="btList_item_color" :style="bt(index)"></div>