openatc-components 0.0.57 → 0.0.62

package/package.json

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

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

@@ -54,7 +54,7 @@ export default {
   props: {
     reqUrl: {
       type: String,
-      default: 'http://192.168.13.105:11003/openatc'
+      default: ''
     },
     AgentId: {
       type: String,

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

@@ -116,7 +116,7 @@ import { getMessageByCode } from '../../../utils/responseMessage'
 import { GetAllFaultRange } from '../../../api/fault'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
-import { setToken } from '../../../utils/auth.js'
+import { setToken, setHost } from '../../../utils/auth.js'
 import RingDataModel from '../../../utils/RingDataModel.js'
 import { getIntersectionInfo } from '../../../api/template'
 export default {
@@ -129,6 +129,10 @@ export default {
     TentativePlanControlModal
   },
   props: {
+    reqUrl: {
+      type: String,
+      default: ''
+    },
     responseTime: {
       type: Number,
       default: 0
@@ -327,6 +331,7 @@ export default {
     }
   },
   created () {
+    this.setHost(this.reqUrl)
     this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
     this.CrossDiagramMgr = new CrossDiagramMgr()
     if (this.realtimeStatusModalvisible === false) {
@@ -342,6 +347,12 @@ export default {
     this.realtimeStages()
   },
   methods: {
+    setHost (host) {
+      // 获取组件外传入的token，便于独立组件调用接口
+      if (host && host !== '') {
+        setHost(host)
+      }
+    },
     getIntersectionInfo (agentid) {
       // 获取路口信息
       getIntersectionInfo(agentid).then(res => {

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

@@ -36,7 +36,7 @@
            <el-form-item
                 :label="$t('openatccomponents.overview.patternoffset') + ':'"
                 prop="count">
-               <el-input v-model="offset" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input>
+               <el-input v-model="manualInfo.offset" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
@@ -186,7 +186,7 @@ export default {
       return this.patternOne.length === 0 ? this.max : (this.patternOne.length > 0 && (this.patternOne[0].cycle < this.max)) ? this.max : this.patternOne[0].cycle
     },
     offset () {
-      return this.patternOne.length === 0 ? 0 : this.patternOne[0].offset
+      return Number((this.patternOne.length === 0 || this.manualInfo.offset > 0) ? this.manualInfo.offset : this.patternOne[0].offset)
     },
     forbiddenstage () {
       return this.patternOne.length === 0 ? this.allPatternList[0].forbiddenstage : this.patternOne[0].forbiddenstage
@@ -1247,9 +1247,11 @@ export default {
       }
     },
     selectPattern () {
+      this.manualInfo.offset = 0
       this.patternOne = this.allPatternList.filter(item => {
         return item.id === this.manualInfo.tempPatternid
       })
+      this.manualInfo.offset = this.offset
       for (let rings of this.patternOne[0].rings) {
         if (rings.length === 0) continue
         for (let ring of rings) {
@@ -1403,7 +1405,7 @@ export default {
       let submitdata = {
         control: 100,
         delay: this.manualInfo.tempDelay !== undefined ? Number(this.manualInfo.tempDelay) : 0,
-        duration: this.manualInfo.duration,
+        duration: Number(this.manualInfo.duration),
         // duration: this.manualInfo.tempDuration !== undefined ? Number(this.manualInfo.tempDuration) : 0,
         data: {}
       }

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

@@ -102,7 +102,7 @@ export default {
   props: {
     reqUrl: {
       type: String,
-      default: 'http://192.168.13.105:11003/openatc'
+      default: ''
     },
     AgentId: {
       type: String,

package/src/kisscomps/index.js

@@ -19,6 +19,7 @@ import StageBord from './components/StageBord/index'
 import ExpendConfig from './components/ExpendConfig/index'
 import PatternWalkSvg from './components/PatternWalkSvg/index'
 import tentativeplancontrolmodal from './components/SchemeConfig/tentativeplancontrolmodal/index'
+import { setToken, setHost } from '../utils/auth.js'
 
 import en from '../i18n/language/en'
 import zh from '../i18n/language/zh'
@@ -53,6 +54,11 @@ const language = {
   zh
 }
 
+const func = {
+  setHost,
+  setToken
+}
+
 const requireAll = requireContext => requireContext.keys().map(requireContext)
 const install = function (Vue) {
   if (install.installed) return
@@ -79,7 +85,8 @@ if (typeof window !== 'undefined' && window.Vue) {
 const API = {
   install,
   ...components,
-  language
+  language,
+  func
 }
 
 export default API

package/src/utils/auth.js

@@ -11,8 +11,9 @@
  **/
 var localStorage = require('../lib/publicjs/localStorage')
 
+const nameSpace = 'openatc_conponents_'
 const LoginKey = 'token'
-const LoginHost = 'kisshost'
+const LoginHost = nameSpace + 'kisshost'
 const typeKey = 'type'
 const type = 'edge'
 const simuKey = 'simu_key'