openatc-components 0.4.52 → 0.4.54

package/package.json

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

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -400,6 +400,7 @@ export default {
   },
   methods: {
     compareIsChangedPhase (newCrossStatus, oldCrossStatus) {
+      if (newCrossStatus.control === 1 || newCrossStatus.control === 2 || newCrossStatus.control === 3) return
     // 返回的相位状态改变后，按照返回的相位状态更新路口相位显示（下个周期生效）
       let newPhaseIds = newCrossStatus.phase.map(item => item.id)
       let oldPhaseIds = oldCrossStatus.phase.map(item => item.id)
@@ -416,6 +417,7 @@ export default {
     },
     handleTempCrossStatus (val) {
       // 模版路口图状态数据
+      debugger
       this.phaseStatusList = val.phase
       this.overlapStatusList = val.overlap
       if (val.control === 1 || val.control === 2 || val.control === 3) {

package/src/kisscomps/components/PhaseLegend/PhaseLegend.vue

@@ -16,7 +16,7 @@
           <div class="control-model" v-for="(item, index) in PhaseList" :key="index">
             <div style="position:relative;" :style="{...singleStyle, 'backgroundColor': item[0].bgcolor}" class="single-model" @click="selectLegend(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">
               <xdr-dir-selector :Width="dirWidth" :Height="dirHeight" :Widths="dirWidths" :Heights="dirHeights" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
-              <div style="display:flex;flex-direction:row;justify-content:center;align-items:end;" :style="{height: StageHeight}">
+              <div style="display:flex;flex-direction:row;justify-content:center;align-items:end;">
                 <div class="current-stage-num" style="width:25%;" :style="{color: themeColor, fontSize: numSize}">{{item[0].phaseid}}</div>
                 <div style="width:70%;">
                   <i class="iconfont icon-feijidongche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>

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

@@ -485,6 +485,15 @@ export default {
     }
   },
   watch: {
+    platform: {
+      handler: function (val1, val2) {
+        if (val1 !== val2 && val2 !== undefined) {
+          this.changeStatus()
+        }
+      },
+      // 深度观察监听
+      deep: true
+    },
     agentId: {
       handler: function (val1, val2) {
         if (val1 !== val2) {
@@ -631,6 +640,10 @@ export default {
       this.isOperation = true
       if (this.platform !== undefined && this.platform !== 'OpenATC') {
         this.queryThirdParty()
+      } else {
+        this.funcSort = 'allFunc'
+        this.thirdPartyControlMenu = []
+        this.thirdPartyControl = []
       }
       this.$refs.ManualControlModalNew.init()
     },

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div style="overflow: hidden;">
+<div class="realtime-panel">
   <div class="cross-mess">{{$t('openatccomponents.overview.crossinfo')}}</div>
   <div class="cross-module">
     <div class="cross-content">

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: 'eyJraWQiOiIxNzQyMzY0ODY2NjgxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0MjM2ODQ2NiwiaWF0IjoxNzQyMzYxMjY2fQ.gx5NHhNR27AxC9DW0-AYnB5Qhxe8ji3KHzHwX_-pSV4',
+      Token: 'eyJraWQiOiIxNzQyODA1NjkxMDAxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0Mjg2MDQ1NywiaWF0IjoxNzQyODE3MjU3fQ.kDOqC_oy_bq2NdwKqVUTZUFXrHns5v-EvkwuXVQASm4',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -1,18 +1,18 @@
 <template>
   <div id="test1">
-    <!-- <overview
+    <overview
         :AgentId="agentId"
         :reqUrl="reqUrl"
         :modeName="modeName"
         :controlName="controlName"
         :isShowState="isShowState"
         :isShowMode="isShowMode"
-        :Token="Token"></overview> -->
+        :Token="Token"></overview>
     <el-button @click="handleChangeOverview">切换overview组件</el-button>
-    <overview-component
-        :AgentId="agentid2"
+    <!-- <overview-component
+        :AgentId="agentId"
         :isShowInterval="isShowInterval"
-        :isShowMessage ="isShowMessage"/>
+        :isShowMessage ="isShowMessage"/> -->
   </div>
 </template>
 
@@ -24,9 +24,9 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: '13013',
-      agentid1: 'gjnlahql',
-      agentid2: '12007_001',
+      agentId: '0',
+      agentid1: 'gjnljml',
+      agentid2: '12008_835_ticp',
       isShowMessage: false,
       isShowInterval: true,
       sum: 0,

package/static/styles/schemeconfig.scss

@@ -17,6 +17,10 @@
     overflow: auto;
     height: 100%;
   }
+  .realtime-panel {
+    overflow: hidden;
+    background-color: $--color-white;
+  }
   .cross-mess {
     margin-left: 15PX;
     margin-top: 15PX;
@@ -294,6 +298,7 @@
 .manual-control-modal-new {
   padding: 20PX 20PX 0 20PX;
   height: 100%;
+  background-color: $--color-white;
   .el-tabs {
     height: 100%;
   }