From ea87f24cdbe89acfdf587654c2c5ee30f0fb8170 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 22 Feb 2023 15:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E8=92=99=E5=AE=85=E5=9F=BA=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login/index.js                         |  8 --------
 .../homeApplication/applicationList.vue        |  4 +++-
 .../homeApplication/proposerLite.vue           | 18 +++++++++++-------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/api/login/index.js b/src/api/login/index.js
index a82d8ed8..3876903d 100644
--- a/src/api/login/index.js
+++ b/src/api/login/index.js
@@ -1,7 +1,4 @@
 import request from '@/utils/request'
-import { encrypt } from '@/utils/jsencrypt' // 公钥,私钥都声明在里面
-
-const VUE_APP_ENABLE_SECRET = true; // 登录账密凭据加密
 
 // 登录方法
 export function login(username, password, code, uuid) {
@@ -11,11 +8,6 @@ export function login(username, password, code, uuid) {
     code,
     uuid
   }
-  if(VUE_APP_ENABLE_SECRET)
-  {
-    data.username = encrypt(username);
-    data.password = encrypt(password);
-  }
   return request({
     url: '/login',
     method: 'post',
diff --git a/src/views/sunVillage_info/homeApplication/applicationList.vue b/src/views/sunVillage_info/homeApplication/applicationList.vue
index a81c6a56..f202e53a 100644
--- a/src/views/sunVillage_info/homeApplication/applicationList.vue
+++ b/src/views/sunVillage_info/homeApplication/applicationList.vue
@@ -81,6 +81,7 @@ export default {
       finished: false,
       refreshing: false,
       deptId:null,
+      idcard:null,
       total: 0,
       queryParams:{
         pageNum:1,
@@ -95,7 +96,8 @@ export default {
     this.houseGetDicts("home_stage_status").then((response) => {
       this.houseApplyStatus = response.data;
     });
-    this.deptId = Cookies.get('deptId')
+    this.deptId = Cookies.get('deptId');
+    this.idcard = Cookies.get('idcard');
     this.$set(this.queryParams, "deptId", this.deptId);
     this.$set(this.queryParams, "sqhhzsfzh", this.idcard);
     this.getList();
diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue
index 1936c5d5..47d57e7e 100644
--- a/src/views/sunVillage_info/homeApplication/proposerLite.vue
+++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue
@@ -2087,7 +2087,7 @@ export default {
      this.sysFarmer = JSON.parse(Cookies.get('user'));
      listHomeapplytype({deptId:this.sysFarmer.deptId}).then(response => {
        let _this = this;
-       _this.tytzList = response.rows;
+       _this.tytzList = response.rows;;
      });
    }
     console.info( this.sysFarmer);
@@ -2122,8 +2122,10 @@ export default {
         allInformationWLHT(this.id).then(response => {
           listHomeapplytype({deptId: response.data.deptId}).then(res => {
             this.tytzList = res.rows;
+            console.info(this.tytzList);
             for (let i = 0; i < this.tytzList.length; i++) {
               //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code});
+              this.$set(this.tytzList[i], "tytzId", this.tytzList[i].id);
               if(this.tytzList[i].id = response.data.tyhxt){
                 this.tytzName = this.tytzList[i].name;
               }
@@ -2143,8 +2145,10 @@ export default {
       this.$nextTick(() => {
         let map = this.$refs.pointDarwMap;
         if(data === null)
+        if( this.applicationDetail.ydjfkg !== null){
           data = this.applicationDetail.ydjfkg.theGeomJson;
-        this.setMapData(map, data);
+          this.setMapData(map, data);
+        }
       });
     },
     // 绘制验收地图
@@ -3563,11 +3567,11 @@ export default {
                 return;
               } else {
                   setTimeout(() => {
-                    saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                      _this.complete(pass, comment);
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
                     }).catch(resp => {
-                      _this.notify(msg, 'danger');
-                      _this.notify("保存失败!", 'danger');
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
                     });
                   }, 500);
               }
@@ -4663,7 +4667,7 @@ export default {
       return false;
     },
     onConfirmTytz(val){
-      this.$set(this.applicationDetail, 'tyhxt', val.value);
+      this.$set(this.applicationDetail, 'tyhxt', val.tytzId);
       this.tytzName = val.name;
       this.showTyt = false;
     },