Merge remote-tracking branch 'origin/master'

src/views/homestead/index.vue

@@ -1,6 +1,5 @@
 <template>
-  <div class="app-container">
-    <!-- <div style="position: relative; z-index: 999999"> -->
+  <div class="app-container" :style="{ height: windowHeight + 'px' }">
     <div style="display: none">
       <select id="zhen"></select>
       <select id="cun" autofocus></select>
@@ -207,7 +206,10 @@
           </div>
           <div class="others">
             <div class="information">
-              <div class="location"></div>
+              <div
+                class="location"
+                @click="landHomeSerial('house', houseInfoList)"
+              ></div>
               <div class="status_text">{{ houseInfoList.xzqk }}</div>
             </div>
             <div class="editor">
@@ -228,7 +230,10 @@
           </div>
           <div class="others">
             <div class="information">
-              <div class="location"></div>
+              <div
+                class="location"
+                @click="landHomeSerial('land', landInfoList)"
+              ></div>
               <div class="status_text">{{ landInfoList.xzqk }}</div>
             </div>
             <div class="editor">
@@ -915,9 +920,6 @@
 <script>
 import $ from "jquery";
 import {
-  bigDataHcAreaInfo,
-  bigDataHcCountyInfo,
-  bigDataHcVillageInfo,
   hcBottomSearch,
   commonUpload,
   houseAdd,
@@ -940,7 +942,7 @@ export default {
       villageValue: "",
       //选中村相关信息
       villageDataObj: {
-        deptName: "", //村名
+        deptName: "  ", //村名
       },
       hcAreaInfoFieldName: {
         text: "label",
@@ -1072,10 +1074,14 @@ export default {
       hasTable: false,
       //查看农地\农房 显隐
       landHomesteadDetailsVisibile: false,
+
+      windowHeight:0,
     };
   },
   mounted() {
     this.initAxios();
+     let windowHeight = document.documentElement.clientHeight;
+    this.windowHeight = windowHeight;
   },
   methods: {
     //编辑农地信息
@@ -1593,7 +1599,9 @@ export default {
           let currDeptId = "169";
           // if(content[0].children && content[0].children.length!=0){
           //   if(content[0].children[0].children && content[0].children[0].children.length!=0){
-          //     currDeptId = content[0].children[0].children[0].value;
+          //     if(content[0].children[0].children[0].children && content[0].children[0].children[0].children.length!=0){
+          //       currDeptId = content[0].children[0].children[0].children[0].value;
+          //     }
           //   }else{
           //     currDeptId = content[0].children[0].value
           //   }
@@ -2630,6 +2638,17 @@ export default {
         this.landInfoList.frontland = res.url;
       });
     },
+    landHomeSerial(type, data) {
+      console.log(type);
+      console.log(data);
+      if (type == "house") {
+        $("#texiao_fang").val(data.fwsyrmc);
+        $("#texiao_fang").trigger("click");
+      } else {
+        $("#texiao_di").val(data.syrmc);
+        $("#texiao_di").trigger("click");
+      }
+    },
   },
 };
 </script>
@@ -2839,8 +2858,7 @@ export default {
     position: fixed;
     z-index: 9;
     top: 24px;
-    left: 8px;
-    // left: -80px;
+    left: 16px;
     display: flex;
     .address_item {
       display: flex;
@@ -2850,11 +2868,11 @@ export default {
       align-items: center; /*  子元素相对父元素垂直居中 */
       position: relative;
       .portrait {
-        width: 76px;
-        height: 76px;
+        width: 86px;
+        height: 86px;
         background: #000;
         border-radius: 50%;
-        margin-bottom: 20px;
+        margin-bottom: 18px;
         font-size: 30px;
         color: #fff;
         text-align: center;
@@ -2876,12 +2894,10 @@ export default {
         }
       }
       .name {
-        font-size: 14px;
+        font-size: 22px;
         background: #fff;
-        padding: 2px 6px;
+        padding: 4px 6px;
         border-radius: 8px;
-        min-height: 42px;
-        min-width: 100px;
       }
       &.more {
         .portrait {
@@ -3203,7 +3219,7 @@ export default {
               border-radius: 20px;
               padding: 8px 15px;
               float: right;
-              width: calc(100% - 56px);
+              max-width: calc(100% - 56px);
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
@@ -3296,7 +3312,9 @@ export default {
           }
           .picture {
             flex: 1;
-            background: #000;
+            background: url("../../assets/images/homestead/no_img.png") center
+              center no-repeat;
+            background-size: 90% auto;
             img {
               width: 100%;
               height: 100%;

src/views/homestead/login.vue

@@ -61,7 +61,6 @@
 <script>
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
-import $ from "jquery";
 export default {
   name: "homesteadLogin",
   data() {