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

src/view/person/index.vue

@@ -64,7 +64,7 @@
             class="my-tag-item"
             v-for="item in dataMyTag.myTag"
             :key="item"
-            @click="onClickTag(item)"
+            @click="item.show ? onClickTag(item) : ''"
             :class="item.show ? 'my-tag-item_active' : ''"
           >
             <p>
@@ -246,77 +246,77 @@ const dataMyTag = reactive({
     {
       name: "低保",
       jkName: "dbao",
-      show: false,
+      show: 0,
     },
     {
       name: "低边",
       jkName: "dbian",
-      show: false,
+      show: 0,
     },
     {
       name: "特困",
       jkName: "tk",
-      show: false,
+      show: 0,
     },
     {
       name: "残疾人",
       jkName: "",
-      show: false,
+      show: 0,
     },
     {
       name: "退役军人",
       jkName: "tyjr",
-      show: false,
+      show: 0,
     },
     {
       name: "留守",
       jkName: "jzzt",
-      show: false,
+      show: 0,
     },
     {
       name: "困境儿童",
       jkName: "kjet",
-      show: false,
+      show: 0,
     },
     {
       name: "医保支出万元以上",
       jkName: "",
-      show: false,
+      show: 0,
     },
     {
       name: "残疾",
       jkName: "cj",
-      show: false,
+      show: 0,
     },
     {
       name: "高血压",
       jkName: "gxy",
-      show: false,
+      show: 0,
     },
     {
       name: "糖尿病",
       jkName: "tnb",
-      show: false,
+      show: 0,
     },
     {
       name: "高血脂",
       jkName: "",
-      show: false,
+      show: 0,
     },
     {
       name: "高血糖",
       jkName: "",
-      show: false,
+      show: 0,
     },
     {
       name: "其他疾病",
       jkName: "",
-      show: false,
+      show: 0,
     },
     {
       name: "大病住院",
       jkName: "",
-      show: false,
+      show: 0,
     },
   ],
 });
@@ -402,11 +402,13 @@ const getData = (nm, identNo) => {
     .then((res) => {
       if (res.code == 200) {
         baseInfo.value = res.data;
-        dataMyTag.myTag.map((item) => {
-          item.show = res.data[item.jkName];
-          console.log(res.data[item.jkName],555);
-        });
 
+        dataMyTag.myTag.map((item) => {
+          if (res.data[item.jkName]) {
+            item.show = Number(res.data[item.jkName]);
+          }
+        });
+        // console.log(dataMyTag.myTag, 555);
       }
     });
 };
@@ -645,7 +647,7 @@ onMounted(() => {
       font-style: normal;
       margin-right: 10px;
       margin-bottom: 20px;
-      cursor: pointer;
+      cursor: not-allowed;
 
       //   &:hover {
       //       background: rgba(0, 158, 255, 0.38);
@@ -656,6 +658,7 @@ onMounted(() => {
     .my-tag-item_active {
       background: rgba(0, 158, 255, 0.38);
       box-shadow: inset 0px 0px 11px 0px rgba(255, 255, 255, 0.5);
+      cursor: pointer;
     }
   }