openatc-components 0.4.6 → 0.4.8

package/package.json

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

package/src/i18n/language/en.js

@@ -194,29 +194,29 @@ const en = {
       'configurationtoolcontrol': 'Configuration Tool Control',
       'manualcontrol': 'Manual Control',
       'modelList': 'modelList',
-      'modelList0': 'Multi Period',
+      'modelList0': 'Multi-Period',
       'modelList1': 'Yellow Flash',
-      'modelList2': 'Red Control',
-      'modelList3': 'Dark Control',
-      'modelList4': 'Step Control',
-      'modelList4-': 'Stage Control',
-      'modelList5': 'Fixed_Cycle Control',
-      'modelList6': 'Free Control',
-      'modelList7': 'Coordinated Induction Control',
-      'modelList8': 'Solution Selection Control',
-      'modelList9': 'Self-Adaption',
+      'modelList2': 'Full Red',
+      'modelList3': 'Turn Off',
+      'modelList4': 'Step',
+      'modelList4-': 'Stage',
+      'modelList5': 'Fixed-Time',
+      'modelList6': 'Adaptive',
+      'modelList7': 'Coordinated Induction',
+      'modelList8': 'Solution-Select',
+      'modelList9': 'Solution Generation',
       'modelList10': 'Nocable Control',
-      'modelList11': 'Host Computer Coordinated Control',
+      'modelList11': 'Computer Coordinated',
       'modelList12': 'phasewalk',
       'modelList13': 'Pattern Recovery',
       'modelList14': 'Phase dwell',
       'modelList15': 'Channel Detection',
-      'modelList16': 'Direction lock',
-      'modelList17': 'Webster Single Point Coordination',
+      'modelList16': 'Channel lock',
+      'modelList17': 'Webster',
       'modelList18': 'Inductive Adaptive',
-      'modelList19': 'Inductive Pedestrian Crossing Control',
+      'modelList19': 'Inductive-Ped',
       'modelList21': 'Reserving21',
-      'modelList22': 'Priority Control',
+      'modelList22': 'Phase-Lock',
       'modelList23': 'Close Phase',
       'modelList100': 'Tentative Plan',
       'modelList101': 'Direction Lock',

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

@@ -11,6 +11,7 @@
         :showBarrier="showBarrier"
         :controlPhase="controlPhase"
         :isShowTip="isShowTip"
+        :isBorder="isBorder"
         :isMove="isMove"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
@@ -78,6 +79,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isBorder: {
+      type: Boolean,
+      default: false
+    },
     isShowTip: {
       type: Boolean,
       default: true

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

@@ -15,7 +15,7 @@
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
-            <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 style="position: relative;" :style="{'height': '35px','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' : isBorder ? 'hovercell' : ''">
               <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">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
@@ -147,6 +147,10 @@ export default {
     }
   },
   props: {
+    isBorder: {
+      type: Boolean,
+      default: false
+    },
     isShowTip: {
       type: Boolean,
       default: true
@@ -1645,7 +1649,15 @@ export default {
   .ring-first {
     margin-top: 1px;
     width: 100%;
-    height: 34px;
+    height: 35px;
+    .hovercell {
+      box-sizing: border-box;
+      border: 1PX solid transparent;
+    }
+    .hovercell:hover {
+      margin-top: 1PX;
+      border: 1PX solid rgb(242, 121, 121);
+    }
   }
   .first-1 {
     float: left;
@@ -1732,7 +1744,15 @@ export default {
 .ring-first {
   margin-top: 1px;
   width: 100%;
-  height: 34px;
+  height: 35px;
+  .hovercell {
+    box-sizing: border-box;
+    border: 1PX solid transparent;
+  }
+  .hovercell:hover {
+    margin-top: 1PX;
+    border: 1PX solid rgb(242, 121, 121);
+  }
 }
 .direction {
   filter: brightness(70%);

package/src/kisscomps/components/patternList/patternList.vue

@@ -5,6 +5,7 @@
     :contrloType="contrloType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
+    :isBorder="isBorder"
     :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
@@ -504,6 +505,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isBorder: {
+      type: Boolean,
+      default: false
+    },
     isMove: {
       type: Boolean,
       default: true

package/src/node_modules/.package_versions.json

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

package/src/views/intersection.vue

@@ -167,7 +167,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzM1ODg1MDA0NjQ1IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTg4ODYwNCwiaWF0IjoxNzM1ODgxNDA0fQ.vzRHd88kW3GT_7h8br4Z4xUeFLabjkr3JrIPwhauaHg',
+      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -26,11 +26,11 @@ export default {
       controlName: '步进',
       agentId: '13013',
       agentid1: 'gjnlahql',
-      agentid2: 'xylsnl',
+      agentid2: '12007_001',
       isShowMessage: false,
       isShowInterval: true,
       sum: 0,
-      Token: 'eyJraWQiOiIxNzM1ODg1MDA0NjQ1IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTg4ODYwNCwiaWF0IjoxNzM1ODgxNDA0fQ.vzRHd88kW3GT_7h8br4Z4xUeFLabjkr3JrIPwhauaHg',
+      Token: 'eyJraWQiOiIxNzMzODg3MDYyMjgwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5MDY2MiwiaWF0IjoxNzMzODgzNDYyfQ.qUJZ4lKv0WU3s3lWfYwl5ZM77n2rriYeFQ8qOwRFuzk',
       reqUrl: 'http://192.168.13.103:10003/openatc',
       isOnlyMap: true
     }