Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/homesteadSurvey/list.vue

@@ -1332,56 +1332,70 @@
           },
           dataList: [["fsssSx"],["zjdSx"],["zrzSx"]],          //地图使用 --end
           checkBoxAll:[],
+          //地图跳转存之
+          mapAddJump:"",
+          mapAddJumpNum:"",
         };
       },
       mounted(){
       },
       created(){
+          this.getDicts("zjlx").then(response => {
+            this.zjlxOptions = response.data;
+          });
+          this.getDicts("qsxz").then(response => {
+            this.suyqxzOptions = response.data;
+          });
+          this.getDicts("sjly").then(response => {
+            this.sjlyOptions = response.data;
+          });
+          this.getDicts("hyzk").then(response => {
+            this.hyzkOptions = response.data;
+          });
+          this.getDicts("occupation").then(response => {
+            this.occupationOptions = response.data;
+          });
+          this.getDicts("living_condition").then(response => {
+            this.jzqkOptions = response.data;
+          });
+          this.getDicts("jzhcssfyzf").then(response => {
+            this.jzhcssfyzfOptions = response.data;
+          });
+          this.getDicts("family_status").then(response => {
+            var arr = [];
+            response.data.forEach(function (item) {
+              if (item.dictLabel !== '户主') {
+                arr.push(item)
+              }
+            });
+            this.yhzgxOptions = arr;
+
+            /*this.yhzgxOptions = response.data;*/
+          });
+          this.getDicts("cybz").then(response => {
+            this.cybzOptions = response.data;
+          });
         if(this.$cookies.get("item")){
+          console.log(this.$cookies.get("item"));
           if(this.$cookies.get("item").activeBtn !=null){
-            this.activeBtn = this.$cookies.get("item").activeBtn;
-            this.item = this.$cookies.get("item").backMapZjdAData;
+            if(this.$cookies.get("item").activeBtn == 4){
+              this.activeBtn = this.$cookies.get("item").activeBtn;
+              this.item = this.$cookies.get("item").backMapZjdAData;
+              this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId;
+              this.mapAddJumpNum =1;
+              this.mapShow();
+              this.onSubmitnh();
+            }
+          }else {
+            this.item = this.$cookies.get("item");
+            this.getZjdList();
+            this.getTotalHR();
           }
         }else {
-
+          this.item = this.$cookies.get("item");
+          this.getZjdList();
+          this.getTotalHR();
         }
-        this.getDicts("zjlx").then(response => {
-          this.zjlxOptions = response.data;
-        });
-        this.getDicts("qsxz").then(response => {
-          this.suyqxzOptions = response.data;
-        });
-        this.getDicts("sjly").then(response => {
-          this.sjlyOptions = response.data;
-        });
-        this.getDicts("hyzk").then(response => {
-          this.hyzkOptions = response.data;
-        });
-        this.getDicts("occupation").then(response => {
-          this.occupationOptions = response.data;
-        });
-        this.getDicts("living_condition").then(response => {
-          this.jzqkOptions = response.data;
-        });
-        this.getDicts("jzhcssfyzf").then(response => {
-          this.jzhcssfyzfOptions = response.data;
-        });
-        this.getDicts("family_status").then(response => {
-          var arr = [];response.data.forEach(function (item) {
-            if (item.dictLabel !== '户主') {
-              arr.push(item)
-            }
-          });
-          this.yhzgxOptions = arr;
-
-          /*this.yhzgxOptions = response.data;*/
-        });
-        this.getDicts("cybz").then(response => {
-          this.cybzOptions = response.data;
-        });
-        this.item = this.$cookies.get("item");
-        this.getZjdList();
-        this.getTotalHR();
       },
       methods: {
         //删除户内成员
@@ -2187,7 +2201,12 @@
           // map.addLayer(zhenTc);
           //镇边界查询开始 ------------------------------end
           //村边界查询开始 ------------------------------start
-          var cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'";
+          var cql_filter
+          if(that.mapAddJumpNum == 1){
+            cql_filter = "dept_id='" + that.mapAddJump + "'";
+          } else {
+            cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'";
+          }
           var cunTc= new ol.layer.Tile({
             source: new ol.source.TileWMS({
               url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
@@ -2244,14 +2263,14 @@
           map.addLayer(cunTc);
           //村边界查询开始 ------------------------------end
           //宅基地图层查询开始 ------------------start
-          var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
+          //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
           var zjdTc= new ol.layer.Tile({
             source: new ol.source.TileWMS({
               url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
               params: {
                 LAYERS: 'zjd_dc:t_house_survey_zjdzd',
                 TILED: true,
-                cql_filter: cql_filter_all,
+                cql_filter: cql_filter,
                 SRID: 3857,
               },
             }),
@@ -2266,7 +2285,7 @@
               params: {
                 LAYERS: 'zjd_dc:t_house_survey_zrz',
                 TILED: true,
-                cql_filter: cql_filter_all,
+                cql_filter: cql_filter,
                 SRID: 3857,
               },
             }),
@@ -2281,7 +2300,7 @@
               params: {
                 LAYERS: 'zjd_dc:t_house_survey_fsss',
                 TILED: true,
-                cql_filter: cql_filter_all,
+                cql_filter: cql_filter,
                 SRID: 3857,
               },
             }),