openatc-components 0.0.66 → 0.0.70

package/src/kisscomps/components/StageBord/StageBord.vue

@@ -3,7 +3,7 @@
   <div class="common-board-column">
     <div class="common-board-column-header" style="position:relative">
       <span>{{$t('openatccomponents.pattern.stage')+(subIndex+1)}}</span>
-      <span v-if="contrloType" style="position: absolute;right: 0;">
+      <span v-if="this.contrloType === 'stage'" style="position: absolute;right: 0;">
         <el-button type="primary" @click="deleteStage(subIndex)" icon="el-icon-close"></el-button>
       </span>
     </div>
@@ -17,7 +17,7 @@
           </el-col>
           <el-col :span="12">
             <el-input-number
-              v-if="contrloType"
+              v-if="this.contrloType === 'stage'"
               :controls="false"
               size="small"
               :disabled="true"
@@ -25,7 +25,7 @@
               v-model.number="stage.stageSplit">
             </el-input-number>
             <el-input-number
-              v-if="!contrloType"
+              v-if="this.contrloType === 'ring' || !this.contrloType"
               :controls="false"
               size="small"
               v-model.number="stage.split"
@@ -40,7 +40,7 @@
             {{this.$t('openatccomponents.pattern.phase')}}
           </el-col>
           <el-col :span="12">
-            <el-select v-if="contrloType" v-model="stage.phases" multiple :placeholder="$t('openatccomponents.common.select')">
+            <el-select v-if="this.contrloType === 'stage'" v-model="stage.stages" multiple :placeholder="$t('openatccomponents.common.select')">
               <el-option
                 v-for="item in coordphaseOption"
                 :key="item.value"
@@ -49,7 +49,7 @@
               </el-option>
             </el-select>
             <el-input
-              v-if="!contrloType"
+              v-if="this.contrloType === 'ring' || !this.contrloType"
               size="small"
               :value="stage.stages.join(',')"
               ref="type"
@@ -57,7 +57,7 @@
             </el-input>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="contrloType">
+        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.green')}}
           </el-col>
@@ -70,7 +70,7 @@
             </el-input-number>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="contrloType">
+        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.yellow')}}
           </el-col>
@@ -83,7 +83,7 @@
             </el-input-number>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="contrloType">
+        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.red')}}
           </el-col>
@@ -128,8 +128,7 @@ export default {
       }
     },
     contrloType: {
-      type: Boolean,
-      default: false
+      type: String
     },
     options: {
       type: Object,
@@ -184,7 +183,7 @@ export default {
     getMaxCycle (pattern) {
       let rings = pattern.stagesList
       let stageCycleList = rings.map(item => {
-        return item.stageSplit
+        return item.stageSplit ? item.stageSplit : item.split
       })
       let maxCycle = stageCycleList.reduce((a, b) => {
         return a + b

package/src/kisscomps/components/StageStatus/StageStatus.vue

@@ -41,7 +41,7 @@ export default {
       type: Array
     },
     contrloType: {
-      type: Boolean
+      type: String
     },
     localPatternList: {
       type: Array
@@ -54,7 +54,7 @@ export default {
     controlData: {
       handler: function (val, oldVal) {
         // this.handleStages() // 计算屏障高度
-        if (this.contrloType) {
+        if (this.contrloType === 'stage') {
           this.getStageLine()
         } else {
           this.getPhaseId(this.controlData)

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

@@ -26,6 +26,10 @@
         <div class="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
           <intersection-base-map
             ref="intersectionMap"
+            :modeName="modeName"
+            :controlName="controlName"
+            :isShowState="isShowState"
+            :isShowMode="isShowMode"
             :crossStatusData="crossStatusData"
             :devStatus="devStatus"
             :agentId="agentId"
@@ -51,7 +55,7 @@
             >
             </pattern-list>
             <over-lap
-            v-if="!contrloType"
+            v-if="this.contrloType === 'ring'"
             :checked="checked"
             :overlap="overlap"
             :stageList="stagesListOver"
@@ -112,6 +116,22 @@ export default {
       type: String,
       default: ''
     },
+    isShowState: {
+      type: Boolean,
+      devault: false
+    },
+    isShowMode: {
+      type: Boolean,
+      default: false
+    },
+    modeName: {
+      type: String,
+      default: ''
+    },
+    controlName: {
+      type: String,
+      default: ''
+    },
     roadDirection: {
       type: String,
       default: 'right'
@@ -125,7 +145,7 @@ export default {
       controlData: {},
       checked: false,
       overlap: [],
-      contrloType: false,
+      contrloType: '',
       narr: [],
       patternList: [],
       allPatternList: [],
@@ -213,10 +233,10 @@ export default {
     this.setHost(this.reqUrl)
     this.PhaseDataModel = new PhaseDataModel()
     this.CrossDiagramMgr = new CrossDiagramMgr()
-    if (getStageTypes('contrloType') === 'true') {
-      this.contrloType = true
+    if (getStageTypes('isRing') === 'true') {
+      this.contrloType = 'stage'
     } else {
-      this.contrloType = false
+      this.contrloType = 'ring'
     }
     this.globalParamModel = this.$store.getters.globalParamModel
     if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
@@ -264,6 +284,7 @@ export default {
         // this.globalParamModel.setGlobalParams(res.data.data.param)
         this.allPatternList = res.data.data.param.patternList
         this.overlap = res.data.data.param.overlaplList
+        this.contrloType = this.allPatternList[0].contrloType
         this.phaseList = res.data.data.param.phaseList
         this.patternList = res.data.data.param.patternList.filter(item => {
           return item.id === id

package/src/kisscomps/components/patternList/patternList.vue

@@ -493,7 +493,7 @@ export default {
   },
   props: {
     contrloType: {
-      type: Boolean
+      type: String
     },
     localPatternList: {
       type: Array

package/src/utils/auth.js

@@ -38,7 +38,7 @@ export function removeToken () {
 }
 
 export function getStageTypes () {
-  let ret = localStorage.getStorage('contrloType')
+  let ret = localStorage.getStorage('isRing')
   if (ret === undefined || ret === null) {
     return ''
   }

package/src/views/overView.vue

@@ -3,6 +3,10 @@
     <overview
         :AgentId="agentId"
         :reqUrl="reqUrl"
+        :modeName="modeName"
+        :controlName="controlName"
+        :isShowState="isShowState"
+        :isShowMode="isShowMode"
         :Token="Token"></overview>
   </div>
 </template>
@@ -11,6 +15,10 @@
 export default {
   data () {
     return {
+      isShowState: true,
+      isShowMode: true,
+      modeName: '交警遥控',
+      controlName: '步进',
       agentId: '10002-994',
       Token: 'eyJraWQiOiIxNjUwNzMxMTY2NTQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNzEzMTE2NiwiaWF0IjoxNjUwNzMxMTY2fQ.qjp7-LyJdSLr29Jm0T8KAQIoPA8ldkpTg83vVvorg_s',
       reqUrl: 'http://192.168.13.105:11003/openatc'

package/static/styles/intersection.scss

@@ -159,4 +159,13 @@
     color: $--color-text-primary;
     font-size:30px;
  }
+ .stateText {
+    position:absolute;
+    top:12%;
+    left:50%;
+    width:25%;
+    height:50px;
+    color: $--color-text-primary;
+    font-size:30px;
+ }
 }

package/static/styles/schemeconfig.scss

@@ -216,7 +216,7 @@
     }
   }
   .col-inner{
-    width: 100% !important;
+    // width: 100% !important;
   }
   .model-label {
     margin-top: 14px;
@@ -243,13 +243,16 @@
     padding: 19px 30px;
   }
   .el-select {
-    width: 75px;
+    // width: 75px;
   }
   .el-input {
-    width: 50%;
+    // width: 50%;
+  }
+  .el-input-number--mini {
+    width: 44%;
   }
   .el-input-number {
-    width: 100%;
+    // width: 100%;
     .el-input__inner {
       text-align: left;
     }
@@ -297,7 +300,7 @@
     margin-top: 30px;
   }
   .el-input--mini{
-    width: 85px;
+    width: 90%;
   }
   .footer {
     float: right;
@@ -318,7 +321,7 @@
     padding: 19px 30px;
   }
   .el-select {
-    width: 85px;
+    width: 90%;
   }
   .el-input-number {
     width: 100%;