openatc-components 0.2.4 → 0.2.6

package/package.json

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

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

@@ -48,7 +48,7 @@
             <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
           </div>
         </div>
-        <div v-show="(this.curtime>0 && cycle && cycle>0) || (this.curtime>0 && newCycle && newCycle>0)">
+        <div v-show="(this.curtime>0 && cycle && cycle>0 && this.isControl) || (this.curtime>0 && newCycle && newCycle>0 && this.isControl)">
           <div class="curTimeDiv" :style="{'left':paddingLeft }">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
@@ -108,6 +108,7 @@ export default {
       patternIds: this.patternId,
       newPatterns: [],
       newList: [],
+      isControl: true,
       contrloCycle: 0,
       sidewalkPhaseData: [],
       // controlDatas: this.controlData,
@@ -209,8 +210,13 @@ export default {
   watch: {
     controlPhase: {
       handler: function (val, oldVal) {
-        if (this.controlPhase && this.controlPhase.curTime) {
-          this.curtime = this.controlPhase.curTime
+        if (val && val.curTime) {
+          this.curtime = val.curTime
+          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+            this.isControl = false
+          } else {
+            this.isControl = true
+          }
         }
       },
       // 深度观察监听
@@ -233,8 +239,14 @@ export default {
           }
           this.handleBarrierHeight()
         }
-        if (!this.controlData.curTime) return
-        this.curtime = this.controlData.curTime
+        if (val && val.curTime) {
+          this.curtime = val.curTime
+          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+            this.isControl = false
+          } else {
+            this.isControl = true
+          }
+        }
       },
       // 深度观察监听
       deep: true

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

@@ -11,7 +11,7 @@
  **/
 <template>
 <div>
-  <div class="cross-mess" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.crossinfo')}}</div>
+  <div class="cross-mess">{{$t('openatccomponents.overview.crossinfo')}}</div>
   <div class="cross-module">
     <div class="cross-content">
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.crossname')}}:</div>
@@ -76,11 +76,11 @@
   <div class="control-bottom">
     <div
       class="cross-mess"
-      style="float: left;margin-top: 40px;margin-bottom: 18px;"
+      style="float: left;margin-top: 20px;margin-bottom: 18px;"
     >{{$t('openatccomponents.overview.controlmode')}}</div>
     <el-button
       type="primary"
-      style="float: right; margin-right: 20px;margin-top: 40px;"
+      style="float: right; margin-right: 20px;margin-top: 40px;font-size: 14px;"
       size="mini"
       v-if="isHasPermission('configer:manual') && isHasPermission('configer:manual:renew')"
       @click="changeStatus"
@@ -150,8 +150,8 @@
     <!-- 信号机控制状态模块 End-->
 
     <div class="cross-content">
-      <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.currentstage')}}:</div>
-      <div style="margin-left: 85PX;">
+      <div class="cross-name">{{$t('openatccomponents.overview.currentstage')}}:</div>
+      <div>
       <Stages :crossStatusData="crossStatusData"
               :phaseList="phaseList"
               @onSelectStages="onSelectStages"></Stages>

package/src/kisscomps/components/Stages/index.vue

@@ -12,7 +12,7 @@
 <template>
   <div id="intersection-stages" class="intersection-stages" :style="stageStyle">
     <!-- <div class="cross-content"><div style="float: left;" class="cross-name">{{'当前阶段'}}:</div> -->
-      <div style="margin-left: 10PX;" >
+      <div>
         <div style="width: 100%; height: auto;">
           <div class="control-model" v-for="(item, index) in stagesList" :key="index">
             <div style="position:relative;" :style="singleStyle" class="single-model" @click="selectStages(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">

package/src/views/overView.vue

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

package/src/views/schemeconfig.vue

@@ -55,8 +55,8 @@ export default {
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '12004-950',
-      Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
+      agentId: 'bclsnl',
+      Token: 'eyJraWQiOiIxNzEzNDkyMDM3Mzc5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMzUzNTIzNywiaWF0IjoxNzEzNDkyMDM3fQ.SONz4foJQutGgyF_CJhcQRimDcYwbsJyMzdjZg9cgLE',
       Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
       boxVisible: false,
       dialogWidth: '80%',

package/static/styles/schemeconfig.scss

@@ -37,7 +37,7 @@
     background-color: $--color-white;
   }
   .cross-content {
-    margin-top: 19PX;
+    margin-top: 10PX;
     // margin-left: 7PX;
     overflow: hidden;
   }

package/src/node_modules/.package_versions.json

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