Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/sy_details.vue

@@ -382,11 +382,11 @@ const data = reactive({
       property: "operatesDeng",
       type: "slot",
     },
-    {
+    // {
-      label: "推送次数",
+    //   label: "推送次数",
-      property: "pushSendTotal",
+    //   property: "pushSendTotal",
-      type: "slot",
+    //   type: "slot",
-    },
+    // },
   ],
   tableData: [],
   tableData1: [],
@@ -449,6 +449,79 @@ const lampScreen = (val) => {
   if (selectedLamp.value === val) {
     return; //防止重复点击
   }
+  console.log(val);
+  if (val == 1 || val == 2) {
+    data.column_2 = [
+      {
+        label: "姓名",
+        property: "xm",
+        width: "90",
+        type: "slot",
+      },
+      {
+        label: "状态",
+        property: "deng",
+        width: "90",
+        align: "center",
+        type: "slot",
+      },
+      {
+        label: "地址",
+        property: "dz",
+      },
+      {
+        label: "年龄",
+        property: "nl",
+        width: "80",
+      },
+      {
+        label: "人口标签",
+        property: "bq",
+        type: "slot",
+      },
+      {
+        label: "推送次数",
+        property: "pushSendTotal",
+        type: "slot",
+      },
+    ];
+  } else {
+    data.column_2 = [
+      {
+        label: "姓名",
+        property: "xm",
+        width: "90",
+        type: "slot",
+      },
+      {
+        label: "状态",
+        property: "deng",
+        width: "90",
+        align: "center",
+        type: "slot",
+      },
+      {
+        label: "地址",
+        property: "dz",
+      },
+      {
+        label: "年龄",
+        property: "nl",
+        width: "80",
+      },
+      {
+        label: "人口标签",
+        property: "bq",
+        type: "slot",
+      },
+      {
+        label: "完成途径",
+        property: "operatesDeng",
+        type: "slot",
+      },
+      
+    ];
+  }
   selectedLamp.value = val;
   getTable(pagination2);
   // console.log("状态灯", val);