openatc-components 0.1.191 → 0.1.193

package/package.json

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

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

@@ -39,7 +39,7 @@
   </div>
 </template>
 <script>
-import echart from 'echarts'
+import * as echart from 'echarts'
 import { getTheme } from '../../../../../utils/auth.js'
 export default {
   name: 'countdownsvg',

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

@@ -136,6 +136,13 @@ export default {
       },
       // 深度观察监听
       deep: true
+    },
+    isVipRoute: {
+      handler: function (val, oldVal) {
+        if (val) {
+          this.reset = true
+        }
+      }
     }
   },
   created () {
@@ -145,6 +152,9 @@ export default {
   },
   mounted () {
     this.getParentSize()
+    if (this.isVipRoute) {
+      this.reset = true
+    }
   },
   updated () {
   },

package/src/node_modules/.package_versions.json

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

package/src/router/index.js

@@ -17,6 +17,13 @@ export default new Router({
         require(['@/views/intersection'], resolve)
       }
     },
+    {
+      path: '/intersection',
+      name: 'intersection',
+      component: (resolve) => {
+        require(['@/views/intersection2'], resolve)
+      }
+    },
     {
       path: '/pattern',
       name: 'pattern',

package/src/utils/conflct.js

@@ -6,7 +6,7 @@ import i18n from '../i18n/index'
 export async function computedRelation (id) {
   let uploadData = await UploadTscParam(id)
   if (!uploadData) return
-  let result = []
+  let results = []
   let channel = uploadData.channelList
   // let channel = store.getters.globalParamModel.getParamsByType('channelList')
   let tableData = channel.map(item => {
@@ -23,7 +23,7 @@ export async function computedRelation (id) {
         // 处理peddirection
         itemA.peddirection.forEach(pedDir => {
           if (pedDir > 0) {
-            result.push({
+            results.push({
               direction: pedDir,
               type: 'pedphase',
               laneConflictList: [],
@@ -35,7 +35,7 @@ export async function computedRelation (id) {
         // 处理phasedirection
         itemA.phasedirection.forEach(phaseDir => {
           if (phaseDir > 0) {
-            result.push({
+            results.push({
               direction: phaseDir,
               type: 'phase',
               conflictchannel: itemB.greenconflict,
@@ -47,7 +47,7 @@ export async function computedRelation (id) {
       }
     })
   })
-  result.forEach(item => {
+  results.forEach(item => {
     item.conflictchannel.forEach(aaaValue => {
       channel.forEach(cha => {
         if (cha.id === aaaValue) {
@@ -61,7 +61,24 @@ export async function computedRelation (id) {
     })
     delete item.conflictchannel
   })
-  console.log(result, 'result')
+  const uniqueDirections = new Set()
+  const doChange = results.filter(obj => {
+    if (uniqueDirections.has(obj.direction)) {
+      return false
+    }
+    uniqueDirections.add(obj.direction)
+    return true
+  })
+  let result = doChange.map(item => {
+    let uniqueLaneConflictList = [...new Set(item.laneConflictList)]
+    let uniquePedConflictList = [...new Set(item.pedConflictList)]
+    return {
+      ...item,
+      laneConflictList: uniqueLaneConflictList,
+      pedConflictList: uniquePedConflictList
+    }
+  })
+  console.log('result', result)
   return result
 }
 export function getDefaul (data) {

package/src/views/intersection.vue

@@ -133,12 +133,12 @@ export default {
     return {
       roadDirection: 'left',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'bclgkxl',
+      agentId: 'cllhsl',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzExNDE1MzU3MjIzIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMTQ1ODU1OCwiaWF0IjoxNzExNDE1MzU4fQ.lbHt7fgSpyVEhcqbUt35U27lBWLZnikwXdO3VElKYq4',
+      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/intersection2.vue

@@ -0,0 +1,329 @@
+<template>
+  <div>
+    <!-- <h2>静态路口图</h2> -->
+    <!-- <intersection-base-map
+            ref="intersectionMap"
+            :crossStatusData="crossStatusData"
+            :agentId="agentId"
+            :clickMode="true" /> -->
+
+      <!-- <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> -->
+    <!-- <el-button type="primary" @click="handleOpenConfigPanel" style="margin: 20px;">打开路口图面板</el-button>
+    <el-dialog
+      refs="intersectionMapDialog"
+      class="abow_dialog"
+      :width="dialogWidth"
+      :visible.sync="boxVisible"
+      :close-on-click-modal="false"
+      @close="oncancle"
+      append-to-body> -->
+      <!-- <intersection-with-interface
+        ref="intersection"
+        :AgentId="agentId"
+        :reqUrl="reqUrl"
+        :Token="Token"
+        :roadDirection="roadDirection"
+        :modeName="modeName"
+        :controlName="controlName"
+        :isShowMode="isShowMode"
+        :isShowInterval="isShowInterval"
+        :isShowMessage ="isShowMessage"
+        :isShowPatternStatus="isShowPatternStatus"
+        :isShowIntersection="isShowIntersection"
+        :isShowStages="isShowStages"
+        @getTscControl="getTscControl"
+        @registerMessage="registerMessage"
+        @queryDevice="queryDevice"
+        @onPhaseChange="onPhaseChange"
+        @onSelectStages="onSelectStages">
+      </intersection-with-interface> -->
+    <!-- </el-dialog> -->
+  <div class="layout-container2">
+      <h2 style="color: #fff;">路口图</h2>
+      <intersection-with-interface
+        ref="intersection"
+        :AgentId="agentId"
+        :reqUrl="reqUrl"
+        :Token="Token"
+        :roadDirection="roadDirection"
+        :modeName="modeName"
+        :controlName="controlName"
+        :isShowState="isShowState"
+        :isShowMode="isShowMode"
+        :isShowInterval="isShowInterval"
+        :isShowMessage ="isShowMessage"
+        :isShowPatternStatus="isShowPatternStatus"
+        :isShowIntersection="isShowIntersection"
+        :isShowStages="isShowStages"
+        @getTscControl="getTscControl"
+        @registerMessage="registerMessage"
+        @queryDevice="queryDevice"
+        @onPhaseChange="onPhaseChange"
+        @onSelectStages="onSelectStages">
+      </intersection-with-interface>
+      <!-- <Stages :stagesList="stagesList"
+              :currentStage="currentStage"
+              @onSelectStages="onSelectStages"></Stages> -->
+
+      <!-- <h2 style="color: #fff;">渠化图</h2>
+      <channelization-with-interface
+        ref="channelization"
+        :AgentId="agentId"
+        :reqUrl="reqUrl"
+        :Token="Token"
+        @getTscControl="getTscControl"
+        @onPhaseChange="onPhaseChange"/>
+
+    <h2 style="color: #fff;">流量统计渠化路口图</h2>
+      <channelization-flow-statistic
+      :AgentId="agentId"
+      :phasesStatisticsList="phasesStatisticsList"
+      bcgColor="#009900"
+      :customText="customText"
+      textFontSize="50"/> -->
+
+    </div>
+  </div>
+</template>
+<script>
+import {
+  setToken
+} from '../utils/auth'
+import IntersectionWithInterface from '../kisscomps/components/IntersectionWithInterface'
+import ChannelizationWithInterface from '../kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface'
+export default {
+  name: 'demo',
+  data () {
+    return {
+      roadDirection: 'left',
+      // reqUrl: 'http://192.168.13.103:10003/openatc',
+      agentId: 'cllzpl',
+      // agentId: '13013',
+      // agentId: '12007_390',
+      // agentId: '12014',
+      reqUrl: 'http://192.168.13.103:10003/openatc',
+      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
+      // agentId: '30003-352',
+      // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
+      // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
+      boxVisible: false,
+      dialogWidth: '80%',
+      modeName: '交警遥控',
+      controlName: '步进',
+      isShowState: true,
+      isShowMode: true,
+      isShowMessage: true,
+      isShowPatternStatus: false,
+      isShowIntersection: true,
+      isShowInterval: true,
+      isShowStages: true,
+      customText: 'A',
+      phasesStatisticsList: [
+        {
+          'phaseno': 1,
+          'time': '2020-08-09 15:44:22',
+          'phasestatistics': {
+            'totalflow': 49,
+            'averageflow': 12,
+            'saturation': 1,
+            'occupyrate': 69,
+            'congestionindex': 'A',
+            'greenusage': 10
+          }
+        },
+        {
+          'phaseno': 2,
+          'time': '2020-08-09 15:44:22',
+          'phasestatistics': {
+            'totalflow': 62,
+            'averageflow': 31,
+            'saturation': 3,
+            'occupyrate': 98,
+            'congestionindex': 'F',
+            'greenusage': 10
+          }
+        }
+      ],
+      crossStatusData: {}
+    }
+  },
+  components: {
+    IntersectionWithInterface,
+    ChannelizationWithInterface
+  },
+  methods: {
+    oncancle () {
+      this.boxVisible = false
+    },
+    handleOpenConfigPanel () {
+      this.boxVisible = true
+    },
+    setDialogWidth () {
+      var val = document.body.offsetWidth
+      const def = 1200 // 默认宽度
+      if (val < def) {
+        this.dialogWidth = '80%'
+      } else {
+        this.dialogWidth = def + 'px'
+      }
+    },
+    async lockPhase (reqData) {
+      console.log('lock')
+      reqData = {
+        'mode': 0,
+        'control': 4,
+        'terminal': 1,
+        'delay': null,
+        'duration': null,
+        'value': 1
+      }
+      let res = await this.$refs.intersection.lockPhase(reqData)
+      console.log(res)
+      console.log(reqData)
+    },
+    async unlockPhase (reqData) {
+      console.log('unlock')
+      reqData = {
+        'mode': 0,
+        'control': 0,
+        'terminal': 1,
+        'delay': null,
+        'duration': null,
+        'value': 0
+      }
+      let res = await this.$refs.intersection.unlockPhase(reqData)
+      console.log(res)
+      console.log(reqData)
+    },
+    async changeControlPattern (reqData) {
+      console.log('changeControlPattern')
+      reqData = {
+        'mode': 0,
+        'control': 1,
+        'terminal': 1,
+        'delay': null,
+        'duration': null,
+        'value': 0
+      }
+      let res = await this.$refs.intersection.changeControlPattern(reqData)
+      console.log(res)
+      console.log(reqData)
+    },
+    async getPhaseInfo () {
+      console.log('getPhaseInfo')
+      let res = await this.$refs.intersection.getPhaseInfo()
+      console.log(res)
+      return res
+    },
+    async getControlInfo () {
+      console.log('getControlInfo')
+      let res = await this.$refs.intersection.getControlInfo()
+      console.log(res)
+      return res
+    },
+    onPhaseChange (res, index) {
+      console.log('onPhaseChange:')
+      console.log(res, index)
+      this.stagesList = res
+      // this.currentStage = index
+    },
+    getTscControl (res) {
+      console.log('getTscControl:', res)
+      // let control = res.data.data.control
+      // let mode = res.data.data.mode
+      // console.log("control,mode:",control,mode)
+      // this.controlName = control
+      // this.modeName = mode
+    },
+    registerMessage (res) {
+      console.log('registerMessage:', res)
+    },
+    queryDevice (res) {
+      console.log('queryDevice:', res)
+    },
+    clearInterVals () {
+      this.$refs.intersection.clearInterVals()
+    },
+    onSelectStages (res) {
+      console.log('onSelectStages')
+      console.log(res)
+    },
+    setPropsToken (token) {
+      // 获取组件外传入的token，便于独立组件调用接口
+      if (token && token !== '') {
+        setToken(token)
+      }
+    },
+    handleClickCrossIcon (allChoosedDir, curClickedPhase) {
+      debugger
+      console.log('handleClickCrossIcon', allChoosedDir, curClickedPhase)
+    }
+  },
+  created () {
+    this.setDialogWidth()
+  },
+  mounted () {
+    // let _this = this
+    // setTimeout(function () {
+    //   alert('Hello')
+    //   _this.agentId = 'scats1'
+    // }, 5 * 1000)
+    this.setPropsToken(this.Token)
+    window.onresize = () => {
+      return (() => {
+        this.setDialogWidth()
+      })()
+    }
+  },
+  destroyed () {
+  }
+}
+</script>
+<style lang='scss'>
+.layout-container {
+  width: 800PX;
+}
+.layout-container1 {
+  width: 242PX;
+  height: 176PX;
+  border: 1PX solid green;
+}
+.layout-container2 {
+  /* height: 600px; */
+  width: 1020px;
+  border: 1PX solid yellow;
+  position: relative;
+}
+.abow_dialog {
+    display: flex;
+    justify-content: center;
+    align-items: Center;
+    overflow: hidden;
+    .el-dialog {
+        margin: 0 auto !important;
+        height: 90%;
+        overflow: hidden;
+        .el-dialog__body {
+            position: absolute;
+            left: 0;
+            top: 54px;
+            bottom: 0;
+            right: 0;
+            padding: 0;
+            z-index: 1;
+            overflow-y: auto;
+            overflow-x: auto;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+  .text {
+    color: #fff;
+  }
+</style>

package/src/views/overView.vue

@@ -19,8 +19,8 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
+      agentId: 'cllhsl',
+      Token: 'eyJraWQiOiIxNzEyMDIwOTMwMDE5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMjA2NDEzMCwiaWF0IjoxNzEyMDIwOTMwfQ.PiFIHzXvVFnAF8l6hqqjt2iNqU3g5-6kKcYbSgqKd9Q',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },

package/static/styles/patternConfig.scss

@@ -33,15 +33,15 @@
           justify-content: flex-start;
           align-items: center;
           .header-span {
-            width: 45px;
+            width: 45PX;
             border: 0px solid red;
             display: flex;
             justify-content: flex-end;
             color: $--color-text-secondary;
-            font-size: 14px;
+            font-size: 14PX;
             font-weight: normal;
             font-stretch: normal;
-            line-height: 14px;
+            line-height: 14PX;
           }
         }
       }