openatc-components 0.5.68 → 0.5.70

package/src/utils/conflictList.js

@@ -1,87 +1,87 @@
-import { computedRelation } from './conflct.js'
-export default class CrossDirectionConflictList {
-  constructor (agentid, choosedDirection, choosedPedDirection) {
-    this.agentid = agentid
-    this.conflictList = []
-    this.phaseConflictMap = new Map()
-    this.pedPhaseConflictMap = new Map()
-    this.allConflictDir = []
-    this.allPedConflictDir = []
-    this.choosedDirection = choosedDirection
-    this.choosedPedDirection = choosedPedDirection
-  }
-
-  getConflictListByAgentid () {
-    return new Promise((resolve, reject) => {
-      computedRelation(this.agentid).then(res => {
-        if (!res) return
-        this.conflictList = res
-        this.setAllConflictMap()
-        resolve(res)
-      })
-    })
-  }
-
-  setAllConflictMap () {
-    for (let i = 0; i < this.conflictList.length; i++) {
-      let item = this.conflictList[i]
-      if (item.type === 'phase') {
-        this.phaseConflictMap.set(item.direction, item)
-      }
-      if (item.type === 'pedphase') {
-        this.pedPhaseConflictMap.set(item.direction, item)
-      }
-    }
-    // console.log(this.phaseConflictMap)
-  }
-
-  getOneDirConflict (dir, type) {
-    let conflictDir = []
-    let conflictPedDir = []
-    if (type === 'phase') {
-      let phaseInfo = this.phaseConflictMap.get(dir)
-      if (!phaseInfo) return
-      conflictDir = phaseInfo.laneConflictList
-      conflictPedDir = phaseInfo.pedConflictList
-    }
-    if (type === 'pedphase') {
-      let pedPhaseInfo = this.pedPhaseConflictMap.get(dir)
-      if (!pedPhaseInfo) return
-      conflictDir = pedPhaseInfo.laneConflictList
-      conflictPedDir = pedPhaseInfo.pedConflictList
-    }
-    return {
-      conflictDir,
-      conflictPedDir
-    }
-  }
-
-  getListDirConflict (choosedDirection, choosedPedDirection) {
-    for (let i = 0; i < choosedDirection.length; i++) {
-      let phaseConflict = this.getOneDirConflict(choosedDirection[i], 'phase')
-      if (phaseConflict) {
-        let conflictDirArr = phaseConflict.conflictDir
-        let conflictPedDirArr = phaseConflict.conflictPedDir
-        this.allConflictDir = this.allConflictDir.concat(conflictDirArr)
-        this.allPedConflictDir = this.allPedConflictDir.concat(conflictPedDirArr)
-      }
-    }
-    for (let i = 0; i < choosedPedDirection.length; i++) {
-      let pedPhaseConflict = this.getOneDirConflict(choosedPedDirection[i], 'pedphase')
-      if (pedPhaseConflict) {
-        let conflictDirArr = pedPhaseConflict.conflictDir
-        let conflictPedDirArr = pedPhaseConflict.conflictPedDir
-        this.allConflictDir = this.allConflictDir.concat(conflictDirArr)
-        this.allPedConflictDir = this.allPedConflictDir.concat(conflictPedDirArr)
-      }
-    }
-    this.allConflictDir = Array.from(new Set(this.allConflictDir))
-    this.allPedConflictDir = Array.from(new Set(this.allPedConflictDir))
-    // console.log(this.allConflictDir)
-    // console.log(this.allPedConflictDir)
-    return {
-      allConflictDir: this.allConflictDir,
-      allPedConflictDir: this.allPedConflictDir
-    }
-  }
-}
+import { computedRelation } from './conflct.js'
+export default class CrossDirectionConflictList {
+  constructor (agentid, choosedDirection, choosedPedDirection) {
+    this.agentid = agentid
+    this.conflictList = []
+    this.phaseConflictMap = new Map()
+    this.pedPhaseConflictMap = new Map()
+    this.allConflictDir = []
+    this.allPedConflictDir = []
+    this.choosedDirection = choosedDirection
+    this.choosedPedDirection = choosedPedDirection
+  }
+
+  getConflictListByAgentid () {
+    return new Promise((resolve, reject) => {
+      computedRelation(this.agentid).then(res => {
+        if (!res) return
+        this.conflictList = res
+        this.setAllConflictMap()
+        resolve(res)
+      })
+    })
+  }
+
+  setAllConflictMap () {
+    for (let i = 0; i < this.conflictList.length; i++) {
+      let item = this.conflictList[i]
+      if (item.type === 'phase') {
+        this.phaseConflictMap.set(item.direction, item)
+      }
+      if (item.type === 'pedphase') {
+        this.pedPhaseConflictMap.set(item.direction, item)
+      }
+    }
+    // console.log(this.phaseConflictMap)
+  }
+
+  getOneDirConflict (dir, type) {
+    let conflictDir = []
+    let conflictPedDir = []
+    if (type === 'phase') {
+      let phaseInfo = this.phaseConflictMap.get(dir)
+      if (!phaseInfo) return
+      conflictDir = phaseInfo.laneConflictList
+      conflictPedDir = phaseInfo.pedConflictList
+    }
+    if (type === 'pedphase') {
+      let pedPhaseInfo = this.pedPhaseConflictMap.get(dir)
+      if (!pedPhaseInfo) return
+      conflictDir = pedPhaseInfo.laneConflictList
+      conflictPedDir = pedPhaseInfo.pedConflictList
+    }
+    return {
+      conflictDir,
+      conflictPedDir
+    }
+  }
+
+  getListDirConflict (choosedDirection, choosedPedDirection) {
+    for (let i = 0; i < choosedDirection.length; i++) {
+      let phaseConflict = this.getOneDirConflict(choosedDirection[i], 'phase')
+      if (phaseConflict) {
+        let conflictDirArr = phaseConflict.conflictDir
+        let conflictPedDirArr = phaseConflict.conflictPedDir
+        this.allConflictDir = this.allConflictDir.concat(conflictDirArr)
+        this.allPedConflictDir = this.allPedConflictDir.concat(conflictPedDirArr)
+      }
+    }
+    for (let i = 0; i < choosedPedDirection.length; i++) {
+      let pedPhaseConflict = this.getOneDirConflict(choosedPedDirection[i], 'pedphase')
+      if (pedPhaseConflict) {
+        let conflictDirArr = pedPhaseConflict.conflictDir
+        let conflictPedDirArr = pedPhaseConflict.conflictPedDir
+        this.allConflictDir = this.allConflictDir.concat(conflictDirArr)
+        this.allPedConflictDir = this.allPedConflictDir.concat(conflictPedDirArr)
+      }
+    }
+    this.allConflictDir = Array.from(new Set(this.allConflictDir))
+    this.allPedConflictDir = Array.from(new Set(this.allPedConflictDir))
+    // console.log(this.allConflictDir)
+    // console.log(this.allPedConflictDir)
+    return {
+      allConflictDir: this.allConflictDir,
+      allPedConflictDir: this.allPedConflictDir
+    }
+  }
+}

package/src/utils/dateFormat.js

@@ -1,41 +1,41 @@
-/**
- * Copyright (c) 2020 kedacom
- * OpenATC is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- * http://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- **/
-/**
- * @Description: 实现日期格式转换,转换后格式为："2019-12-12 19:00:00"
- * @Author: yangdongyang
- * @Date: Create in 13:41 2019/12/12
- * @Param {date} date
- */
-export function formatDate (date, time) {
-  var y = date.getFullYear()
-  var m = date.getMonth() + 1
-  m = m < 10 ? ('0' + m) : m
-  var d = date.getDate()
-  d = d < 10 ? ('0' + d) : d
-  var h = time.getHours()
-  h = h < 10 ? ('0' + h) : h
-  var minute = time.getMinutes()
-  minute = minute < 10 ? ('0' + minute) : minute
-  var second = time.getSeconds()
-  second = second < 10 ? ('0' + second) : second
-  return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second
-}
-
-// 将字符串格式转化为date格式
-export function dateToString (date) {
-  var t = Date.parse(date)
-  if (!isNaN(t)) {
-    return new Date(Date.parse(date.replace(/-/g, '/')))
-  } else {
-    return new Date()
-  }
-}
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+/**
+ * @Description: 实现日期格式转换,转换后格式为："2019-12-12 19:00:00"
+ * @Author: yangdongyang
+ * @Date: Create in 13:41 2019/12/12
+ * @Param {date} date
+ */
+export function formatDate (date, time) {
+  var y = date.getFullYear()
+  var m = date.getMonth() + 1
+  m = m < 10 ? ('0' + m) : m
+  var d = date.getDate()
+  d = d < 10 ? ('0' + d) : d
+  var h = time.getHours()
+  h = h < 10 ? ('0' + h) : h
+  var minute = time.getMinutes()
+  minute = minute < 10 ? ('0' + minute) : minute
+  var second = time.getSeconds()
+  second = second < 10 ? ('0' + second) : second
+  return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second
+}
+
+// 将字符串格式转化为date格式
+export function dateToString (date) {
+  var t = Date.parse(date)
+  if (!isNaN(t)) {
+    return new Date(Date.parse(date.replace(/-/g, '/')))
+  } else {
+    return new Date()
+  }
+}

package/src/utils/index.js

@@ -1,69 +1,69 @@
-/**
- * Copyright (c) 2020 kedacom
- * OpenATC is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- * http://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- **/
-/**
- * Created by jiachenpan on 16/11/18.
- */
-
-export function parseTime (time, cFormat) {
-  if (arguments.length === 0) {
-    return null
-  }
-  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if (('' + time).length === 10) time = parseInt(time) * 1000
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key]
-    if (key === 'a') return ['一', '二', '三', '四', '五', '六', '日'][value - 1]
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
-    }
-    return value || 0
-  })
-  return time_str
-}
-
-export function formatTime (time, option) {
-  time = +time * 1000
-  const d = new Date(time)
-  const now = Date.now()
-
-  const diff = (now - d) / 1000
-
-  if (diff < 30) {
-    return '刚刚'
-  } else if (diff < 3600) { // less 1 hour
-    return Math.ceil(diff / 60) + '分钟前'
-  } else if (diff < 3600 * 24) {
-    return Math.ceil(diff / 3600) + '小时前'
-  } else if (diff < 3600 * 24 * 2) {
-    return '1天前'
-  }
-  if (option) {
-    return parseTime(time, option)
-  } else {
-    return d.getMonth() + 1 + '月' + d.getDate() + '日' + d.getHours() + '时' + d.getMinutes() + '分'
-  }
-}
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+/**
+ * Created by jiachenpan on 16/11/18.
+ */
+
+export function parseTime (time, cFormat) {
+  if (arguments.length === 0) {
+    return null
+  }
+  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if (('' + time).length === 10) time = parseInt(time) * 1000
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    if (key === 'a') return ['一', '二', '三', '四', '五', '六', '日'][value - 1]
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+
+export function formatTime (time, option) {
+  time = +time * 1000
+  const d = new Date(time)
+  const now = Date.now()
+
+  const diff = (now - d) / 1000
+
+  if (diff < 30) {
+    return '刚刚'
+  } else if (diff < 3600) { // less 1 hour
+    return Math.ceil(diff / 60) + '分钟前'
+  } else if (diff < 3600 * 24) {
+    return Math.ceil(diff / 3600) + '小时前'
+  } else if (diff < 3600 * 24 * 2) {
+    return '1天前'
+  }
+  if (option) {
+    return parseTime(time, option)
+  } else {
+    return d.getMonth() + 1 + '月' + d.getDate() + '日' + d.getHours() + '时' + d.getMinutes() + '分'
+  }
+}