openatc-components 0.0.102 → 0.0.103

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/detectorChart.vue

@@ -27,11 +27,6 @@
     >
       <div v-if="UsageMode === 'draw'" class="centerText" :class="{'defaultBg': chooseIndex !== DetectorChartData.index, 'highlightBg': chooseIndex === DetectorChartData.index }" :style="{'width': item.w + 'px', 'height': item.h + 'px'}">
         <div class="detector-statistics-echarts" :id="'detectorStatisticsEcharts' + DetectorChartData.index"></div>
-        <!-- <div>
-          <div class="detector-rect"
-          :class="{'defaultVehicleBorder': DetectorData.detectortype === 1,
-          'defaultPedBorder': DetectorData.detectortype === 2 }"></div>
-        </div> -->
       </div>
       <div v-if="UsageMode === 'show'" class="centerText" :class="{'defaultBg': chooseIndex !== DetectorChartData.index, 'highlightBg': chooseIndex === DetectorChartData.index }" :style="{'width': item.w + 'px', 'height': item.h + 'px'}">
       </div>
@@ -66,20 +61,12 @@ export default {
           this.$emit('changeDetectorItem', data, fields)
         }
       }
-    },
-    DetectorChartData: {
-      handler: function (newval, oldval) {
-        console.log(this.Detector)
-      }
     }
   },
   props: {
     DetectorChartData: {
       type: Object
     },
-    Detector: {
-      type: Array
-    },
     isSeletable: {
       type: Boolean
     },
@@ -127,19 +114,16 @@ export default {
         xAxis: {
           type: 'category',
           axisLabel: {
-            show: false,
             textStyle: {
               color: getTheme() === 'light' ? '#666666' : '#B9BABF'
             }
           },
           axisTick: {
-            show: false,
             lineStyle: {
               color: getTheme() === 'light' ? '#D7DFE1' : '#30384D'
             }
           },
           axisLine: {
-            show: false,
             lineStyle: {
               color: getTheme() === 'light' ? '#D7DFE1' : '#30384D'
             }
@@ -158,7 +142,6 @@ export default {
             // }
           },
           axisLine: {
-            show: false,
             lineStyle: {
               color: getTheme() === 'light' ? '#D7DFE1' : '#30384D'
             }
@@ -176,7 +159,6 @@ export default {
             // }
           },
           axisLabel: {
-            show: false,
             textStyle: {
               color: getTheme() === 'light' ? '#666666' : '#B9BABF'
             }
@@ -186,14 +168,7 @@ export default {
           type: 'bar',
           barWidth: '10',
           itemStyle: {
-            color: 'red',
-            borderWidth: 0,
-            shadowBlur: {
-              shadowColor: 'rgba(255,255,255,0.31)',
-              shadowBlur: 10,
-              shadowOffsetX: 0,
-              shadowOffsetY: 2
-            }
+            color: 'red'
           },
           data: this.flowsaturation
         }, {

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/detectorIconSvg.vue

@@ -64,29 +64,26 @@ export default {
     }
   },
   watch: {
-    // item: {
-    //   handler: function (newval, oldval) {
-    //     if ((JSON.stringify(oldval) !== '{}')) {
-    //       // 更改原数据的位置大小数据
-    //       let data = {
-    //         ...this.DetectorData,
-    //         ...newval
-    //       }
-    //       let fields = Object.keys(newval)
-    //       this.$emit('changeDetectorItem', data, fields)
-    //     }
-    //   }
-    // }
-    DetectorData: {
-      handler: function (val) {
-        if (this.UsageMode === 'draw') {
-          this.item.x = val.x
-          this.item.y = val.y
-          this.item.angle = val.angle
+    item: {
+      handler: function (newval, oldval) {
+        if ((JSON.stringify(oldval) !== '{}')) {
+          // 更改原数据的位置大小数据
+          let data = {
+            ...this.DetectorData,
+            ...newval
+          }
+          let fields = Object.keys(newval)
+          this.$emit('changeDetectorItem', data, fields)
         }
-      },
-      deep: true
+      }
     }
+    // DetectorData: {
+    // 监听失效，不明原因，有时间可以看下
+    //   handler: function (val) {
+    //     debugger
+    //   },
+    //   deep: true
+    // }
 
     // CurChooseIcon: {
     //   handler: function (data) {
@@ -117,12 +114,10 @@ export default {
     boxDragStop (origin, final) {
       this.item = JSON.parse(JSON.stringify(final))
       this.$emit('handleSelectIcon', this.DetectorData)
-      this.handleChangeData()
     },
     boxResize (final) {
       // this.resetSvg()
       this.item = JSON.parse(JSON.stringify(final))
-      this.handleChangeData()
     },
     boxResizeStop (origin, final) {
       // this.resetSvg()
@@ -130,11 +125,6 @@ export default {
     },
     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
@@ -148,15 +138,6 @@ export default {
     culculateFontsize () {
       // 根据倒计时图标大小，动态计算内部文字大小
       this.Fontsize = Math.floor(this.DetectorData.w / 140 * 20)
-    },
-    handleChangeData () {
-      let data = {
-        ...this.DetectorData,
-        ...this.item
-      }
-      let fields = Object.keys(this.item)
-      this.$emit('changeDetectorItem', data, fields)
-      this.handleSelectIcon()
     }
   },
   created () {

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/laneIcon.vue

@@ -23,6 +23,12 @@
           d="M13.473,12.000 L13.473,-0.000 L16.000,-0.000 L16.000,12.000 L13.473,12.000 ZM8.982,-0.000 L11.508,-0.000 L11.508,12.000 L8.982,12.000 L8.982,-0.000 ZM4.491,-0.000 L7.017,-0.000 L7.017,12.000 L4.491,12.000 L4.491,-0.000 ZM-0.000,-0.000 L2.526,-0.000 L2.526,12.000 L-0.000,12.000 L-0.000,-0.000 Z"/>
         </svg>
       </div>
+      <!-- <div :class="laneicon.type === 'bicyclelane' ? '' : 'hide'">
+        <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" :width="laneicon.width ? laneicon.width : iconw" :height="laneicon.height ? laneicon.height : iconh">
+          <path fill-rule="evenodd"  :fill="laneicon.active === true ? highlightColor : defaultColor"
+          d="M6.994,6.074 L3.495,0.003 L-0.004,6.074 L2.091,6.074 L2.091,16.007 L4.898,16.007 L4.898,6.074 L6.994,6.074 Z"/>
+        </svg>
+      </div> -->
       <div :class="laneicon.type === 'countdown' ? '' : 'hide'">
         <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" :width="laneicon.width ? laneicon.width : iconw" :height="laneicon.height ? laneicon.height : iconh">
           <path fill-rule="evenodd"  :fill="laneicon.active === true ? highlightColor : defaultColor"

package/src/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/src/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/src/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 () {}