gx

src/view/dialog/dialogRW.vue

@@ -68,7 +68,6 @@
             <template v-for="item in data.columns" :key="item.label">
               <el-table-column
                 v-if="item.type === 'slot'"
-               
                 :label="item.label"
                 :property="item.property"
                 :width="item.width || ''"
@@ -137,7 +136,7 @@ import { CircleCloseFilled } from "@element-plus/icons-vue";
 import { useRouter, useRoute } from "vue-router";
 import lamp1 from "../../assets/sy-table/green.gif";
 import lamp2 from "../../assets/sy-table/red.gif";
-import lamp3 from "../../assets/sy-table/yellow.gif";
+import lamp3 from "../../assets/sy-table/lampYellow1.gif";
 import lamp4 from "../../assets/sy-table/green1.gif";
 import lamp5 from "../../assets/sy-table/red1.gif";
 import lamp6 from "../../assets/sy-table/yellow1.gif";
@@ -148,7 +147,6 @@ import { ElMessage } from "element-plus";
 
 const router = useRouter();
 const routers = useRoute();
-
 const props = defineProps({
   dialogShow: {
     type: Boolean,
@@ -425,24 +423,18 @@ const handle = (current) => {
 }
 
 .progressGreen {
-  width: 106px;
-  height: 8px;
-  background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%);
-  border-radius: 8px;
+  width: 181px;
+  height: 15px;
   margin: 0 auto;
+  border-radius: 8px;
+  background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%);
 }
 .progressYellow {
-  width: 106px;
-  height: 8px;
-  border-radius: 8px;
-  border: 2px solid;
+  width: 181px;
+  height: 15px;
+  border: 2px dashed #ffe1a5;
   margin: 0 auto;
-  border-image: linear-gradient(
-      270deg,
-      rgba(255, 197, 117, 1),
-      rgba(255, 226, 151, 1)
-    )
-    1 1;
+  border-radius: 8px;
 }
 
 .bo {

src/view/sy_details.vue

@@ -125,43 +125,16 @@
           <div class="lampState">
             <div>
               <img
-                :src="
-                  selectedLamp1.green
-                    ? lampImages[7]
-                    : selectedLamp == 1
-                    ? lampImages[1]
-                    : lampImages[4]
-                "
-                :style="{
-                  cursor: selectedLamp1.green ? 'not-allowed' : 'pointer',
-                }"
-                @click="
-                  selectedLamp1.green ? null : lampScreen(1, data.tableData3)
-                "
+                :src="selectedLamp == 1 ? lampImages[1] : lampImages[4]"
+                @click="lampScreen(1, data.tableData3)"
               />
               <img
                 :src="selectedLamp == 2 ? lampImages[2] : lampImages[5]"
-                :style="{
-                  cursor: selectedLamp1.red ? 'not-allowed' : 'pointer',
-                }"
-                @click="
-                  selectedLamp1.red ? null : lampScreen(2, data.tableData3)
-                "
+                @click="lampScreen(2, data.tableData3)"
               />
               <img
-                :src="
-                  selectedLamp1.yellow
-                    ? lampImages[9]
-                    : selectedLamp == 3
-                    ? lampImages[3]
-                    : lampImages[6]
-                "
-                :style="{
-                  cursor: selectedLamp1.yellow ? 'not-allowed' : 'pointer',
-                }"
-                @click="
-                  selectedLamp1.yellow ? null : lampScreen(3, data.tableData3)
-                "
+                :src="selectedLamp == 3 ? lampImages[3] : lampImages[6]"
+                @click="lampScreen(3, data.tableData3)"
               />
             </div>
           </div>
@@ -304,17 +277,17 @@ const router = useRouter();
 const routers = useRoute();
 const data = reactive({
   name: "",
-  identNo: "",//人物ID
-  first: 1,//随访记录&体检记录切换
-  tabelshow: true,//老年人福利补贴切换
-  pagedData: [],//服务内容清单(中间)临时分页数据
+  identNo: "", //人物ID
+  first: 1, //随访记录&体检记录切换
+  tabelshow: true, //老年人福利补贴切换
+  pagedData: [], //服务内容清单(中间)临时分页数据
   columns: [],
   column_1: [],
   column_2: [],
   tableData: [],
   tableData1: [],
-  tableData2: [],
-  tableData3: [],
+  tableData2: [], //状态筛选数据
+  tableData3: [], //3表格总数据
 });
 const formData = reactive({
   name: "",
@@ -392,6 +365,12 @@ const formData = reactive({
       },
     ],
     column_3: [
+      {
+        label: "序号",
+        property: "index",
+        width: "60",
+        align: "center",
+      },
       {
         label: "服务内容",
         property: "fwnr",
@@ -2356,11 +2335,14 @@ const lampScreen = (val, val2) => {
     return; //防止重复点击
   }
   selectedLamp.value = val;
-  console.log("绿灯", val2);
+  // console.log("状态灯", val2);
   if (data.name == "最低生活保障") {
     if (val == 3) {
       data.tableData2 = formData.dbTableData.tableData_yellow;
       pagination2.total = data.tableData2.length;
+    } else if (val == 2) {
+      data.tableData2 = [];
+      pagination2.total = data.tableData2.length;
     } else if (val == 1) {
       pagination2.currentPage = 1;
       pagination2.url = "/api/ggfwyth/pg/shjzShbz"; //假数据
@@ -2375,21 +2357,7 @@ const lampScreen = (val, val2) => {
     selectedLamp1.yellow = !val2.some((element) => element.zt === 3);
   }
 
-  // const filteredData = formData.hjlnrTableData.tableData2.filter(
-  //   (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);
+  console.log("状态灯2", data.tableData2, selectedLamp1, val);
 };
 //---------表格弹框-------
 const dialogShow = ref(false);
@@ -2403,7 +2371,6 @@ const tableType = reactive({
 // 状态弹框
 const statusDetails = (val) => {
   tableType.title = `服务详情`;
-  console.log(111, val);
   if (val.zt == 1) {
     return;
   }
@@ -2549,9 +2516,7 @@ const getTable3 = (pagination) => {
             zt: 1,
           };
         });
-
         pagination2.total = res.count - 6;
-        // lampScreen(1, data.tableData2);
       }
     });
 };
@@ -2667,8 +2632,8 @@ const updateFormDataAndTable = (formDataName, tableData) => {
   data.tableData = tableData.tableData1; //列表1
   data.tableData1 = tableData.tableData2; //列表2
   data.tableData3 = tableData.tableData3; //列表3 状态假数据
-  pagination1.total = tableData.tableData2.length;
-  handlePagination1(1);
+  pagination1.total = tableData.tableData2.length; //中间数据总数
+  handlePagination1(1); //中间分页的数据截取
   if (formDataName == "低保") {
     selectedLamp1.red = true;
     selectedLamp.value = 1;
@@ -2680,11 +2645,12 @@ const updateFormDataAndTable = (formDataName, tableData) => {
 
   lampScreen(1, data.tableData3);
 };
-// 页面初始化赋值
+// 初始化 判断赋值
 const listAssignment = () => {
   data.tableData = [];
   data.tableData1 = [];
   data.tableData2 = [];
+  data.tableData3 = [];
 
   switch (data.name) {
     case "最低生活保障":

src/view/sy_table.vue

@@ -136,7 +136,7 @@
                   class="progress-bar"
                   :style="{ width: item.progress + '%' }"
                 >
-                  <span>{{ item.progress }}%</span>
+                  <!-- <span>{{ item.progress }}%</span> -->
                 </div>
               </div>
             </div>
@@ -185,6 +185,8 @@ const router = useRouter();
 const routers = useRoute();
 // 路由跳转
 const goto = (val) => {
+  console.log('跳转',val);
+  
   const availableRoutes = [
     "最低生活保障",
     "老年人福利补贴",
@@ -194,10 +196,10 @@ const goto = (val) => {
   ];
   // 检查数组val.name中是否存在availableRoutes。
   if (availableRoutes.includes(val.name)) {
-    router.push({
-      path: "/home/index/table/details",
-      query: { name: val.name },
-    });
+    // router.push({
+    //   path: "/home/index/table/details",
+    //   query: { name: val.name },
+    // });
   } else {
     ElMessage.warning({
       message: `${val.name}暂无数据!`,
@@ -647,6 +649,8 @@ const getData = async (name, fullName) => {
               // progress: item.xh,
               progress: "95", //进度条
             });
+            // console.log( data.tabPublicService);
+            
           });
         }
       }
@@ -678,7 +682,7 @@ const sevenYX = (name) => {
 onMounted(() => {
   tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
 
-  if (localStorage.getItem("taps1") !== undefined) {
+  if (localStorage.getItem("taps1")) {
     data.tapbody = JSON.parse(localStorage.getItem("taps1"));
     data.taps = localStorage.getItem("taps");
     data.taps1 = data.tapbody.id;