openatc-components 0.0.102 → 0.0.103

package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue

@@ -323,48 +323,41 @@ export default {
     }
   },
   watch: {
-    // item: {
-    //   handler: function (newval, oldval) {
-    //     if (JSON.stringify(oldval) !== '{}') {
-    //       // 更改原数据的位置大小数据
-    //       let data = {
-    //         ...this.Data,
-    //         ...newval
-    //       }
-    //       let fields = Object.keys(newval)
-    //       this.$emit('changeMotorwayItem', data, fields)
-    //     }
-    //   }
-    // },
+    item: {
+      handler: function (newval, oldval) {
+        if (JSON.stringify(oldval) !== '{}') {
+          // 更改原数据的位置大小数据
+          let data = {
+            ...this.Data,
+            ...newval
+          }
+          let fields = Object.keys(newval)
+          this.$emit('changeMotorwayItem', data, fields)
+        }
+      }
+    },
     Data: {
       handler: function (val) {
         this.iconnameArr = val.icondirename
-        if (this.UsageMode === 'draw') {
-          this.item.x = val.x
-          this.item.y = val.y
-          this.item.angle = val.angle
-        }
-        if (this.UsageMode === 'show') {
-          if (val.type === 4 && this.lastType === '') {
+        if (val.type === 4 && this.lastType === '') {
           // 绿闪：绿-》灰-》绿 循环效果
-            this.GreenFlashColor = '#77fb65'
-            this.GreenIntervalId = setInterval(() => {
-              this.GreenFlashColor =
+          this.GreenFlashColor = '#77fb65'
+          this.GreenIntervalId = setInterval(() => {
+            this.GreenFlashColor =
               !this.GreenFlashColor || this.GreenFlashColor === '#828282'
                 ? '#77fb65'
                 : '#828282'
-            }, 500)
-            this.lastType = val.type
-          }
-          if (
-            this.GreenIntervalId &&
+          }, 500)
+          this.lastType = val.type
+        }
+        if (
+          this.GreenIntervalId &&
           val.type !== 4 &&
           val.type !== this.lastType
-          ) {
-            clearInterval(this.GreenIntervalId)
-            this.GreenFlashColor = undefined
-            this.lastType = ''
-          }
+        ) {
+          clearInterval(this.GreenIntervalId)
+          this.GreenFlashColor = undefined
+          this.lastType = ''
         }
       },
       deep: true
@@ -395,22 +388,16 @@ export default {
   methods: {
     boxDragStop (origin, final) {
       this.item = JSON.parse(JSON.stringify(final))
-      this.handleChangeData()
+      this.$emit('handleSelectIcon', this.Data)
     },
     boxResizeStop (origin, final) {
       this.IconW = final.w + 'px'
       this.IconH = final.h + 'px'
       this.resetSvg()
       this.item = JSON.parse(JSON.stringify(final))
-      this.handleChangeData()
     },
     boxRotateStop (origin, final) {
       this.item = JSON.parse(JSON.stringify(final))
-      // 第四象限的角度是负值（开源组件接口返回），转化为正值便于理解
-      if (this.item.angle < 0) {
-        this.item.angle = this.item.angle + 360
-      }
-      this.handleChangeData()
     },
     resetSvg () {
       this.reset = false
@@ -418,17 +405,8 @@ export default {
         this.reset = true
       })
     },
-    handleSelectIcon () {
+    handleSelectIcon (iconparams) {
       this.$emit('handleSelectIcon', this.Data)
-    },
-    handleChangeData () {
-      let data = {
-        ...this.Data,
-        ...this.item
-      }
-      let fields = Object.keys(this.item)
-      this.$emit('changeMotorwayItem', data, fields)
-      this.handleSelectIcon()
     }
   },
   created () {

package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/pedroadIconSvg.vue

@@ -65,49 +65,42 @@ export default {
     }
   },
   watch: {
-    // item: {
-    //   handler: function (newval, oldval) {
-    //     if ((JSON.stringify(oldval) !== '{}')) {
-    //       // 更改原数据的位置大小数据
-    //       let data = {
-    //         ...this.PedData,
-    //         ...newval,
-    //         viewbox: this.Viewbox
-    //       }
-    //       let fields = Object.keys(newval).concat('viewbox')
-    //       this.$emit('changePedItem', data, fields)
-    //     }
-    //   }
-    // },
+    item: {
+      handler: function (newval, oldval) {
+        if ((JSON.stringify(oldval) !== '{}')) {
+          // 更改原数据的位置大小数据
+          let data = {
+            ...this.PedData,
+            ...newval,
+            viewbox: this.Viewbox
+          }
+          let fields = Object.keys(newval).concat('viewbox')
+          this.$emit('changePedItem', data, fields)
+        }
+      }
+    },
     PedData: {
       handler: function (val) {
-        if (this.UsageMode === 'draw') {
-          this.item.x = val.x
-          this.item.y = val.y
-          this.item.angle = val.angle
-        }
-        if (this.UsageMode === 'show') {
-          if (!val.pedtype) return
-          if (val.pedtype === 4 && this.lastType === '') {
+        if (!val.pedtype) return
+        if (val.pedtype === 4 && this.lastType === '') {
           // 绿闪：绿-》灰-》绿 循环效果
-            this.GreenFlashColor = '#7bd66b'
-            this.GreenIntervalId = setInterval(() => {
-              this.GreenFlashColor =
+          this.GreenFlashColor = '#7bd66b'
+          this.GreenIntervalId = setInterval(() => {
+            this.GreenFlashColor =
               !this.GreenFlashColor || this.GreenFlashColor === '#828282'
                 ? '#7bd66b'
                 : '#828282'
-            }, 500)
-            this.lastType = val.pedtype
-          }
-          if (
-            this.GreenIntervalId &&
+          }, 500)
+          this.lastType = val.pedtype
+        }
+        if (
+          this.GreenIntervalId &&
           val.pedtype !== 4 &&
           val.pedtype !== this.lastType
-          ) {
-            clearInterval(this.GreenIntervalId)
-            this.GreenFlashColor = undefined
-            this.lastType = ''
-          }
+        ) {
+          clearInterval(this.GreenIntervalId)
+          this.GreenFlashColor = undefined
+          this.lastType = ''
         }
       },
       deep: true
@@ -137,7 +130,6 @@ export default {
   methods: {
     boxDragStop (origin, final) {
       this.item = JSON.parse(JSON.stringify(final))
-      this.handleChangeData()
     },
     boxResizeStop (origin, final) {
       this.IconW = final.w + 'px'
@@ -147,15 +139,9 @@ export default {
       this.Viewbox[2] = final.w.toFixed(1)
       this.Viewbox[3] = final.h.toFixed(1)
       this.item = JSON.parse(JSON.stringify(final))
-      this.handleChangeData()
     },
     boxRotateStop (origin, final) {
       this.item = JSON.parse(JSON.stringify(final))
-      // 第四象限的角度是负值（开源组件接口返回），转化为正值便于理解
-      if (this.item.angle < 0) {
-        this.item.angle = this.item.angle + 360
-      }
-      this.handleChangeData()
     },
     resetSvg () {
       this.reset = false
@@ -169,18 +155,8 @@ export default {
         this.rectArr.push(i)
       }
     },
-    handleSelectIcon () {
+    handleSelectIcon (iconparams) {
       this.$emit('handleSelectIcon', this.PedData)
-    },
-    handleChangeData () {
-      let data = {
-        ...this.PedData,
-        ...this.item,
-        viewbox: this.Viewbox
-      }
-      let fields = Object.keys(this.item).concat('viewbox')
-      this.$emit('changePedItem', data, fields)
-      this.handleSelectIcon()
     }
   },
   created () {

package/package/kisscomps/components/DrawChannelization/drawsvg/importDialog.vue

@@ -48,7 +48,7 @@ export default {
     // 底图加载
     readAsText () {
       this.svgmethods = new Svgmethods()
-      this.svgmethods.clickOpen(this.loadSvgString, this.getMapWidthHeighgt)
+      this.svgmethods.clickOpen(this.loadSvgString)
       this.dialogVisible = false
     },
     loadSvgString (type, content) {
@@ -62,9 +62,6 @@ export default {
       } else {
         this.$emit('loadSvgString', type, content)
       }
-    },
-    getMapWidthHeighgt (type, size) {
-      this.$emit('loadMapSize', type, size)
     }
   },
   mounted () {}