230320a303 2 years ago
parent
commit
cf7215fadd

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-088b36d8.6545a920.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.e29da47b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-088b36d8.f032989b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-e1716226.28e935d8.js


+ 4 - 2
src/views/map/components/popup/MapTextEdit.vue

@@ -82,8 +82,10 @@ export default {
       let remoteOptions = []
       let remoteOptions = []
       if (params.estateObj) {
       if (params.estateObj) {
         const estateObj = JSON.parse(params.estateObj)
         const estateObj = JSON.parse(params.estateObj)
-        params.estate_id = estateObj.id
-        remoteOptions = [{ keyRO: estateObj.estate_name, valRO: estateObj.id }]
+        if (estateObj.id) {
+          params.estate_id = estateObj.id
+          remoteOptions = [{ keyRO: estateObj.estate_name, valRO: estateObj.id }]
+        }
       }
       }
       if (str === 'color') {
       if (str === 'color') {
         const oldform = this.$refs.ruleForm.baseForm
         const oldform = this.$refs.ruleForm.baseForm

+ 2 - 2
src/views/map/dtl.vue

@@ -851,7 +851,7 @@ export default {
           strokeWeight: 2, // 轮廓宽度
           strokeWeight: 2, // 轮廓宽度
           strokeOpacity: 0.8, // 轮廓透明度
           strokeOpacity: 0.8, // 轮廓透明度
           text: obj.text,
           text: obj.text,
-          estateObj: obj.estateObj || {}
+          estateObj: obj.estateObj || '{}'
         })
         })
         that.polygons = [...polygons]
         that.polygons = [...polygons]
         mouseTool.close(true)
         mouseTool.close(true)
@@ -1002,7 +1002,7 @@ export default {
             tempData[index].fillOpacity = obj.fillOpacity
             tempData[index].fillOpacity = obj.fillOpacity
             tempData[index].strokeColor = obj.strokeColor
             tempData[index].strokeColor = obj.strokeColor
             tempData[index].strokeStyle = obj.strokeStyle
             tempData[index].strokeStyle = obj.strokeStyle
-            tempData[index].estateObj = obj.estateObj || {}
+            tempData[index].estateObj = obj.estateObj || '{}'
           }
           }
           this[str] = [...tempData]
           this[str] = [...tempData]
           this.$storage(`map_${str}`, JSON.stringify(tempData))
           this.$storage(`map_${str}`, JSON.stringify(tempData))

Some files were not shown because too many files changed in this diff