openatc-components 0.2.42 → 0.2.44

package/package.json

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

package/src/i18n/language/en.js

@@ -109,7 +109,7 @@ const en = {
       'protocoltype': 'Protocol',
       'signalID': 'Intersection ID',
       'flow': 'Average lane flow (h)low',
-      'saturationflow': 'Planned lane saturation Flow (h)',
+      'saturationflow': 'Planned lane saturation Flow(h)',
       'typeflow-split-opt': 'Flow Split Op',
       'maxFlow': 'The average lane flow is too large. Is it further optimized?',
       'typecycle-opt': 'Cycle Opt',

package/src/i18n/language/zh.js

@@ -105,7 +105,7 @@ const zh = {
     'overview': {
       'crossinfo': '路口信息',
       'flow': '车道平均流量(h)',
-      'saturationflow': '车道规划饱和流量（h）',
+      'saturationflow': '车道规划饱和流量(h)',
       'typeflow-split-opt': '饱和绿信比优化',
       'maxFlow': '车道平均流量过大，是否继续优化？',
       'typecycle-opt': '周期优化',

package/src/kisscomps/components/ExpendConfig/ExpendConfig.vue

@@ -5,14 +5,14 @@
       {{headerText}}
     </div>
     <div class="common-board-table-header">
-      <el-row :gutter="13">
-        <el-col :span="3">{{this.$t('openatccomponents.pattern.phase')}}
+      <el-row :gutter="10">
+        <el-col :span="4">{{this.$t('openatccomponents.pattern.phase')}}
         </el-col>
-        <el-col :span="11">{{this.$t('openatccomponents.pattern.property')}}
+        <el-col :span="8">{{this.$t('openatccomponents.pattern.property')}}
         </el-col>
-        <el-col :span="5">{{this.$t('openatccomponents.pattern.delaystart')}}
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.delaystart')}}
         </el-col>
-        <el-col :span="5">{{this.$t('openatccomponents.pattern.advanceend')}}
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.advanceend')}}
         </el-col>
       </el-row>
     </div>
@@ -21,8 +21,8 @@
       :list="list"
       :options="options">
       <div class="common-board-item" v-for="element in list" :key="element.id">
-        <el-row :gutter="13" >
-          <el-col :span="3">
+        <el-row :gutter="10" >
+          <el-col :span="4">
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
@@ -30,7 +30,7 @@
               </div>
             </el-tooltip>
         </el-col>
-          <el-col :span="11">
+          <el-col :span="8">
             <el-select v-model="element.options" size="small" multiple collapse-tags :placeholder="$t('openatccomponents.common.select')">
               <el-option
                 v-for="item in coordphaseOption"
@@ -40,10 +40,10 @@
               </el-option>
             </el-select>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.delaystart" ref="type"></el-input-number>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.advanceend" ref="type"></el-input-number>
           </el-col>
         </el-row>

package/src/kisscomps/components/KanBan/kanban.vue

@@ -5,11 +5,11 @@
     </div>
     <div class="common-board-table-header">
       <el-row :gutter="13">
-        <el-col :span="6">{{this.$t('openatccomponents.overview.phase')}}
+        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
         </el-col>
-        <el-col :span="9">{{this.$t('openatccomponents.overview.phasesplit')}}
+        <el-col :span="10">{{this.$t('openatccomponents.overview.phasesplit')}}
         </el-col>
-        <el-col :span="9">{{this.$t('openatccomponents.detector.mode')}}
+        <el-col :span="10">{{this.$t('openatccomponents.detector.mode')}}
         </el-col>
       </el-row>
     </div>
@@ -19,7 +19,7 @@
       :options="options">
       <div class="common-board-item" v-for="element in list" :key="element.id">
         <el-row :gutter="13">
-          <el-col :span="6">
+          <el-col :span="4">
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
@@ -27,10 +27,10 @@
               </div>
             </el-tooltip>
         </el-col>
-        <el-col :span="9">
+        <el-col :span="10">
           <el-input-number :controls="false" class="col-content" size="small" :min="element.minSplit" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
         </el-col>
-        <el-col :span="9">
+        <el-col :span="10">
           <el-select v-model="element.mode" class="col-content"  size="small" @change="doChange(element)" :placeholder="$t('openatccomponents.common.select')">
             <el-option
               v-for="item in modeOption"

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

@@ -557,7 +557,7 @@ export default {
       this.changeStatus()
     }
     this.setPropsToken(this.Token)
-    // await this.getPhase()
+    await this.getPhase()
     this.getFault()
     this.initData()
   },

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

@@ -98,7 +98,7 @@ export default {
       type: Number,
       default: 1
     },
-    StageWidth: {
+    StageWidth: { // 图的大小样式
       type: String,
       default: '70px'
     },
@@ -122,23 +122,26 @@ export default {
       type: String,
       default: '65PX'
     },
-    showStyle: {
+    showStyle: { // 图内部方向的位置
       type: Object,
       default: () => ({
         top:'7PX',
         left:'13px'
       })
     },
-    showStyles: {
+    showStyles: { // 图内部人行道的位置
       type: Object,
       default: () => ({
         top:'5PX',
         left:'12px'
       })
     },
-    noClick: {
+    noClick: { // 图是否可以点击
       type: Boolean,
       default: false
+    },
+    showDataType: { // 图展示的数据类型：默认按阶段展示，如果传phase则按相位维度展示
+      type: String
     }
   },
   data () {
@@ -162,7 +165,11 @@ export default {
       let list = []
       if (this.crossStatusData && this.crossStatusData.stages && this.phaseList && this.phaseList.length > 0) {
         let ringDataModel = new RingDataModel(this.crossStatusData, this.phaseList)
-        list = ringDataModel.getStageData()
+        if (this.showDataType === 'phase') {
+          list = ringDataModel.getStageData('phase')
+        } else {
+          list = ringDataModel.getStageData()
+        }
         if (this.isShowCurrentStage) {
           this.currentStage = this.crossStatusData.current_stage
         }

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/src/utils/RingDataModel.js

@@ -181,12 +181,19 @@ export default class RingDataModel {
     }
     return stagesTemp
   }
-  getStageData () {
+  getStageData (datatype) {
     let data = this.crossStatusData
     let stagesTemp = []
     let busPhaseData = this.getBusPos()
     let sidewalkPhaseData = this.getPedPhasePos()
-    let stages = data.stages
+    let stages
+    if (datatype === 'phase') {
+      // 如果需要按相位展示，datatype传'phase'
+      stages = data.phase.map(ele => [ele.id])
+    } else {
+      // 默认按阶段数据处理
+      stages = data.stages
+    }
     for (let stage of stages) {
       let tempList = []
       let directionList = []

package/static/styles/commonkanban.scss

@@ -1,11 +1,19 @@
 // 公共面板组件通用样式
 .common-board-column {
-  min-width: 180PX;
+  min-width: 260PX;
+  max-width: 380PX;
   min-height: 100PX;
-  max-width: 350PX;
   height: auto;
   overflow: hidden;
   // background: #f0f0f0;
+  border-radius: 3PX;
+  border: 1PX solid $--border-color-base;
+  // min-width: 180PX;
+  // min-height: 100PX;
+  // max-width: 350PX;
+  // height: auto;
+  // overflow: hidden;
+  // background: #f0f0f0;
   // border: 1PX solid $--border-color-base;
 .common-phase-description {
   position: relative;
@@ -14,7 +22,27 @@
   height: 40PX;
 }
 
-
+// .board-column-header {
+//   height: 50PX;
+//   line-height: 50PX;
+//   overflow: hidden;
+//   padding: 0 10PX;
+//   text-align: center;
+//   background: $--color-primary;
+//   color: #FFFFFF;
+//   border-radius: 3PX 3PX 0 0;
+// }
+// .board-table-header {
+//   height: 30PX;
+//   line-height: 30PX;
+//   overflow: hidden;
+//   text-align: center;
+//   padding: 0 6PX;
+//   margin-bottom: -20PX;
+//   font-size: 12PX;
+//   color: $--color-info;
+//   background-color: $--color-black;
+// }
 .common-board-column-header {
   line-height: 40PX;
   overflow: hidden;
@@ -24,15 +52,24 @@
   height: 40PX;
 }
 .common-board-table-header {
-  height: 42PX;
+  height: 30PX;
+  line-height: 30PX;
   overflow: hidden;
   text-align: center;
-  margin-bottom: -12PX;
-  font-size: 14PX;
+  padding: 0 6PX;
+  margin-bottom: -20PX;
+  font-size: 12PX;
   color: $--color-info;
   background-color: $--color-black;
-  border: 20PX solid transparent;
-  border-bottom-width: 0PX;
+  // height: 42PX;
+  // overflow: hidden;
+  // text-align: center;
+  // margin-bottom: -12PX;
+  // font-size: 14PX;
+  // color: $--color-info;
+  // background-color: $--color-black;
+  // border: 20PX solid transparent;
+  // border-bottom-width: 0PX;
   .common-titlecolumn {
     float: left;
     text-align: left;
@@ -60,9 +97,30 @@
   flex-direction: column;
   align-items: center;
   background-color: $--color-black;
-  border-width: 20PX;
-  border-top-width: 16PX;
-  border-bottom-width: 15PX;
+
+  // .board-item {
+    // cursor: pointer;
+    // width: 100%;
+    // height: 48PX;
+    // margin: 5PX 0;
+    // // background-color: rgba(31,46,46,0.9);
+    // text-align: left;
+    // line-height: 40PX;
+    // padding: 1PX 1PX;
+    // box-sizing: border-box;
+  // }
+  // height: auto;
+  // overflow: hidden;
+  // border: 10PX solid transparent;
+  // min-height: 60PX;
+  // display: flex;
+  // justify-content: flex-start;
+  // flex-direction: column;
+  // align-items: center;
+  // background-color: $--color-black;
+  // border-width: 20PX;
+  // border-top-width: 16PX;
+  // border-bottom-width: 15PX;
   .common-contentcolumn {
     float: left;
   }
@@ -82,10 +140,19 @@
   .common-board-item {
     cursor: pointer;
     width: 100%;
-    height: 40PX;
-    margin-top: 10PX;
+    height: 48PX;
+    margin: 5PX 0;
+    // background-color: rgba(31,46,46,0.9);
     text-align: left;
+    line-height: 40PX;
+    padding: 1PX 1PX;
     box-sizing: border-box;
+    // cursor: pointer;
+    // width: 100%;
+    // height: 40PX;
+    // margin-top: 10PX;
+    // text-align: left;
+    // box-sizing: border-box;
     .index{
       color: $--color-text-primary;
       font-size: 14PX;

package/static/styles/schemeconfig.scss

@@ -392,6 +392,7 @@
     flex-wrap: wrap;
   }
   .optimizetype {
+    font-size: 14PX;
     color: $--color-text-primary;
   }
   // .todo {