openatc-components 0.5.36 → 0.5.38

package/package.json

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

package/src/i18n/language/en.js

@@ -361,7 +361,10 @@ const en = {
       'schemeselection': 'Pattern Select',
       'others': 'Others',
       'recovery': 'Recovery',
-      'conflictdirectionstips': 'Are you certain that there is a conflict in the current direction?'
+      'conflictdirectionstips': 'Are you certain that there is a conflict in the current direction?',
+      'faultboard': 'Fault Board',
+      'faultboardLearned': 'Learned',
+      'faultboardNotLearned': 'Not Learned'
     },
     'phase': {
       'stageid': 'Stage number',

package/src/i18n/language/ru.js

@@ -353,11 +353,15 @@ const ru = {
       'ignored': 'Проигнорировано',
       'untreated': 'Не обработано',
       'item': 'Пункт',
-      'noselectcontroltip': 'Сначала выберите способ управления!',
+      'noselectcontroltip': 'Пожалуйста, сначала выберите способ управления!',
       'residentcontrol': 'Удерживающий контроль',
       'schemeselection': 'Выбор схемы',
       'others': 'Другое',
-      'recovery': 'Восстановление'
+      'recovery': 'Восстановление',
+      'conflictdirectionstips': 'В текущем направлении есть конфликт, вы уверены?',
+      'faultboard': 'Плата неисправностей',
+      'faultboardLearned': 'Обучена',
+      'faultboardNotLearned': 'Не обучена'
     },
     'phase': {
       'phase': 'Фаза',

package/src/i18n/language/zh.js

@@ -361,7 +361,10 @@ const zh = {
       'schemeselection': '方案选择',
       'others': '其他',
       'recovery': '恢复',
-      'conflictdirectionstips': '当前方向存在冲突，是否确定？'
+      'conflictdirectionstips': '当前方向存在冲突，是否确定？',
+      'faultboard': '故障板',
+      'faultboardLearned': '已学习',
+      'faultboardNotLearned': '未学习'
     },
     'phase': {
       'stageid': '阶段编号',

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

@@ -325,11 +325,12 @@ export default {
       handler: function (val, oldVal) {
         if ((val && val.curTime) || val.curTime === 0) {
           this.curtime = val.curTime
-          if (val.control === 4 || val.control === 16 || val.control === 22) {
-            this.isControl = false
-          } else {
-            this.isControl = true
-          }
+          // if (val.control === 4 || val.control === 16 || val.control === 22) {
+          //   this.isControl = false
+          // } else {
+          //   this.isControl = true
+          // }
+          this.isControl = true
         }
       },
       // 深度观察监听
@@ -354,11 +355,12 @@ export default {
         }
         if ((val && val.curTime) || val.curTime === 0) {
           this.curtime = val.curTime
-          if (val.control === 4 || val.control === 16 || val.control === 22) {
-            this.isControl = false
-          } else {
-            this.isControl = true
-          }
+          // if (val.control === 4 || val.control === 16 || val.control === 22) {
+          //   this.isControl = false
+          // } else {
+          //   this.isControl = true
+          // }
+          this.isControl = true
         }
       },
       // 深度观察监听

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

@@ -78,6 +78,7 @@
                 :phaseList="phaseList"
                 :sidewalkPhaseData="sidewalkPhaseData"
                 :roadDirection="roadDirection"
+                :faultboardState="faultboardState"
                 @changeStatus="changeStatus"
                 @showFaultDetail="showFaultDetail"/>
             </div>
@@ -234,6 +235,13 @@ export default {
     protocol: {
       type: String,
       default: 'ocp'
+    },
+    faultboardState: {
+      type: Number,
+      default: null,
+      validator: function (value) {
+        return value === null || value === 1 || value === 2
+      }
     }
   },
   data () {

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

@@ -82,6 +82,10 @@
         v-if="!curFaultList.length"
       >{{$t('openatccomponents.overview.nofault')}}</div>
     </div>
+    <div class="cross-content" v-if="faultboardState !== null">
+      <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.faultboard')}}:</div>
+      <div style="margin-left: 85px;" class="cross-value">{{faultboardStateText}}</div>
+    </div>
   </div>
   <div class="control-bottom">
     <div
@@ -263,8 +267,24 @@ export default {
     },
     roadDirection: {
       type: String
+    },
+    faultboardState: {
+      type: Number,
+      default: null,
+      validator: function (value) {
+        return value === null || value === 1 || value === 2
+      }
+    }
+  },
+  computed: {
+    faultInfo () {
+      return this.$t('openatccomponents.overview.nofault')
+    },
+    faultboardStateText () {
+      return this.faultboardState === 1
+        ? this.$t('openatccomponents.overview.faultboardLearned')
+        : this.$t('openatccomponents.overview.faultboardNotLearned')
     }
-
   },
   watch: {
     agentId: {

package/src/views/schemeconfig.vue

@@ -12,23 +12,24 @@
 <template>
   <div>
     <el-button type="primary" @click="handleOpenConfigPanel" style="margin: 20px;">打开控制面板</el-button>
-    <!-- <el-dialog
+    <el-dialog
       refs="intersectionMapDialog"
       class="abow_dialog"
       :width="dialogWidth"
       :visible.sync="boxVisible"
       :close-on-click-modal="false"
       @close="oncancle"
-      append-to-body> -->
-      <!-- <scheme-config
+      append-to-body>
+      <scheme-config
         ref="rightpanel"
         :fromPage="fromPage"
         :agentId="agentId"
         :statusData="crossStatusData"
-        :phaseList="phaseList2"/> -->
-    <!-- </el-dialog> -->
+        :faultboardState="1"
+        :phaseList="phaseList2"/>
+    </el-dialog>
 
-    <div v-if="boxVisible" style="height: 700px;width: 450px;">
+    <!-- <div v-if="boxVisible" style="height: 700px;width: 450px;">
       <scheme-config
       ref="rightpanel"
       :agentId="agentId"
@@ -37,8 +38,9 @@
       :realtimeStatusModalvisible="false"
       :isShowBack="false"
       :isShowRecovery="false"
+      :faultboardState="1"
       protocol="rcp"/>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -55,17 +57,19 @@ export default {
   },
   data () {
     return {
-      fromPage: 2,
+      fromPage: 0,
       timer: 0,
       phaseList2: [],
       phaseList: [],
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '32050101041121000001',
+      // agentId: '32050101041121000001',
+      agentId: '19709',
+      Token112: 'eyJraWQiOiIxNzY1NTI3MTA5NzE4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MzE2MDc0MjQwMCwiaWF0IjoxNzY0NTE0ODAwfQ.MA6kmPwTmDg9DibpP47cMjSdSpgRP5kNLlWGKmenDGU',
       Token: 'eyJraWQiOiIxNzU5OTk2MDExMTg5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTg5MDU3NjAwMCwiaWF0IjoxNzU5MjQ0NDAwfQ.N0igTWJwfGZYzZJX91V1pevh5Xi7-itNgobQcD7vv_k',
       Token103: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
-      boxVisible: false,
+      boxVisible: true,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
     }
@@ -119,7 +123,7 @@ export default {
         }
       })
     },
-    initData () {
+initData () {
       // let iframdevid = getIframdevid()
       this.getIntersectionInfo(this.agentId, '')
       this.getPhase()
@@ -168,7 +172,8 @@ export default {
     clearInterval(this.timer)
   },
   mounted () {
-    this.setPropsToken(this.Token)
+    // this.setPropsToken(this.Token)
+    this.setPropsToken(this.Token112)
     this.timer = setInterval(() => {
       this.initData()
     }, 1000 * 2)