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

src/view/analyze.vue

@@ -581,6 +581,7 @@ const close = () => {
   dialogShowElderly.value = false;
 };
 const closeJj = () => {
+  tableType.data=[];
   dialogShow.value = false;
   pagination.currentPage = 1;
 };

src/view/person/index.vue

@@ -103,7 +103,7 @@
                 :data="tableType.data"
                 border
                 style="width: 100%"
-                max-height="270"
+                height="270"
                 :header-cell-style="{
                   border: 'none',
                   height: '60px',
@@ -127,19 +127,11 @@
                     <template #default="scope">
                       <!-- 医疗保险类型 -->
                       <div v-if="item.property == 'ylbxlx'">
-                        <div v-if="scope.row.ylbxlx == 0">
-                          城乡居民基本医疗保险
-                        </div>
                         <div v-if="scope.row.ylbxlx == 0">
                           城乡居民基本医疗保险
                         </div>
                         <div v-else>职工基本医疗保险</div>
                       </div>
-                      <!-- 养老金类型 -->
-                      <div v-if="item.property == 'yljlx'">
-                        <div v-if="scope.row.yljlx == 0">城乡居民养老金</div>
-                        <div v-else>职工养老金</div>
-                      </div>
                     </template>
                   </el-table-column>
                   <el-table-column
@@ -171,7 +163,7 @@
                 :data="dataMyTag.form.data"
                 border
                 style="width: 100%"
-                max-height="270"
+                height="270"
                 :header-cell-style="{
                   border: 'none',
                   height: '60px',
@@ -281,7 +273,7 @@
           </div>
           <div class="my-info">
             <div class="my-info-item" v-if="dataMyTag.title == '学习'">
-              <div class="my-info-label">学历</div>
+              <div class="my-info-label" style="min-width:40px;">学历</div>
               <div class="my-info-content">
                 <p>{{ baseInfo.eduPhase || "" }}</p>
               </div>
@@ -296,7 +288,7 @@
               class="my-info-item"
               v-for="(item, index) in tableType.columns"
             >
-              <div class="my-info-label">{{ item.label }}</div>
+              <div class="my-info-label" :class="item.label=='学校' || item.label=='班级'? 'widu':''">{{ item.label }}</div>
               <div class="my-info-content" v-if="rightList?.length != 0">
                 <p>{{ pd(item.label, rightList[item.property]) }}</p>
               </div>
@@ -307,7 +299,7 @@
     </div>
     <Dialog
       :dialogShow="dialogShow"
-      :columns="tableType.columns"
+      :columns="tableType.columns2"
       :title="tableType.title2"
       :tableData="tableType.data"
       :pagination="paginationDialog"
@@ -490,6 +482,7 @@ const tableType = reactive({
   title2: "",
   title: "出生",
   columns: [],
+  columns:[],
   data: [],
 });
 const columnsList = reactive({
@@ -691,7 +684,7 @@ const pd = computed(() => {
 //特殊标签弹框
 const onClickTag = (item) => {
   tableType.title2 = item.name;
-  tableType.columns = columnsList["特殊标签"].column;
+  tableType.columns2 = columnsList["特殊标签"].column;
   dialogShow.value = true;
 };
 //圆球弹框
@@ -808,8 +801,8 @@ const back = () => {
 watch(
   () => props.message,
   (newValue, oldValue) => {
-    identNo.value = props.message.identNo;
+    // identNo.value = props.message.identNo;
-    dataMyTag.identNo = routers.query.identNo;
+    dataMyTag.identNo = props.message.identNo;
     getData(props.message.identNo);
     onClickTag2("出生", "出生");
     jump.value = "map";
@@ -821,7 +814,7 @@ onMounted(() => {
     dataMyTag.identNo = routers.query.identNo;
     jump.value = "detail";
     getData(routers.query.identNo);
-    onClickTag2("出生");
+    onClickTag2("出生",'出生');
   } else {
     jump.value = "map";
   }
@@ -999,7 +992,7 @@ onMounted(() => {
 
       .my-info-label {
         position: relative;
-        min-width: 40px;
+        min-width: 80px;
         font-family: PingFangSC, PingFang SC;
         font-weight: 400;
         font-size: 18px;
@@ -1097,7 +1090,7 @@ onMounted(() => {
   }
 
   .my-table {
-    margin: 36px 0 52px;
+    margin: 36px 0 32px;
 
     :deep(.el-table) {
       --el-table-header-bg-color: #ffffff3a;
@@ -1178,4 +1171,7 @@ onMounted(() => {
     line-height: 22px;
   }
 }
+.widu{
+  min-width: 40px !important;
+}
 </style>