openatc-components 0.3.85 → 0.3.87

package/package/kisscomps/components/patternConfig/index.vue

@@ -11,7 +11,7 @@
  **/
 <template>
   <div class="patternConfig">
-    <el-container v-if="!isShowSingle" >
+    <el-container v-if="!isShowSingle" style="height: 100%;" >
         <div class="main-container" style="height: 100%;width: 100%;">
           <el-tabs v-model="editableTabsValue" type="card"  @edit="handleTabsEdit" :before-leave="beforeLeave" style="height: 100%;">
             <el-tab-pane

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

@@ -316,7 +316,7 @@ export default {
       return res
     },
     getPeriod (row) {
-      let period = row.period || row.timeperiodrange
+      let period = row.timeperiodrange || row.period
       let res = ''
       if (period && period.length > 0) {
         res = period[0].substring(0, 5) + '-' + period[1].substring(0, 5)
@@ -345,9 +345,30 @@ export default {
       // this.phaseList = phaseList
       this.handlePatternList(routeData, patternList, phaseList)
     },
+    // 依据anengid获取设备信息,同时兼容单路口数据按序index取值
+    getDevFromDevsOrIndex (devs, agentid, index) {
+      let res
+      // check special
+      let isSingleCrossMode = false
+      if (devs && devs.length > 1 && devs[0].agentid === devs[1].agentid) {
+        isSingleCrossMode = true
+        // check errData
+        if (index === undefined || index === null) {
+          console.log('getDevFromDevsOrIndex Err: index is null')
+        }
+      }
+      if (!isSingleCrossMode) {
+        res = devs.filter(ist => ist.agentid === agentid)[0]
+      } else {
+        res = devs[index]
+        console.log('getDevByIndex:', res)
+      }
+      return res
+    },
     handlePatternList (routeData, patternList, phaseList) {
       this.newPatternList = []
       let devs = routeData.devs
+      let index = 0
       for (let pattern of patternList) {
         let obj = {}
         let id = pattern.agentid
@@ -355,7 +376,9 @@ export default {
         let count = [] // 计算相位有几个环
         if (pattern.feature !== undefined && pattern.feature.patternList.length !== 0) {
           let currPatternList = pattern.feature.patternList
-          let dev = devs.filter(ist => ist.agentid === id)[0]
+          // let dev = devs.filter(ist => ist.agentid === id)[0]
+          let dev = this.getDevFromDevsOrIndex(devs, id, index)
+          index = index + 1
           let patternId = dev.patternid
           let currPattern
           if (Array.isArray(currPatternList)) {