openatc-components 0.2.31 → 0.2.33

package/package.json

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

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

@@ -60,7 +60,7 @@
         </div>
         <div class="stage-label">{{$t('openatccomponents.overview.stage')}}:</div>
         <div style="width: 100%; height: auto;overflow: hidden;" v-if="isHasPermission('configer:manual:dwell')">
-          <Stages :crossStatusData="manuals?manualsStage:realtimeStage"
+          <Stages :crossStatusData="crossStatusData"
                   :phaseList="phaseList"
                   :preselectStages="preselectStages"
                   :preselectModel="preselectModel"

package/src/kisscomps/components/patternConfig/pattern/patternTable.vue

@@ -77,6 +77,13 @@
         <template slot-scope="scope">
           <div class="pattern-figure">
             <pattern-list
+              :patternStatusList="scope.row.rings"
+              :cycles="scope.row.cycle"
+              :phaseList="scope.row.currPhase"
+              :contrloType="getControlType(scope.row)"
+            >
+            </pattern-list>
+            <!-- <pattern-list
               v-if="getControlType(scope.row) === 'ring'"
               :patternStatusList="scope.row.rings"
               :cycles="scope.row.cycle"
@@ -98,7 +105,7 @@
               :phaseList="scope.row.currPhase"
               :agentId="scope.row.agentid"
               :showBarrier="false">
-            </pattern-list>
+            </pattern-list> -->
           </div>
          </template>
       </el-table-column>

package/src/views/schemeconfig.vue

@@ -20,12 +20,12 @@
       :close-on-click-modal="false"
       @close="oncancle"
       append-to-body>
-      <!-- <scheme-config
-        :agentId="agentId"
-        :statusData="crossStatusData"
-        :realtimeStatusModalvisible="false"
-        @patternCommitCallback="patternCommitCallback"/> -->
       <scheme-config
+            ref="rightpanel"
+            :agentId="agentId"
+            :statusData="crossStatusData"
+            :phaseList="phaseList2"/>
+      <!-- <scheme-config
         ref="rightpanel"
         :agentId="agentId"
         :lockPhaseBtnName="lockPhaseBtnName"
@@ -33,8 +33,7 @@
         :phaseList="phaseList"
         :realtimeStatusModalvisible="true"
         roadDirection="left"
-         />
-         <!-- funcSort="basicFunc" -->
+         /> -->
     </el-dialog>
   </div>
 </template>
@@ -42,6 +41,7 @@
 import { getTscControl } from '../api/control.js'
 import { getMessageByCode } from '../utils/responseMessage.js'
 import { getIntersectionInfo } from '../api/template'
+import { getTscPhase } from '../api/cross.js'
 import {
   setToken
 } from '../utils/auth'
@@ -51,14 +51,16 @@ export default {
   },
   data () {
     return {
+      timer: 0,
+      phaseList2: [],
       phaseList: [],
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '12004-950',
-      Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
+      agentId: 'cslsnl',
+      Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
       Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
-      boxVisible: false,
+      boxVisible: true,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
     }
@@ -82,11 +84,10 @@ export default {
         this.dialogWidth = def + 'px'
       }
     },
-    initData () {
-      // let iframdevid = getIframdevid()
-      this.getIntersectionInfo(this.agentId, '')
-      getTscControl(this.agentId).then((data) => {
-        if (!data.data.success) {
+    getPhase () {
+      getTscPhase(this.agentId).then(data => {
+        let res = data.data
+        if (!res.success) {
           if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
             let success = data.data.data.content.success
             if (success !== 0) {
@@ -95,10 +96,31 @@ export default {
               return
             }
           }
-          if (data.data.code === '4003') {
-            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
-            return
+          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)
           }
+          return
+        }
+        if (res.data.data && res.data.data.phaseList) {
+          this.phaseList2 = res.data.data.phaseList
+        }
+      })
+    },
+    initData () {
+      // let iframdevid = getIframdevid()
+      this.getIntersectionInfo(this.agentId, '')
+      this.getPhase()
+      getTscControl(this.agentId).then((data) => {
+        // debugger
+        if (!data.data.success) {
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {
             // 子类型错误
@@ -112,7 +134,11 @@ export default {
           }
           return
         }
+        console.log(data.data.data)
         this.crossStatusData = JSON.parse(JSON.stringify(data.data.data.data))
+        // debugger
+        console.log(this.crossStatusData)
+        // debugger
       }).catch(error => {
         console.log(error)
       })
@@ -136,9 +162,14 @@ export default {
   created () {
     this.setDialogWidth()
   },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
   mounted () {
     this.setPropsToken(this.Token)
-    this.initData()
+    this.timer = setInterval(() => {
+      this.initData()
+    }, 1000 * 2)
     window.onresize = () => {
       return (() => {
         this.setDialogWidth()