openatc-components 0.0.23 → 0.0.26

package/src/kisscomps/index.js

@@ -11,6 +11,13 @@ import PatternStatus from './components/PatternStatus/index'
 import BoardCard from './components/BoardCard/index'
 import StageStatus from './components/StageStatus/index'
 import OverLap from './components/OverLap/index'
+import Stages from './components/Stages/index'
+import PhaseMarker from './components/PhaseMarker/index'
+import overView from './components/overView/index'
+import KanBan from './components/KanBan/index'
+import StageBord from './components/StageBord/index'
+import ExpendConfig from './components/ExpendConfig/index'
+import tentativeplancontrolmodal from './components/SchemeConfig/tentativeplancontrolmodal/index'
 
 import en from '../i18n/language/en'
 import zh from '../i18n/language/zh'
@@ -29,7 +36,14 @@ const components = {
   OverLap,
   StageStatus,
   patternList,
-  CommonKanban
+  CommonKanban,
+  Stages,
+  PhaseMarker,
+  overView,
+  KanBan,
+  StageBord,
+  ExpendConfig,
+  tentativeplancontrolmodal
 }
 
 const language = {

package/src/lib/publicjs/KissApi.js

@@ -16,6 +16,7 @@ import axios from 'axios'
 import * as localStorge from './localStorage'
 import { removeToken } from '../../utils/auth'
 
+axios.defaults.withCredentials = true
 export const getAxios = () => {
   return axios
 }
@@ -96,6 +97,7 @@ export class KissApi {
     }
     const config = {
       baseURL: host,
+      withCredentials: false,
       url: apiUrl,
       method: urlInfo.method,
       headers: this.headerInfo,

package/src/main.js

@@ -12,6 +12,8 @@ import i18n from './i18n'
 import 'element-ui/lib/theme-chalk/index.css'
 import './icons' // icon
 
+window.dev = process.env.NODE_ENV
+
 // 深浅主题按需加载
 import('../static/styles/dark/index.scss')
 // import('../static/styles/light/index.scss')

package/src/router/index.js

@@ -4,13 +4,13 @@ Vue.use(Router)
 
 export default new Router({
   routes: [
-    {
-      path: '/',
-      name: 'home',
-      component: (resolve) => {
-        require(['@/views/home'], resolve)
-      }
-    },
+    // {
+    //   path: '/',
+    //   name: 'home',
+    //   component: (resolve) => {
+    //     require(['@/views/home'], resolve)
+    //   }
+    // },
     {
       path: '/cross',
       name: 'cross',
@@ -19,11 +19,18 @@ export default new Router({
       }
     },
     {
-      path: '/config',
+      path: '/',
       name: 'config',
       component: (resolve) => {
         require(['@/views/schemeconfig'], resolve)
       }
+    },
+    {
+      path: '/overView',
+      name: 'config',
+      component: (resolve) => {
+        require(['@/views/overView'], resolve)
+      }
     }
   ]
 })

package/src/utils/ControlFormat.js

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use i18n 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.
+ **/
+import i18n from '../i18n/index.js'
+export default class ControlFormat {
+  constructor (crossStatusData, phaseList) {
+    this.ParamsMode = new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']])
+    this.ParamsModeEn = new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']])
+    this.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']])
+    this.ParamsControlEn = new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']])
+    this.phaseType = new Map([[1, '红'], [2, '黄'], [3, '绿']]) // phaseType表示红，黄，绿
+    this.phaseTypeEn = new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]) // phaseType表示红，黄，绿
+  }
+  handleGetData (data) {
+    let that = this
+    if (data.name === '') {
+      if (i18n.locale === 'en') {
+        data.name = 'Pattern' + data.patternid
+      } else if (i18n.locale === 'zh') {
+        data.name = '方案' + data.patternid
+      }
+    }
+    Object.keys(data).forEach(function (key) {
+      if (i18n.locale === 'en') {
+        if (key === 'mode') {
+          if (data[key] > 0 && data[key] < 6) {
+            data[key] = that.ParamsModeEn.get(data[key])
+          } else {
+            data[key] = that.ParamsModeEn.get(0)
+          }
+        }
+        if (key === 'control') {
+          data[key] = that.ParamsControlEn.get(data[key])
+        }
+        if (key === 'phase') {
+          for (let val of data[key]) {
+            val.type = that.phaseTypeEn.get(val.type)
+          }
+        }
+      } else if (i18n.locale === 'zh') {
+        if (key === 'mode') {
+          if (data[key] > 0 && data[key] < 6) {
+            data[key] = that.ParamsMode.get(data[key])
+          } else {
+            data[key] = that.ParamsMode.get(0)
+          }
+        }
+        if (key === 'control') {
+          data[key] = that.ParamsControl.get(data[key])
+        }
+        if (key === 'phase') {
+          for (let val of data[key]) {
+            val.type = that.phaseType.get(val.type)
+          }
+        }
+      }
+    })
+    return data
+  }
+}

package/src/utils/RingDataModel.js

@@ -13,7 +13,7 @@ import i18n from '../i18n/index.js'
 import PhaseDataModel from '../kisscomps/components/IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../EdgeMgr/controller/crossDiagramMgr.js'
 export default class RingDataModel {
-  constructor (crossStatusData, phaseList) {
+  constructor (crossStatusData = {}, phaseList) {
     this.crossStatusData = crossStatusData
     this.phaseList = phaseList
     this.PhaseDataModel = new PhaseDataModel()

package/src/utils/auth.js

@@ -36,6 +36,14 @@ export function removeToken () {
   return localStorage.setStorage(LoginKey, '')
 }
 
+export function getStageTypes () {
+  let ret = localStorage.getStorage('contrloType')
+  if (ret === undefined || ret === null) {
+    return ''
+  }
+  return ret
+}
+
 export function getHost () {
   let ret = localStorage.getStorage(LoginHost)
   if (ret === undefined || ret === null) {

package/src/views/home.vue

@@ -1,5 +1,11 @@
 <template>
-  <div class="wrap">
+  <div id="test1">
+    <div>
+      <phase-marker :params="params"
+                  :dirshow="dirshow"
+                  :showLevel="showLevel"
+      ></phase-marker>
+    </div>
     <xdr-dir-selector Width="300px"
                       Height="300px"
                       :showlist="dirshow"></xdr-dir-selector>
@@ -10,6 +16,15 @@
 export default {
   data () {
     return {
+      params: {
+        countdown: 0,
+        split: 0,
+        control: 0,
+        cycle: 0,
+        offset: 0,
+        curpattern: 'NO PLAN'
+      },
+      showLevel: 3,
       dirshow: [
         {
           id: 1,

package/src/views/intersection.vue

@@ -1,5 +1,11 @@
 <template>
   <div>
+      <button @click="lockPhase" >相位锁定</button><br/>
+      <button @click="unlockPhase" >解锁相位</button><br/>
+      <button @click="changeControlPattern" >改变控制方案</button><br/>
+      <button @click="getPhaseInfo" >获取相位参数信息</button><br/>
+      <button @click="getControlInfo" >获取当前方案信息</button>
+      <button @click="clearInterVals" >清除定时器</button>
     <!-- <el-button type="primary" @click="handleOpenConfigPanel" style="margin: 20px;">打开路口图面板</el-button>
     <el-dialog
       refs="intersectionMapDialog"
@@ -9,26 +15,86 @@
       :close-on-click-modal="false"
       @close="oncancle"
       append-to-body> -->
-      <intersection-with-interface
-        ref="intersectionWithInterface"
+      <!-- <intersection-with-interface
+        ref="intersection"
         :AgentId="agentId"
-        roadDirection="left"
+        :reqUrl="reqUrl"
         :Token="Token"
-        ></intersection-with-interface>
+        :roadDirection="roadDirection"
+        :modeName="modeName"
+        :controlName="controlName"
+        :isShowMode="isShowMode"
+        :isShowInterval="isShowInterval"
+        :isShowMessage ="isShowMessage"
+        :isShowPatternStatus="isShowPatternStatus"
+        :isShowIntersection="isShowIntersection"
+        :isShowStages="isShowStages"
+        @getTscControl="getTscControl"
+        @registerMessage="registerMessage"
+        @queryDevice="queryDevice"
+        @onPhaseChange="onPhaseChange"
+        @onSelectStages="onSelectStages">
+      </intersection-with-interface> -->
     <!-- </el-dialog> -->
+  <div class="layout-container2">
+      <intersection-with-interface
+        ref="intersection"
+        :AgentId="agentId"
+        :reqUrl="reqUrl"
+        :Token="Token"
+        :roadDirection="roadDirection"
+        :modeName="modeName"
+        :controlName="controlName"
+        :isShowMode="isShowMode"
+        :isShowInterval="isShowInterval"
+        :isShowMessage ="isShowMessage"
+        :isShowPatternStatus="isShowPatternStatus"
+        :isShowIntersection="isShowIntersection"
+        :isShowStages="isShowStages"
+        @getTscControl="getTscControl"
+        @registerMessage="registerMessage"
+        @queryDevice="queryDevice"
+        @onPhaseChange="onPhaseChange"
+        @onSelectStages="onSelectStages">
+      </intersection-with-interface>
+      <!-- <Stages :stagesList="stagesList"
+              :currentStage="currentStage"
+              @onSelectStages="onSelectStages"></Stages> -->
+
+      <!-- 本地调试，不要删除 -->
+      <!-- <IntersectionWithInterface
+        :AgentId="agentId"
+        :Token="Token"/> -->
+
+    </div>
   </div>
 </template>
 <script>
+import IntersectionWithInterface from '../kisscomps/components/IntersectionWithInterface'
 export default {
   name: 'demo',
   data () {
     return {
-      Token: 'eyJraWQiOiIxNjQ5MzM4NzA5MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTczODcwOSwiaWF0IjoxNjQ5MzM4NzA5fQ.JDSkpT1SbB61dEKvorhVdZJHKJzoQZEY5DPKHs1Imo0',
+      roadDirection: 'right',
+      // reqUrl: 'http://192.168.13.103:10003/openatc',
+      agentId: '10002-994',
+      reqUrl: 'http://192.168.13.105:11003/openatc',
+      Token: 'eyJraWQiOiIxNjUwNzMxMTY2NTQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNzEzMTE2NiwiaWF0IjoxNjUwNzMxMTY2fQ.qjp7-LyJdSLr29Jm0T8KAQIoPA8ldkpTg83vVvorg_s',
       boxVisible: false,
       dialogWidth: '80%',
-      agentId: '10002-994'
+      modeName: '交警遥控',
+      controlName: '步进',
+      isShowMode: true,
+      isShowMessage: true,
+      isShowPatternStatus: false,
+      isShowIntersection: true,
+      isShowInterval: true,
+      isShowStages: true
     }
   },
+  components: {
+    IntersectionWithInterface
+  },
   methods: {
     oncancle () {
       this.boxVisible = false
@@ -44,6 +110,90 @@ export default {
       } else {
         this.dialogWidth = def + 'px'
       }
+    },
+    async lockPhase (reqData) {
+      console.log('lock')
+      reqData = {
+        'mode': 0,
+        'control': 4,
+        'terminal': 1,
+        'delay': null,
+        'duration': null,
+        'value': 1
+      }
+      let res = await this.$refs.intersection.lockPhase(reqData)
+      console.log(res)
+      console.log(reqData)
+    },
+    async unlockPhase (reqData) {
+      console.log('unlock')
+      reqData = {
+        'mode': 0,
+        'control': 0,
+        'terminal': 1,
+        'delay': null,
+        'duration': null,
+        'value': 0
+      }
+      let res = await this.$refs.intersection.unlockPhase(reqData)
+      console.log(res)
+      console.log(reqData)
+    },
+    async changeControlPattern (reqData) {
+      console.log('changeControlPattern')
+      reqData = {
+        'mode': 0,
+        'control': 1,
+        'terminal': 1,
+        'delay': null,
+        'duration': null,
+        'value': 0
+      }
+      let res = await this.$refs.intersection.changeControlPattern(reqData)
+      console.log(res)
+      console.log(reqData)
+    },
+    async getPhaseInfo () {
+      console.log('getPhaseInfo')
+      let res = await this.$refs.intersection.getPhaseInfo()
+      console.log(res)
+      return res
+    },
+    async getControlInfo () {
+      console.log('getControlInfo')
+      let res = await this.$refs.intersection.getControlInfo()
+      console.log(res)
+      return res
+    },
+    onPhaseChange (res, index) {
+      console.log('onPhaseChange:')
+      console.log(res, index)
+      this.stagesList = res
+      // this.currentStage = index;
+    },
+    getTscControl (res) {
+      console.log('getTscControl:')
+      console.log(res)
+      // let control = res.data.data.control
+      // let mode = res.data.data.mode
+      // console.log("control,mode:",control,mode)
+      // this.controlName = control
+      // this.modeName = mode
+    },
+    registerMessage (res) {
+      console.log('registerMessage')
+      console.log(res)
+    },
+    queryDevice (res) {
+      console.log('queryDevice')
+      console.log(res)
+    },
+    clearInterVals () {
+      this.$refs.intersection.clearInterVals()
+    },
+    onSelectStages (res) {
+      console.log('onSelectStages')
+      console.log(res)
     }
   },
   created () {
@@ -84,3 +234,35 @@ export default {
     }
 }
 </style>
+
+<style scoped lang='scss'>
+.layout-container {
+  width: 800PX;
+  // width: 300rem;
+  // height: 390PX;
+  border: 1PX solid red;
+  // color: green;
+}
+.layout-container1 {
+  // width: 12.5rem;
+  // height: 12.5rem;
+  // width: 275px;
+  // height: 202px;
+  // width: 330.33px;
+  // height: 242.67px;
+  width: 242PX;
+  height: 176PX;
+  border: 1PX solid green;
+  // background: green;
+}
+.layout-container2 {
+  // width: 25.6rem;
+  // height: 25.6rem;
+  // width: 600px;
+  height: 600px;;
+  width: 1020px;
+  border: 1PX solid yellow;
+  position: relative;
+  // background: white;
+}
+</style>

package/src/views/overView.vue

@@ -0,0 +1,33 @@
+<template>
+  <div id="test1">
+    <overview
+        :AgentId="agentId"
+        :reqUrl="reqUrl"
+        :Token="Token"></overview>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      agentId: '10002-994',
+      Token: 'eyJraWQiOiIxNjUwNzMxMTY2NTQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNzEzMTE2NiwiaWF0IjoxNjUwNzMxMTY2fQ.qjp7-LyJdSLr29Jm0T8KAQIoPA8ldkpTg83vVvorg_s',
+      reqUrl: 'http://192.168.13.105:11003/openatc'
+    }
+  },
+  methods: {
+  },
+  watch: {
+  },
+  mounted () {
+  }
+}
+</script>
+<style scoped>
+.wrap {
+  /* background: #333333; */
+  width: 100%;
+  height: 100%;
+}
+</style>

package/src/views/schemeconfig.vue

@@ -31,7 +31,8 @@
         :lockPhaseBtnName="lockPhaseBtnName"
         :statusData="crossStatusData"
         roadDirection="left"
-        funcSort="basicFunc" />
+         />
+         <!-- funcSort="basicFunc" -->
     </el-dialog>
   </div>
 </template>
@@ -39,7 +40,7 @@
 import { getTscControl } from '../api/control.js'
 import { getMessageByCode } from '../utils/responseMessage.js'
 import {
-  getIframdevid, setToken
+  setToken
 } from '../utils/auth'
 export default {
   name: 'democonfig',
@@ -47,7 +48,7 @@ export default {
     return {
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
       agentId: '10002-994',
-      Token: 'eyJraWQiOiIxNjQ5MzM4NzA5MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTczODcwOSwiaWF0IjoxNjQ5MzM4NzA5fQ.JDSkpT1SbB61dEKvorhVdZJHKJzoQZEY5DPKHs1Imo0',
+      Token: 'eyJraWQiOiIxNjUyODM5NzcwNjcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTIzOTc3MCwiaWF0IjoxNjUyODM5NzcwfQ.1A0TkheNaATu5TttB4L2CTflV4DnzO23i8pdDRNm9lg',
       Token103: 'eyJraWQiOiIxNjQ5MzM4NzA5MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTczODcwOSwiaWF0IjoxNjQ5MzM4NzA5fQ.JDSkpT1SbB61dEKvorhVdZJHKJzoQZEY5DPKHs1Imo0',
       boxVisible: false,
       dialogWidth: '80%',
@@ -74,8 +75,8 @@ export default {
       }
     },
     initData () {
-      let iframdevid = getIframdevid()
-      getTscControl(iframdevid).then((data) => {
+      // let iframdevid = getIframdevid()
+      getTscControl(this.agentId).then((data) => {
         if (!data.data.success) {
           if (data.data.code === '4003') {
             this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))

package/static/styles/common.scss

@@ -1,6 +1,8 @@
 @import './intersection.scss';
 @import './schemeconfig.scss';
 @import './commonkanban.scss';
+@import './stages.scss';
+@import './overview.scss';
 
  // 全局滚动条样式
  ::-webkit-scrollbar {

package/static/styles/intersection.scss

@@ -141,4 +141,22 @@
      padding: 0PX;
     //  zoom: 0.25;
    }
+   .controlText {
+    position:absolute;
+    top:20%;
+    left:7%;
+    width:25%;
+    height:50px;
+    color: $--color-text-primary;
+    font-size:30px;
+ }
+ .modeText {
+    position:absolute;
+    top:20%;
+    left:68%;
+    width:25%;
+    height:50px;
+    color: $--color-text-primary;
+    font-size:30px;
+ }
 }