openatc-components 0.0.105 → 0.0.108

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.0.105",
+  "version": "0.0.108",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/kisscomps/components/Channelization/Channelization.vue

@@ -70,10 +70,6 @@ export default {
     AgentId: {
       type: String,
       default: '0'
-    },
-    resizeMap: { // 重新获取容器大小，调整底图大小
-      type: Boolean,
-      default: false
     }
   },
   watch: {
@@ -120,13 +116,6 @@ export default {
         this.load('all')
       },
       deep: true
-    },
-    resizeMap: {
-      handler: function (newval, oldval) {
-        if (newval === true && oldval === false) {
-          this.getParentSize()
-        }
-      }
     }
   },
   data () {
@@ -353,7 +342,7 @@ export default {
       this.handleReset()
       return new Promise((resolve, reject) => {
         getChannelizatonChart(this.AgentId).then(data => {
-          this.$emit('getChannelizationSetting', data)
+          // this.$emit('getChannelizationSetting', data)
           if (!data.data.success) {
             // let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
             // if (data.data.data) {
@@ -482,6 +471,7 @@ export default {
         this.bodyDomWidth = this.bodyDomSize.width
         window.addEventListener('resize', () => {
         // 定义窗口大小变更通知事件
+          if (_this.$el.parentElement === null || _this.$el.parentElement === undefined) return
           _this.bodyDomSize.width = _this.$el.parentElement.clientWidth
           this.bodyDomWidth = this.bodyDomSize.width
           console.log('resize this.bodyDomSize.width', _this.bodyDomSize.width)

package/src/kisscomps/components/ChannelizationFlowStatistic/ChannelizationFlowStatistic.vue

@@ -241,7 +241,6 @@ export default {
       this.handleReset()
       return new Promise((resolve, reject) => {
         getChannelizatonChart(this.AgentId).then(data => {
-          this.$emit('getChannelizationSetting', data)
           if (!data.data.success) {
             // let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
             // if (data.data.data) {
@@ -275,6 +274,7 @@ export default {
         this.bodyDomWidth = this.bodyDomSize.width
         window.addEventListener('resize', () => {
         // 定义窗口大小变更通知事件
+          if (_this.$el.parentElement === null || _this.$el.parentElement === undefined) return
           _this.bodyDomSize.width = _this.$el.parentElement.clientWidth
           this.bodyDomWidth = this.bodyDomSize.width
           console.log('resize this.bodyDomSize.width', _this.bodyDomSize.width)

package/src/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -95,10 +95,6 @@ export default {
     controlName: {
       type: String,
       default: ''
-    },
-    resizeMap: { // 重新获取容器大小，调整底图大小
-      type: Boolean,
-      default: false
     }
   },
   watch: {
@@ -110,13 +106,6 @@ export default {
       },
       // 深度观察监听
       deep: true
-    },
-    resizeMap: {
-      handler: function (newval, oldval) {
-        if (newval === true && oldval === false) {
-          this.getParentSize()
-        }
-      }
     }
   },
   created () {
@@ -145,6 +134,7 @@ export default {
         this.bodyDomWidth = this.bodyDomSize.width
         window.addEventListener('resize', () => {
         // 定义窗口大小变更通知事件
+          if (_this.$el.parentElement === null || _this.$el.parentElement === undefined) return
           _this.bodyDomSize.width = _this.$el.parentElement.clientWidth
           this.bodyDomWidth = this.bodyDomSize.width
           console.log('resize this.bodyDomSize.width', _this.bodyDomSize.width)

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -411,12 +411,10 @@ export default {
       this.newList = []
       if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
       if (!this.controlData.phase) return
-      // let cycle = this.controlData.cycle
       if (!this.controlData.rings) return
       let newValue = []
       for (let rings of this.controlData.rings) {
         let phase = this.controlData.phase
-        // let list = []
         let obj = {}
         for (let key in rings.sequence) {
           obj[key] = rings.sequence[key]
@@ -438,45 +436,7 @@ export default {
               }
             })
           })
-          // let currPhase = this.phaseList.filter((item) => {
-          //   if (item.id === sequ && item.controltype === 99) {
-          //     obj.controltype = item.controltype
-          //   }
-          //   return item.id === sequ
-          // })[0]
-          // if (currPhase) {
-          //   obj.redWidth = (currPhase.redclear / cycle * 100).toFixed(3) + '%'
-          //   obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
-          //   obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
-          //   obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
-          //   // obj.peddirection = currPhase.peddirection
-          //   let peddirections = []
-          //   for (let walk of this.sidewalkPhaseData) {
-          //     for (let ped of currPhase.peddirection) {
-          //       // if (stg === walk.phaseid) {
-          //       let objs = {}
-          //       objs.name = walk.name
-          //       objs.id = walk.id
-          //       if (ped === walk.id) {
-          //         peddirections.push(objs)
-          //         peddirections = Array.from(new Set(peddirections))
-          //       }
-          //       // }
-          //     }
-          //   }
-          //   obj.peddirection = peddirections
-          //   obj.split = split
-          //   obj.direction = currPhase.direction.map(item => {
-          //     return {
-          //       id: item,
-          //       color: '#454545'
-          //     }
-          //   })
-          //   list.push(obj)
-          // }
         }
-        // this.newList.push(list)
-        // this.patternInfo = [...this.newList]
       }
       this.handleOverViewChange(newValue)
     },
@@ -544,11 +504,10 @@ export default {
               }
             })
           }
+          obj.split = split
           if (ring.sum) {
-            obj.split = split
-            obj.redWidth = (currPhase.redclear + ring.sum / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
-            obj.split = split
             obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           }
           obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'

package/src/views/intersection.vue

@@ -96,7 +96,7 @@ export default {
       // reqUrl: 'http://192.168.13.103:10003/openatc',
       agentId: '13001-460',
       reqUrl: 'http://192.168.13.105:11003/openatc',
-      Token: 'eyJraWQiOiIxNjYwNjQwMDMyMzc0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0NzAzOTk3OCwiaWF0IjoxNjYwNjM5OTc4fQ.I2O7bJPOFWDU9ZE8BqE6p-fsn-Kuj2i0z5lRgvvkzgA',
+      Token: 'eyJraWQiOiIxNjYwMjgzMzQwMzM4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0NjY4MzM0MCwiaWF0IjoxNjYwMjgzMzQwfQ.xmgkrjwcdwT_miC3krjqL27Tv4txJ9FQuDEKlfWdtzU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',