openatc-components 0.1.10 → 0.1.12

package/package.json

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

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

@@ -226,6 +226,10 @@ export default {
     controlName: {
       type: String,
       default: ''
+    },
+    stateName: {
+      type: String,
+      default: ''
     }
   },
   // computed: {
@@ -310,7 +314,6 @@ export default {
   },
   data () {
     return {
-      stateName: '',
       roadDir: 'right', // 道路行车方向，默认右行
       phaseCountdownList: [], // 相位倒计时列表
       statusData: null, // 信号机状态
@@ -554,7 +557,6 @@ export default {
         if (!res.data.success) {
           this.isLoaded = false
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
-          this.stateName = this.$t('openatccomponents.overview.offline')
           let msg = getMessageByCode(res.data.code, this.$i18n.locale)
           if (res.data.data) {
             // 子类型错误
@@ -568,7 +570,6 @@ export default {
           this.$message.error(msg)
           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

@@ -31,6 +31,7 @@
       :isShowMode="isShowMode"
       :modeName="modeName"
       :controlName="controlName"
+      :stateName="stateName"
       :devStatus="devStatus"
       :roadDirection="roadDirection" />
   </div>
@@ -95,6 +96,10 @@ export default {
     controlName: {
       type: String,
       default: ''
+    },
+    stateName: {
+      type: String,
+      default: ''
     }
   },
   watch: {

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

@@ -21,6 +21,7 @@
         :roadDirection="roadDirection"
         :modeName="modeName !== '' ? modeName : controlData.mode"
         :controlName="controlName !== '' ? controlName : controlData.control"
+        :stateName="stateName"
         :isShowMode="isShowMode"
         :isShowState="isShowState"
         :isShowInterval="isShowInterval"
@@ -41,6 +42,7 @@ export default {
   },
   data () {
     return {
+      stateName: this.$t('openatccomponents.overview.offline'),
       controlData: {},
       boxVisible: false,
       dialogWidth: '100%',
@@ -244,6 +246,12 @@ export default {
           _this.agentName = res.data.data.name
         }
         _this.platform = res.data.data.platform
+        let state = res.data.data.state
+        if (state === 'UP') {
+          _this.stateName = _this.$t('openatccomponents.overview.online')
+        } else {
+          _this.stateName = _this.$t('openatccomponents.overview.offline')
+        }
         _this.$refs.intersectionMap.resetCrossDiagram()
         _this.registerMessage() // 注册消息
         _this.$emit('queryDevice', res)

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

@@ -27,6 +27,7 @@
           <intersection-base-map
             ref="intersectionMap"
             :modeName="modeName"
+            :stateName="stateName"
             :controlName="controlName"
             :isShowState="isShowState"
             :isShowMode="isShowMode"
@@ -138,6 +139,7 @@ export default {
   },
   data () {
     return {
+      stateName: this.$t('openatccomponents.overview.offline'),
       curBodyWidth: 1920,
       graphicMode: false,
       FuncSort: 'allFunc',
@@ -643,6 +645,12 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        let state = res.data.data.state
+        if (state === 'UP') {
+          this.stateName = this.$t('openatccomponents.overview.online')
+        } else {
+          this.stateName = this.$t('openatccomponents.overview.offline')
+        }
         // let func = 'allFunc'
         // if (this.platform === 'OpenATC') {
         //   func = 'allFunc'

package/src/views/intersection.vue

@@ -94,7 +94,8 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '12345-176',
+      agentId: '10002-739',
+      // agentId: '0351-01',
       reqUrl: 'http://192.168.13.105:11003/openatc',
       Token: 'eyJraWQiOiIxNjYwMjgzMzQwMzM4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0NjY4MzM0MCwiaWF0IjoxNjYwMjgzMzQwfQ.xmgkrjwcdwT_miC3krjqL27Tv4txJ9FQuDEKlfWdtzU',
       // agentId: '30003-352',

package/static/styles/common.scss

@@ -7,8 +7,8 @@
 
  // 全局滚动条样式
  ::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
+  width: 12PX;
+  height: 12PX;
 }
 ::-webkit-scrollbar-thumb {
   // 滚动条的滑块