openatc-components 0.0.6 → 0.0.12

package/package.json

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

package/src/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/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,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/src/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/src/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/src/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/src/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/src/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/src/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/src/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/src/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/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,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,

package/src/store/getters.js

@@ -10,20 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 const getters = {
-  sidebar: state => state.app.sidebar,
-  device: state => state.app.device,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  roles: state => state.user.roles,
-  Agent: state => state.Agent.agentid,
-  controlmode: state => state.Agent.controlmode,
   globalParam: state => state.globalParam,
-  tscParam: state => state.globalParam.tscParam,
-  curPath: state => state.globalParam.curPath,
-  globalParamModel: state => state.globalParamModel.GlobalParamModeObject,
-  devParams: state => state.globalParamModel.devParams,
-  permissionRoutes: state => state.permissionRoutes.routers
-  // roadDirection: state => state.globalParam.roadDirection
+  roadDirection: state => state.globalParam.roadDirection
 }
 export default getters

package/src/store/index.js

@@ -11,24 +11,14 @@
  **/
 import Vue from 'vue'
 import Vuex from 'vuex'
-import app from './modules/app'
-import user from './modules/user'
 import getters from './getters'
-import agent from './modules/saveAgent'
 import globalParam from './modules/globalParam'
-import globalParamModel from './modules/globalParamModel'
-import permissionRoutes from './modules/permissionRoutes'
 
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
   modules: {
-    app,
-    user,
-    agent,
-    globalParam,
-    globalParamModel,
-    permissionRoutes
+    globalParam
   },
   getters
 })

package/src/store/modules/globalParam.js

@@ -9,187 +9,18 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
-const tscParam = {
-  phaseList: [],
-  patternList: [],
-  planList: [],
-  dateList: [],
-  overlaplList: [],
-  channelList: [],
-  detectorList: [],
-  pedestrainDetectorList: [],
-  channellock: [],
-  // customInfo: {
-  //   areaid: Number,
-  //   intersectionid: Number,
-  //   siteid: '',
-  //   selflearning: 0,
-  //   fixintersectioninfo: '',
-  //   commuport: 0,
-  //   commutype: '',
-  //   steptype: ''
-  // },
-  manualpanel: {
-    mingreen: 15
-  },
-  singleoptim: [
-  ]
-}
-let defaultCopiedTscParam = null
-try {
-  if (sessionStorage.tscParam) {
-    defaultCopiedTscParam = JSON.parse(sessionStorage.tscParam)
-  }
-} catch (e) {
-  console.log(e)
-}
-
-// function getPerRouterMap (routerArr, noper, parent) {
-//   for (let per of routerArr) {
-//     if (per.name && per.name === noper) {
-//       parent.hidden = true
-//       break
-//     } else if (per.children && per.children.length) {
-//       getPerRouterMap(per.children, noper, per)
-//     }
-//   }
-// }
-
 const Global = {
   state: {
-    tscParam: JSON.parse(JSON.stringify(tscParam)),
-    curPath: '/overview/index',
-    copiedTscParam: defaultCopiedTscParam,
-    routers: [],
-    curBodyWidth: 1920,
-    curBodyHeight: 1080,
-    FuncSort: 'allFunc',
-    hideMenu: false,
-    graphicMode: false, // 为true时，切换到图形界面模式，只显示路口图部分
-    // roadDirection: 'right', // 当前路口行车方向：默认右行
-    channelDescMap: new Map(), // 管理实时通道描述数据
-    isShowGui: true, // 总览当前是否是图形界面
-    isRefreshTankuang: 'norefresh' // 刷新某个页面的相位弹框组件
+    roadDirection: 'right' // 当前路口行车方向：默认右行
   },
   mutations: {
-    SAVE_PARAM: (state, data) => {
-      // let customInfo = data.customInfo
-      // data.customInfo = {
-      //   ...tscParam.customInfo,
-      //   ...customInfo
-      // }
-      state.tscParam = JSON.parse(JSON.stringify(data))
-    },
-    SAVE_SINGLE_PARAM: (state, param) => {
-      state.tscParam[param.type] = param.data
-    },
-    RESET_PARAM: (state) => {
-      state.tscParam = JSON.parse(JSON.stringify(tscParam))
-    },
-    SAVE_CUR_PATH: (state, path) => {
-      state.curPath = path
-    },
-    SET_COPY: (state, param) => {
-      state.copiedTscParam = param
-      sessionStorage.tscParam = JSON.stringify(param)
-    },
-    CLEAR_COPY: (state) => {
-      state.copiedTscParam = null
-      sessionStorage.removeItem('tscParam')
-    },
-    // ,
-    // SET_ROUTERS: (state, routers) => {
-    //   state.routers = JSON.parse(JSON.stringify(routers))
-    // }
-    SAVE_BODY_DOM_SIZE: (state, size) => {
-      state.curBodyWidth = size.width
-      state.curBodyHeight = size.height
-    },
-    SAVE_FUNNCTION_LEVEL: (state, FUNC) => {
-      state.FuncSort = FUNC
-    },
-    SET_MENU_VISIBLE: (state, isHideMenu) => {
-      state.hideMenu = isHideMenu
-    },
-    SET_GRAPHIC_MODE: (state, isSwitchGraphicMode) => {
-      state.graphicMode = isSwitchGraphicMode
-    },
-    // SET_ROAD_RIRECTION: (state, DIR) => {
-    //   state.roadDirection = DIR
-    // },
-    SET_CHANNEL_DESC: (state, descmap) => {
-      state.channelDescMap = descmap
-    },
-    CLEAR_MANUAL_PANEL: (state) => {
-      state.tscParam.manualpanel = tscParam.manualpanel
-    },
-    SET_SHOW_GUI: (state, isShowGui) => {
-      state.isShowGui = isShowGui
-    },
-    SET_ISREFRESHTANKUANG: (state, isRefreshTankuang) => {
-      state.isRefreshTankuang = isRefreshTankuang
+    SET_ROAD_RIRECTION: (state, DIR) => {
+      state.roadDirection = DIR
     }
   },
   actions: {
-    SaveTscParam ({ commit }, data) {
-      commit('SAVE_PARAM', data)
-    },
-    SaveSingleParam ({ commit }, param) {
-      commit('SAVE_SINGLE_PARAM', param)
-    },
-    ResetTscParam ({ commit }) {
-      commit('RESET_PARAM')
-    },
-    SaveCurPath ({ commit }, path) {
-      commit('SAVE_CUR_PATH', path)
-    },
-    SetCopy ({ commit }, data) {
-      commit('SET_COPY', data)
-    },
-    ClearCopy ({ commit }) {
-      commit('CLEAR_COPY')
-    },
-    // GenerateRoutes ({
-    //   commit
-    // }, {curRoutes, noPermission}) {
-    //   // 生成路由(仅支持sidebar一级菜单的隐藏)
-    //   // noPermission: Array 需要隐藏的路由name属性组成的数组
-    //   if (noPermission && noPermission.length) {
-    //     let perRouter = JSON.parse(JSON.stringify(curRoutes))
-    //     noPermission.forEach(noper => {
-    //       getPerRouterMap(perRouter, noper)
-    //     })
-    //     commit('SET_ROUTERS', perRouter)
-    //   } else {
-    //     commit('SET_ROUTERS', curRoutes)
-    //   }
-    // }
-    SaveBodyDomSize ({ commit }, size) {
-      commit('SAVE_BODY_DOM_SIZE', size)
-    },
-    SaveFunctionLevel ({ commit }, FUNC) {
-      commit('SAVE_FUNNCTION_LEVEL', FUNC)
-    },
-    SetMenuVisible ({ commit }, isHideMenu) {
-      commit('SET_MENU_VISIBLE', isHideMenu)
-    },
-    SetGraphicMode ({ commit }, isSwitchGraphicMode) {
-      commit('SET_GRAPHIC_MODE', isSwitchGraphicMode)
-    },
-    // SetRoadDirection ({ commit }, DIR) {
-    //   commit('SET_ROAD_RIRECTION', DIR)
-    // },
-    SetChannelDesc ({ commit }, descmap) {
-      commit('SET_CHANNEL_DESC', descmap)
-    },
-    ClearManualPanel ({ commit }) {
-      commit('CLEAR_MANUAL_PANEL')
-    },
-    SetShowGui ({ commit }, isShowGui) {
-      commit('SET_SHOW_GUI', isShowGui)
-    },
-    SetRefreshTankuang ({ commit }, isRefreshTankuang) {
-      commit('SET_ISREFRESHTANKUANG', isRefreshTankuang)
+    SetRoadDirection ({ commit }, DIR) {
+      commit('SET_ROAD_RIRECTION', DIR)
     }
   }
 }

package/src/views/intersection.vue

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

package/src/views/schemeconfig.vue

@@ -20,12 +20,16 @@
       :close-on-click-modal="false"
       @close="oncancle"
       append-to-body>
+      <!-- <scheme-config
+        ref="rightpanel"
+        agentId="10001-928"
+        :statusData="crossStatusData"
+        :realtimeStatusModalvisible="false" /> -->
       <scheme-config
         ref="rightpanel"
         agentId="10001-928"
-        roadDirection="right"
         :statusData="crossStatusData"
-        :realtimeStatusModalvisible="false" />
+        funcSort="basicFunc" />
     </el-dialog>
   </div>
 </template>