openatc-components 0.3.38 → 0.3.41

package/package.json

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

package/src/i18n/language/zh.js

@@ -465,6 +465,7 @@ const zh = {
       'ringConfig': '环配置',
       'stage': '阶段',
       'phase': '相位',
+      'algorithmEngineOptimization': '算法引擎优化中!',
       'agentidError': '获取设备ID失败!',
       'splitCheckMsg': '绿信比需大于相位过渡时间或绿信比需大于行人过街+行人过渡时间!',
       'pattern': '方案',

package/src/kisscomps/components/XiaoKanban/index.vue

@@ -14,6 +14,16 @@
     <div class="board-column-header">
       {{headerText}}
     </div>
+    <div class="board-table-header" v-if="isSingleCrossMode">
+      <el-row :gutter="13">
+        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
+        </el-col>
+        <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
+        </el-col>
+        <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
+        </el-col>
+      </el-row>
+    </div>
     <draggable
       class="board-column-content"
       :list="list"
@@ -21,15 +31,21 @@
       <div class="board-item" v-for="element in list" :key="element.id">
         <el-row :gutter="25">
           <el-col :span="4">
-        <el-tooltip class="item" effect="dark" placement="left">
-          <div slot="content">{{$t('openatccomponents.pattern.phase') + ' ' + element.id}}</div>
-          <div class="phase-description">
-            <DirSelector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></DirSelector>
-          </div>
-        </el-tooltip>
+            <el-tooltip class="item" effect="dark" placement="left">
+              <div slot="content">{{$t('openatccomponents.pattern.phase') + ' ' + element.id}}</div>
+              <div class="phase-description">
+                <DirSelector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></DirSelector>
+              </div>
+            </el-tooltip>
+          </el-col>
+        <el-col :span="19" v-show="!isSingleCrossMode">
+          <el-input-number controls-position="right" :min="0" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
         </el-col>
-        <el-col :span="19">
-        <el-input-number controls-position="right" :min="0" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
+        <el-col :span="10" v-if="isSingleCrossMode">
+            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
+        </el-col>
+        <el-col :span="10" v-if="isSingleCrossMode">
+            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
         </el-col>
         </el-row>
       </div>
@@ -47,6 +63,10 @@ export default {
     DirSelector
   },
   props: {
+    isSingleCrossMode: {
+      type: Boolean,
+      default: false
+    },
     headerText: {
       type: String,
       default: 'Header'
@@ -76,17 +96,14 @@ export default {
       default: '#000000'
     }
   },
-  created () {
-    console.log('list', this.list)
-  },
   watch: {
     list: {
-      handler: function () {
-        let list = this.$refs.type
+      handler: function (val) {
+        let list = val
         let cycle = 0
         let n = this.index
         for (let i = 0; i < list.length; i++) {
-          cycle = cycle + Number(list[i].currentValue)
+          cycle = cycle + Number(list[i].value)
         }
         let obj = {}
         obj.index = n
@@ -95,6 +112,9 @@ export default {
       },
       deep: true
     }
+  },
+  created () {
+    console.log('list', this.list)
   }
 }
 </script>

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

@@ -38,6 +38,9 @@
                 </div>
                 <div style="height: 94%;" class="table-container">
                   <PatternTable ref="patterntable"
+                                :isSingleCrossMode="isSingleCrossMode"
+                                :isShowTableHeader="isShowTableHeader"
+                                :tableColums="tableColums"
                                 :devicesData="devicesData"
                                 :maxTableHeight="maxTableHeight"
                                 :opt="item.devs"
@@ -56,8 +59,11 @@
     </el-container>
     <div v-if="isShowSingle" style="height: 94%;" class="table-container">
       <PatternTable ref="patterntable"
+                    :isSingleCrossMode="isSingleCrossMode"
+                    :isShowTableHeader="isShowTableHeader"
+                    :tableColums="tableColums"
                     :devicesData="devicesData"
-                    :opt="opt.optPatternList[0].devs"
+                    :opt="opt.optPatternList && opt.optPatternList.length > 0 ? opt.optPatternList[0].devs : {}"
                     :isAllowedExpand="isAllowedExpand"
                     :maxTableHeight="maxTableHeight"
                     @onNewPatternListChange="onNewPatternListChange"/>
@@ -97,6 +103,18 @@ export default {
       type: Object,
       default: () => null
     },
+    isShowTableHeader: {
+      type: Boolean,
+      default: true
+    },
+    isSingleCrossMode: {
+      type: Boolean,
+      default: false
+    },
+    tableColums: {
+      type: Array,
+      default: () => ['no', 'agentid', 'name', 'isused', 'patternid', 'offset', 'cycle', 'pattern']
+    },
     isOnlyOneTab: {
       type: Boolean,
       default: true
@@ -255,7 +273,7 @@ export default {
       for (let opt of optPatternList) {
         if (opt.devs && opt.devs.length > 0) {
           for (let dev of opt.devs) {
-            if (!dev.feature || dev.feature.patternList) {
+            if (!dev.feature || !dev.feature.patternList) {
               resetFlag = true
               break
             }

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

@@ -11,30 +11,57 @@
  **/
 <template>
   <div class="app-container" ref="pattern-container">
-    <el-table :data="newPatternList" :max-height="tableHeight" id="footerBtn">
+    <el-table :data="newPatternList" :max-height="tableHeight" id="footerBtn" :show-header="isShowTableHeader">
       <el-table-column type="expand" v-if="isAllowedExpand">
         <template slot-scope="scope">
+          <div v-if="isAllowedExpand && isSingleCrossMode" class="optimizetype">
+              <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
+              <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
+                <el-option
+                    v-for="item in typeOptions"
+                    :key="item.value"
+                    :label="$t('openatccomponents.overview.type' + item.value)"
+                    :value="item.value"
+                    >
+                </el-option>
+                </el-select>
+                <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
+                <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
+              <el-button type="primary" @click="onOptimizeClick(scope.row, scope.$index)">{{$t('openatccomponents.pattern.inoptimize')}}</el-button>
+          </div>
           <div class="components-container board">
-            <XiaoKanBan v-for="n in scope.row.ringCount" :key="n" class="kanban todo" :list="scope.row.rings[n-1]" :header-text="$t('openatccomponents.pattern.ring') +' '+n" :index="scope.$index" @fatherMethod="fatherMethod"/>
+            <XiaoKanBan v-for="n in scope.row.ringCount"
+                        :key="n"
+                        :isSingleCrossMode="isSingleCrossMode"
+                        class="kanban todo"
+                        :list="scope.row.rings[n-1]"
+                        :header-text="$t('openatccomponents.pattern.ring') +' '+n"
+                        :index="scope.$index"
+                        @fatherMethod="fatherMethod"/>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="No" width="45" minWidth="40">
+      <el-table-column align="center" label="No" width="45" minWidth="40" v-if="isShowColumn('no')">
         <template slot-scope="scope">
           <span>{{scope.$index+1}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.deviceid')" width="100" minWidth="40">
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.deviceid')" width="100" minWidth="40" v-if="isShowColumn('agentid')">
         <template slot-scope="scope">
           <span>{{scope.row.agentid}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40">
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
+        <template slot-scope="scope">
+          <span>{{getPeriod(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')">
         <template slot-scope="scope">
           <span>{{getDevName(scope.row)}}</span>
         </template>
       </el-table-column>
-      <el-table-column property="isValid" :label="$t('openatccomponents.token.isValid')" align="center" width="80" prop="isused">
+      <el-table-column property="isValid" :label="$t('openatccomponents.token.isValid')" align="center" width="80" prop="isused" v-if="isShowColumn('isused')">
         <template slot-scope="scope">
           <el-switch
             style="padding-left: 5px;"
@@ -46,7 +73,8 @@
       <el-table-column
         :label="$t('openatccomponents.greenwaveoptimize.pattern')"
         width="120"
-        align="center">
+        align="center"
+        v-if="isShowColumn('patternid')">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.patternid"
@@ -64,7 +92,7 @@
           <span></span>
         </template>
       </el-table-column>
-      <el-table-column  align="center" :label="$t('openatccomponents.greenwaveoptimize.offset')" width="70" prop="offset">
+      <el-table-column  align="center" :label="$t('openatccomponents.greenwaveoptimize.offset')" width="85" prop="offset" v-if="isShowColumn('offset')">
         <template slot-scope="scope">
           <el-input-number v-if="isAllowedExpand" :controls="false" :min="0" :step="1" v-model.number="scope.row.offset" size="small" style="width:70%;"></el-input-number>
           <span v-else>
@@ -72,18 +100,11 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.cycle')" width="60" prop="cycle">
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.cycle')" width="60" prop="cycle" v-if="isShowColumn('cycle')">
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.pattern.plan')">
+      <el-table-column align="center" :label="$t('openatccomponents.pattern.plan')" v-if="isShowColumn('pattern')">
         <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"
@@ -115,10 +136,11 @@
 </template>
 
 <script>
-import XiaoKanBan from '../../XiaoKanBan'
+import XiaoKanBan from '../../XiaoKanBan/index.vue'
 // import { getPatternList } from '../../../../api/route'
 import { getIntersectionInfo } from '../../../../api/template'
 import { getMessageByCode } from '../../../../utils/responseMessage'
+import { getDuration } from '../../../../api/cross'
 // import { getDirName } from '../../../components/SelectCrossPhase/utils.js'
 export default {
   name: 'PatternTable',
@@ -133,10 +155,26 @@ export default {
     optList: {
       type: Array
     },
+    isSingleCrossMode: {
+      type: Boolean,
+      default: false
+    },
+    tableColums: {
+      type: Array,
+      default: () => []
+    },
     isAllowedExpand: {
       type: Boolean,
       default: true
     },
+    isShowGenerateButton: {
+      type: Boolean,
+      default: true
+    },
+    isShowTableHeader: {
+      type: Boolean,
+      default: true
+    },
     maxTableHeight: {
       type: Number,
       default: 200
@@ -144,6 +182,13 @@ export default {
   },
   data () {
     return {
+      typeOptions: [{
+        value: 'flow-split-opt'
+      }, {
+        value: 'cycle-opt'
+      }],
+      value: 'flow-split-opt',
+      optimizecycle: 0,
       controlType: 'stage',
       loading: true,
       tableHeight: 460,
@@ -181,6 +226,113 @@ export default {
     })
   },
   methods: {
+    onOptimizeClick (row, index) {
+      let msg = this.$t('openatccomponents.pattern.algorithmEngineOptimization')
+      const loading = this.$loading({
+        lock: true,
+        text: msg,
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      setTimeout(() => {
+        loading.close()
+        this.handeleOptimizeClick(row, index)
+      }, 1000)
+    },
+    handeleOptimizeClick (row, index) {
+      let newPha = []
+      for (let i = 0; i < row.rings.length; i++) {
+        newPha.push(...row.rings[i])
+      }
+      let phaseData = newPha.map(item => {
+        return {
+          id: item.id,
+          flowperhour: item.flowperhour,
+          saturation: item.saturation
+        }
+      })
+      let patternList = row.allPatterns
+      if (row.feature && row.feature.patternList && row.feature.patternList.length > 0) {
+        patternList = row.feature.patternList
+      }
+      let pattern = patternList.filter((item) => item.id === row.patternid)[0]
+      let phaseList = row.currPhase
+      let reqData = {
+        'type': this.value,
+        'optcycle': this.optimizecycle ? this.optimizecycle : 0,
+        'phaseList': phaseList,
+        'pattern': pattern,
+        'phases': phaseData
+      }
+      let isValidata = []
+      for (let j = 0; j < newPha.length; j++) {
+        let comNum = (newPha[j].length / 4) * 1700 * 0.8
+        isValidata.push(newPha[j].flowperhour > comNum)
+      }
+      if (isValidata.includes(true)) {
+        this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
+          this.$t('openatccomponents.common.alarm'), {
+            confirmButtonText: this.$t('openatccomponents.common.confirm'),
+            cancelButtonText: this.$t('openatccomponents.common.cancel'),
+            type: 'warning'
+          }).then(() => {
+          this.doOptimize(row, index, reqData)
+        }).catch(() => {})
+      } else {
+        this.doOptimize(row, index, reqData)
+      }
+    },
+    doOptimize (row, index, reqData) {
+      // let _this = this
+      getDuration(reqData).then(data => {
+        if (data.data.success) {
+          this.$message({
+            type: 'success',
+            message: this.$t('openatccomponents.pattern.success')
+          })
+          // let cycle = 0
+          for (let i = 0; i < row.rings.length; i++) {
+            for (let j = 0; j < row.rings[i].length; j++) {
+              for (let h = 0; h < data.data.data.phase.length; h++) {
+                if (row.rings[i][j].id === data.data.data.phase[h].id) {
+                  row.rings[i][j].value = data.data.data.phase[h].duration
+                  // cycle = cycle + row.rings[i][j].value
+                }
+              }
+            }
+          }
+          // row.cycle = cycle
+          // let newPattern = _this.newPatternList[index]
+          // newPattern.cycle = cycle
+          // newPattern.rings = row.rings
+          // _this.newPatternList[index] = newPattern
+          // if (row.feature && row.feature.patternList && row.feature.patternList.length > 0) {
+          //   let pattern = row.feature.patternList.find((item) => item.id === row.patternid)
+          //   if (pattern) {
+          //     pattern.cycle = cycle
+          //     pattern.rings = row.rings
+          //   }
+          // }
+        }
+      }).catch(error => {
+        console.log(error)
+      })
+    },
+    isShowColumn (colum) {
+      let res = true
+      if (this.tableColums && this.tableColums.length > 0) {
+        res = this.tableColums.find(item => item === colum)
+      }
+      return res
+    },
+    getPeriod (row) {
+      let period = row.period
+      let res = ''
+      if (period && period.length > 0) {
+        res = period[0] + '-' + period[1]
+      }
+      return res
+    },
     getDevName (row) {
       let res = row.name ? row.name : ''
       if (this.devicesData) {
@@ -258,7 +410,9 @@ export default {
             if (ring.length === 0) continue
             for (let rr of ring) {
               rr.desc = []
-              let direction = currPhase.filter(curp => curp.id === rr.id)[0].direction // 相位方向集合
+              let targetPhase = currPhase.filter(curp => curp.id === rr.id)[0]
+              if (!targetPhase) continue
+              let direction = targetPhase.direction // 相位方向集合
               let phaseRing = currPhase.filter(curp => curp.id === rr.id)[0].ring
               count.push(phaseRing)
               for (let dir of direction) {
@@ -405,17 +559,30 @@ export default {
 <style lang="scss">
   .board {
     width: 100%;
-    margin-left: 10px;
+    margin-left: 10PX;
     display: flex;
-    justify-content: space-around;
-    flex-direction: row;
+    justify-content: flex-start;
+    gap: 10PX;
     align-items: flex-start;
   }
-  // .kanban {
-  //   &.todo {
-  //     .board-column-header {
-  //       background: $--color-primary;
-  //     }
-  //   }
-  // }
+  .optimizetype{
+    font-size: 14PX;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    gap: 10PX;
+    padding-left: 20PX;
+    .el-input {
+      width: 120PX;
+    }
+    // .el-select{
+    //   width: 170PX;
+    // }
+    // .el-button {
+    //   margin-left: 10PX;
+    // }
+    .optimiNum {
+      padding-left: 10PX;
+    }
+  }
 </style>

package/src/kisscomps/components/patternConfig/planContent.vue

@@ -119,7 +119,7 @@ export default {
       let res = []
       let devs = tab.devs
       for (let dev of devs) {
-        if (!dev.patternList || dev.patternList.length === 0) {
+        if (!dev.feature || !dev.feature.patternList || dev.feature.patternList.length === 0) {
           res = list
           return res
         }
@@ -127,9 +127,7 @@ export default {
       let devPatternList = devs.map(item => {
         let pattern = {
           agentid: item.agentid,
-          feature: {
-            patternList: item.patternList
-          }
+          feature: item.feature
         }
         return pattern
       })