openatc-components 0.0.85 → 0.0.90

package/src/kisscomps/components/MessageBox/index.vue

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this 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.
+ **/
+<template>
+  <div>
+    <el-dialog
+      center
+      width="424px"
+      :visible.sync="boxVisible"
+      :title="modalTitle"
+      :close-on-click-modal="false"
+      custom-class="MessageBox"
+      @close="oncancle"
+      append-to-body>
+      <div class="text">{{text}}</div>
+      <div slot="footer" class="boxFooter">
+        <el-button class="btn canclebtn" @click="oncancle">{{$t('openatccomponents.button.Cancel')}}</el-button>
+        <el-button class="btn okbtn" type="primary" @click="onok">{{$t('openatccomponents.button.OK')}}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: 'message-box',
+  data () {
+    return {
+      boxVisible: this.visible,
+      modalTitle: this.$t('openatccomponents.common.tipsmodaltitle')
+    }
+  },
+  watch: {
+    visible: function (val) {
+      this.boxVisible = val
+    },
+    title: function (val) {
+      this.modalTitle = val
+    }
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: '提示'
+    },
+    text: {
+      type: String,
+      default: ''
+    }
+  },
+  methods: {
+    onok () {
+      this.$emit('ok')
+    },
+    oncancle () {
+      this.$emit('cancle')
+    }
+  },
+  mounted () {
+  },
+  beforeUpdate () {
+    this.modalTitle = this.$t('openatccomponents.common.tipsmodaltitle')
+  }
+}
+</script>
+<style>
+.MessageBox .el-dialog__body {
+  text-align: center;
+}
+.MessageBox .el-dialog__title {
+  font-size: 16px;
+}
+.MessageBox .text {
+  font-size: 14px;
+}
+.MessageBox .boxFooter .btn {
+  font-size: 14px;
+  width: 64px;
+  height: 34px;
+  padding: 2px 10px;
+}
+.MessageBox .el-dialog__footer {
+  padding: 10px 20px 20px;
+}
+</style>

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

@@ -179,6 +179,7 @@ export default {
           this.getIndexStage()
         }
         // this.controlDatas = this.controlData
+        this.getPedPhasePos()
         this.handlePatternData()
         this.handleBarrierHeight()
       },
@@ -190,6 +191,7 @@ export default {
         this.getPedPhasePos()
         this.getBusPos()
         this.getStage()
+        this.handlePatternData()
       },
       // 深度观察监听
       deep: true

package/src/kisscomps/components/PatternWalkSvg/PatternWalkSvg.vue

@@ -398,9 +398,14 @@ export default {
   },
   methods: {
     refreshShow (showWalk) {
-      for (let i = 0; i < this.showWalk.length; i++) {
+      for (let i = 0; i < 16; i++) {
+        if (this.status[i].isshow) {
+          this.status[i].isshow = false
+        }
+      }
+      for (let i = 0; i < showWalk.length; i++) {
         for (let j = 0; j < this.status.length; j++) {
-          if (this.showWalk[i].name === this.status[j].name) {
+          if (showWalk[i].name === this.status[j].name) {
             this.status[j].isshow = true
           }
         }

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

@@ -128,6 +128,10 @@ export default {
     TentativePlanControlModal
   },
   props: {
+    phaseList: {
+      type: Array,
+      default: () => []
+    },
     reqUrl: {
       type: String,
       default: ''
@@ -275,7 +279,7 @@ export default {
       tempPatternid: 0, // 控制方式手动操作的情况下的控制编号的临时值。
       tempDelay: 0, // 控制方式手动操作的情况下的延迟时间的临时值。
       tempDuration: 0, // 控制方式手动操作的情况下的持续时间的临时值。
-      phaseList: [], // 当前相位集合
+      // phaseList: [], // 当前相位集合
       faultvisible: false,
       isClosePhase: false, // 是否在相位关断
       toPage: 1, // 与哪一个页面交互，1 代表路口信息页面，3代表 相位关断页面
@@ -303,6 +307,7 @@ export default {
     statusData: {
       handler: function (val) {
         this.initData()
+        this.getPedPhasePos()
       },
       // 深度观察监听
       deep: true
@@ -338,7 +343,7 @@ export default {
   },
   async mounted () {
     this.setPropsToken(this.Token)
-    await this.getPhase()
+    // await this.getPhase()
     this.getFault()
     this.initData()
   },

package/src/kisscomps/index.js

@@ -4,6 +4,8 @@ import IntersectionWithInterface from './components/IntersectionWithInterface/in
 import IntersectionMap from './components/IntersectionMap/index'
 import SchemeConfig from './components/SchemeConfig/index'
 import lockingPhaselControlModal from './components/SchemeConfig/lockingPhaselControlModal/index'
+import Channelization from './components/Channelization/index'
+import DrawChannelization from './components/DrawChannelization/index'
 import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
 import patternList from './components/patternList/index'
@@ -32,6 +34,8 @@ const components = {
   IntersectionMap,
   SchemeConfig,
   lockingPhaselControlModal,
+  Channelization,
+  DrawChannelization,
   FaultDetailModal,
   PatternStatus,
   BoardCard,

package/src/main.js

@@ -12,6 +12,7 @@ import i18n from './i18n'
 import 'element-ui/lib/theme-chalk/index.css'
 import './icons' // icon
 import './icons/iconfont.css'
+import drr from '@minogin/vue-drag-resize-rotate'
 
 window.dev = process.env.NODE_ENV
 
@@ -27,6 +28,8 @@ Vue.use(ElementUI, {
   locale
 })
 
+Vue.component('drr', drr)
+
 /* 使用动画库 */
 Vue.use(animate)
 

package/src/router/index.js

@@ -31,6 +31,13 @@ export default new Router({
       component: (resolve) => {
         require(['@/views/overView'], resolve)
       }
+    },
+    {
+      path: '/quhua',
+      name: 'config',
+      component: (resolve) => {
+        require(['@/views/customchannelization'], resolve)
+      }
     }
   ]
 })

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,70 @@
  * 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 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: [
+  ]
+}
+const Global = {
+  state: {
+    tscParam: JSON.parse(JSON.stringify(tscParam)),
+    channelizationPageIndex: 1, // 总览编辑页面显示： 1 代表首次导入 2 代表已有保存的渠化图
+    associatedPhaseList: [], // 关联相位列表
+    PhaseDataMgr: {} // 关联相位数据处理模型
+  },
+  mutations: {
+    SET_TSCPARAM: (state, tscParam) => {
+      state.tscParam = JSON.parse(JSON.stringify(tscParam))
+    },
+    SET_ASSOCIATED_PHASE_LIST: (state, Associatedphaselist) => {
+      state.associatedPhaseList = JSON.parse(JSON.stringify(Associatedphaselist))
+    },
+    INIT_PHASE_DATA_MGR: (state, PhaseDataMgrClass) => {
+      state.PhaseDataMgr = PhaseDataMgrClass
+    },
+    SET_CHANNELZATION_PAGE_INDEX: (state, isHasChannelSetting) => {
+      if (isHasChannelSetting) {
+        state.channelizationPageIndex = 2
+      } else {
+        state.channelizationPageIndex = 1
+      }
+    }
+  },
+  actions: {
+    SetTscParam ({ commit }, tscParam) {
+      commit('SET_TSCPARAM', tscParam)
+    },
+    SetAssociatedPhaseList ({ commit }, Associatedphaselist) {
+      commit('SET_ASSOCIATED_PHASE_LIST', Associatedphaselist)
+    },
+    InitPhaseDataMgr ({ commit }, PhaseDataMgrClass) {
+      commit('INIT_PHASE_DATA_MGR', PhaseDataMgrClass)
+    },
+    SetChannelizationPageIndex ({ commit }, isHasChannelSetting) {
+      commit('SET_CHANNELZATION_PAGE_INDEX', isHasChannelSetting)
+    }
+  }
+}
+export default Global

package/src/utils/RingDataModel.js

@@ -171,6 +171,17 @@ export default class RingDataModel {
         peddirection: peddirections,
         sidewalkPhaseData: sidewalkPhaseData
       }))
+      if (directionList.length === 0) {
+        tempList = [
+          {
+            id: -1,
+            color: '#606266',
+            controltype: stageControType,
+            peddirection: peddirections,
+            sidewalkPhaseData: sidewalkPhaseData
+          }
+        ]
+      }
       stagesTemp.push(tempList)
     }
     this.stagesList = JSON.parse(JSON.stringify(stagesTemp))

package/src/views/customchannelization.vue

@@ -0,0 +1,49 @@
+<template>
+<!-- 渠化绘制demo -->
+  <div style="height: 100%;">
+      <!-- <custom-channelization
+        :AgentId="agentId" /> -->
+      <CustomChannelization
+        :AgentId="agentId"
+        :tscParam="tscParams"
+        @saveCallback="saveCallback" />
+  </div>
+</template>
+<script>
+import { getIntersectionInfo } from '../api/template.js'
+import CustomChannelization from '../kisscomps/components/DrawChannelization/drawsvg/index'
+export default {
+  name: 'custom-channelization-demo',
+  data () {
+    return {
+      agentId: '40001-547',
+      tscParams: {}
+    }
+  },
+  components: {
+    CustomChannelization
+  },
+  methods: {
+    getIntersectionInfo () {
+      // 获取路口信息
+      getIntersectionInfo(this.agentId).then(res => {
+        console.log('接口上载的参数', res.data.data.param)
+        this.tscParams = res.data.data.param
+      })
+    },
+    saveCallback (res) {
+      // 保存渠化图回调
+      console.log('保存接口返回的参数', res)
+    }
+  },
+  created () {
+  },
+  mounted () {
+    this.getIntersectionInfo()
+  },
+  destroyed () {
+  }
+}
+</script>
+<style lang="scss">
+</style>

package/src/views/intersection.vue

@@ -66,18 +66,23 @@
         :AgentId="agentId"
         :Token="Token"/> -->
 
+      <channelization-with-interface
+        :AgentId="agentId" />
+      <!-- <ChannelizationWithInterface
+        :AgentId="agentId" /> -->
     </div>
   </div>
 </template>
 <script>
 import IntersectionWithInterface from '../kisscomps/components/IntersectionWithInterface'
+import ChannelizationWithInterface from '../kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface'
 export default {
   name: 'demo',
   data () {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '10002-994',
+      agentId: '10003-391',
       reqUrl: 'http://192.168.13.105:11003/openatc',
       Token: 'eyJraWQiOiIxNjUzMjgyODkwMDYxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTY4Mjg5MCwiaWF0IjoxNjUzMjgyODkwfQ.emqFxXlot1Zk6TGkLMDx0zIp2B8toSz17xdZI_DrXZI',
       // agentId: '30003-352',
@@ -96,7 +101,8 @@ export default {
     }
   },
   components: {
-    IntersectionWithInterface
+    IntersectionWithInterface,
+    ChannelizationWithInterface
   },
   methods: {
     oncancle () {

package/src/views/schemeconfig.vue

@@ -53,7 +53,7 @@ export default {
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
       agentId: '10002-994',
       Token: 'eyJraWQiOiIxNjUzMjgyODkwMDYxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTY4Mjg5MCwiaWF0IjoxNjUzMjgyODkwfQ.emqFxXlot1Zk6TGkLMDx0zIp2B8toSz17xdZI_DrXZI',
-      Token103: 'eyJraWQiOiIxNjQ5MzM4NzA5MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTczODcwOSwiaWF0IjoxNjQ5MzM4NzA5fQ.JDSkpT1SbB61dEKvorhVdZJHKJzoQZEY5DPKHs1Imo0',
+      Token103: 'eyJraWQiOiIxNjU4MzgxMzQ4NjczIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0NDc4NDY1NSwiaWF0IjoxNjU4Mzg0NjU1fQ.5HIdmPgPCf9n5NbyVqXFq7rFA3g1IxGDw3IQeB6fJ8s',
       boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
@@ -118,7 +118,7 @@ export default {
     this.setDialogWidth()
   },
   mounted () {
-    this.setPropsToken(this.Token)
+    this.setPropsToken(this.Token103)
     this.initData()
     window.onresize = () => {
       return (() => {

package/static/apiconfig.json

@@ -332,5 +332,20 @@
   "key": "enumerateCheck",
   "url": "/fault/check",
   "method": "post"
+},
+{
+  "key": "getChannelizatonChart",
+  "url": "/devs/channelizatonchart",
+  "method": "get"
+},
+{
+  "key": "saveChannelizatonChart",
+  "url": "/devs/channelizatonchart",
+  "method": "post"
+},
+{
+  "key": "getDetectorStatus",
+  "url": "/devs/detectorstatus",
+  "method": "get"
 }
 ]