t

src/views/facillity/components/popup/IndexEdit.vue

@@ -74,6 +74,7 @@ export default {
   watch: {
     isShow: function(val) {
       if (val) {
+        this.imagesArr = []
         if (this.curObj.id) {
           this.$api.facility.admfacilitydetail({id: this.curObj.id}).then(res => {
             let curData = res || {}

src/views/map/components/popup/MapTextEdit.vue

@@ -66,6 +66,7 @@ export default {
       cObj: {},
       estateObj: {},
       schoolObj: {},
+      facilityObj: {},
     }
   },
   watch: {
@@ -73,6 +74,7 @@ export default {
       if (val) {
         this.estateObj = {}
         this.schoolObj = {}
+        this.facilityObj = {}
         this.cObj = JSON.parse(JSON.stringify(this.curObj))
         this.getDef()
       }
@@ -96,31 +98,55 @@ export default {
       }
       let remoteSchoolOptions = []
       if (params.schoolObj) {
-        const schoolObj = JSON.parse(params.schoolObj)
+        let schoolObj = {}
+        if (typeof(params.schoolObj) === 'object') {
+          schoolObj = params.schoolObj
+        } else {
+          schoolObj = JSON.parse(params.schoolObj)
+        }
         if (schoolObj.id) {
           params.school_id = schoolObj.id
           remoteSchoolOptions = [{ keyRO: schoolObj.school_name, valRO: schoolObj.id }]
         }
       }
+      let remoteFacilityOptions = []
+      if (params.facilityObj) {
+        const facilityObj = JSON.parse(params.facilityObj)
+        if (facilityObj.id) {
+          params.facility_id = facilityObj.id
+          remoteFacilityOptions = [{ keyRO: facilityObj.facility_name, valRO: facilityObj.id }]
+        }
+      }
       if (str === 'color') {
         const oldform = this.$refs.ruleForm.baseForm
         params = {...oldform}
         params.fillColor = this.fillColor
         params.strokeColor = this.strokeColor
       }
+      if (str === 'facility') {
+        const oldform = this.$refs.ruleForm.baseForm
+        params = {...oldform}
+        params.text = this.facilityObj.facility_name
+        remoteFacilityOptions = [{ keyRO: this.facilityObj.facility_name, valRO: this.facilityObj.id }]
+        params.school_id = ''
+        params.estate_id = ''
+      }
       if (str === 'estate') {
         const oldform = this.$refs.ruleForm.baseForm
         params = {...oldform}
         params.text = this.estateObj.estate_name
         remoteEstateOptions = [{ keyRO: this.estateObj.estate_name, valRO: this.estateObj.id }]
         params.school_id = ''
+        params.facility_id = ''
       }
+      
       if (str === 'school') {
         const oldform = this.$refs.ruleForm.baseForm
         params = {...oldform}
         params.text = this.schoolObj.school_name
         remoteSchoolOptions = [{ keyRO: this.schoolObj.school_name, valRO: this.schoolObj.id }]
         params.estate_id = ''
+        params.facility_id = ''
       }
       if (!params.text) params.text = '标题示例'
       if (!params.strokeStyle) params.strokeStyle = 'solid'
@@ -131,6 +157,10 @@ export default {
           params.strokeColor = this.strokeColor
         }
         this.formData = [
+          { label: '关联配套', key: 'facility_id', type: 'selectRemote', changeHandle: this.facilityChange,
+            remoteParams: { skey: 'name', api: `facility.admfacilitylist`, opKey: 'name', opVal: 'id' },
+            remoteOptions: remoteFacilityOptions
+          },
           { label: '关联楼盘', key: 'estate_id', type: 'selectRemote', changeHandle: this.estateChange,
             remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
             remoteOptions: remoteEstateOptions
@@ -156,6 +186,15 @@ export default {
       }
       this.setDefaultValue(params)
     },
+    facilityChange (val, op, valObj) {
+      this.facilityObj = {
+          id: valObj.id,
+          facility_name: valObj.name,
+          pri_image: valObj.pri_image,
+          remarked: valObj.remarked,
+        }
+      this.getDef('facility')
+    },
     estateChange (val, op, valObj) {
       this.estateObj = {
           id: valObj.id,
@@ -200,6 +239,10 @@ export default {
             if (this.schoolObj && this.schoolObj.id) {
               newForm.schoolObj = JSON.stringify(this.schoolObj)
             }
+            if (this.facilityObj && this.facilityObj.id) {
+              newForm.facilityObj = JSON.stringify(this.facilityObj)
+            }
+            
             if (this.curObj.obj) {
               this.$emit('close', newForm, 'edit')
             } else {

src/views/map/dtl.vue

@@ -343,6 +343,7 @@ export default {
           const cObj = that.polygons[that.polygonIndex]
           const estateObj = cObj.estateObj ? JSON.parse(cObj.estateObj) : {}
           const schoolObj = cObj.schoolObj ? JSON.parse(cObj.schoolObj) : {}
+          const facilityObj = cObj.facilityObj ? JSON.parse(cObj.facilityObj) : {}
           const typeObj = {
             '#ff0': '新楼盘',
             '#bb9c2c': '二手房',
@@ -381,6 +382,20 @@ export default {
                 </div>
               </div>
             `
+          } else if (facilityObj.id) {
+            that.winObj.content = `
+              <div style="border-radius: 6px;overflow:hidden;background:#fff;box-shadow: 0 0 3px #ccc;">
+                <div style="font-weight: bold;color:#fff;padding: 6px;background:#409eff;user-select: none;margin-bottom: 6px;text-align: left;font-size: 12px;">${cObj.text}</div>
+                <div style="display: flex;padding-left: 6px;">
+                  <div style="width: 80px;">
+                    <img style="width: 80px;height: auto;" src="${facilityObj.pri_image}_xs" />
+                  </div>
+                  <div style="width: 160px;">
+                    <div style="padding: 0 6px 6px;color: #999;font-size: 12px;">备注：${facilityObj.remarked}</div>
+                  </div>
+                </div>
+              </div>
+            `
           } else if (schoolObj.id) {
             const saObj = arrToObj(that.$dictData.school_attrib)
             const stObj = arrToObj(that.$dictData.school_type)
@@ -956,6 +971,7 @@ export default {
           strokeWeight: 2, // 轮廓宽度
           strokeOpacity: 0.8, // 轮廓透明度
           text: obj.text,
+          facilityObj: obj.facilityObj || '{}',
           estateObj: obj.estateObj || '{}',
           schoolObj: obj.schoolObj || '{}'
         })
@@ -1113,6 +1129,7 @@ export default {
             tempData[index].strokeStyle = obj.strokeStyle
             tempData[index].estateObj = obj.estateObj || '{}'
             tempData[index].schoolObj = obj.schoolObj || '{}'
+            tempData[index].facilityObj = obj.facilityObj || '{}'
           }
           this[str] = [...tempData]
           this.$storage(`map_${str}`, JSON.stringify(tempData))