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

src/view/person/index.vue

@@ -802,26 +802,50 @@ const onClickTag = (item) => {
   dialogShow.value = true;
 };
 //圆球弹框
+// const onClickTag2 = (name, label) => {
+//   //如果没有身后事就不请求
+//   if (name == "身后事" && !isShs.value) {
+//   } else {
+//     tableType.title = name;
+//     dataMyTag.title = label;
+//     tableType.url = columnsList[name].url;
+//     tableType.columns = columnsList[name].column;
+//     if (name == "婚育") {
+//     } else if (name == "综合") {
+//       dataMyTag.form.column = columnsList["一卡通"].column;
+//       dataMyTag.zfForm.column = columnsList["走访记录"].column;
+//       oneCardSolution();
+//       visitRecords();
+//       getTable(tableType.url, true);
+//     } else {
+//       getTable(tableType.url, true);
+//     }
+//   }
+// };
 const onClickTag2 = (name, label) => {
-  //如果没有身后事就不请求
+  if (name === "身后事" && !isShs.value) {
-  if (name == "身后事" && !isShs.value) {
+    return;
-  } else {
+  }
+
   tableType.title = name;
   dataMyTag.title = label;
   tableType.url = columnsList[name].url;
   tableType.columns = columnsList[name].column;
-    if (name == "婚育") {
+
-    } else if (name == "综合") {
+  if (name === "婚育") {
+    return;
+  }
+
+  if (name === "综合") {
     dataMyTag.form.column = columnsList["一卡通"].column;
     dataMyTag.zfForm.column = columnsList["走访记录"].column;
     oneCardSolution();
     visitRecords();
-      getTable(tableType.url, true);
-    } else {
-      getTable(tableType.url, true);
-    }
   }
+
+  getTable(tableType.url, true);
 };
+
 /**
  * 判断右侧显示的为表格还是列表，0为列表，1为表格
  */

src/view/sy.vue

@@ -300,7 +300,9 @@
                     <img src="../assets/images/sy/dropDown.png" />
                     <span>龙游通平均日活</span>
                   </div>
-                  <span style="margin-right: 20px">8146</span>
+                  <span style="margin-right: 20px">{{
+                    data.lytAppDayActive
+                  }}</span>
                 </div>
               </div>
               <el-table
@@ -944,37 +946,39 @@ const data = reactive({
     cxyilbxzzc: "0", //城乡居民医疗保险总支出
     nf: "", //年份
   }, //民生福祉
+
+  lytAppDayActive: "105",
   tableData: [
-    {
+    // {
-      highFrequencyApp: "智享工会",
+    //   highFrequencyApp: "公交查询",
-      monthlyVisits: "474797",
+    //   monthlyVisits: "474797",
-      highFrequencyApp1: "公交查询",
+    //   highFrequencyApp1: "公共自行车",
-      monthlyVisits1: "26837",
+    //   monthlyVisits1: "26837",
-    },
+    // },
-    {
+    // {
-      highFrequencyApp: "老兵码",
+    //   highFrequencyApp: "小奔通",
-      monthlyVisits: "18246",
+    //   monthlyVisits: "18246",
-      highFrequencyApp1: "小奔通",
+    //   highFrequencyApp1: "积分商城",
-      monthlyVisits1: "22917",
+    //   monthlyVisits1: "22917",
-    },
+    // },
-    {
+    // {
-      highFrequencyApp: "民政为民",
+    //   highFrequencyApp: "商户入口",
-      monthlyVisits: "12899",
+    //   monthlyVisits: "12899",
-      highFrequencyApp1: "公共自行车",
+    //   highFrequencyApp1: "奔小服",
-      monthlyVisits1: "22705",
+    //   monthlyVisits1: "22705",
-    },
+    // },
-    {
+    // {
-      highFrequencyApp: "走心驿站",
+    //   highFrequencyApp: "商户核销",
-      monthlyVisits: "8524",
+    //   monthlyVisits: "8524",
-      highFrequencyApp1: "商城积分",
+    //   highFrequencyApp1: "乘公交",
-      monthlyVisits1: "18080",
+    //   monthlyVisits1: "18080",
-    },
+    // },
-    {
+    // {
-      highFrequencyApp: "龙游通",
+    //   highFrequencyApp: "交通查询",
-      monthlyVisits: "2205",
+    //   monthlyVisits: "2205",
-      highFrequencyApp1: "商户入口",
+    //   highFrequencyApp1: "人才乡贤",
-      monthlyVisits1: "3565",
+    //   monthlyVisits1: "3565",
-    },
+    // },
   ],
   jysyList: [
     {
@@ -1301,6 +1305,29 @@ const getData = async () => {
         data.ageRatio.push(res.data.rksj[key]);
       });
       // 公共服务&企业服务&政府服务
+      data.lytAppDayActive = res.data.app.lytAppDayActive;
+
+      // for (let i = 0; i < res.data.app.lytApp.length; i += 2) {
+      //   let obj = {
+      //     highFrequencyApp: res.data.app.lytApp[i]?.title || "",
+      //     monthlyVisits: res.data.app.lytApp[i]?.num || "",
+      //     highFrequencyApp1: res.data.app.lytApp[i + 1]?.title || "",
+      //     monthlyVisits1: res.data.app.lytApp[i + 1]?.num || "",
+      //   };
+      //   data.tableData.push(obj);
+      // }
+      data.tableData = res.data.app.lytApp.reduce((acc, _, i, arr) => {
+        if (i % 2 === 0) {
+          acc.push({
+            highFrequencyApp: arr[i]?.title || "",
+            monthlyVisits: arr[i]?.num || "",
+            highFrequencyApp1: arr[i + 1]?.title || "",
+            monthlyVisits1: arr[i + 1]?.num || "",
+          });
+        }
+        return acc;
+      }, []);
+
       // 医疗卫生
       const ylwsKeys = [
         "yywsysl",