openatc-components 0.0.90 → 0.0.93

package/package.json

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

package/src/kisscomps/components/Channelization/Channelization.vue

@@ -9,6 +9,7 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
+  <!--静态渠化路口，需要传入路口状态数据和检测器状态数据-->
 <template>
   <div class="show-channelization" :class="{
     'superlargeCrossImg': bodyDomWidth <= 1680 && bodyDomWidth > 1440,

package/src/kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface.vue

@@ -9,7 +9,7 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
- <!--动态路口图，只需要设备AgentId，此组件会处理方案状态接口轮询-->
+ <!--动态渠化路口图，只需要设备AgentId，此组件会处理方案状态接口轮询-->
 <template>
   <div class="channelization-with-interface">
       <Channelization
@@ -24,7 +24,7 @@ import Channelization from '../Channelization/Channelization'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import { getTscControl, queryDevice, putTscControl } from '../../../api/control.js'
 import { registerMessage, uploadSingleTscParam } from '../../../api/param'
-import { getIframdevid, setIframdevid, setToken, setHost } from '../../../utils/auth.js'
+import { setIframdevid, setToken, setHost } from '../../../utils/auth.js'
 import ControlFormat from '../../../utils/ControlFormat.js'
 import { getDetectorStatus } from '../../../api/cross'
 export default {
@@ -56,31 +56,27 @@ export default {
     Token: {
       type: String,
       default: ''
-    },
-    roadDirection: {
-      type: String,
-      default: 'right'
-    },
-    isShowInterval: {
-      type: Boolean,
-      default: true
-    },
-    isShowState: {
-      type: Boolean,
-      devault: false
-    },
-    isShowMode: {
-      type: Boolean,
-      default: false
-    },
-    modeName: {
-      type: String,
-      default: ''
-    },
-    controlName: {
-      type: String,
-      default: ''
     }
+    // isShowInterval: {
+    //   type: Boolean,
+    //   default: true
+    // },
+    // isShowState: {
+    //   type: Boolean,
+    //   devault: false
+    // },
+    // isShowMode: {
+    //   type: Boolean,
+    //   default: false
+    // },
+    // modeName: {
+    //   type: String,
+    //   default: ''
+    // },
+    // controlName: {
+    //   type: String,
+    //   default: ''
+    // }
   },
   watch: {
     AgentId: {
@@ -154,8 +150,8 @@ export default {
     },
     initData () {
       this.intervalFlag = false
-      let iframdevid = getIframdevid()
-      console.log(iframdevid)
+      // let iframdevid = getIframdevid()
+      // console.log(iframdevid)
       let startTime = new Date().getTime()
       getTscControl(this.AgentId).then((data) => {
         let endTime = new Date().getTime()

package/src/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue

@@ -9,6 +9,7 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
+<!--渠化绘制功能-->
 <template>
   <div class="custom-cross" v-if="visible">
     <ImportDialog ref="importDialog" @loadSvgString="loadSvgString"/>

package/src/kisscomps/components/DrawChannelization/drawsvg/index.vue

@@ -9,6 +9,7 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
+  <!--完整渠化编辑功能，包含导入-->
 <template>
   <div class="custom-cross-part">
     <FirstImportCrossmap v-if="pageindex === 1"
@@ -22,7 +23,7 @@
 <script>
 import FirstImportCrossmap from './firstImportCrossmap'
 import CustomDraw from './index.draw'
-import { mapState } from 'vuex'
+// import { mapState } from 'vuex'
 // import { getIframdevid } from '../../../../utils/auth.js'
 import { getChannelizatonChart } from '../../../../api/cross'
 // import { getMessageByCode } from '../../../utils/responseMessage.js'
@@ -44,22 +45,11 @@ export default {
   },
   data () {
     return {
-      pageindex: 1,
+      pageindex: 1, // 渠化编辑显示： 1 代表首次导入 2 代表已有保存的渠化图
       loadedChannelizatonData: {} // 接口返回的已保存路口渠化数据
     }
   },
-  computed: {
-    ...mapState({
-      channelizationPageIndex: state => state.globalParam.channelizationPageIndex,
-      curOpenatcAgentid: state => state.globalParam.curOpenatcAgentid
-    })
-  },
   watch: {
-    channelizationPageIndex: {
-      handler: function (index) {
-        this.pageindex = index
-      }
-    },
     AgentId: {
       handler: function (val) {
         this.getChannelizatonChart()
@@ -85,7 +75,7 @@ export default {
     getChannelizatonChart () {
       // let agentid = getIframdevid()
       let _this = this
-      _this.$store.dispatch('SetChannelizationPageIndex', false)
+      _this.pageindex = 1
       getChannelizatonChart(this.AgentId).then(data => {
         if (!data.data.success) {
           // let parrenterror = getMessageByCode(data.data.code, _this.$i18n.locale)
@@ -102,7 +92,7 @@ export default {
           return
         }
         if (JSON.stringify(data.data.data) === '{}') return
-        _this.$store.dispatch('SetChannelizationPageIndex', true)
+        _this.pageindex = 2
         _this.loadedChannelizatonData = JSON.parse(JSON.stringify(data.data.data))
       })
     },

package/src/kisscomps/index.js

@@ -22,6 +22,7 @@ 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 componentsGlobalParam from '../store/modules/globalParam'
 
 import en from '../i18n/language/en'
 import zh from '../i18n/language/zh'
@@ -63,6 +64,10 @@ const func = {
   setToken
 }
 
+const Store = {
+  componentsGlobalParam
+}
+
 const requireAll = requireContext => requireContext.keys().map(requireContext)
 const install = function (Vue) {
   if (install.installed) return
@@ -90,7 +95,8 @@ const API = {
   install,
   ...components,
   language,
-  func
+  func,
+  Store
 }
 
 export default API

package/src/store/modules/globalParam.js

@@ -38,7 +38,6 @@ const tscParam = {
 const Global = {
   state: {
     tscParam: JSON.parse(JSON.stringify(tscParam)),
-    channelizationPageIndex: 1, // 总览编辑页面显示： 1 代表首次导入 2 代表已有保存的渠化图
     associatedPhaseList: [], // 关联相位列表
     PhaseDataMgr: {} // 关联相位数据处理模型
   },
@@ -51,13 +50,6 @@ const Global = {
     },
     INIT_PHASE_DATA_MGR: (state, PhaseDataMgrClass) => {
       state.PhaseDataMgr = PhaseDataMgrClass
-    },
-    SET_CHANNELZATION_PAGE_INDEX: (state, isHasChannelSetting) => {
-      if (isHasChannelSetting) {
-        state.channelizationPageIndex = 2
-      } else {
-        state.channelizationPageIndex = 1
-      }
     }
   },
   actions: {
@@ -69,9 +61,6 @@ const Global = {
     },
     InitPhaseDataMgr ({ commit }, PhaseDataMgrClass) {
       commit('INIT_PHASE_DATA_MGR', PhaseDataMgrClass)
-    },
-    SetChannelizationPageIndex ({ commit }, isHasChannelSetting) {
-      commit('SET_CHANNELZATION_PAGE_INDEX', isHasChannelSetting)
     }
   }
 }

package/src/views/customchannelization.vue

@@ -16,7 +16,7 @@ export default {
   name: 'custom-channelization-demo',
   data () {
     return {
-      agentId: '40001-547',
+      agentId: '10003-391',
       tscParams: {}
     }
   },

package/src/views/intersection.vue

@@ -67,7 +67,12 @@
         :Token="Token"/> -->
 
       <channelization-with-interface
-        :AgentId="agentId" />
+        ref="channelization"
+        :AgentId="agentId"
+        :reqUrl="reqUrl"
+        :Token="Token"
+        @getTscControl="getTscControl"
+        @onPhaseChange="onPhaseChange"/>
       <!-- <ChannelizationWithInterface
         :AgentId="agentId" /> -->
     </div>
@@ -178,11 +183,10 @@ export default {
       console.log('onPhaseChange:')
       console.log(res, index)
       this.stagesList = res
-      // this.currentStage = index;
+      // this.currentStage = index
     },
     getTscControl (res) {
-      console.log('getTscControl:')
-      console.log(res)
+      console.log('getTscControl:', res)
       // let control = res.data.data.control
       // let mode = res.data.data.mode
       // console.log("control,mode:",control,mode)
@@ -190,12 +194,10 @@ export default {
       // this.modeName = mode
     },
     registerMessage (res) {
-      console.log('registerMessage')
-      console.log(res)
+      console.log('registerMessage:', res)
     },
     queryDevice (res) {
-      console.log('queryDevice')
-      console.log(res)
+      console.log('queryDevice:', res)
     },
     clearInterVals () {
       this.$refs.intersection.clearInterVals()

package/src/views/schemeconfig.vue

@@ -53,7 +53,7 @@ export default {
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
       agentId: '10002-994',
       Token: 'eyJraWQiOiIxNjUzMjgyODkwMDYxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTY4Mjg5MCwiaWF0IjoxNjUzMjgyODkwfQ.emqFxXlot1Zk6TGkLMDx0zIp2B8toSz17xdZI_DrXZI',
-      Token103: 'eyJraWQiOiIxNjU4MzgxMzQ4NjczIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0NDc4NDY1NSwiaWF0IjoxNjU4Mzg0NjU1fQ.5HIdmPgPCf9n5NbyVqXFq7rFA3g1IxGDw3IQeB6fJ8s',
+      Token103: 'eyJraWQiOiIxNjQ5MzM4NzA5MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTczODcwOSwiaWF0IjoxNjQ5MzM4NzA5fQ.JDSkpT1SbB61dEKvorhVdZJHKJzoQZEY5DPKHs1Imo0',
       boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
@@ -118,7 +118,7 @@ export default {
     this.setDialogWidth()
   },
   mounted () {
-    this.setPropsToken(this.Token103)
+    this.setPropsToken(this.Token)
     this.initData()
     window.onresize = () => {
       return (() => {