openatc-components 0.3.17 → 0.3.19

package/src/views/intersection.vue

@@ -106,6 +106,22 @@
       <!-- <Stages :stagesList="stagesList"
               :currentStage="currentStage"
               @onSelectStages="onSelectStages"></Stages> -->
+          <div style="height: 100px;">
+            <PhaseLegend :crossStatusData="tscControlData"
+              :phaseList="phaseList"
+              showDataType="phase"
+              :noClick="true"
+              :isShowCurrentStage="false"
+              StageWidth="46px"
+              StageHeight="52px"
+              dirWidth="46px"
+              dirHeight="52px"
+              dirWidths="46px"
+              dirHeights="52px"
+              :showStyle="{top:'2PX',left:'9px'}"
+              :showStyles="{top:'0PX',left:'7px'}"
+              ></PhaseLegend>
+          </div>
 
       <!-- <h2 style="color: #fff;">渠化图</h2>
       <channelization-with-interface
@@ -133,18 +149,24 @@ import {
 } from '../utils/auth'
 import IntersectionWithInterface from '../kisscomps/components/IntersectionWithInterface'
 import ChannelizationWithInterface from '../kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface'
+import {
+  getTscPhase
+} from '../api/cross.js'
+import {
+  getTscControl
+} from '../api/control.js'
 export default {
   name: 'demo',
   data () {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblfql',
+      agentId: '12008_ticp',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE4NzU5ODA0Njc0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxODgwMzAwNCwiaWF0IjoxNzE4NzU5ODA0fQ.8CKosL9Yrp8h8d_op6kGHHcNXIBgNu3YhwY7JdPIKJc',
+      Token: 'eyJraWQiOiIxNzIxOTcwMTEzMTMwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk3MzcxMywiaWF0IjoxNzIxOTY2NTEzfQ.aT14xZel09fHji-SrPMDTPAxISEUS8Y6KF30BWjCGKY',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -187,6 +209,72 @@ export default {
         }
       ],
       crossStatusData: {},
+      crossStatusDataMock:
+        {
+          'agentid': '12008_ticp',
+          'operation': 'get-request',
+          'infotype': 'status/pattern',
+          'data': {
+            'phase': [
+              {
+                'id': 1,
+                'type': 1,
+                'pedtype': 1
+              },
+              {
+                'id': 3,
+                'type': 1,
+                'pedtype': 1
+              },
+              {
+                'id': 4,
+                'type': 1,
+                'pedtype': 1
+              },
+              {
+                'id': 6,
+                'type': 3,
+                'pedtype': 3
+              }
+            ],
+            'mode': 0,
+            'control': 5,
+            'patternid': 2,
+            'cycle': 141,
+            'stages': [
+              [
+                1
+              ],
+              [
+                4,
+                3
+              ],
+              [
+                6
+              ]
+            ],
+            'stages_len': [
+              70,
+              25,
+              46
+            ],
+            'stages_seq': [
+              1,
+              2,
+              3
+            ],
+            'current_stage': 3,
+            'current_stagecd': 15,
+            'offset': 0,
+            'current_phase': [
+              6
+            ],
+            'next_phase': [
+              1
+            ],
+            'curTime': 127
+          }
+        },
       channelRealtimeStatusData: {
         'channellamp': [
           {
@@ -234,7 +322,9 @@ export default {
             'light': 3
           }
         ]
-      }
+      },
+      tscControlData: {},
+      phaseList: []
     }
   },
   components: {
@@ -325,6 +415,19 @@ export default {
       // this.controlName = control
       // this.modeName = mode
     },
+    getTscControlData () {
+      this.tscControlData = {}
+      getTscControl(this.agentId).then((data) => {
+        this.tscControlData = data.data.data.data
+      }).catch(error => {
+        console.log(error)
+      })
+    },
+    getCurPhaseDirection () {
+      getTscPhase(this.agentId).then(res => {
+        this.phaseList = res.data.data.data.phaseList
+      })
+    },
     registerMessage (res) {
       console.log('registerMessage:', res)
     },
@@ -363,6 +466,11 @@ export default {
         this.setDialogWidth()
       })()
     }
+    this.getTscControlData()
+    this.getCurPhaseDirection()
+    // setTimeout(() => {
+    //   this.crossStatusData = this.crossStatusDataMock.data
+    // }, 1000)
   },
   destroyed () {
   }

package/src/views/overView.vue

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

package/static/styles/phasePedSelect.scss

@@ -45,6 +45,7 @@
         background-color: $--card-background-base;
         border-radius: 5PX;
         .num {
+          color: $--color-text-primary;
           position: absolute;
           left: 5PX;
           bottom: 5PX;

package/static/styles/stages.scss

@@ -1,6 +1,6 @@
 
- //阶段图
- .intersection-stages {
+ //阶段图/相位图例
+ .intersection-stages, .intersection-phases {
   .cross-content {
     margin-top: 19PX;
     // margin-left: 7PX;