openatc-components 0.3.17 → 0.3.18

package/package.json

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

package/src/kisscomps/components/PhaseLegend/PhaseLegend.vue

@@ -0,0 +1,290 @@
+/**
+ * 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 id="intersection-phases" class="intersection-phases" :style="PhaseStyle">
+      <div>
+        <div style="width: 100%; height: auto;">
+          <div class="control-model" v-for="(item, index) in PhaseList" :key="index">
+            <div style="position:relative;" :style="{...singleStyle, 'backgroundColor': item[0].bgcolor}" class="single-model" @click="selectLegend(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">
+              <xdr-dir-selector :Width="dirWidth" :Height="dirHeight" :Widths="dirWidths" :Heights="dirHeights" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
+              <div style="display:flex;flex-direction:row;justify-content:center;align-items:end;" :style="{height: StageHeight}">
+                <div class="current-stage-num" style="width:25%;" :style="{color: themeColor, fontSize: numSize}">{{item[0].phaseid}}</div>
+                <div style="width:70%;">
+                  <i class="iconfont icon-feijidongche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
+                  <i class="iconfont icon-lukouzhilu" :style="{color: themeColor2, fontSize: iconSize2}" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
+                  <i class="iconfont icon-BRT" :style="{color: themeColor2, fontSize: iconSize}" style="font-size:11PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 4"></i>
+                  <div style="transform:scale(0.65);margin-left:10PX">
+                    <i class="iconfont icon-xuxiangwei-xin" :style="{color: themeColor2}" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
+                  </div>
+                  <i class="iconfont icon-gongjiaoche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 3"></i>
+                  <i class="iconfont icon-youguidianche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 5"></i>
+                  <div v-if="presetStageIndex === index + 1" style="color:red;width:50px;position:absolute;right:0px;bottom:5px;font-size:11px;">{{presetText}}</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+  </div>
+</template>
+
+<script>
+/* eslint-disable */
+import RingDataModel from '../../../utils/RingDataModel.js'
+import { getTheme } from '../../../utils/auth.js'
+
+export default {
+  name: 'PhaseLegend',
+  props: {
+    isShowCurrentStage: {
+      type: Boolean,
+      default: true
+    },
+    crossStatusData: {
+      type: Object,
+      default: () => {}
+    },
+    phaseList: {
+      type: Array,
+      default: () => []
+    },
+    presetText: {
+      type: String,
+      default: '预置'
+    },
+    presetIndex: {
+      type: Number,
+      default: -1
+    },
+    preselectStages:{
+      type: Number,
+      default: -1
+    },
+    preselectModel:{
+      type: Number,
+      default: -1
+    },
+    presetPhaseId: {
+      type: Number,
+      default: -1
+    },
+    zoom: {
+      type: Number,
+      default: 1
+    },
+    StageWidth: { // 图的大小样式
+      type: String,
+      default: '70px'
+    },
+    StageHeight: {
+      type: String,
+      default: '80px'
+    },
+    dirWidth: {
+      type: String,
+      default: '75PX'
+    },
+    dirHeight: {
+      type: String,
+      default: '75PX'
+    },
+    dirWidths: {
+      type: String,
+      default: '65PX'
+    },
+    dirHeights: {
+      type: String,
+      default: '65PX'
+    },
+    showStyle: { // 图内部方向的位置
+      type: Object,
+      default: () => ({
+        top:'7PX',
+        left:'13px'
+      })
+    },
+    showStyles: { // 图内部人行道的位置
+      type: Object,
+      default: () => ({
+        top:'5PX',
+        left:'12px'
+      })
+    },
+    noClick: { // 图是否可以点击
+      type: Boolean,
+      default: false
+    },
+    showDataType: { // 图展示的数据类型：默认按阶段展示，如果传phase则按相位维度展示
+      type: String
+    }
+  },
+  data () {
+    return {
+      presetStageIndex: -1,
+      side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
+      // PhaseList: [],
+      currentStage: -1,
+      themeColor: getTheme() === 'light' ? '#606266' : '#fff',
+      themeColor2: getTheme() === 'light' ? '#454545' : '#fff'
+    };
+  },
+  computed: {
+    singleStyle () {
+      return {
+        width: this.StageWidth,
+        height: this.StageHeight
+      }
+    },
+    PhaseList () {
+      let list = []
+      if (this.crossStatusData && this.crossStatusData.stages && this.phaseList && this.phaseList.length > 0) {
+        let ringDataModel = new RingDataModel(this.crossStatusData, this.phaseList)
+        if (this.showDataType === 'phase') {
+          list = ringDataModel.getStageData('phase')
+        } else {
+          list = ringDataModel.getStageData()
+        }
+        if (this.isShowCurrentStage) {
+          this.currentStage = this.crossStatusData.current_stage
+        }
+      }
+      console.log(list,'list')
+      this.clickType(list, this.currentStage)
+      console.log(this.phaseList,'this.phaseList')
+      return list
+    },
+    PhaseStyle () {
+      return {
+        zoom: this.zoom
+      }
+    },
+    iconSize () {
+      const fontsize = parseInt(this.dirWidth.replace(/px$/, ""));
+      return fontsize / 75 * 11 + 'px'
+    },
+    iconSize2 () {
+      const fontsize = parseInt(this.dirWidth.replace(/px$/, ""));
+      return fontsize / 75 * 16 + 'px'
+    },
+    numSize () {
+      const fontsize = parseInt(this.dirWidth.replace(/px$/, ""));
+      const newfontsize = fontsize / 75 * 12
+      if (newfontsize < 10) {
+        return 10 + 'px'
+      } else {
+        return newfontsize + 'px'
+      }
+    }
+  },
+  watch: {
+    preselectStages: { 
+      handler: function (val, oldVal) {
+        if(this.preselectStages === -1 && this.preselectModel !== -1) {
+          this.currentStage = -1
+        }
+      },
+      // 深度观察监听
+      deep: true
+    },
+    preselectModel: { 
+      handler: function (val, oldVal) {
+        if(this.preselectStages === -1 && this.preselectModel !== -1) {
+          this.currentStage = -1
+        }
+      },
+      // 深度观察监听
+      deep: true
+    },
+    PhaseList: {
+      handler: function (val, oldVal) {
+        if (this.presetPhaseId > -1) {
+          this.presetStageIndex = this.getComputedPresetIndex()
+        } else {
+          this.presetStageIndex = this.presetIndex
+        }
+      },
+      // 深度观察监听
+      deep: true
+    }
+  },
+  methods: {
+    getComputedPresetIndex() {
+      let res = -1
+      for (let i = 0; i < this.PhaseList.length; i++) {
+        let stage = this.PhaseList[i]
+        for (let phase of stage) {
+          let phaseId = phase.id
+          if (phaseId === this.presetPhaseId) {
+            res = i
+            break
+          }
+        }
+        if (res > -1) {
+          res = res + 1
+          break
+        }
+      }
+      return res
+    },
+    selectLegend (value) {
+      if (this.noClick) return
+      if (this.isShowCurrentStage) {
+        return false
+      }
+      this.currentStage = value
+      this.$emit('onSelectStages', value)
+      this.clickType(this.PhaseList, value)
+    },
+    resetToDefaultThemeColor (List) {
+      for (let i = 0; i < List.length; i++) {
+        if (List[i].length) {
+          if (List[i][0].clicked) {
+            delete List[i][0].clicked
+          }
+          List[i][0].bgcolor = getTheme() === 'light' ? '#edf6ff' : '#243d59'
+        } 
+      }
+    },
+    highlightThemeColor (List, index) {
+      for (let i = 0; i < List.length; i++) {
+        if (i === index) {
+          List[i][0].clicked = true
+          List[i][0].bgcolor = getTheme() === 'light' ? '#c1e0ff' : '#0082ac'
+        }
+      }
+    },
+    clickType (stagelist, value) {
+      this.resetToDefaultThemeColor(stagelist)
+      this.highlightThemeColor(stagelist, value - 1)
+    },
+    dirListSetTheme (list) {
+      let dirArr = []
+      let color = getTheme() === 'light' ? '#606266' : '#F1F3F4'
+      let pedColor = getTheme() === 'light' ? '#606266' : 'rgba(255, 255, 255, 0.6)'
+      for (let rec of list) {
+        let recd = {
+          ...rec,
+          color: color
+        }
+        dirArr.push(recd)
+        for(let i=0;i<rec.peddirection.length;i++) {
+          rec.peddirection[i].color = pedColor
+        }
+      }
+      return dirArr
+    }
+  },
+  mounted () {
+    this.resetToDefaultThemeColor(this.PhaseList)
+  }
+};
+</script>

package/src/kisscomps/components/PhaseLegend/index.js

@@ -0,0 +1,2 @@
+import PhaseLegend from './PhaseLegend.vue'
+export default PhaseLegend

package/src/kisscomps/index.js

@@ -31,6 +31,7 @@ import patternConfig from './components/patternConfig/index.vue'
 import XiaoKanBan from './components/XiaoKanBan/index.vue'
 import DirectionListConfiguration from './components/DirectionListConfiguration/index.js'
 import IntersectionDirectionSelection from './components/IntersectionDirectionSelection/index.js'
+import PhaseLegend from './components/PhaseLegend/index.js'
 import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions } from '../utils/auth.js'
 import componentsGlobalParam from '../store/modules/globalParam'
 
@@ -71,7 +72,8 @@ const components = {
   XiaoKanBan,
   PhaseDirectionSelect,
   DirectionListConfiguration,
-  IntersectionDirectionSelection
+  IntersectionDirectionSelection,
+  PhaseLegend
 }
 
 const language = {

package/src/router/index.js

@@ -7,7 +7,7 @@ export default new Router({
     {
       path: '/',
       component: (resolve) => {
-        require(['@/views/overView'], resolve)
+        require(['@/views/intersection'], resolve)
       }
     },
     {

package/src/utils/RingDataModel.js

@@ -197,6 +197,7 @@ export default class RingDataModel {
     for (let stage of stages) {
       let tempList = []
       let directionList = []
+      let currPhaseid = ''
       let stageControType = 0
       let peddirections = []
       for (let stg of stage) {
@@ -207,6 +208,9 @@ export default class RingDataModel {
         if (!currPhase) return
         if (currPhase !== undefined && phaseMode[0].mode !== 1) {
           directionList = [...currPhase.direction, ...directionList]
+          if (datatype === 'phase') {
+            currPhaseid = stg
+          }
         }
         if (currPhase.peddirection) {
           for (let walk of sidewalkPhaseData) {
@@ -232,13 +236,20 @@ export default class RingDataModel {
         }
       }
       directionList = [...new Set(directionList)]
-      tempList = directionList.map(dir => ({
-        id: dir,
-        color: '#606266',
-        controltype: stageControType,
-        peddirection: peddirections,
-        sidewalkPhaseData: sidewalkPhaseData
-      }))
+      tempList = directionList.map(dir => {
+        let temp = {
+          id: dir,
+          phaseid: currPhaseid,
+          color: '#606266',
+          controltype: stageControType,
+          peddirection: peddirections,
+          sidewalkPhaseData: sidewalkPhaseData
+        }
+        if (datatype === 'phase') {
+          temp.phaseid = currPhaseid
+        }
+        return temp
+      })
       if (directionList.length === 0) {
         tempList = [
           {

package/src/views/intersection.vue

@@ -106,6 +106,22 @@
       <!-- <Stages :stagesList="stagesList"
               :currentStage="currentStage"
               @onSelectStages="onSelectStages"></Stages> -->
+          <div style="height: 100px;">
+            <PhaseLegend :crossStatusData="tscControlData"
+              :phaseList="phaseList"
+              showDataType="phase"
+              :noClick="true"
+              :isShowCurrentStage="false"
+              StageWidth="46px"
+              StageHeight="52px"
+              dirWidth="46px"
+              dirHeight="52px"
+              dirWidths="46px"
+              dirHeights="52px"
+              :showStyle="{top:'2PX',left:'9px'}"
+              :showStyles="{top:'0PX',left:'7px'}"
+              ></PhaseLegend>
+          </div>
 
       <!-- <h2 style="color: #fff;">渠化图</h2>
       <channelization-with-interface
@@ -133,18 +149,24 @@ import {
 } from '../utils/auth'
 import IntersectionWithInterface from '../kisscomps/components/IntersectionWithInterface'
 import ChannelizationWithInterface from '../kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface'
+import {
+  getTscPhase
+} from '../api/cross.js'
+import {
+  getTscControl
+} from '../api/control.js'
 export default {
   name: 'demo',
   data () {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblfql',
+      agentId: '12007_001',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE4NzU5ODA0Njc0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxODgwMzAwNCwiaWF0IjoxNzE4NzU5ODA0fQ.8CKosL9Yrp8h8d_op6kGHHcNXIBgNu3YhwY7JdPIKJc',
+      Token: 'eyJraWQiOiIxNzIxODAwODA0MzQxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTgwNDQwNCwiaWF0IjoxNzIxNzk3MjA0fQ.HrNlQ_mgyoHFwtyCO77W1efPcyAHH6BwgImWRXjGE-8',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -234,7 +256,9 @@ export default {
             'light': 3
           }
         ]
-      }
+      },
+      tscControlData: {},
+      phaseList: []
     }
   },
   components: {
@@ -325,6 +349,19 @@ export default {
       // this.controlName = control
       // this.modeName = mode
     },
+    getTscControlData () {
+      this.tscControlData = {}
+      getTscControl(this.agentId).then((data) => {
+        this.tscControlData = data.data.data.data
+      }).catch(error => {
+        console.log(error)
+      })
+    },
+    getCurPhaseDirection () {
+      getTscPhase(this.agentId).then(res => {
+        this.phaseList = res.data.data.data.phaseList
+      })
+    },
     registerMessage (res) {
       console.log('registerMessage:', res)
     },
@@ -363,6 +400,8 @@ export default {
         this.setDialogWidth()
       })()
     }
+    this.getTscControlData()
+    this.getCurPhaseDirection()
   },
   destroyed () {
   }

package/src/views/overView.vue

@@ -20,7 +20,7 @@ export default {
       modeName: '交警遥控',
       controlName: '步进',
       agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNzIxMzc5ODY5NTc1IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTQyMzA2OSwiaWF0IjoxNzIxMzc5ODY5fQ.gr6NbmMF0DmAiGVjJkj9KCnHn-cEtt7FEXT9MmkKJb8',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },

package/static/styles/phasePedSelect.scss

@@ -45,6 +45,7 @@
         background-color: $--card-background-base;
         border-radius: 5PX;
         .num {
+          color: $--color-text-primary;
           position: absolute;
           left: 5PX;
           bottom: 5PX;

package/static/styles/stages.scss

@@ -1,6 +1,6 @@
 
- //阶段图
- .intersection-stages {
+ //阶段图/相位图例
+ .intersection-stages, .intersection-phases {
   .cross-content {
     margin-top: 19PX;
     // margin-left: 7PX;