openatc-components 0.0.65 → 0.0.69

package/package.json

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

package/src/kisscomps/components/BoardCard/BoardCard.vue

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

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -11,6 +11,13 @@
  **/
 <template>
   <div class="crossImg">
+    <div v-show="isShowState">
+      <div class="stateText">
+        <div style="border:0px solid red;float:right;">
+          {{stateName }}
+        </div>
+      </div>
+    </div>
     <div v-show="isShowMode">
       <div class="controlText">
         <div style="border:0px solid red;float:right;">
@@ -204,6 +211,10 @@ export default {
     roadDirection: {
       type: String
     },
+    isShowState: {
+      type: Boolean,
+      devault: false
+    },
     isShowMode: {
       type: Boolean,
       devault: false
@@ -299,6 +310,7 @@ export default {
   },
   data () {
     return {
+      stateName: '',
       roadDir: 'right', // 道路行车方向，默认右行
       phaseCountdownList: [], // 相位倒计时列表
       statusData: null, // 信号机状态
@@ -541,6 +553,7 @@ export default {
       getIntersectionInfo(agentid).then(res => {
         if (!res.data.success) {
           this.isLoaded = false
+          this.stateName = this.$t('openatccomponents.overview.offline')
           let parrenterror = getMessageByCode(res.data.code, this.$i18n.locale)
           if (res.data.data) {
             // 子类型错误
@@ -554,6 +567,7 @@ export default {
           }
           return
         }
+        this.stateName = this.$t('openatccomponents.overview.online')
         this.isLoaded = true
         this.crossInfo = res.data.data.param
         this.tempType = res.data.data.type

package/src/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -27,6 +27,7 @@
       :crossStatusData="crossStatusData"
       :agentId="agentId"
       :isShowInterval="isShowInterval"
+      :isShowState="isShowState"
       :isShowMode="isShowMode"
       :modeName="modeName"
       :controlName="controlName"
@@ -79,6 +80,10 @@ export default {
       type: String,
       default: 'right'
     },
+    isShowState: {
+      type: Boolean,
+      devault: false
+    },
     isShowMode: {
       type: Boolean,
       default: false

package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -22,6 +22,7 @@
         :modeName="modeName !== '' ? modeName : controlData.mode"
         :controlName="controlName !== '' ? controlName : controlData.control"
         :isShowMode="isShowMode"
+        :isShowState="isShowState"
         :isShowInterval="isShowInterval"
         @onSelectStages="onSelectStages"/>
   </div>
@@ -72,6 +73,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isShowState: {
+      type: Boolean,
+      devault: false
+    },
     isShowMode: {
       type: Boolean,
       default: false

package/src/kisscomps/components/OverLap/OverLap.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="overLap" v-if="checked" :style="{'width':tentative?'100%':'852px','margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 0 0 377px'}">
+<div class="overLap" v-if="checked" :style="{'width':'100%','margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40px 0 327px'}">
     <div class="ring-first" v-for="(list, index1) in this.overlapDatas" :key="index1">
         <div v-for="(item,index2) in list.stageLists" :key="index2" >
             <div class="first-2">

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

@@ -12,7 +12,7 @@
 <template>
     <div class="main-patternstatus">
       <!-- 环模式true -->
-      <div v-if="!contrloType">
+      <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <div v-for="(item,index2) in list" :key="index2" :class="item.controltype===99?'direction': ''">
             <div class="first-1" :style="{'width':item.greenWidth,'height':'34px','background':'#7ccc66'}">
@@ -51,7 +51,7 @@
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
       </div>
-      <div v-if="contrloType">
+      <div v-if="this.contrloType === 'stage'">
         <div v-for="(list, index1) in stageLists" :key="index1">
           <!-- <div> -->
             <div class="first-1" :style="{'width':list.greenWidth,'height':'34px','background':'#7ccc66'}">
@@ -115,7 +115,7 @@ export default {
       type: Array
     },
     contrloType: {
-      type: Boolean
+      type: String
     },
     phaseList: {
       type: Array
@@ -175,7 +175,7 @@ export default {
   watch: {
     controlData: {
       handler: function (val, oldVal) {
-        if (this.contrloType) {
+        if (this.contrloType === 'stage') {
           this.getIndexStage()
         }
         // this.controlDatas = this.controlData
@@ -217,7 +217,7 @@ export default {
     },
     contrloType: {
       handler: function (val, oldVal) {
-        if (this.contrloType) {
+        if (this.contrloType === 'stage') {
           this.getStage()
         }
       },
@@ -226,7 +226,7 @@ export default {
     },
     stagesChange: {
       handler: function (val, oldVal) {
-        if (this.contrloType) {
+        if (this.contrloType === 'stage') {
           this.getStage()
         }
       },
@@ -261,7 +261,7 @@ export default {
     this.CrossDiagramMgr = new CrossDiagramMgr()
     this.getPedPhasePos()
     this.getBusPos()
-    if (this.contrloType) {
+    if (this.contrloType === 'stage') {
       this.getStage()
     }
   },
@@ -743,6 +743,7 @@ export default {
 <style lang="scss" scoped>
 .main-patternstatus {
   position: relative;
+  margin-bottom: 20px;
 }
 .main-patternstatus {
   position: relative;

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

@@ -357,7 +357,8 @@ export default {
         this.patternAll = res.data.data.param.patternList
         this.patternSelect = res.data.data.param.patternList.map(item => {
           return {
-            value: item.id
+            value: item.id,
+            desc: item.desc ? item.desc : '' + item.id ? item.id : ''
           }
         })
       })

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

@@ -23,11 +23,11 @@
                 :label="$t('openatccomponents.overview.controlnumber') + ':'"
                 prop="shape">
                 <!-- <el-input-number v-model="manualInfo.tempPatternid" :controls="false" size="mini" :max="65535" :min="0" :precision="0" :step="1" :placeholder="$t('openatccomponents.common.input')"></el-input-number> -->
-                <el-select v-model="manualInfo.tempPatternid" @change="changeStage" class="col-inner"  size="small" :placeholder="$t('openatccomponents.common.select')">
+                <el-select v-model="manualInfo.tempPatternid" clearable @change="changeStage" class="col-inner"  size="small" :placeholder="$t('openatccomponents.common.select')">
                   <el-option
                     v-for="item in patternSelect"
                     :key="item.value"
-                    :value="item.value">
+                    :value="item.desc">
                   </el-option>
                 </el-select>
             </el-form-item>
@@ -174,13 +174,19 @@ export default {
   },
   methods: {
     changeStage (value) {
-      this.manualsStage = {}
-      this.manuals = true
-      let stages = []
-      stages = this.patternAll.filter(item => {
-        return item.id === value
-      })[0].stages
-      this.manualsStage.stages = stages
+      if (value) {
+        this.manualsStage = {}
+        this.manuals = true
+        let stages = []
+        let secletIds = isNaN(parseInt(value)) ? Number(value.replace(/[^0-9]/ig, '')) : value
+        stages = this.patternAll.filter(item => {
+          return item.id === secletIds
+        })[0].stages
+        this.manualsStage.stages = stages
+      } else {
+        this.manuals = false
+        this.realtimeStage = JSON.parse(JSON.stringify(this.crossStatusData))
+      }
     },
     handleClose () {
       this.$emit('closeManualModal')