openatc-components 0.3.86 → 0.3.88

package/package.json

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

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

@@ -51,14 +51,14 @@
           <span>{{scope.row.agentid}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
+      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
         <template slot-scope="scope">
-          <span>{{getPeriod(scope.row)}}</span>
+          <span>{{getDevName(scope.row)}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
         <template slot-scope="scope">
-          <span>{{getDevName(scope.row)}}</span>
+          <span>{{getPeriod(scope.row)}}</span>
         </template>
       </el-table-column>
       <el-table-column property="isValid" :label="$t('openatccomponents.token.isValid')" align="center" width="80" prop="isused" v-if="isShowColumn('isused')">
@@ -200,7 +200,9 @@ export default {
   },
   watch: {
     maxTableHeight: function () {
-      this.tableHeight = this.maxTableHeight
+      this.$nextTick(() => {
+        this.tableHeight = this.maxTableHeight // 动态更新高度
+      })
     },
     optList: {
       handler: function (val) {
@@ -221,11 +223,6 @@ export default {
     }
   },
   mounted: function () {
-    // var _this = this
-    // _this.$nextTick(function () {
-    //   _this.tableHeight = _this.maxTableHeight
-    // })
-    // _this.tableHeight = _this.maxTableHeight
   },
   methods: {
     onOptimizeClick (row, index) {
@@ -316,7 +313,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 +342,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 +373,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)) {

package/src/views/patternConfig.vue

@@ -4,8 +4,8 @@
       <button @click="getSaveParam" >获取相位参数信息</button><br/>
       <div class="layout-container2">
         <PatternConfig
-          :agentids="agentids5"
-          :opt="opt5"
+          :agentids="agentids7"
+          :opt="opt7"
           :isShowTableHeader="isShowTableHeader"
           :tableColums="tableColums"
           :isSingleCrossMode="isSingleCrossMode"
@@ -72,7 +72,7 @@ export default {
   // },
   data () {
     return {
-      tableColums: ['agentid', 'period', 'offset', 'cycle', 'pattern'], // greenWave, period
+      tableColums: ['agentid', 'name', 'period', 'pattern'], // greenWave, period
       // tableColums: ['no', 'id', 'period', 'name', 'isUsed', 'patternId', 'offset', 'cycle', 'pattern'], // greenWave, period
       isShowSingle: true,
       isOnlyOneTab: false,