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

src/view/sy_details.vue

@@ -114,15 +114,15 @@
             <i></i>
             <i></i>
           </div>
-          <div v-if="data.name == '慢性病患者健康管理'" class="mxbRecord">
+          <!-- <div v-if="data.name == '慢性病患者健康管理'" class="mxbRecord">
             <div :class="data.first ? 'text_0' : 'text_2'" @click="change(1)">
               随访记录
             </div>
             <div :class="data.first ? 'text_2' : 'text_0'" @click="change(0)">
               体检记录
             </div>
-          </div>
+          </div> -->
-          <div v-else class="lampState">
+          <div class="lampState">
             <div>
               <img
                 :src="
@@ -136,7 +136,7 @@
                   cursor: selectedLamp1.green ? 'not-allowed' : 'pointer',
                 }"
                 @click="
-                  selectedLamp1.green ? null : lampScreen(1, data.tableData2)
+                  selectedLamp1.green ? null : lampScreen(1, data.tableData3)
                 "
               />
               <img
@@ -151,7 +151,7 @@
                   cursor: selectedLamp1.red ? 'not-allowed' : 'pointer',
                 }"
                 @click="
-                  selectedLamp1.red ? null : lampScreen(2, data.tableData2)
+                  selectedLamp1.red ? null : lampScreen(2, data.tableData3)
                 "
               />
               <img
@@ -166,7 +166,7 @@
                   cursor: selectedLamp1.yellow ? 'not-allowed' : 'pointer',
                 }"
                 @click="
-                  selectedLamp1.yellow ? null : lampScreen(3, data.tableData2)
+                  selectedLamp1.yellow ? null : lampScreen(3, data.tableData3)
                 "
               />
             </div>
@@ -283,6 +283,7 @@ const data = reactive({
   tableData: [],
   tableData1: [],
   tableData2: [],
+  tableData3: [],
 });
 const formData = reactive({
   name: "",
@@ -337,6 +338,13 @@ const formData = reactive({
         property: "fullName",
         width: "90",
       },
+      {
+        label: "状态",
+        property: "zt",
+        width: "90",
+        align: "center",
+        type: "slot",
+      },
       {
         label: "地址",
         property: "address",
@@ -598,6 +606,95 @@ const formData = reactive({
       },
     ],
     resultsList: [],
+    tableData2: [
+      {
+        fullName: "吴*琴",
+        zt: 1,
+        address: "龙游户籍的公民...",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 1,
+        address: "龙游户籍的公民...",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 1,
+        address: "龙游户籍的公民...",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 1,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 2,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 2,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 2,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 2,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 2,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 3,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 3,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+      {
+        fullName: "吴*琴",
+        zt: 3,
+        address: "衢州市龙游县模******居民委员会",
+        age: "57",
+        PopulationLabel: "自主申报",
+      },
+
+      
+     
+    ],
   },
   hjlnrTableData: {
     url: "",
@@ -1206,16 +1303,23 @@ const formData = reactive({
       },
     ],
     column_2: [
-      {
+      // {
-        label: "时间",
+      //   label: "时间",
-        property: "sfsj",
+      //   property: "sfsj",
-        width: "120",
+      //   width: "120",
-      },
+      // },
       {
         label: "姓名",
         property: "xm",
         width: "90",
       },
+      {
+        label: "状态",
+        property: "zt",
+        width: "90",
+        align: "center",
+        type: "slot",
+      },
       {
         label: "地址",
         property: "dz",
@@ -1240,7 +1344,87 @@ const formData = reactive({
       },
     ],
     resultsList: [],
-    tableData2: [],
+    tableData2: [
+      {
+        xm: "吴*琴",
+        zt: 1,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 1,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+
+      {
+        xm: "吴*琴",
+        zt: 1,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+
+      {
+        xm: "吴*琴",
+        zt: 2,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 2,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 2,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 2,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 3,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 3,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 3,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+      {
+        xm: "吴*琴",
+        zt: 3,
+        dz: "浙江省龙游县龙*****１单元４０１室",
+        age: "38",
+        bq: "糖尿病,高血压",
+      },
+    ],
   },
   shbz_knxs_TableData: {
     url: "",
@@ -1448,91 +1632,91 @@ const formData = reactive({
     tableData2: [
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
@@ -1740,91 +1924,91 @@ const formData = reactive({
     tableData2: [
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '1',
+        zt: 1,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '2',
+        zt: 2,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
       {
         xm: "何*媱",
-        zt: '3',
+        zt: 3,
         xx: "寺后小学",
         bzlx: "原外地建档",
       },
@@ -1970,19 +2154,19 @@ const selectedLamp1 = reactive({
   red: false,
   yellow: false,
 });
-const lampScreen = (val, data) => {
+const lampScreen = (val, val2) => {
+  console.log(222, val2);
   if (selectedLamp.value === val) {
     return;
   }
   selectedLamp.value = val;
 
-  console.log(222,data.tableData2,data);
+  const filteredData = val2.filter((element) => element.zt === val);
-  const filteredData = data.filter((element) => element.zt === val);
   data.tableData2 = filteredData;
-  console.log(333,data.tableData2,data);
+
-  selectedLamp1.green = !data.some((element) => element.zt === 1);
+  selectedLamp1.green = !val2.some((element) => element.zt === 1);
-  selectedLamp1.red = !data.some((element) => element.zt === 2);
+  selectedLamp1.red = !val2.some((element) => element.zt === 2);
-  selectedLamp1.yellow = !data.some((element) => element.zt === 3);
+  selectedLamp1.yellow = !val2.some((element) => element.zt === 3);
 
   // const filteredData = formData.hjlnrTableData.tableData2.filter(
   //   (element) => element.zt === val
@@ -1998,7 +2182,7 @@ const lampScreen = (val, data) => {
   // selectedLamp1.yellow = !formData.hjlnrTableData.tableData2.some(
   //   (element) => element.zt === 3
   // );
-  console.log(111,data.tableData2, selectedLamp1, val);
+  console.log(111, data.tableData2, selectedLamp1, val);
 };
 
 const getTable = (pagination) => {
@@ -2137,10 +2321,11 @@ const updateFormDataAndTable = (formDataName, tableData) => {
   data.tableData = tableData.resultsList;
   data.tableData1 = tableData.tableData;
   data.tableData2 = tableData.tableData2;
+  data.tableData3 = tableData.tableData2;
   pagination1.total = tableData.tableData.length;
   console.log(6666, data.tableData2);
 
-  lampScreen(1, data.tableData2);
+  lampScreen(1, data.tableData3);
   handleCurrentChange(1);
 };
 
@@ -2152,7 +2337,7 @@ const listAssignment = () => {
   switch (data.name) {
     case "最低生活保障":
       updateFormDataAndTable("低保", formData.dbTableData);
-      data.tableData2 = formData.dbTableData.resultsList;
+      // data.tableData2 = formData.dbTableData.resultsList;
       pagination.url = "/api/ggfwyth/pg/shjzShbz";
       getTable(pagination);
       break;
@@ -2193,7 +2378,7 @@ const listAssignment = () => {
   }
 };
 onMounted(() => {
-  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   if (routers.query.name) {
     data.name = routers.query.name;
     listAssignment();

src/view/sy_table.vue

@@ -676,7 +676,7 @@ const sevenYX = (name) => {
 };
 
 onMounted(() => {
-  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
 
   if (localStorage.getItem("taps1") !== undefined) {
     data.tapbody = JSON.parse(localStorage.getItem("taps1"));

vite.config.js

@@ -15,8 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        target: "http://10.0.0.65:8095/", //刘进
+        // target: "http://10.0.0.65:8095/", //刘进
-        // target: "http://220.191.238.50:996/", //线上
+        target: "http://220.191.238.50:996/", //线上
         changeOrigin: true, //是否支持跨域
         //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
       },