openatc-components 0.0.85 → 0.0.90

package/package/kisscomps/components/MessageBox/index.vue

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+<template>
+  <div>
+    <el-dialog
+      center
+      width="424px"
+      :visible.sync="boxVisible"
+      :title="modalTitle"
+      :close-on-click-modal="false"
+      custom-class="MessageBox"
+      @close="oncancle"
+      append-to-body>
+      <div class="text">{{text}}</div>
+      <div slot="footer" class="boxFooter">
+        <el-button class="btn canclebtn" @click="oncancle">{{$t('openatccomponents.button.Cancel')}}</el-button>
+        <el-button class="btn okbtn" type="primary" @click="onok">{{$t('openatccomponents.button.OK')}}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: 'message-box',
+  data () {
+    return {
+      boxVisible: this.visible,
+      modalTitle: this.$t('openatccomponents.common.tipsmodaltitle')
+    }
+  },
+  watch: {
+    visible: function (val) {
+      this.boxVisible = val
+    },
+    title: function (val) {
+      this.modalTitle = val
+    }
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: '提示'
+    },
+    text: {
+      type: String,
+      default: ''
+    }
+  },
+  methods: {
+    onok () {
+      this.$emit('ok')
+    },
+    oncancle () {
+      this.$emit('cancle')
+    }
+  },
+  mounted () {
+  },
+  beforeUpdate () {
+    this.modalTitle = this.$t('openatccomponents.common.tipsmodaltitle')
+  }
+}
+</script>
+<style>
+.MessageBox .el-dialog__body {
+  text-align: center;
+}
+.MessageBox .el-dialog__title {
+  font-size: 16px;
+}
+.MessageBox .text {
+  font-size: 14px;
+}
+.MessageBox .boxFooter .btn {
+  font-size: 14px;
+  width: 64px;
+  height: 34px;
+  padding: 2px 10px;
+}
+.MessageBox .el-dialog__footer {
+  padding: 10px 20px 20px;
+}
+</style>

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

@@ -179,6 +179,7 @@ export default {
           this.getIndexStage()
         }
         // this.controlDatas = this.controlData
+        this.getPedPhasePos()
         this.handlePatternData()
         this.handleBarrierHeight()
       },
@@ -190,6 +191,7 @@ export default {
         this.getPedPhasePos()
         this.getBusPos()
         this.getStage()
+        this.handlePatternData()
       },
       // 深度观察监听
       deep: true

package/package/kisscomps/components/PatternWalkSvg/PatternWalkSvg.vue

@@ -398,9 +398,14 @@ export default {
   },
   methods: {
     refreshShow (showWalk) {
-      for (let i = 0; i < this.showWalk.length; i++) {
+      for (let i = 0; i < 16; i++) {
+        if (this.status[i].isshow) {
+          this.status[i].isshow = false
+        }
+      }
+      for (let i = 0; i < showWalk.length; i++) {
         for (let j = 0; j < this.status.length; j++) {
-          if (this.showWalk[i].name === this.status[j].name) {
+          if (showWalk[i].name === this.status[j].name) {
             this.status[j].isshow = true
           }
         }

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

@@ -128,6 +128,10 @@ export default {
     TentativePlanControlModal
   },
   props: {
+    phaseList: {
+      type: Array,
+      default: () => []
+    },
     reqUrl: {
       type: String,
       default: ''
@@ -275,7 +279,7 @@ export default {
       tempPatternid: 0, // 控制方式手动操作的情况下的控制编号的临时值。
       tempDelay: 0, // 控制方式手动操作的情况下的延迟时间的临时值。
       tempDuration: 0, // 控制方式手动操作的情况下的持续时间的临时值。
-      phaseList: [], // 当前相位集合
+      // phaseList: [], // 当前相位集合
       faultvisible: false,
       isClosePhase: false, // 是否在相位关断
       toPage: 1, // 与哪一个页面交互，1 代表路口信息页面，3代表 相位关断页面
@@ -303,6 +307,7 @@ export default {
     statusData: {
       handler: function (val) {
         this.initData()
+        this.getPedPhasePos()
       },
       // 深度观察监听
       deep: true
@@ -338,7 +343,7 @@ export default {
   },
   async mounted () {
     this.setPropsToken(this.Token)
-    await this.getPhase()
+    // await this.getPhase()
     this.getFault()
     this.initData()
   },

package/package/kisscomps/index.js

@@ -4,6 +4,8 @@ import IntersectionWithInterface from './components/IntersectionWithInterface/in
 import IntersectionMap from './components/IntersectionMap/index'
 import SchemeConfig from './components/SchemeConfig/index'
 import lockingPhaselControlModal from './components/SchemeConfig/lockingPhaselControlModal/index'
+import Channelization from './components/Channelization/index'
+import DrawChannelization from './components/DrawChannelization/index'
 import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
 import patternList from './components/patternList/index'
@@ -32,6 +34,8 @@ const components = {
   IntersectionMap,
   SchemeConfig,
   lockingPhaselControlModal,
+  Channelization,
+  DrawChannelization,
   FaultDetailModal,
   PatternStatus,
   BoardCard,