diff --git a/src/utils/request.js b/src/utils/request.js index ab56c12..02a9252 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -2,7 +2,7 @@ import axios from "axios"; import { ElMessage } from "element-plus"; import tools from "@/utils/tools"; import router from "../router"; -// axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/' +axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/' axios.defaults.timeout = 120000; // HTTP request 拦截器 diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 6645a54..23cdb73 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -382,11 +382,11 @@ const data = reactive({ property: "operatesDeng", type: "slot", }, - { - label: "推送次数", - property: "pushSendTotal", - type: "slot", - }, + // { + // label: "推送次数", + // property: "pushSendTotal", + // 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);