内蒙宅基地

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',

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();

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;
     },