openatc-components 0.3.70 → 0.3.71

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

@@ -155,6 +155,13 @@ export default {
           this.reset = true
         }
       }
+    },
+    agentId: {
+      handler: function (val1, val2) {
+        if (val1 !== val2) {
+          this.resetCrossDiagram()
+        }
+      }
     }
   },
   created () {
@@ -164,9 +171,7 @@ export default {
   },
   mounted () {
     this.getParentSize()
-    if (this.isVipRoute || this.channelType) {
-      this.reset = true
-    }
+    this.reset = true
   },
   updated () {
   },

package/package/kisscomps/components/OverviewComponent/index.vue

@@ -10,16 +10,23 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="container-main" v-if="resetcomponent">
+  <div class="container-main">
     <div :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
       <div class="tuxingjiemian" v-show="curHomePage === 'Graphical' || curHomePage === 'Channelization'" :class="{'minifont': curBodyWidth <= 650}">
         <div class="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
           <intersection-base-map
+            v-if="curHomePage === 'Graphical'"
             ref="intersectionMap"
             :stateName="stateName"
             :crossStatusData="crossStatusData"
             :agentId="agentId"
             :roadDirection="roadDirection" />
+          <channelization
+            v-if="curHomePage === 'Channelization'"
+             ref="channelization"
+            :AgentId="agentId"
+            :crossStatusData="crossStatusData"
+            :detectorStatusData="detectorStatusData" />
           <div class="pattern-status" v-if="!graphicMode && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
             <div class="pattern-name cross-mess">{{$t('openatccomponents.overviewcomponent.patternstate')}}</div>
             <div class="pattern-message">({{$t('openatccomponents.overviewcomponent.cycle')}}: {{controlData.cycle}}  {{$t('openatccomponents.overviewcomponent.patternoffset')}}: {{controlData.patternoffset}} {{$t('openatccomponents.overviewcomponent.coordinationtime')}}: {{controlData.offset}})</div>
@@ -104,7 +111,6 @@
 </template>
 
 <script>
-import { mapState, mapGetters } from 'vuex'
 import { getTscControl, queryDevice } from '../../../api/control.js'
 import { registerMessage, uploadSingleTscParam } from '../../../api/param'
 import { getIntersectionInfo } from '../../../api/template'
@@ -112,6 +118,7 @@ import { setIframdevid } from '../../../utils/auth.js'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
+import { getChannelizatonChart } from '../../../api/cross'
 export default {
   name: 'overview-component',
   components: {
@@ -120,6 +127,14 @@ export default {
     AgentId: {
       type: String,
       default: '0'
+    },
+    roadDirection: {
+      type: String,
+      default: 'right'
+    },
+    isfromatc: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -167,7 +182,8 @@ export default {
       commonHeight: undefined, // 左右侧面板的高度值
       graphicMode: false,
       resetcomponent: true,
-      curHomePage: 'Graphical'
+      curHomePage: 'Graphical',
+      FuncSort: 'allFunc'
     }
   },
   computed: {
@@ -178,18 +194,7 @@ export default {
       return this.allPatternList.filter(item => {
         return item.id === this.controlData.patternid
       })[0]
-    },
-    ...mapGetters([
-      'isfromatc'
-    ]),
-    ...mapState({
-      curBodyWidth: state => state.globalParam.curBodyWidth,
-      curBodyHeight: state => state.globalParam.curBodyHeight,
-      FuncSort: state => state.globalParam.FuncSort,
-      // curHomePage: state => state.globalParam.curHomePage,
-      roadDirection: state => state.globalParam.roadDirection,
-      curOpenatcAgentid: state => state.globalParam.curOpenatcAgentid
-    })
+    }
   },
   watch: {
     AgentId: {
@@ -197,9 +202,11 @@ export default {
         this.agentId = val
         this.resetcomponent = false
         this.$nextTick(() => {
-          setTimeout(() => {
-            this.resetcomponent = true
-          }, 100)
+          this.resetcomponent = true
+          this.getChannelizatonChart()
+          this.getPlatform()
+          this.getPhase()
+          this.initData()
         })
       },
       // 深度观察监听
@@ -211,14 +218,6 @@ export default {
       },
       // 深度观察监听
       deep: true
-    },
-    curOpenatcAgentid: {
-      handler: function (val) {
-        // 平台设备切换时行人横道切换
-        this.getPhase()
-        this.initData()
-      },
-      deep: true
     }
   },
   created () {
@@ -236,9 +235,12 @@ export default {
     if (this.$route.query.shrink) {
       this.shrink = Number(this.$route.query.shrink)
     }
-    this.$nextTick(() => {
-      this.$refs.intersectionMap.resetCrossDiagram()
-    })
+    this.getChannelizatonChart()
+    if (this.curHomePage === 'Graphical') {
+      this.$nextTick(() => {
+        this.$refs.intersectionMap.resetCrossDiagram()
+      })
+    }
   },
   updated () {
     if (this.$refs.tuxingLeft.offsetHeight !== this.commonHeight) {
@@ -300,6 +302,32 @@ export default {
         // }
       })
     },
+    getChannelizatonChart () {
+      let _this = this
+      getChannelizatonChart(this.AgentId).then(data => {
+        if (!data.data.success) {
+          // let parrenterror = getMessageByCode(data.data.code, _this.$i18n.locale)
+          // if (data.data.data) {
+          //   // 子类型错误
+          //   let childErrorCode = data.data.data.errorCode
+          //   if (childErrorCode) {
+          //     let childerror = getMessageByCode(data.data.data.errorCode, _this.$i18n.locale)
+          //     _this.$message.error(parrenterror + ',' + childerror)
+          //   }
+          // } else {
+          //   _this.$message.error(parrenterror)
+          // }
+          _this.curHomePage = 'Graphical'
+          return
+        }
+        // 路口已设置渠化，则总览默认显示渠化路口，未设置显示模版路口
+        if (_this.isfromatc === true && data.data.success === true && JSON.stringify(data.data.data) !== '{}') {
+          _this.curHomePage = 'Channelization'
+        } else {
+          _this.curHomePage = 'Graphical'
+        }
+      })
+    },
     getPedPhasePos () {
       // 行人相位信息
       this.sidewalkPhaseData = []
@@ -442,7 +470,7 @@ export default {
         let TscData = JSON.parse(JSON.stringify(data.data.data.data))
         // this.handleStageData(TscData) // 处理阶段（驻留）stage数据
         this.controlData = this.handleGetData(TscData)
-        console.log(this.controlData)
+        console.log('this.controlData', this.controlData)
         this.checkStage(this.controlData)
       }).catch(error => {
         // this.$message.error(error)
@@ -744,20 +772,9 @@ export default {
         if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
           func = 'basicFunc'
         }
-        this.$store.dispatch('SaveFunctionLevel', func)
+        this.FuncSort = func
       })
     }
-    // getChannelizationSetting (ChannelizationData) {
-    //   // 路口已设置渠化，则总览默认显示渠化路口，未设置显示模版路口
-    //   if (this.isfromatc === true) {
-    //     this.$store.dispatch('SetShowHomePage', 'Graphical')
-    //     this.$store.dispatch('isSetChannelization', false)
-    //     if (ChannelizationData.data.success === true && JSON.stringify(ChannelizationData.data.data) !== '{}') {
-    //       this.$store.dispatch('SetShowHomePage', 'Channelization')
-    //       this.$store.dispatch('isSetChannelization', true)
-    //     }
-    //   }
-    // },
   },
   destroyed () {
     this.isResend = false

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

@@ -19,6 +19,7 @@
           :leave-active-class="toPage === 1 ? 'animated fadeOutRight' : 'animated fadeOutLeft' ">
             <div class="new" style="position: absolute;width: 100%;height:100%;"  v-show="(isOperation && !isClosePhase)">
               <ManualControlModalNew
+              v-if="resetcomponent"
               ref="ManualControlModalNew"
               :residentControlList="residentControlList"
               :specialControlList="specialControlList"
@@ -81,6 +82,7 @@
         <div v-else style="height: 100%;">
           <div class="new" style="position: absolute;width: 100%;height:100%;"  v-show="(isOperation && !isClosePhase)">
             <ManualControlModalNew
+            v-if="resetcomponent"
             ref="ManualControlModalNew"
             :residentControlList="residentControlList"
             :specialControlList="specialControlList"
@@ -460,13 +462,17 @@ export default {
       patternAll: [],
       patternSelect: [], // 所有方案id
       specialPage: '', // 哪一个特殊控制页面
-      nextcycleefficcontrol: [5, 6, 9, 10, 12, 19] // 下周期生效的控制方式
+      nextcycleefficcontrol: [5, 6, 9, 10, 12, 19], // 下周期生效的控制方式
+      resetcomponent: false
     }
   },
   watch: {
     agentId: {
-      handler: function (val) {
-        this.getIntersectionInfo(val)
+      handler: function (val1, val2) {
+        if (val1 !== val2) {
+          this.resetComponent()
+        }
+        this.getIntersectionInfo(val1)
       },
       // 深度观察监听
       deep: true
@@ -503,18 +509,29 @@ export default {
     this.setHost(this.reqUrl)
     this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
     this.CrossDiagramMgr = new CrossDiagramMgr()
-    this.getIntersectionInfo(this.agentId)
   },
   async mounted () {
-    if (this.realtimeStatusModalvisible === false) {
-      this.changeStatus()
-    }
-    this.setPropsToken(this.Token)
-    // await this.getPhase()
-    this.getFault()
-    this.initData()
+    this.resetcomponent = true
+    this.init()
   },
   methods: {
+    resetComponent () {
+      this.resetcomponent = false
+      this.$nextTick(() => {
+        this.resetcomponent = true
+        this.init()
+      })
+    },
+    init () {
+      this.getIntersectionInfo(this.agentId)
+      if (this.realtimeStatusModalvisible === false) {
+        this.changeStatus()
+      }
+      this.setPropsToken(this.Token)
+      // await this.getPhase()
+      this.getFault()
+      this.initData()
+    },
     setHost (host) {
       // 获取组件外传入的token，便于独立组件调用接口
       if (host && host !== '') {

package/package/kisscomps/components/SchemeConfig/realtimeStatusModal/index.vue

@@ -160,7 +160,8 @@
     <div class="cross-content">
       <div class="cross-name">{{$t('openatccomponents.overview.currentstage')}}:</div>
       <div>
-      <Stages :crossStatusData="crossStatusData"
+      <Stages v-if="resetcomponent"
+              :crossStatusData="crossStatusData"
               :phaseList="phaseList"
               @onSelectStages="onSelectStages"></Stages>
       </div>
@@ -260,8 +261,27 @@ export default {
     }
 
   },
+  watch: {
+    agentId: {
+      handler: function (val1, val2) {
+        this.$nextTick(() => {
+          setTimeout(() => {
+          if (val1 !== val2) {
+        this.resetcomponent = false
+        this.$nextTick(() => {
+          this.resetcomponent = true
+        })
+        }
+        }, 100)
+        })
+      },
+      // 深度观察监听
+      deep: true
+    }
+  },
   data () {
     return {
+      resetcomponent: true
     }
   },
   methods: {