openatc-components 0.0.67 → 0.0.69

package/package.json

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

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 40 0 327px'}">
+<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/SchemeConfig/manualControlModal/index.vue

@@ -23,7 +23,7 @@
                 :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"
@@ -174,14 +174,19 @@ export default {
   },
   methods: {
     changeStage (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
+      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')

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"
@@ -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'

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

@@ -249,7 +249,7 @@
     // width: 50%;
   }
   .el-input-number--mini {
-    width: 180px;
+    width: 44%;
   }
   .el-input-number {
     // width: 100%;