openatc-components 0.1.189 → 0.1.191

package/src/utils/conflct.js

@@ -0,0 +1,233 @@
+// import store from '../store'
+import { uploadTscParams } from '../api/param'
+import { Message } from 'element-ui'
+import { getMessageByCode } from '../utils/responseMessage'
+import i18n from '../i18n/index'
+export async function computedRelation (id) {
+  let uploadData = await UploadTscParam(id)
+  if (!uploadData) return
+  let result = []
+  let channel = uploadData.channelList
+  // let channel = store.getters.globalParamModel.getParamsByType('channelList')
+  let tableData = channel.map(item => {
+    return {
+      id: item.id,
+      peddirection: item.realtype && item.realtype === 'peddirection' ? item.realdir : [],
+      phasedirection: item.realtype && item.realtype === 'direction' ? item.realdir : []
+    }
+  })
+  let colorArray = getDefaul(uploadData)
+  tableData.forEach(itemA => {
+    (uploadData.channelGreenConflictInfo.length > 0 ? uploadData.channelGreenConflictInfo : colorArray).forEach(itemB => {
+      if (itemA.id === itemB.channelid) {
+        // 处理peddirection
+        itemA.peddirection.forEach(pedDir => {
+          if (pedDir > 0) {
+            result.push({
+              direction: pedDir,
+              type: 'pedphase',
+              laneConflictList: [],
+              conflictchannel: itemB.greenconflict,
+              pedConflictList: []
+            })
+          }
+        })
+        // 处理phasedirection
+        itemA.phasedirection.forEach(phaseDir => {
+          if (phaseDir > 0) {
+            result.push({
+              direction: phaseDir,
+              type: 'phase',
+              conflictchannel: itemB.greenconflict,
+              laneConflictList: [],
+              pedConflictList: []
+            })
+          }
+        })
+      }
+    })
+  })
+  result.forEach(item => {
+    item.conflictchannel.forEach(aaaValue => {
+      channel.forEach(cha => {
+        if (cha.id === aaaValue) {
+          if (cha.realtype === 'direction') {
+            item.laneConflictList.push(...cha.realdir)
+          } else if (cha.realtype === 'peddirection') {
+            item.pedConflictList.push(...cha.realdir)
+          }
+        }
+      })
+    })
+    delete item.conflictchannel
+  })
+  console.log(result, 'result')
+  return result
+}
+export function getDefaul (data) {
+  let phaseList = data.phaseList
+  let overlaplList = data.overlaplList
+  let channel = data.channelList
+  let newPhase = phaseList.map(item => {
+    return {
+      id: item.id,
+      concurrent: item.concurrent
+    }
+  })
+  let newOverlap = overlaplList.map(item => {
+    return {
+      id: item.id,
+      includedphases: item.includedphases
+    }
+  })
+  let newChannel = channel.map(item => {
+    return {
+      id: item.id,
+      controltype: item.controltype,
+      controlsource: item.controlsource
+    }
+  })
+  let defaultList = newChannel.map(cha => {
+    if (cha.controltype === 2 || cha.controltype === 3) {
+      for (let i = 0; i < newPhase.length; i++) {
+        if (cha.controlsource === newPhase[i].id) {
+          return {
+            id: cha.id,
+            controlsource: cha.controlsource,
+            newCurren: newPhase[i].concurrent
+          }
+        }
+      }
+    } else if (cha.controltype === 4 || cha.controltype === 5) {
+      let newLap = newOverlap.map(item => {
+        let phaList = []
+        if (item.id === cha.controlsource) {
+          phaList.push(...item.includedphases)
+        }
+        // for (let h = 0; h < item.includedphases.length; h++) {
+        //   for (let k = 0; k < newPhase.length; k++) {
+        //     if (item.includedphases[h] === newPhase[k].id) {
+        //       phaList.push(...newPhase[k].concurrent)
+        //     }
+        //   }
+        // }
+        return {
+          id: item.id,
+          concurrent: Array.from(new Set(phaList))
+        }
+      })
+      for (let i = 0; i < newLap.length; i++) {
+        if (cha.controlsource === newLap[i].id) {
+          return {
+            id: cha.id,
+            controlsource: newLap[i].concurrent,
+            newCurren: newLap[i].concurrent
+          }
+        }
+      }
+    } else {
+      return {
+        id: cha.id,
+        controlsource: cha.controlsource,
+        newCurren: []
+      }
+    }
+  })
+  // this.colorArray = this.transform(defaultList)
+  const ret = defaultList.map((i, idx) => {
+    const result = []
+    let greenconflict = []
+    defaultList.forEach((j, jdx) => {
+      if (idx !== jdx) {
+        const ic = Array.isArray(i.controlsource) ? i.controlsource : [i.controlsource]
+        const jc = Array.isArray(j.controlsource) ? j.controlsource : [j.controlsource]
+        let hasDuplicate = false
+        for (let i = 0; i < ic.length; i++) {
+          for (let j = 0; j < jc.length; j++) {
+            if (ic[i] === jc[j]) {
+              hasDuplicate = true
+              break
+            }
+          }
+          if (hasDuplicate) {
+            break
+          }
+        }
+        const isRelation = ic.some(x => jc.some(y => newPhase.find(m => m.id === x && m.concurrent.includes(y))))
+        if (isRelation || hasDuplicate) {
+          result.push(j.id)
+        } else {
+          greenconflict.push(j.id)
+        }
+      }
+    })
+    i.result = result
+    i.greenconflict = greenconflict
+    return i
+  })
+  let newFlict = ret.map(r => {
+    return {
+      channelid: r.id,
+      greenOther: r.result,
+      greenconflict: r.greenconflict
+    }
+  })
+  return newFlict
+}
+export function UploadTscParam (id) {
+  return uploadTscParams(id).then(data => {
+    if (!data.data.success) {
+      if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+        let success = data.data.data.content.success
+        if (success !== 0) {
+          let errormsg = 'openatccomponents.overview.putTscControlError' + success
+          Message.error(this.$t(errormsg))
+          return
+        }
+      }
+      if (data.data.code === '4002') { // 错误应答
+      // 子类型错误
+        let childErrorCode = data.data.data.errorCode
+        if (childErrorCode) {
+          Message.error(getMessageByCode(data.data.data.errorCode, i18n.locale))
+          return
+        }
+      }
+      Message.error(getMessageByCode(data.data.code, i18n.locale))
+      return
+    }
+    if (Object.keys(data.data.data.data).length === 0) {
+      Message.error(this.$t('edge.errorTip.noSchemeUpload'))
+      return
+    }
+    let {customInfo, ...allTscParam} = data.data.data.data
+    if (allTscParam.manualpanel === undefined) {
+      allTscParam.manualpanel = {}
+    }
+    if (allTscParam.channellock === undefined) {
+      allTscParam.channellock = []
+    }
+    if (allTscParam.channelList === undefined) {
+      allTscParam.channelList = []
+    }
+    if (allTscParam.overlaplList === undefined) {
+      allTscParam.overlaplList = []
+    }
+    if (allTscParam.detectorList === undefined) {
+      allTscParam.detectorList = []
+    }
+    if (allTscParam.pedestrainDetectorList === undefined) {
+      allTscParam.pedestrainDetectorList = []
+    }
+    if (allTscParam.preemptList === undefined) {
+      allTscParam.preemptList = []
+    }
+    if (allTscParam.channelGreenConflictInfo === undefined) {
+      allTscParam.channelGreenConflictInfo = []
+    }
+    if (allTscParam.singleoptim === undefined) {
+      allTscParam.singleoptim = []
+    }
+    return allTscParam
+  })
+}

package/src/utils/conflictList.js

@@ -0,0 +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
+    }
+  }
+}

package/src/utils/phasedesc.js

@@ -15,85 +15,105 @@
  * @Date: Create in 13:41 2019/3/26
  * @Modified By:
  */
-const images = [{
+export const images = [{
   id: 1,
   zname: '东直行',
-  ename: 'East-Straight'
+  ename: 'East-Straight',
+  class: 'iconfont icon-dongzhihang'
 },
 {
   id: 2,
   zname: '东左转',
-  ename: 'East-Left'
+  ename: 'East-Left',
+  class: 'iconfont icon-dongzuozhuan'
 },
 {
   id: 3,
   zname: '东右转',
-  ename: 'East-Right'
+  ename: 'East-Right',
+  class: 'iconfont icon-dongyouzhuan'
 },
 {
   id: 4,
   zname: '东掉头',
-  ename: 'East-Back'
+  ename: 'East-Back',
+  class: 'iconfont icon-dongdiaotou',
+  leftclass: 'iconfont icon-dongdiaotouzuohang'
 },
 {
   id: 5,
   zname: '西直行',
-  ename: 'West-Straight'
+  ename: 'West-Straight',
+  class: 'iconfont icon-xizhihang'
 },
 {
   id: 6,
   zname: '西左转',
-  ename: 'West-Left'
+  ename: 'West-Left',
+  class: 'iconfont icon-xizuozhuan'
 },
 {
   id: 7,
   zname: '西右转',
-  ename: 'West-Right'
+  ename: 'West-Right',
+  class: 'iconfont icon-xiyouzhuan'
 },
 {
   id: 8,
   zname: '西掉头',
-  ename: 'West-Back'
+  ename: 'West-Back',
+  class: 'iconfont icon-xidiaotou',
+  leftclass: 'iconfont icon-xidiaotouzuohang'
 },
 {
   id: 9,
   zname: '北直行',
-  ename: 'North-Straight'
+  ename: 'North-Straight',
+  class: 'iconfont icon-beizhihang'
 },
 {
   id: 10,
   zname: '北左转',
-  ename: 'North-Left'
+  ename: 'North-Left',
+  class: 'iconfont icon-beizuozhuan'
 },
 {
   id: 11,
   zname: '北右转',
-  ename: 'North-Right'
+  ename: 'North-Right',
+  class: 'iconfont icon-beiyouzhuan'
 },
 {
   id: 12,
   zname: '北掉头',
-  ename: 'North-Back'
+  ename: 'North-Back',
+  class: 'iconfont icon-beidiaotou',
+  leftclass: 'iconfont icon-beidiaotouzuohang'
 },
 {
   id: 13,
   zname: '南直行',
-  ename: 'South-Straight'
+  ename: 'South-Straight',
+  class: 'iconfont icon-nanzhihang'
 },
 {
   id: 14,
   zname: '南左转',
-  ename: 'South-Left'
+  ename: 'South-Left',
+  class: 'iconfont icon-nanzuozhuan'
 },
 {
   id: 15,
   zname: '南右转',
-  ename: 'South-Right'
+  ename: 'South-Right',
+  class: 'iconfont icon-nanyouzhuan'
 },
 {
   id: 16,
   zname: '南掉头',
-  ename: 'South-Back'
+  ename: 'South-Back',
+  class: 'iconfont icon-nandiaotou',
+  leftclass: 'iconfont icon-nandiaotouzuohang'
 }]
 
 export function getPhaseDesc (list, language) {

package/src/views/intersection.vue

@@ -1,11 +1,49 @@
 <template>
   <div>
-      <button @click="lockPhase" >相位锁定</button><br/>
+    <!-- <h2>静态路口图</h2> -->
+    <!-- <intersection-base-map
+            ref="intersectionMap"
+            :crossStatusData="crossStatusData"
+            :agentId="agentId"
+            :clickMode="true" /> -->
+
+    <!-- 显示按通道获取相位的模版路口图 -->
+    <h2 class="text">显示配置的相位路口图</h2>
+    <intersection-base-map
+            ref="intersectionMap"
+            :crossStatusData="crossStatusData"
+            agentId="bclgkxl"
+            isVipRoute
+            :choosedDirection="[1,2,3]"
+            :choosedPedDirection="[3,4]"
+            :roadDirection="roadDirection" />
+
+    <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
+    <h2 class="text">非第三方配置路口图</h2>
+    <intersection-direction-selection
+      :agentId="this.agentId"
+      :choosedDirection="[14,6,13,8]"
+      :choosedPedDirection="[1]"
+      :roadDirection="roadDirection"
+      @handleClickCrossIcon="handleClickCrossIcon" />
+
+      <h2 class="text">第三方配置路口图</h2>
+      <div>
+        <intersection-direction-selection
+        :agentId="this.agentId"
+        thirdSignal
+        :choosedDirection="[5,6,7,8,13]"
+        :choosedPedDirection="[1,2]"
+        :roadDirection="roadDirection"
+        @handleClickCrossIcon="handleClickCrossIcon" />
+      </div>
+
+      <!-- <button @click="lockPhase" >相位锁定</button><br/>
       <button @click="unlockPhase" >解锁相位</button><br/>
       <button @click="changeControlPattern" >改变控制方案</button><br/>
       <button @click="getPhaseInfo" >获取相位参数信息</button><br/>
       <button @click="getControlInfo" >获取当前方案信息</button>
-      <button @click="clearInterVals" >清除定时器</button>
+      <button @click="clearInterVals" >清除定时器</button> -->
     <!-- <el-button type="primary" @click="handleOpenConfigPanel" style="margin: 20px;">打开路口图面板</el-button>
     <el-dialog
       refs="intersectionMapDialog"
@@ -36,7 +74,7 @@
         @onSelectStages="onSelectStages">
       </intersection-with-interface> -->
     <!-- </el-dialog> -->
-  <div class="layout-container2">
+  <!-- <div class="layout-container2">
       <h2 style="color: #fff;">路口图</h2>
       <intersection-with-interface
         ref="intersection"
@@ -58,12 +96,12 @@
         @queryDevice="queryDevice"
         @onPhaseChange="onPhaseChange"
         @onSelectStages="onSelectStages">
-      </intersection-with-interface>
+      </intersection-with-interface> -->
       <!-- <Stages :stagesList="stagesList"
               :currentStage="currentStage"
               @onSelectStages="onSelectStages"></Stages> -->
 
-      <h2 style="color: #fff;">渠化图</h2>
+      <!-- <h2 style="color: #fff;">渠化图</h2>
       <channelization-with-interface
         ref="channelization"
         :AgentId="agentId"
@@ -78,8 +116,9 @@
       :phasesStatisticsList="phasesStatisticsList"
       bcgColor="#009900"
       :customText="customText"
-      textFontSize="50"/>
-    </div>
+      textFontSize="50"/> -->
+
+    <!-- </div> -->
   </div>
 </template>
 <script>
@@ -92,12 +131,14 @@ export default {
   name: 'demo',
   data () {
     return {
-      roadDirection: 'right',
+      roadDirection: 'left',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '12008_835',
-      // agentId: '0351-01',
+      agentId: 'bclgkxl',
+      // agentId: '13013',
+      // agentId: '12007_390',
+      // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzA4MzkyMTMyNTIxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODQzNTMzMiwiaWF0IjoxNzA4MzkyMTMyfQ.xAu8PsIwJAc2cMhxxuncVzW5sgxVBRZu0OYep1Q8vFU',
+      Token: 'eyJraWQiOiIxNzExNDE1MzU3MjIzIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMTQ1ODU1OCwiaWF0IjoxNzExNDE1MzU4fQ.lbHt7fgSpyVEhcqbUt35U27lBWLZnikwXdO3VElKYq4',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -138,7 +179,8 @@ export default {
             'greenusage': 10
           }
         }
-      ]
+      ],
+      crossStatusData: {}
     }
   },
   components: {
@@ -247,6 +289,9 @@ export default {
       if (token && token !== '') {
         setToken(token)
       }
+    },
+    handleClickCrossIcon (allChoosedDir, curClickedPhase) {
+      console.log('handleClickCrossIcon', allChoosedDir, curClickedPhase)
     }
   },
   created () {
@@ -307,3 +352,8 @@ export default {
     }
 }
 </style>
+<style lang="scss" scoped>
+  .text {
+    color: #fff;
+  }
+</style>

package/src/views/overView.vue

@@ -20,7 +20,7 @@ export default {
       modeName: '交警遥控',
       controlName: '步进',
       agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },

package/static/styles/uiComponents.scss

@@ -3,4 +3,56 @@
   width: 100%;
   color: $--color-text-regular;
   font-size: 14PX;
+}
+.direction-list-configuration {
+  .dir-config-row {
+    overflow: hidden;
+    white-space: nowrap;
+  }
+  .label {
+      font-size: 14PX;
+      line-height: 14PX;
+      color: $--color-text-regular;
+      float: left;
+      margin-right: 10PX;
+  }
+  .dir-btn {
+    float: left;
+    max-width: 410PX;
+    .disabled-icon {
+      opacity: 0.3;
+    }
+    .each-icon {
+      float: left;
+      width: 90PX;
+      height: 80PX;
+      margin-right: 4PX;
+      margin-bottom: 7PX;
+      background-color: $--color-black;
+      cursor: pointer;
+      overflow: hidden;
+      .single-icon {
+        height: 100%;
+          text-align: center;
+          .iconfont {
+            color: $--color-text-primary;
+            font-size: 52PX;
+          }
+          .single-icon-name {
+            font-size: 14PX;
+            text-align: center;
+            color: $--color-text-regular;
+          }
+        }
+        .ped-icon {
+          padding-top: 6PX;
+        }
+        .single-icon-select {
+          background-color: #69bce0;
+        } 
+    }
+  }
+  .default-ped-path {
+    fill: $--color-text-primary;
+  }
 }

package/src/node_modules/.package_versions.json

@@ -1 +0,0 @@
-{}