openatc-components 0.1.189 → 0.1.190

package/package.json

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

package/src/api/param.js

@@ -39,6 +39,17 @@ export function uploadTscParam () {
   return api.Send({}, data)
 }
 
+export function uploadTscParams (id) {
+  var iframdevid = id
+  let api = new Authapi('uploadTscParam')
+  let data = {}
+  data.agentid = iframdevid
+  data.operation = 'get-request'
+  data.infotype = 'feature/all'
+  // let paramList = [iframdevid, 'param', 'upload']
+  return api.Send({}, data)
+}
+
 export function uploadSingleTscParam (type, iframdevid) {
   // var iframdevid = getIframdevid()
   let api = new Authapi('uploadSingleTscParam')

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/views/intersection.vue

@@ -94,10 +94,10 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '12008_835',
+      agentId: 'bclgkxl',
       // agentId: '0351-01',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzA4MzkyMTMyNTIxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODQzNTMzMiwiaWF0IjoxNzA4MzkyMTMyfQ.xAu8PsIwJAc2cMhxxuncVzW5sgxVBRZu0OYep1Q8vFU',
+      Token: 'eyJraWQiOiIxNzExMDY5ODQ1OTU3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMTExMzA0NiwiaWF0IjoxNzExMDY5ODQ2fQ.El-dGs65l7TANRBdj1hR8dz2xVur8GjeVO8hkcBhRIQ',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -1,17 +1,19 @@
 <template>
   <div id="test1">
     <overview
-        :AgentId="agentId"
-        :reqUrl="reqUrl"
-        :modeName="modeName"
-        :controlName="controlName"
-        :isShowState="isShowState"
-        :isShowMode="isShowMode"
-        :Token="Token"></overview>
+      :AgentId="agentId"
+      :reqUrl="reqUrl"
+      :modeName="modeName"
+      :controlName="controlName"
+      :isShowState="isShowState"
+      :isShowMode="isShowMode"
+      :Token="Token"
+    ></overview>
   </div>
 </template>
 
 <script>
+import { computedRelation } from '../utils/conflct'
 export default {
   data () {
     return {
@@ -19,8 +21,8 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',
+      agentId: 'bclgkxl',
+      Token: 'eyJraWQiOiIxNzExMDY5ODQ1OTU3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMTExMzA0NiwiaWF0IjoxNzExMDY5ODQ2fQ.El-dGs65l7TANRBdj1hR8dz2xVur8GjeVO8hkcBhRIQ',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },
@@ -29,6 +31,7 @@ export default {
   watch: {
   },
   mounted () {
+    computedRelation('bclgkxl')
   }
 }
 </script>

package/src/views/patternConfig.vue

@@ -30,10 +30,10 @@ export default {
       // agentids2: ['15001', '15001', '15003', '15004', '15005'],
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '12008_835',
+      agentId: 'bclgkxl',
       // agentId: '0351-01',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzAwMjAwNDQ4MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2NzExMDQwMCwiaWF0IjoxNjk5Mjg2NDAwfQ.AyVJCGmVQVafdWBDQ7TMhVQ5Dvjy13NeuQ8rimTPgtc',
+      Token: 'eyJraWQiOiIxNzExMDY5ODQ1OTU3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMTExMzA0NiwiaWF0IjoxNzExMDY5ODQ2fQ.El-dGs65l7TANRBdj1hR8dz2xVur8GjeVO8hkcBhRIQ',
       // reqUrl: 'http://192.168.13.113:10003/openatc',
       // Token: 'eyJraWQiOiIxNjkxMzcxMTc5ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDE0NzIwMCwiaWF0IjoxNjkwODE5MjAwfQ.AhUj9taw4_IpP77AmP5bvCE87dDQ4-ZdsEJzrlWXKF8',
       // agentId: '30003-352',

package/src/views/schemeconfig.vue

@@ -55,9 +55,9 @@ export default {
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '12004-950',
-      Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
-      Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
+      agentId: 'bclgkxl',
+      Token: 'eyJraWQiOiIxNzExMDY5ODQ1OTU3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMTExMzA0NiwiaWF0IjoxNzExMDY5ODQ2fQ.El-dGs65l7TANRBdj1hR8dz2xVur8GjeVO8hkcBhRIQ',
+      Token103: 'eyJraWQiOiIxNzExMDY5ODQ1OTU3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMTExMzA0NiwiaWF0IjoxNzExMDY5ODQ2fQ.El-dGs65l7TANRBdj1hR8dz2xVur8GjeVO8hkcBhRIQ',
       boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据