openatc-components 0.4.38 → 0.4.40

package/build/webpack.base.conf.js

@@ -61,11 +61,6 @@ module.exports = {
           symbolId: 'icon-[name]'
         }
       },
-      {
-        test: /\.svg$/,
-        loader: 'raw-loader',  // 让 Webpack 直接返回 SVG 文件内容
-        include: [resolve('src/assets/svg')] // 仅针对 `src/assets/svg` 目录
-      },
       {
         test: /\.less$/,
         loader: ['style', 'css', 'less'],
@@ -73,7 +68,7 @@ module.exports = {
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         loader: 'url-loader',
-        exclude: [resolve('src/icons'), resolve('src/assets/svg')],
+        exclude: [resolve('src/icons')],
         options: {
           limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]')

package/package/kisscomps/components/DrawChannelization/drawsvg/index.vue

@@ -1,32 +1,29 @@
-/** * Copyright (c) 2020 kedacom * OpenATC is licensed under Mulan PSL v2. * You
-can use this software according to the terms and conditions of the Mulan PSL v2.
-* You may obtain a copy of Mulan PSL v2 at: *
-http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS"
-BASIS, WITHOUT WARRANTIES OF ANY KIND, * EITHER EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO NON-INFRINGEMENT, * MERCHANTABILITY OR FIT FOR A PARTICULAR
-PURPOSE. * See the Mulan PSL v2 for more details. **/
-<!--完整渠化编辑功能，包含导入-->
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+  <!--完整渠化编辑功能，包含导入-->
 <template>
   <div class="custom-cross-part draw-channelization">
-    <!-- <FirstImportCrossmap v-if="pageindex === 1"
+    <FirstImportCrossmap v-if="pageindex === 1"
     @loadSvgString="loadSvgString" @loadMapSize="loadMapSize" />
     <CustomDraw v-show="pageindex === 2" ref="CustomDraw"
       :AgentId="AgentId"
       :loadedChannelizatonData="loadedChannelizatonData"
-      @saveCallback="saveCallback" /> -->
-    <CustomDraw
-      ref="CustomDraw"
-      :AgentId="AgentId"
-      :loadedChannelizatonData="loadedChannelizatonData"
-      @saveCallback="saveCallback"
-    />
+      @saveCallback="saveCallback" />
   </div>
 </template>
 <script>
 import FirstImportCrossmap from './firstImportCrossmap'
 import CustomDraw from './index.draw'
 import { getChannelizatonChart } from '../../../../api/cross'
-import DefaultCrossRoadsSvg from '../../../../assets/svg/CrossRoadsSvg.svg'
 
 export default {
   name: 'custom-channelization',
@@ -80,57 +77,28 @@ export default {
     getChannelizatonChart () {
       let _this = this
       _this.pageindex = 1
-      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.AutoReadSVG()
-            return
-          }
-          if (
-            data.data.data === undefined ||
-            JSON.stringify(data.data.data) === '{}'
-          ) {
-            this.AutoReadSVG()
-            return
-          }
-          _this.pageindex = 2
-          _this.loadedChannelizatonData = JSON.parse(
-            JSON.stringify(data.data.data)
-          )
-        })
-        .catch(() => {
-          this.AutoReadSVG()
-        })
+      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)
+          // }
+          return
+        }
+        if (data.data.data === undefined || JSON.stringify(data.data.data) === '{}') return
+        _this.pageindex = 2
+        _this.loadedChannelizatonData = JSON.parse(JSON.stringify(data.data.data))
+      })
     },
     saveCallback (res) {
       this.$emit('saveCallback', res)
-    },
-    AutoReadSVG () {
-      this.loadedChannelizatonData = {
-        crossMap: {
-          index: -2,
-          icontype: 'crossmap',
-          x: 435,
-          y: 325,
-          w: 870,
-          h: 650,
-          angle: 0,
-          imgfilesrc: '',
-          svgstr: DefaultCrossRoadsSvg,
-          type: 'vectorgraph'
-        }
-      }
     }
   },
   mounted () {
@@ -138,4 +106,5 @@ export default {
   }
 }
 </script>
-<style scoped></style>
+<style scoped>
+</style>

package/package/kisscomps/components/OptimizeKanban/index.js

@@ -0,0 +1,2 @@
+import OptimizeKanban from './OptimizeKanban.vue'
+export default OptimizeKanban

package/package/kisscomps/components/OptimizeKanban/index.vue

@@ -0,0 +1,369 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+<template>
+<div class="kanbanOptimize">
+    <div v-if="this.nowNumber === 1" 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()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
+    </div>
+  <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px',marginLeft:this.nowNumber === 1 ? 0 : 0}">
+    <div class="common-board-column-header">
+      {{headerText}}
+    </div>
+    <div class="openatccomponents-board-table-header">
+      <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="common-board-column-content"
+      :list="list"
+      :options="options">
+      <div class="common-board-item" v-for="element in list" :key="element.id">
+        <el-row :gutter="13">
+          <el-col :span="4">
+            <el-tooltip class="item" effect="dark" placement="left">
+              <div slot="content">{{element.name}}</div>
+              <div class="common-phase-description">
+                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+              </div>
+            </el-tooltip>
+        </el-col>
+        <el-col :span="10">
+            <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">
+            <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>
+    </draggable>
+  </div>
+</div>
+</template>
+<script>
+import draggable from 'vuedraggable'
+import { getDuration } from '@/api/cross'
+import xdrdirselector from '@/components/XRDDirSelector'
+
+export default {
+  name: 'patternOptimize',
+  components: {
+    draggable,
+    xdrdirselector
+  },
+  data () {
+    return {
+      showStyle: {
+        left: '7px',
+        top: '0px'
+      },
+      styles: {
+        left: '7px',
+        top: '0px'
+      },
+      typeOptions: [{
+        value: 'flow-split-opt'
+      }, {
+        value: 'cycle-opt'
+      }],
+      value: 'flow-split-opt',
+      optimizecycle: 0
+    }
+  },
+  props: {
+    headerText: {
+      type: String,
+      default: 'Header'
+    },
+    id: {
+      type: Number
+    },
+    rings: {
+      type: Array
+    },
+    nowNumber: {
+      type: Number
+    },
+    phaseList: {
+      type: Array
+    },
+    options: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    list: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    // index: {
+    //   type: Number
+    // },
+    ISActiveMask: {
+      type: Boolean,
+      default: true
+    },
+    // 当phase的描述为空时，显示的图形颜色。
+    MaskColor: {
+      type: String,
+      default: '#000000'
+    }
+  },
+  created () {
+    // this.addMinSplit()
+    this.addMin()
+  },
+  computed () {
+
+  },
+  watch: {
+    list: {
+      handler: function () {
+        // let list = this.$refs.type
+        // let flow = this.$refs.types
+        // console.log(this.list, 'list')
+        // let cycle = 0
+        // let n = this.index
+        // for (let i = 0; i < list.length; i++) {
+        //   cycle = cycle + Number(list[i].currentValue)
+        // }
+        // const globalParamModel = this.$store.getters.globalParamModel
+        // // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
+        // let pattern = globalParamModel.getParamsByType('patternList')[n]
+        // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
+        // this.addMinSplit()
+        // this.$emit('handleSplit', n)
+      },
+      deep: true
+    }
+  },
+  methods: {
+    onOptimizeClick () {
+      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()
+      }, 1000)
+    },
+    handeleOptimizeClick () {
+      let newPha = []
+      for (let i = 0; i < this.rings.length; i++) {
+        newPha.push(...this.rings[i])
+      }
+      let phaseData = newPha.map(item => {
+        return {
+          id: item.id,
+          flowperhour: item.flowperhour,
+          saturation: item.saturation
+        }
+      })
+      let patternList = this.$store.state.globalParam.tscParam.patternList
+      let pattern = patternList.filter((item) => item.id === this.id)[0]
+      let reqData = {
+        'type': this.value,
+        'optcycle': this.optimizecycle ? this.optimizecycle : 0,
+        'phaseList': this.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('eopenatccomponentsdge.common.confirm'),
+            cancelButtonText: this.$t('openatccomponents.common.cancel'),
+            type: 'warning'
+          }).then(() => {
+          getDuration(reqData).then(data => {
+            if (data.data.success) {
+              this.$message({
+                type: 'success',
+                message: this.$t('openatccomponents.pattern.success')
+              })
+              for (let i = 0; i < this.rings.length; i++) {
+                for (let j = 0; j < this.rings[i].length; j++) {
+                  for (let h = 0; h < data.data.data.phase.length; h++) {
+                    if (this.rings[i][j].id === data.data.data.phase[h].id) {
+                      this.rings[i][j].value = data.data.data.phase[h].duration
+                      // this.rings[i][j].cycle = data.data.data.phase[h].cycle
+                    }
+                  }
+                }
+              }
+            }
+          }).catch(error => {
+            console.log(error)
+          })
+        }).catch(() => {
+        })
+      } else {
+        getDuration(reqData).then(data => {
+          if (data.data.success) {
+            this.$message({
+              type: 'success',
+              message: this.$t('openatccomponents.pattern.success')
+            })
+            for (let i = 0; i < this.rings.length; i++) {
+              for (let j = 0; j < this.rings[i].length; j++) {
+                for (let h = 0; h < data.data.data.phase.length; h++) {
+                  if (this.rings[i][j].id === data.data.data.phase[h].id) {
+                    this.rings[i][j].value = data.data.data.phase[h].duration
+                    // this.rings[i][j].cycle = data.data.data.phase[h].cycle
+                  }
+                }
+              }
+            }
+          }
+        }).catch(error => {
+          console.log(error)
+        })
+      }
+    },
+    addMin () {
+      for (let i of this.list) {
+        if (!i.flowperhour || !i.saturation) {
+          i.length = this.list.length
+          i.flowperhour = 0
+          i.saturation = 1700
+        }
+      }
+    }
+    // addMinSplit () {
+    //   const globalParamModel = this.$store.getters.globalParamModel
+    //   let phaseList = globalParamModel.getParamsByType('phaseList')
+    //   for (let ls of this.list) {
+    //     let phase = phaseList.filter((item) => {
+    //       return item.id === ls.id
+    //     })[0]
+    //     if (!phase.redyellow) {
+    //       phase.redyellow = 0
+    //     }
+    //     if (!phase.yellow) {
+    //       phase.yellow = 0
+    //     }
+    //     if (!phase.redclear) {
+    //       phase.redclear = 0
+    //     }
+    //     if (!phase.flashgreen) {
+    //       phase.flashgreen = 0
+    //     }
+    //     if (!phase.phasewalk) {
+    //       phase.phasewalk = 0
+    //     }
+    //     if (!phase.pedclear) {
+    //       phase.pedclear = 0
+    //     }
+    //     // let temp1 = phase.redyellow + phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
+    //     // let temp2 = phase.phasewalk + phase.pedclear
+    //     // if (temp1 > temp2) {
+    //     //   ls.minSplit = temp1
+    //     // } else {
+    //     //   ls.minSplit = temp2
+    //     // }
+    //     // if (ls.mode !== 7 && ls.value < ls.minSplit) {
+    //     //   ls.value = ls.minSplit
+    //     // }
+    //     // let temp1 = phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
+    //     let temp1 = phase.yellow + phase.redclear + phase.mingreen
+    //     let temp2 = phase.yellow + phase.redclear + phase.phasewalk + phase.pedclear
+    //     ls.minSplit = temp1 > temp2 ? temp1 : temp2
+    //     if (ls.mode !== 7 && ls.value < ls.minSplit) {
+    //       ls.value = ls.minSplit
+    //       this.$message.error(this.$t('openatccomponents.pattern.splitCheckMsg'))
+    //     }
+    //   }
+    // },
+    // getMaxCycle (pattern) {
+    //   let rings = pattern.rings
+    //   let maxCycle = 0
+    //   for (let ring of rings) {
+    //     if (ring.length === 0) continue
+    //     let cycle = 0
+    //     for (let r of ring) {
+    //       if (r.mode === 7) { // 忽略相位不计周期
+    //         continue
+    //       }
+    //       cycle = cycle + r.value
+    //     }
+    //     if (cycle > maxCycle) {
+    //       maxCycle = cycle
+    //     }
+    //   }
+    //   return maxCycle
+    // },
+    // doChange (val) {
+    //   // if (val.mode === 7) {
+    //   //   val.value = 0
+    //   // } else {
+    //   //   val.value = 30
+    //   // }
+    // }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.col-content {
+  width: 100%;
+}
+.kanbanOptimize {
+  .common-board-column {
+    max-width: unset !important;
+  }
+}
+.optimizetype{
+  // float: left;
+  font-size: 14PX;
+  margin:0 0 10PX 0;
+  .el-input {
+    width: 80PX;
+  }
+  .el-select{
+    width: 145PX;
+  }
+  .el-button {
+    margin-left: 10PX;
+  }
+  .optimiNum {
+    padding-left: 10PX;
+  }
+}
+</style>

package/package/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -1170,17 +1170,17 @@ export default {
           return k.id
         })
       })
-      let valSplit = val.map(item => {
-        return item.map(val => {
-          return val.value + (val.sum ? val.sum : 0)
-        })
-      })
-      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
-        return item.length > 0 ? item.reduce((a, b) => {
-          return a + b
-        }) : 0
-      }) : 0
-      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
+      // let valSplit = val.map(item => {
+      //   return item.map(val => {
+      //     return val.value + (val.sum ? val.sum : 0)
+      //   })
+      // })
+      // let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+      //   return item.length > 0 ? item.reduce((a, b) => {
+      //     return a + b
+      //   }) : 0
+      // }) : 0
+      // let cycle = Math.max(...splitCycle)// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
@@ -1313,7 +1313,7 @@ export default {
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {
-          return (j / (this.max ? this.max : cycle) * 100) + '%'
+          return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
         })
         // this.barrierList.unshift(0)
       }
@@ -1571,7 +1571,17 @@ export default {
         let newmaxNum = Math.max.apply(Math, newMax)// 每组最大值
         let newminNum = Math.min.apply(Math, newMin)
         if (newArr.length > 1) {
-          this.newCycle = newmaxNum + newminNum
+          let mapAdd = pattern.map(item => {
+            return item.map(val => {
+              return val.value + (val.sum ? val.sum : 0)
+            })
+          })
+          let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
+            return item.length > 0 ? item.reduce((a, b) => {
+              return a + b
+            }) : 0
+          }) : 0
+          this.newCycle = Math.max(...maxCycle)
         }
         if (newmaxNum === newminNum) {
           this.max = newmaxNum + newminNum