openatc-components 0.0.12 → 0.0.13

package/package.json

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

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

@@ -27,7 +27,12 @@
             <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"></xdrdirselector>
+                <xdrdirselector Width="40px"
+                  Height="40px"
+                  :showlist="element.desc"
+                  :ISActiveMask="ISActiveMask"
+                  :MaskColor="MaskColor"
+                  :roadDirection="roadDirection"></xdrdirselector>
               </div>
             </el-tooltip>
         </div>
@@ -46,7 +51,12 @@
                 <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"></xdrdirselector>
+                <xdrdirselector Width="40px"
+                  Height="40px"
+                  :showlist="element.desc"
+                  :ISActiveMask="ISActiveMask"
+                  :MaskColor="MaskColor"
+                  :roadDirection="roadDirection"></xdrdirselector>
               </div>
             </el-tooltip>
         </div>
@@ -94,6 +104,9 @@ export default {
     },
     sidewalkPhaseData: {
       type: Array
+    },
+    roadDirection: {
+      type: String
     }
   },
   methods: {

package/src/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,13 +186,16 @@ export default {
     isShowInterval: {
       type: Boolean,
       devault: true
+    },
+    roadDirection: {
+      type: String
     }
   },
-  computed: {
-    ...mapState({
-      roadDirection: state => state.globalParam.roadDirection
-    })
-  },
+  // computed: {
+  //   ...mapState({
+  //     roadDirection: state => state.globalParam.roadDirection
+  //   })
+  // },
   watch: {
     tempType: {
       handler: function (val) {
@@ -296,7 +299,7 @@ export default {
     init () {
       this.CrossDiagramMgr = new CrossDiagramMgr()
       this.getRoadDirection()
-      this.PhaseDataModel = new PhaseDataModel()
+      this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
       this.getIntersectionInfo() // 获取路口信息
     },
     comparePhaseStatus () {

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

@@ -10,15 +10,16 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
-import store from '../../../../store'
+// import store from '../../../../store'
 export default class PhaseDataModel {
-  constructor () {
+  constructor (roadDirection = 'right') {
     this.PhasePosMap = new Map()
     this.SidePosMap = new Map()
     this.RampMainPosMap = new Map() // 匝道主路坐标
     this.RampSidePosMap = new Map() // 匝道支路坐标
     this.BusMapMap = new Map() // 公交相位底图坐标
     this.BusPhaseMap = new Map() // 公交相位坐标
+    this.roadDirection = roadDirection
     this.Init()
   }
   Init () {
@@ -27,7 +28,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 (store.getters.roadDirection === 'left') {
+    if (this.roadDirection === 'left') {
       phaseJson = require('./posJson/phasePos.left.json').phaseList
       busMapJson = require('./posJson/busPos.left.json').busMap
       busPhaseJson = require('./posJson/busPos.left.json').busphases

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

@@ -11,7 +11,7 @@
  **/
 <template>
 <div class="intersection-map">
-  <div class="crossDirection-display" :class="{
+  <div class="crossDirection-display openatc-intersection-base-map" :class="{
     'superlargeCrossImg': bodyDomWidth <= 1680 && bodyDomWidth > 1440,
     'largeCrossImg': bodyDomWidth <= 1440 && bodyDomWidth > 1280,
     'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 960,
@@ -27,7 +27,8 @@
       :crossStatusData="crossStatusData"
       :agentId="agentId"
       :isShowInterval="isShowInterval"
-      :devStatus="devStatus" />
+      :devStatus="devStatus"
+      :roadDirection="roadDirection" />
   </div>
 </div>
 </template>
@@ -36,7 +37,7 @@
 import CrossDiagram from './crossDirection/crossDiagram'
 import { setToken } from '../../../utils/auth.js'
 export default {
-  name: 'intersection-map',
+  name: 'intersection-base-map',
   components: {
     CrossDiagram
   },
@@ -75,6 +76,10 @@ export default {
       handler: function (val) {
         this.setPropsToken(val)
       }
+    },
+    roadDirection: {
+      type: String,
+      default: 'right'
     }
   },
   watch: {

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

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

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="scheme-config" style="height: 100%;">
+  <div class="scheme-config openatc-scheme-config" style="height: 100%;">
     <fault-detail-modal ref="faultDetail" :agentId="agentId" @refreshFault="getFaultById"></fault-detail-modal>
         <div style="height: 100%;">
           <transition name="fade-right" mode="out-in"
@@ -28,6 +28,7 @@
                :preselectStages="preselectStages"
                :realtimeStatusModalvisible="realtimeStatusModalvisible"
                :funcSort="funcSort"
+               :roadDirection="roadDirection"
                @closeManualModal="closeManualModal"
                @selectModel="selectModel"
                @selectStages="selectStages"
@@ -45,6 +46,7 @@
                 :closePhaseRings="phaseRings"
                 :sidewalkPhaseData="sidewalkPhaseData"
                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
+                :roadDirection="roadDirection"
                 @closePhaseBack="closePhaseBack"
                 @closePhaseControl= "closePhaseControl" />
               <LockingPhaseControlModal
@@ -53,6 +55,7 @@
                 :closePhaseRings="phaseRings"
                 :sidewalkPhaseData="sidewalkPhaseData"
                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
+                :roadDirection="roadDirection"
                 @closePhaseBack="closePhaseBack"
                 @closePhaseControl= "closePhaseControl" />
             </div>
@@ -79,6 +82,7 @@
                 :agentId="agentId"
                 :stagesList="stagesList"
                 :sidewalkPhaseData="sidewalkPhaseData"
+                :roadDirection="roadDirection"
                 @changeStatus="changeStatus"
                 @showFaultDetail="showFaultDetail"/>
             </div>
@@ -89,7 +93,7 @@
 
 <script>
 import { putTscControl } from '../../../api/control.js'
-import { uploadSingleTscParam } from '../../../api/param'
+import { uploadSingleTscParam } from '../../../api/param.js'
 import RealtimeStatusModal from './realtimeStatusModal'
 import ManualControlModal from './manualControlModal'
 import ClosePhaseControlModal from './closePhaselControlModal'
@@ -144,7 +148,12 @@ export default {
       default: ''
     },
     funcSort: {
-      type: String
+      type: String,
+      default: 'allFunc'
+    },
+    roadDirection: {
+      type: String,
+      default: 'right'
     }
   },
   data () {
@@ -276,10 +285,17 @@ 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.PhaseDataModel = new PhaseDataModel(this.roadDirection)
     this.CrossDiagramMgr = new CrossDiagramMgr()
     if (this.realtimeStatusModalvisible === false) {
       this.changeStatus()

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

@@ -42,6 +42,7 @@
             :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>
@@ -110,6 +111,9 @@ export default {
     },
     sidewalkPhaseData: {
       type: Array
+    },
+    roadDirection: {
+      type: String
     }
   },
   data () {

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

@@ -58,6 +58,7 @@
             :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>
@@ -126,6 +127,9 @@ export default {
     },
     sidewalkPhaseData: {
       type: Array
+    },
+    roadDirection: {
+      type: String
     }
   },
   data () {

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

@@ -44,7 +44,7 @@
             <div class="single-model"
             @click="selectModel(item.id)"
             :class="(preselectModel == item.id && preselectStages == -1)? 'single-model-select' : ''"
-            v-if="FuncSort === 'allFunc' || (FuncSort === 'basicFunc'&& basicFuncControlId.indexOf(item.id) !== -1)">
+            v-if="funcSort === 'allFunc' || (funcSort === 'basicFunc'&& basicFuncControlId.indexOf(item.id) !== -1)">
               <svg-icon :icon-class="item.iconClass" className="model-icon"></svg-icon>
               <div class="single-model-name">{{$t('openatccomponents.overview.modelList' + item.id)}}</div>
             </div>
@@ -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"></xdrdirselector>
+              <xdrdirselector Width="40px" Height="40px" :showlist="item" :roadDirection="roadDirection"></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%;">
@@ -67,8 +67,8 @@
             </div>
           </div>
         </div>
-        <div class="stage-label" v-if="FuncSort === 'allFunc'">{{$t('openatccomponents.overview.specialcontrol')}}:</div>
-        <div style="width: 100%; height: auto;overflow: hidden;" v-if="FuncSort === 'allFunc'">
+        <div class="stage-label" v-if="funcSort === 'allFunc'">{{$t('openatccomponents.overview.specialcontrol')}}:</div>
+        <div style="width: 100%; height: auto;overflow: hidden;" v-if="funcSort === 'allFunc'">
           <div class="control-model" v-for="(item, index) in specialcontrolList" :key="index">
             <div class="single-model" @click="selectSpecialStages(item.id)">
               <svg-icon :icon-class="item.iconClass" className="closephase-icon"></svg-icon>
@@ -127,16 +127,13 @@ export default {
       default: true
     },
     funcSort: {
+      type: String,
+      default: 'allFunc'
+    },
+    roadDirection: {
       type: String
     }
   },
-  watch: {
-    funcSort: {
-      handler: function (val) {
-        this.FuncSort = val
-      }
-    }
-  },
   data () {
     return {
       basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
@@ -145,8 +142,7 @@ export default {
         tempPatternid: 0, // 控制方式手动操作的情况下的控制编号的临时值。
         tempDelay: 0, // 控制方式手动操作的情况下的延迟时间的临时值。
         tempDuration: 300 // 控制方式手动操作的情况下的持续时间的临时值。
-      },
-      FuncSort: 'allFunc'
+      }
     }
   },
   methods: {
@@ -176,9 +172,6 @@ export default {
     if (this.controlData.tempDuration) {
       this.manualInfo.tempDuration = this.controlData.duration
     }
-    if (this.funcSort) {
-      this.FuncSort = this.funcSort
-    }
   }
 }
 </script>

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

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

package/src/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,13 +344,18 @@ 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,

package/src/kisscomps/index.js

@@ -25,6 +25,7 @@ const language = {
   zh
 }
 
+const requireAll = requireContext => requireContext.keys().map(requireContext)
 const install = function (Vue) {
   if (install.installed) return
   Vue.use(VTooltip)
@@ -32,6 +33,15 @@ const install = function (Vue) {
   Object.keys(components).forEach(key => {
     Vue.component(components[key].name, components[key])
   })
+
+  const req = require.context('../icons/svg', false, /\.svg$/)
+  requireAll(req)
+
+  const urlMgr = require('../lib/publicjs/HttpurlMgr')
+  if (urlMgr.HttpUrlMgr.urlMap === undefined) {
+    let data = require('../../static/apiconfig.json')
+    urlMgr.HttpUrlMgr.init(data)
+  }
 }
 
 if (typeof window !== 'undefined' && window.Vue) {

package/src/store/getters.js

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 const getters = {
-  globalParam: state => state.globalParam,
-  roadDirection: state => state.globalParam.roadDirection
+  // globalParam: state => state.globalParam,
+  // roadDirection: state => state.globalParam.roadDirection
 }
 export default getters

package/src/store/index.js

@@ -12,13 +12,13 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import getters from './getters'
-import globalParam from './modules/globalParam'
+// import globalParam from './modules/globalParam'
 
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
   modules: {
-    globalParam
+    // globalParam
   },
   getters
 })

package/src/store/modules/globalParam.js

@@ -9,19 +9,19 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
-const Global = {
-  state: {
-    roadDirection: 'right' // 当前路口行车方向：默认右行
-  },
-  mutations: {
-    SET_ROAD_RIRECTION: (state, DIR) => {
-      state.roadDirection = DIR
-    }
-  },
-  actions: {
-    SetRoadDirection ({ commit }, DIR) {
-      commit('SET_ROAD_RIRECTION', DIR)
-    }
-  }
-}
-export default Global
+// const Global = {
+//   state: {
+//     roadDirection: 'right' // 当前路口行车方向：默认右行
+//   },
+//   mutations: {
+//     SET_ROAD_RIRECTION: (state, DIR) => {
+//       state.roadDirection = DIR
+//     }
+//   },
+//   actions: {
+//     SetRoadDirection ({ commit }, DIR) {
+//       commit('SET_ROAD_RIRECTION', DIR)
+//     }
+//   }
+// }
+// export default Global

package/src/views/intersection.vue

@@ -12,6 +12,7 @@
       <intersection-with-interface
         ref="intersectionWithInterface"
         :AgentId="agentId"
+        roadDirection="left"
         Token="eyJraWQiOiIxNjQ4ODYzOTI2NjA4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTI2MzkyNiwiaWF0IjoxNjQ4ODYzOTI2fQ.IQZ7m9_lNOVQ4H2icGKKWc84KKSWYUF9OUEJvYgjIgw"
         ></intersection-with-interface>
     </el-dialog>

package/src/views/schemeconfig.vue

@@ -29,6 +29,7 @@
         ref="rightpanel"
         agentId="10001-928"
         :statusData="crossStatusData"
+        roadDirection="left"
         funcSort="basicFunc" />
     </el-dialog>
   </div>