openatc-components 0.2.78 → 0.2.79

package/src/kisscomps/components/SchemeConfig/realtimeStatusModal/index.vue

@@ -49,14 +49,6 @@
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.platform')}}:</div>
       <div style="margin-left: 85px;" class="cross-value">{{platform}}</div>
     </div>
-    <div class="cross-content" v-if="controlData.current_stagecd !== undefined">
-      <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.stagecountdown')}}:</div>
-      <div style="margin-left: 85px;" class="cross-value">{{controlData.current_stagecd}}</div>
-    </div>
-    <div class="cross-content" v-if="controlData.stages_len">
-      <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.stageduration')}}:</div>
-      <div style="margin-left: 85px;" class="cross-value">{{controlData.stages_len + ''}}</div>
-    </div>
     <div class="cross-content">
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.faultinfo')}}:</div>
       <div style="margin-left: 85px;" v-if="curFaultList.length">

package/src/kisscomps/index.js

@@ -7,6 +7,7 @@ import lockingPhaselControlModal from './components/SchemeConfig/lockingPhaselCo
 import Channelization from './components/Channelization/index'
 import ChannelizationFlowStatistic from './components/ChannelizationFlowStatistic/index'
 import DrawChannelization from './components/DrawChannelization/index'
+import ChannelRealtimeIntersection from './components/ChannelRealtimeIntersection/index'
 import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
 import patternList from './components/patternList/index'
@@ -47,6 +48,7 @@ const components = {
   Channelization,
   ChannelizationFlowStatistic,
   DrawChannelization,
+  ChannelRealtimeIntersection,
   FaultDetailModal,
   PatternStatus,
   BoardCard,

package/src/views/intersection.vue

@@ -1,31 +1,14 @@
 <template>
   <div>
-    <!-- <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="tjblsxl-ticp6"
-            isVipRoute
-            :choosedDirection="[1,2,3]"
-            :choosedPedDirection="[3,4]"
-            :roadDirection="roadDirection" /> -->
-      <intersection-direction-selection
-            :agentId="this.agentId"
-            :clickMode="false"
-            :choosedDirection="[14,6,13,8]"
-            :choosedPedDirection="[1]"
-            :roadDirection="roadDirection" />
+    <h2 class="text">实时通道路口图</h2>
+    <channel-intection-with-interface
+      :agentId="this.agentId"
+      :roadDirection="roadDirection"
+      :channelRealtimeStatusData="channelRealtimeStatusData"
+    />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
-    <h2 class="text">非第三方配置路口图</h2>
+    <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
     <intersection-direction-selection
       :agentId="this.agentId"
       :choosedDirection="[14,6,13,8]"
@@ -33,7 +16,7 @@
       :roadDirection="roadDirection"
       @handleClickCrossIcon="handleClickCrossIcon" />
 
-      <h2 class="text">第三方配置路口图</h2>
+      <h2 class="text">第三方配置路口图(按路口相位配置显示相位方向)</h2>
       <div>
         <intersection-direction-selection
         :agentId="this.agentId"
@@ -44,6 +27,23 @@
         @handleClickCrossIcon="handleClickCrossIcon" />
       </div>
 
+      <!-- 显示按通道获取相位的模版路口图 -->
+    <h2 class="text">显示配置的相位路口图</h2>
+    <!-- <intersection-base-map
+            ref="intersectionMap"
+            :crossStatusData="crossStatusData"
+            agentId="tjblsxl-ticp6"
+            isVipRoute
+            :choosedDirection="[1,2,3]"
+            :choosedPedDirection="[3,4]"
+            :roadDirection="roadDirection" /> -->
+      <!-- <intersection-direction-selection
+            :agentId="this.agentId"
+            :clickMode="false"
+            :choosedDirection="[14,6,13,8]"
+            :choosedPedDirection="[1]"
+            :roadDirection="roadDirection" /> -->
+
       <!-- <button @click="lockPhase" >相位锁定</button><br/>
       <button @click="unlockPhase" >解锁相位</button><br/>
       <button @click="changeControlPattern" >改变控制方案</button><br/>
@@ -139,12 +139,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblsxl-ticp6',
+      agentId: 'tjbljml',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
+      Token: 'eyJraWQiOiIxNzE4NjcyODI1MTg4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxODcxNjAyNSwiaWF0IjoxNzE4NjcyODI1fQ.vjEP7xqngwal74DlUwqs4FLoy-IsNphHNrbuDqzGce4',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -186,7 +186,39 @@ export default {
           }
         }
       ],
-      crossStatusData: {}
+      crossStatusData: {},
+      channelRealtimeStatusData: {
+        'channellamp': [
+          {
+            'id': 1,
+            'light': 1
+          },
+          {
+            'id': 2,
+            'light': 3
+          },
+          {
+            'id': 3,
+            'light': 1
+          },
+          {
+            'id': 4,
+            'light': 1
+          },
+          {
+            'id': 5,
+            'light': 3
+          },
+          {
+            'id': 6,
+            'light': 1
+          },
+          {
+            'id': 7,
+            'light': 3
+          }
+        ]
+      }
     }
   },
   components: {

package/src/views/overView.vue

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

package/src/node_modules/.package_versions.json

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