openatc-components 0.2.84 → 0.2.86

package/package.json

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

package/src/i18n/language/en.js

@@ -343,6 +343,8 @@ const en = {
       'recovery': 'Recovery'
     },
     'phase': {
+      'phase': 'P',
+      'stage': 'S',
       'desc': 'LaneDirection',
       'peddesc': 'PedestrianDirection',
       'controltype': 'ControlType',

package/src/i18n/language/zh.js

@@ -343,6 +343,8 @@ const zh = {
       'recovery': '恢复'
     },
     'phase': {
+      'phase': '相位',
+      'stage': '阶段',
       'desc': '车道方向',
       'peddesc': '行人方向',
       'controltype': '控制类型',

package/src/kisscomps/components/BoardCard/BoardCard.vue

@@ -22,7 +22,7 @@
         :phaseList="phaseList"
         :cycle="cycle"
         :syncTime="syncTime"
-        :style="{'margin-top':(cycle || !showBarrier)? '25px':'0'}"
+        :style="{'margin-top': '25px'}"
         :patternStatusList="patternStatusList"
         :patternId="patternId"
         :cycles="cycles">

package/src/kisscomps/components/OverLap/OverLap.vue

@@ -8,7 +8,7 @@
                 <div slot="content">
                     O{{list.id}}-
                     <span v-for="(ids,index3) in list.includedphases" :key="index3">
-                        P{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
+                        {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                     </span>
                 </div>
                 <div style="cursor:pointer;">
@@ -20,7 +20,7 @@
                         <div class="ring-nums">
                             O{{list.id}}-
                             <span v-for="(ids,index3) in list.includedphases" :key="index3">
-                                P{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
+                                {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                             </span>
                         </div>
                     </div>

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -17,14 +17,14 @@
           <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
             <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
-                  <div slot="content">P{{item.id}}:{{item.split}}</div>
+                  <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="item.direction"></xdrdirselector>
                     </div>
-                    <div class="box" style="position: absolute; left:40px; width:20px; top: -1px;">
-                      <div class="ring-nums">P{{item.id}}</div>
+                    <div class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
+                      <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
                       <div class="ring-nums">{{item.split}}</div>
                     </div>
                   </div>
@@ -60,7 +60,7 @@
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">
                     <span class="ring-nums" v-for="(pha,index) in list.phases" :key="index">
-                      P{{pha}}
+                      {{$t('openatccomponents.phase.phase')}}{{pha}}
                       </span>
                   </div>
                   <div style="cursor:pointer;">
@@ -68,8 +68,8 @@
                       <!-- <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector v-if="list.direction&&list.direction.length>0"  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="list.direction"></xdrdirselector>
                     </div>
-                    <div class="box" style="position: absolute; left:41px;  width:20px; top:-1px;">
-                      <div class="ring-nums">S{{list.key+1}}</div>
+                    <div class="box" style="position: absolute; left:41px;  width:40px; top:-1px;">
+                      <div class="ring-nums">{{$t('openatccomponents.phase.stage')}}{{list.key+1}}</div>
                       <div class="ring-nums">{{list.stageSplit}}</div>
                     </div>
                     <!-- <div class="box" style="line-height:28px">

package/src/node_modules/.package_versions.json

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

package/src/utils/errorcode.js

@@ -33,8 +33,7 @@ let errorCodeMap = new Map([
   [502, '月份超出限值'],
   [503, '星期超出限值'],
   [504, '日期值超出限值'],
-  [505, '配置未知计划号'],
-  [505, '配置未知计划号'],
+  [505, '日期配置中未知计划号'],
   [506, '包含普通计划的日期未覆盖全年'],
   [601, '通道数超出限值'],
   [602, '通道配置未知控制源'],

package/src/views/intersection.vue

@@ -139,12 +139,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'bclsnl_ticp',
+      agentId: 'tjblfql',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE5ODk2OTc2MTMwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxOTk0MDE3NiwiaWF0IjoxNzE5ODk2OTc2fQ.W14uptaN4j85l-ZzYBMJ1wv_6A5MQA1x_tCWGMQ0kwE',
+      Token: 'eyJraWQiOiIxNzE4NzU5ODA0Njc0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxODgwMzAwNCwiaWF0IjoxNzE4NzU5ODA0fQ.8CKosL9Yrp8h8d_op6kGHHcNXIBgNu3YhwY7JdPIKJc',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',