openatc-components 0.0.6 → 0.0.12

package/package/kisscomps/components/CommonKanban/CommonKanban.vue

@@ -27,7 +27,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor" :roadDirection="roadDirection"></xdrdirselector>
+                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </div>
@@ -46,7 +46,7 @@
                 <div v-for="(side, index) in sidewalkPhaseData" :key="side.key + '-' + index">
                   <PatternWalkSvg v-if="element.peddirection.includes(side.id)" :Data="side" Width="38" Height="40" />
                 </div>
-                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor" :roadDirection="roadDirection"></xdrdirselector>
+                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </div>
@@ -94,9 +94,6 @@ export default {
     },
     sidewalkPhaseData: {
       type: Array
-    },
-    roadDirection: {
-      type: String
     }
   },
   methods: {

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

@@ -136,7 +136,7 @@ import RampSouthRoadsSvg from './baseImg/RampSouthSvg'
 import RampPhaseIconSvg from './phaseIcon/rampPhaseIconSvg'
 import PedSectionEWSvg from './baseImg/PedSectionEWSvg'
 import PedSectionSNSvg from './baseImg/PedSectionSNSvg'
-// import { mapState } from 'vuex'
+import { mapState } from 'vuex'
 import LCrossRoadsSvg from './baseImg/leftroad/LCrossRoadsSvg'
 import LTShapeEastRoadsSvg from './baseImg/leftroad/LTShapeEastRoadsSvg'
 import LTShapeWestRoadsSvg from './baseImg/leftroad/LTShapeWestRoadsSvg.vue'
@@ -186,17 +186,13 @@ export default {
     isShowInterval: {
       type: Boolean,
       devault: true
-    },
-    roadDirection: {
-      type: String,
-      default: 'right'
     }
   },
-  // computed: {
-  //   ...mapState({
-  //     roadDirection: state => state.globalParam.roadDirection
-  //   })
-  // },
+  computed: {
+    ...mapState({
+      roadDirection: state => state.globalParam.roadDirection
+    })
+  },
   watch: {
     tempType: {
       handler: function (val) {
@@ -300,7 +296,7 @@ export default {
     init () {
       this.CrossDiagramMgr = new CrossDiagramMgr()
       this.getRoadDirection()
-      this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
+      this.PhaseDataModel = new PhaseDataModel()
       this.getIntersectionInfo() // 获取路口信息
     },
     comparePhaseStatus () {

package/package/kisscomps/components/IntersectionMap/crossDirection/utils.js

@@ -10,9 +10,9 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
+import store from '../../../../store'
 export default class PhaseDataModel {
-  constructor (roadDirection = 'right') {
-    this.roadDirection = roadDirection
+  constructor () {
     this.PhasePosMap = new Map()
     this.SidePosMap = new Map()
     this.RampMainPosMap = new Map() // 匝道主路坐标
@@ -27,7 +27,7 @@ export default class PhaseDataModel {
     let rampJson = require('./posJson/rampPos.json')
     let busMapJson = require('./posJson/busPos.json').busMap
     let busPhaseJson = require('./posJson/busPos.json').busphases
-    if (this.roadDirection === 'left') {
+    if (store.getters.roadDirection === 'left') {
       phaseJson = require('./posJson/phasePos.left.json').phaseList
       busMapJson = require('./posJson/busPos.left.json').busMap
       busPhaseJson = require('./posJson/busPos.left.json').busphases

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

@@ -27,8 +27,7 @@
       :crossStatusData="crossStatusData"
       :agentId="agentId"
       :isShowInterval="isShowInterval"
-      :devStatus="devStatus"
-      :roadDirection="roadDirection" />
+      :devStatus="devStatus" />
   </div>
 </div>
 </template>
@@ -76,10 +75,6 @@ export default {
       handler: function (val) {
         this.setPropsToken(val)
       }
-    },
-    roadDirection: {
-      type: String,
-      default: 'right'
     }
   },
   watch: {

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

@@ -17,8 +17,7 @@
         :crossStatusData="crossStatusData"
         :devStatus="devStatus"
         :agentId="agentId"
-        :graphicMode="true"
-        :roadDirection="roadDirection" />
+        :graphicMode="true" />
   </div>
 </template>
 <script>
@@ -52,10 +51,6 @@ export default {
     Token: {
       type: String,
       default: ''
-    },
-    roadDirection: {
-      type: String,
-      default: 'right'
     }
   },
   watch: {

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

@@ -27,7 +27,7 @@
                :currentStage="currentStage"
                :preselectStages="preselectStages"
                :realtimeStatusModalvisible="realtimeStatusModalvisible"
-               :roadDirection="roadDirection"
+               :funcSort="funcSort"
                @closeManualModal="closeManualModal"
                @selectModel="selectModel"
                @selectStages="selectStages"
@@ -45,7 +45,6 @@
                 :closePhaseRings="phaseRings"
                 :sidewalkPhaseData="sidewalkPhaseData"
                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
-                :roadDirection="roadDirection"
                 @closePhaseBack="closePhaseBack"
                 @closePhaseControl= "closePhaseControl" />
               <LockingPhaseControlModal
@@ -54,7 +53,6 @@
                 :closePhaseRings="phaseRings"
                 :sidewalkPhaseData="sidewalkPhaseData"
                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
-                :roadDirection="roadDirection"
                 @closePhaseBack="closePhaseBack"
                 @closePhaseControl= "closePhaseControl" />
             </div>
@@ -81,7 +79,6 @@
                 :agentId="agentId"
                 :stagesList="stagesList"
                 :sidewalkPhaseData="sidewalkPhaseData"
-                :roadDirection="roadDirection"
                 @changeStatus="changeStatus"
                 @showFaultDetail="showFaultDetail"/>
             </div>
@@ -146,9 +143,8 @@ export default {
       type: String,
       default: ''
     },
-    roadDirection: {
-      type: String,
-      default: 'right'
+    funcSort: {
+      type: String
     }
   },
   data () {
@@ -280,17 +276,10 @@ export default {
       handler: function (val) {
         this.setPropsToken(val)
       }
-    },
-    roadDirection: {
-      handler: function (val) {
-        if (val === 'left' || val === 'right') {
-          this.PhaseDataModel = new PhaseDataModel(val)
-        }
-      }
     }
   },
   created () {
-    this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
+    this.PhaseDataModel = new PhaseDataModel()
     this.CrossDiagramMgr = new CrossDiagramMgr()
     if (this.realtimeStatusModalvisible === false) {
       this.changeStatus()

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

@@ -42,7 +42,6 @@
             :header-text="$t('openatccomponents.pattern.ring') + ring.num"
             :Draggable="false"
             :sidewalkPhaseData="sidewalkPhaseData"
-            :roadDirection="roadDirection"
             @handleSort="handleSort">
               <template v-slot:kanbantitle>
                 <div class="col-title" v-text="$t('openatccomponents.overview.closemode')"></div>
@@ -111,13 +110,8 @@ export default {
     },
     sidewalkPhaseData: {
       type: Array
-    },
-    roadDirection: {
-      type: String
     }
   },
-  computed: {
-  },
   data () {
     return {
       visible: this.Visible,

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

@@ -58,7 +58,6 @@
             :header-text="$t('openatccomponents.pattern.ring') + ring.num"
             :Draggable="false"
             :sidewalkPhaseData="sidewalkPhaseData"
-            :roadDirection="roadDirection"
             @handleSort="handleSort">
               <template v-slot:kanbantitle>
                 <div class="col-title" v-text="$t('openatccomponents.overview.closemode')"></div>
@@ -127,9 +126,6 @@ export default {
     },
     sidewalkPhaseData: {
       type: Array
-    },
-    roadDirection: {
-      type: String
     }
   },
   data () {

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

@@ -54,7 +54,7 @@
         <div style="width: 100%; height: auto;overflow: hidden;">
           <div class="control-model" v-for="(item, index) in stagesList" :key="index">
             <div class="single-model" @click="selectStages(index + 1)" :class="preselectStages == index + 1 ? 'single-model-select' : ''">
-              <xdrdirselector Width="40px" Height="40px" :showlist="item" :roadDirection="roadDirection"></xdrdirselector>
+              <xdrdirselector Width="40px" Height="40px" :showlist="item"></xdrdirselector>
               <div style="display:flex;flex-direction:row;justify-content:center;align-items:center;">
                 <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                 <div style="width:70%;">
@@ -89,7 +89,6 @@
 
 <script>
 import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
-import { mapState } from 'vuex'
 export default {
   name: 'manualControl',
   components: {
@@ -127,14 +126,16 @@ export default {
       type: Boolean,
       default: true
     },
-    roadDirection: {
+    funcSort: {
       type: String
     }
   },
-  computed: {
-    ...mapState({
-      FuncSort: state => state.globalParam.FuncSort
-    })
+  watch: {
+    funcSort: {
+      handler: function (val) {
+        this.FuncSort = val
+      }
+    }
   },
   data () {
     return {
@@ -144,7 +145,8 @@ export default {
         tempPatternid: 0, // 控制方式手动操作的情况下的控制编号的临时值。
         tempDelay: 0, // 控制方式手动操作的情况下的延迟时间的临时值。
         tempDuration: 300 // 控制方式手动操作的情况下的持续时间的临时值。
-      }
+      },
+      FuncSort: 'allFunc'
     }
   },
   methods: {
@@ -174,6 +176,9 @@ export default {
     if (this.controlData.tempDuration) {
       this.manualInfo.tempDuration = this.controlData.duration
     }
+    if (this.funcSort) {
+      this.FuncSort = this.funcSort
+    }
   }
 }
 </script>

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

@@ -161,7 +161,7 @@
                 :Width="'44'"
                 :Height="'44'"
               />
-              <xdrdirselector Width="40PX" Height="40PX" :showlist="item" :roadDirection="roadDirection"></xdrdirselector>
+              <xdrdirselector Width="40PX" Height="40PX" :showlist="item"></xdrdirselector>
               <div
                 style="display:flex;flex-direction:row;justify-content:center;align-items:center;"
               >
@@ -274,9 +274,6 @@ export default {
     },
     untreatedFault: {
       type: Array
-    },
-    roadDirection: {
-      type: String
     }
   },
   data () {

package/package/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -306,7 +306,7 @@
   </svg>
 </template>
 <script>
-// import { mapState } from 'vuex'
+import { mapState } from 'vuex'
 export default {
   name: 'xdr-dir-selector',
   props: {
@@ -344,17 +344,13 @@ export default {
     MaskColor: {
       type: String,
       default: '#0096ba'
-    },
-    roadDirection: {
-      type: String,
-      default: 'right'
     }
   },
-  // computed: {
-  //   ...mapState({
-  //     roadDirection: state => state.globalParam.roadDirection
-  //   })
-  // },
+  computed: {
+    ...mapState({
+      roadDirection: state => state.globalParam.roadDirection
+    })
+  },
   data () {
     return {
       maskmark: false,