地图优化

src/components/Map/MapGisDrawing.vue

@@ -132,7 +132,18 @@ export default {
         map.removeLayer(zjdTc);
         map.removeLayer(fsssTc);
         //宅基地图层查询开始 ------------------start
+        // var zjddmNew;
+        // if(that.$cookies.get("search").zjddm !=undefined && that.$cookies.get("search").zjddm !=""){
+        //   zjddmNew = that.$cookies.get("search").zjddm;
+        // }else {
+        //   if(that.$cookies.get("item").zjddm !=undefined && that.$cookies.get("item").zjddm !=""){
+        //     zjddmNew = that.$cookies.get("item").zjddm;
+        //   }
+        // }
         var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.$cookies.get("item").zjddm + "'";
+        console.log(cql_filter_all);
+        console.log(that.$cookies.get("item"));
+        console.log(that.$cookies.get("search"));
         zjdTc= new ol.layer.Tile({
           source: new ol.source.TileWMS({
             url: that.mapGeoServerUrl +"/geoserver/zjd_dc/wms",

src/views/homesteadSurvey/add.vue

@@ -48,7 +48,7 @@
         <van-col span="2">
           <div style=" height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
-        <van-col span="4" style="text-align:center;" @click="active=4,getFsssList(),showPic()">
+        <van-col span="4" style="text-align:center;" @click="active=4,getFsssList()">
           <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
           <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属物</p>
         </van-col>
@@ -446,9 +446,35 @@
             placeholder="备注"
             maxlength="200"
           />
+          <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.ycms"
+          name="异常描述"
+          label="异常描述"
+          placeholder="异常描述"
+          maxlength="200"
+          rows="1"
+          autosize
+          type="textarea"
+          disabled
+        />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="form.auditRemark"
+            name="审核描述"
+            label="审核描述"
+            placeholder="审核描述"
+            maxlength="200"
+            rows="1"
+            autosize
+            type="textarea"
+            disabled
+          />
           <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div  style="margin: 16px;">
-            <van-button v-if="isFinished" round  color="#7AC943" style="width:100%" native-type="submit">保存</van-button>
+            <van-button v-if="isFinished" round  color="#7AC943" style="width:70%;vertical-align:bottom;" native-type="submit">保存</van-button>
           </div>
         </van-form>
       </div>
@@ -581,18 +607,10 @@
           <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfsss('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加附属设施信息</p>
         </div>
       </div>
-      <!--<div v-if="!isFinished&&showsh">
-        <div style="margin:20px;">
-          <p class="title" style="position:relative;padding-left:20px;line-height:32px;">电子签名</p>
-        </div>
-        <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF">
-          <img :src="resultImg" alt="" width="100%" height="100%"/>
-        </van-row>
-      </div>-->
       <div style="position:fixed;bottom:0;left:5%;width:90%;text-align:center;display:flex;">
-        <van-button round color="#ee0a24"  style="flex:1;" @click="showycbjinfo">异常标记</van-button>
-        <van-button round color="#7AC943"  style="flex:1;" @click="searchCommit">签名确认</van-button>
-        <van-button round color="#ff976a" v-if="!isFinished&&showsh" style="flex:1;" @click="showdcshinfo">调查审核</van-button>
+        <van-button round color="#ee0a24" v-if="isFinished" style="width:30%;flex:1;" @click="showycbjinfo">异常标记</van-button>
+        <van-button round color="#7AC943" v-if="isFinished" style="width:30%;flex:1;" @click="searchCommit">签名确认</van-button>
+        <van-button round color="#ff976a" v-if="!isFinished" style="width:30%;flex:1;" @click="showdcshinfo">调查审核</van-button>
       </div>
     </div>
     <van-popup v-model="showsyqr" style="height:100%;width:100%;">
@@ -2739,9 +2757,9 @@
         />
         <img :src="resultImg" alt="" width="100%" height="100%" v-if="resultImg"/>
       </van-row>
-      <van-row type="flex" justify="center" style="margin-bottom:20px;" v-if="isFinished">
+      <van-row type="flex" justify="center" style="margin-bottom:20px;">
         <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleReset">清空画板</van-button></van-col>
-        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button></van-col>
+        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存确认</van-button></van-col>
       </van-row>
     </van-popup>
     <van-popup v-model="showycbj" position="bottom"
@@ -2760,8 +2778,8 @@
           <van-uploader v-model="fileListyc" :after-read="beforeReadyc" multiple @delete="deleteFileyc" :max-count="8"></van-uploader>
         </template>
       </van-field>
-      <div style="margin: 16px;" v-if="isFinished">
-        <van-button round block type="info" @click="saveyc">保存</van-button>
+      <div style="margin: 16px;">
+        <van-button round block type="info" @click="saveyc">关闭</van-button>
       </div>
     </van-popup>
     <van-popup v-model="showdcsh" position="bottom"
@@ -2932,7 +2950,6 @@
     components: { MapGisDrawing,},
     data() {
       return {
-        showsh:false,
         showdcsh:false,
         zjdAudit:'1',
         auditRemark:"",
@@ -3142,6 +3159,7 @@
           deptId:"",
           zjddm:"",
         },
+        ztMap: true,
         //记录是否从地图进入
         enterMap: "",
         //记录从地图进入宅基地代码
@@ -3156,6 +3174,13 @@
       };
     },
     created(){
+      console.log(this.$cookies.get("search"));
+      if(this.$cookies.get("search") !=null &&this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
+        this.ztMap =false;
+        this.$cookies.set("item",this.$cookies.get("search"));
+      }else {
+        this.ztMap =true;
+      }
       if(this.$cookies.get("search")){
         if(this.$cookies.get("search").active!=null){
           this.cookiesInfo = this.$cookies.get("search")
@@ -3166,7 +3191,9 @@
           this.backMap.backMapZjdAData = this.cookiesInfo.mapZjdAData;
           this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId;
           this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm;
-          this.$cookies.set("item",this.backMap);
+          if(this.ztMap){
+            this.$cookies.set("item",this.backMap);
+          }
           this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom;
           //this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm;
           //返回地图值记录----end
@@ -3176,16 +3203,18 @@
             this.isFinished = true
           }
           this.form = this.cookiesInfo.mapZjdAData;
-          this.mapClickLoading();
+          //this.mapClickLoading();
           let zrz = this.cookiesInfo.mapZrzAData;
           let fsss = this.cookiesInfo.mapFsssAData;
-          this.getnhdmlist();
-          this.getBaseUrl();
-          this.getZjd();
+
+          // this.getnhdmlist();
+          // this.getBaseUrl();
+          // this.getZjd();
           if(this.cookiesInfo.active=="3"){
             this.showzrz= true
-            this.form3 =
+            //this.form3 =  this.cookiesInfo.mapZrzAData;
             this.form3.theGeom = this.cookiesInfo.mapZrzAData.theGeom;
+            this.form3.zjddm = this.form.zjddm;
             this.getZrzList()
             setTimeout(() => {
               this.showPopupzrz(zrz)
@@ -3193,7 +3222,8 @@
 
           }else if(this.cookiesInfo.active=="4"){
             this.showfsss= true
-            this.form4.theGeom = this.cookiesInfo.mapFsssAData.theGeom;
+            //this.form4.theGeom = this.cookiesInfo.mapFsssAData.theGeom;
+            this.form4.zjddm = this.form.zjddm;
             this.getFsssList()
             setTimeout(() => {
               this.showPopupfsss(fsss)
@@ -3327,7 +3357,6 @@
       if(this.active ==1){
         //this.form.theGeom = this.item.theGeom;
         this.message = this.form.theGeom;
-        console.log(this.message);
         //this.$refs.drewingClickLoading = this.form.theGeom;
         this.mapClickLoading();
       }
@@ -3336,16 +3365,6 @@
 
     },
     methods: {
-      showPic(){
-        if(this.form.dzqm!=null&&this.form.dzqm!=""){
-          this.resultImg = this.baseUrl+this.form.dzqm
-        }
-        if(this.$cookies.get("businessLevel")=='2'){
-          this.showsh = true
-        }else{
-          this.showsh = false
-        }
-      },
       validatorIdcard(val){
         if(this.form1.shyqrdbzjlx=='01'){
           if(this.vcheckID(val)){
@@ -3466,6 +3485,7 @@
         this.form.auditRemark = this.auditRemark
         if(this.form.zjdAudit=='2'){
           this.form.houseDataConfirmStatus = 'UNCONFIRMED'
+          this.form.dzqm = ''
           updateZjdzd(this.form).then(response => {
             let _this =this
             this.$toast({
@@ -3495,17 +3515,6 @@
         this.showycbj = false
         this.form.isyc = this.isyc
         this.form.ycms = this.ycms
-        updateZjdzd(this.form).then(response => {
-          let _this =this
-          this.$toast({
-            icon: 'success', // 找到自己需要的图标
-            message: '保存成功',
-            duration:"1000",
-            onClose:function(){
-              _this.showycbj = false
-            }
-          })
-        });
       },
       // 图片上传前
       beforeReadyc(file){
@@ -3577,7 +3586,6 @@
           configKey: "system.attachment.url"}
         sysConfig(params).then(response => {
           this.baseUrl = response.rows[0].configValue
-          console.log(this.baseUrl)
         })
       },
       // 验证
@@ -5904,6 +5912,9 @@
       },
       searchCommit(){
         this.showesign = true
+        if(this.form.dzqm!=null&&this.form.dzqm!=""){
+          this.resultImg = this.baseUrl+this.form.dzqm
+        }
       },
       searchCommit1(){
         this.form.houseDataConfirmStatus = "CONFIRMED"