openatc-components 0.1.52 → 0.1.54

package/package/kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface.vue

@@ -37,7 +37,7 @@ export default {
       controlData: {},
       crossStatusData: {}, // 路口状态数据
       detectorStatusData: {}, // 检测器状态数据（包括车辆检测器状态和行人检测器状态）
-      devStatus: 1,
+      // devStatus: 1,
       isResend: true,
       intervalFlag: true,
       phaseControlTimer: null, // 定时器
@@ -102,7 +102,7 @@ export default {
     registerMessage () {
       registerMessage(this.AgentId).then(data => {
         if (!data.data.success) {
-          this.devStatus = 2
+          // this.devStatus = 2
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {
             // 子类型错误
@@ -120,7 +120,7 @@ export default {
           return
         }
         this.$emit('registerMessage', data)
-        this.devStatus = 3
+        // this.devStatus = 3
         this.clearPatternInterval() // 清除其他定时器
         this.phaseControlTimer = setInterval(() => {
           if (this.intervalFlag) {
@@ -160,7 +160,7 @@ export default {
         this.intervalFlag = true
         if (!data.data.success) {
           if (data.data.code === '4003') {
-            this.devStatus = 2
+            // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             if (this.isResend) {

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

@@ -32,7 +32,7 @@
     <div class="right-dir-road" v-if="roadDir === 'right'">
       <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
       <!-- 相位倒计时 -->
-      <div class="phaseCountdown" v-show="isShowInterval" v-if="devStatus === 3 && isLoaded && isHasPhase" :class="{'countdownBg': isLoaded}">
+      <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && isHasPhase" :class="{'countdownBg': isLoaded}">
         <div v-for="curPhase in phaseCountdownList" :key="curPhase.id" :style="{color: curPhase.phaseCountdownColor}">
           <div v-if="curPhase.phaseCountdown !== -1">
             <span style="float: left;font-size: 20px;color: #fff;width: 70px;">{{$t('openatccomponents.overview.phase')}}{{curPhase.id}}:</span>
@@ -93,7 +93,7 @@
     <div class="left-dir-road" v-if="roadDir === 'left'">
       <div class="centerText" v-if="mainType === '100' || mainType === '101'" :class="{'countdownBg': isLoaded}">
         <!-- 相位倒计时 -->
-        <div class="phaseCountdown" v-if="devStatus === 3 && isLoaded && isHasPhase">
+        <div class="phaseCountdown" v-if="isLoaded && isHasPhase">
           <div v-for="curPhase in phaseCountdownList" :key="curPhase.id" :style="{color: curPhase.phaseCountdownColor}">
             <div v-if="curPhase.phaseCountdown !== -1">
               <span style="float: left;font-size: 20px;color: #fff;width: 70px;">{{$t('openatccomponents.overview.phase')}}{{curPhase.id}}:</span>
@@ -201,9 +201,9 @@ export default {
     agentId: {
       type: String
     },
-    devStatus: {
-      type: Number
-    },
+    // devStatus: {
+    //   type: Number
+    // },
     isShowInterval: {
       type: Boolean,
       devault: true

package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/sidePos.json

@@ -94,6 +94,78 @@
       "name": "南北路段人行横道",
       "x": "310px",
       "y": "198px"
+    },
+    {
+      "id": 17,
+      "name": "东南人行横道",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 18,
+      "name": "西南人行横道",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 19,
+      "name": "东北人行横道",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 20,
+      "name": "西北人行横道",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 21,
+      "name": "东南人行横道-上",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 22,
+      "name": "东南人行横道-下",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 23,
+      "name": "西南人行横道-上",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 24,
+      "name": "西南人行横道-下",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 25,
+      "name": "东北人行横道-上",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 26,
+      "name": "东北人行横道-下",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 27,
+      "name": "西北人行横道-上",
+      "x": "310px",
+      "y": "198px"
+    },
+    {
+      "id": 28,
+      "name": "西北人行横道-下",
+      "x": "310px",
+      "y": "198px"
     }
   ]
 }

package/package/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -32,7 +32,6 @@
       :modeName="modeName"
       :controlName="controlName"
       :stateName="stateName"
-      :devStatus="devStatus"
       :roadDirection="roadDirection" />
   </div>
 </div>
@@ -61,10 +60,10 @@ export default {
       type: Object,
       required: true
     },
-    devStatus: {
-      type: Number,
-      default: 0
-    },
+    // devStatus: {
+    //   type: Number,
+    //   default: 0
+    // },
     agentId: {
       type: String,
       default: '0'

package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -15,7 +15,6 @@
       <IntersectionMap
         ref="intersectionMap"
         :crossStatusData="crossStatusData"
-        :devStatus="devStatus"
         :agentId="agentId"
         :graphicMode="true"
         :roadDirection="roadDirection"
@@ -47,7 +46,7 @@ export default {
       boxVisible: false,
       dialogWidth: '100%',
       crossStatusData: {}, // 路口状态数据
-      devStatus: 1,
+      // devStatus: 1,
       isResend: true,
       intervalFlag: true,
       phaseControlTimer: null, // 定时器
@@ -131,7 +130,7 @@ export default {
     registerMessage () {
       registerMessage(this.AgentId).then(data => {
         if (!data.data.success) {
-          this.devStatus = 2
+          // this.devStatus = 2
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + this.AgentId
           let msg = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {
@@ -148,7 +147,7 @@ export default {
           return
         }
         this.$emit('registerMessage', data)
-        this.devStatus = 3
+        // this.devStatus = 3
         this.clearPatternInterval() // 清除其他定时器
         this.phaseControlTimer = setInterval(() => {
           if (this.intervalFlag) {
@@ -158,7 +157,7 @@ export default {
       })
     },
     reSend () { // 设备掉线重连机制
-      this.devStatus = 1
+      // this.devStatus = 1
       this.clearRegisterMessageTimer()
       this.registerMessageTimer = setTimeout(() => {
         this.reconnectionDev()
@@ -189,7 +188,7 @@ export default {
         if (!data.data.success) {
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + this.AgentId
           if (data.data.code === '4003') {
-            this.devStatus = 2
+            // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
             this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)

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

@@ -21,7 +21,7 @@
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
-                      <xdrdirselector  Width="36px" Height="34px" :showlist="item.direction"></xdrdirselector>
+                      <xdrdirselector  Width="38px" Height="36px" :showlist="item.direction"></xdrdirselector>
                     </div>
                     <div class="box">
                       <div class="ring-nums">P{{item.id}}</div>
@@ -190,12 +190,15 @@ export default {
         }
         // this.controlDatas = this.controlData
         this.getPedPhasePos()
-        if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
-          this.handleTentivePatternData()
-        } else if (this.controlData) {
-          this.handlePatternData()
+        if (this.localPatternList) {
+          let idPattern = this.localPatternList.filter(item => item.id === this.controlData.patternid)
+          if (idPattern.length === 0 || (this.controlData && this.showCondition)) {
+            this.handleTentivePatternData()
+          } else if (this.controlData) {
+            this.handlePatternData()
+          }
+          this.handleBarrierHeight()
         }
-        this.handleBarrierHeight()
       },
       // 深度观察监听
       deep: true
@@ -265,12 +268,13 @@ export default {
   },
   created () {
     this.globalParamModel = this.$store.getters.globalParamModel
+    let idPattern = this.localPatternList.filter(item => item.id === this.controlData.patternid)
     if (this.patternStatusList && this.newCycle && !this.controlData) {
       setTimeout(() => {
         this.handleCurrentChange(this.patternStatusList)
         this.handleBarrierHeight()
       }, 400)
-    } else if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
+    } else if (idPattern.length === 0 || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
       this.handleTentivePatternData()
     } else {
       this.handlePatternData()
@@ -291,6 +295,7 @@ export default {
         let currPhase = this.phaseList.filter((item) => {
           return item.id === stg
         })[0]
+        if (!currPhase.peddirection) return
         for (let walk of this.sidewalkPhaseData) {
           for (let ped of currPhase.peddirection) {
             if (stg === walk.phaseid) {
@@ -509,16 +514,20 @@ export default {
           })[0]
           let peddirections = []
           for (let walk of this.sidewalkPhaseData) {
-            for (let ped of currPhase.peddirection) {
-            // if (stg === walk.phaseid) {
-              let objs = {}
-              objs.name = walk.name
-              objs.id = walk.id
-              if (ped === walk.id) {
-                peddirections.push(objs)
-                peddirections = Array.from(new Set(peddirections))
+            if (currPhase.peddirection) {
+              for (let ped of currPhase.peddirection) {
+                // if (stg === walk.phaseid) {
+                let objs = {}
+                objs.name = walk.name
+                objs.id = walk.id
+                if (ped === walk.id) {
+                  peddirections.push(objs)
+                  peddirections = Array.from(new Set(peddirections))
+                }
+                // }
               }
-            // }
+            } else {
+              peddirections = []
             }
           }
           if (ring.desc) {
@@ -720,16 +729,20 @@ export default {
           })[0]
           let peddirections = []
           for (let walk of this.sidewalkPhaseData) {
-            for (let ped of currPhase.peddirection) {
-            // if (stg === walk.phaseid) {
-              let objs = {}
-              objs.name = walk.name
-              objs.id = walk.id
-              if (ped === walk.id) {
-                peddirections.push(objs)
-                peddirections = Array.from(new Set(peddirections))
+            if (currPhase.peddirection) {
+              for (let ped of currPhase.peddirection) {
+                // if (stg === walk.phaseid) {
+                let objs = {}
+                objs.name = walk.name
+                objs.id = walk.id
+                if (ped === walk.id) {
+                  peddirections.push(objs)
+                  peddirections = Array.from(new Set(peddirections))
+                }
+                // }
               }
-            // }
+            } else {
+              peddirections = []
             }
           }
           if (ring.desc) {
@@ -908,16 +921,20 @@ export default {
           })[0]
           let peddirections = []
           for (let walk of this.sidewalkPhaseData) {
-            for (let ped of currPhase.peddirection) {
-            // if (stg === walk.phaseid) {
-              let objs = {}
-              objs.name = walk.name
-              objs.id = walk.id
-              if (ped === walk.id) {
-                peddirections.push(objs)
-                peddirections = Array.from(new Set(peddirections))
+            if (currPhase.peddirection) {
+              for (let ped of currPhase.peddirection) {
+                // if (stg === walk.phaseid) {
+                let objs = {}
+                objs.name = walk.name
+                objs.id = walk.id
+                if (ped === walk.id) {
+                  peddirections.push(objs)
+                  peddirections = Array.from(new Set(peddirections))
+                }
+                // }
               }
-            // }
+            } else {
+              peddirections = []
             }
           }
           if (ring.desc && ring.desc.length > 0) {

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

@@ -96,7 +96,6 @@
                 :untreatedFault="untreatedFault"
                 :closePhase="closePhase"
                 :agentName="agentName"
-                :devStatus="devStatus"
                 :agentId="agentId"
                 :crossStatusData="crossStatusData"
                 :phaseList="phaseList"
@@ -158,10 +157,10 @@ export default {
       type: String,
       default: ''
     },
-    devStatus: {
-      type: Number,
-      default: 0
-    },
+    // devStatus: {
+    //   type: Number,
+    //   default: 0
+    // },
     agentId: {
       type: String,
       default: '0'

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

@@ -17,7 +17,7 @@
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.crossname')}}:</div>
       <div style="margin-left: 85px;" class="cross-value">{{agentName}}</div>
     </div>
-    <div class="cross-content">
+    <!-- <div class="cross-content">
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.divicestate')}}:</div>
       <div
         v-show="devStatus===3"
@@ -34,7 +34,7 @@
         style="margin-left: 85px;"
         class="cross-value"
       >{{$t('openatccomponents.overview.onlineing')}}</div>
-    </div>
+    </div> -->
     <!-- <div class="cross-content"><div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.protocoltype')}}:</div><div style="margin-left: 85px;" class="cross-value">{{protocol}}</div></div> -->
     <!-- <div class="cross-content"><div style="float: left;" class="cross-name">信号机型号:</div><div style="margin-left: 85px;" class="cross-value">XHJ-CW-GA-KSS100</div></div> -->
     <div class="cross-content">
@@ -202,9 +202,9 @@ export default {
     agentName: {
       type: String
     },
-    devStatus: {
-      type: Number
-    },
+    // devStatus: {
+    //   type: Number
+    // },
     agentId: {
       type: String
     },