openatc-components 0.5.13 → 0.5.15

package/package/kisscomps/components/IntersectionMap/crossDirection/baseImg/SidewalkClickSvg.vue

@@ -19,15 +19,25 @@
       :style="{position: 'absolute', left: '310px', top: '198px', zIndex: '10'}"
     >
       <defs>
-          <filter id="shadow-effect" x="-50%" y="-50%" width="200%" height="200%">
-            <!-- 对应 box-shadow: 0 0 6px 6px #10B800 -->
-            <feDropShadow
-              dx="0"
-              dy="0"
-              stdDeviation="4"
-              flood-color="#10B800"
-              flood-opacity="1"/>
-          </filter>
+        <filter id="shadow-effect-side"
+          x="-10%"
+          y="-10%"
+          width="200%"
+          height="200%">
+          <feFlood flood-color="#10B800" flood-opacity="1" result="glowColor" />
+          <feComposite in="glowColor"
+                in2="SourceGraphic"
+                operator="in"
+                result="glowMask" />
+          <feGaussianBlur in="glowMask" stdDeviation="2" result="blurredGlow" />
+          <feComponentTransfer in="blurredGlow" result="brightGlow">
+            <feFuncA type="linear" slope="2" />
+          </feComponentTransfer>
+          <feMerge>
+            <feMergeNode in="brightGlow" />
+            <feMergeNode in="SourceGraphic" />
+          </feMerge>
+        </filter>
         </defs>
       <g
         id="西行人"
@@ -1224,7 +1234,7 @@ export default {
             }
           }
           clickedPath.setAttribute('fill', this.clickedColor)
-          clickedPath.setAttribute('filter', 'url(#shadow-effect)')
+          clickedPath.setAttribute('filter', 'url(#shadow-effect-side)')
         }
         this.$emit('handleClickSidewalkIcon', this.sidewalkData, curChoosePed)
       }
@@ -1239,7 +1249,7 @@ export default {
             let data = this.sidewalkData.filter(ele => ele.id === side.id)[0]
             if (data && data.clicked === true) {
               dom.setAttribute('fill', this.clickedColor)
-              dom.setAttribute('filter', 'url(#shadow-effect)')
+              dom.setAttribute('filter', 'url(#shadow-effect-side)')
             }
             if (this.clickMode && data && data.disabled === true) {
               dom.setAttribute('fill', this.disabledColor)

package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -1411,8 +1411,8 @@ export default {
       } else {
         nextSelected = this.inneChoosedDirection.filter(d => d !== id)
       }
-      // 第三方信号机检查是否冲突，冲突提示是否确定；非第三方不进冲突检查
-      if (this.isThirdSignal && this.checkConflict(nextSelected)) {
+      // 检查是否冲突，冲突提示是否确定
+      if (this.checkConflict(nextSelected)) {
         try {
           await this.$confirm(this.$t('openatccomponents.overview.conflictdirectionstips'), this.$t('openatccomponents.common.tipsmodaltitle'), {
             confirmButtonText: this.$t('openatccomponents.button.OK'),

package/package/kisscomps/components/IntersectionMap/crossDirection/phaseIcon/phaseIconSvg.vue

@@ -18,14 +18,24 @@
       </svg> -->
       <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 36 26" :width="IconLengh" :height="IconWdith">
         <defs>
-          <filter id="shadow-effect" x="-50%" y="-50%" width="200%" height="200%">
-            <!-- 对应 box-shadow: 0 0 6px 6px #10B800 -->
-            <feDropShadow
-              dx="0"
-              dy="0"
-              stdDeviation="4"
-              flood-color="#10B800"
-              flood-opacity="1"/>
+          <filter id="shadow-effect"
+                x="-10%"
+                y="-10%"
+                width="200%"
+                height="200%">
+            <feFlood flood-color="#10B800" flood-opacity="1" result="glowColor" />
+            <feComposite in="glowColor"
+                  in2="SourceGraphic"
+                  operator="in"
+                  result="glowMask" />
+            <feGaussianBlur in="glowMask" stdDeviation="2" result="blurredGlow" />
+            <feComponentTransfer in="blurredGlow" result="brightGlow">
+              <feFuncA type="linear" slope="2" />
+            </feComponentTransfer>
+            <feMerge>
+              <feMergeNode in="brightGlow" />
+              <feMergeNode in="SourceGraphic" />
+            </feMerge>
           </filter>
         </defs>
           <!-- 东相位 -->
@@ -148,8 +158,7 @@ export default {
       default: false
     },
     beforeSelect: {
-      type: Function,
-      required: true
+      type: Function
     }
   },
   methods: {

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/OverviewComponent/index.vue

@@ -222,7 +222,7 @@ export default {
         this.agentId = val
         this.resetcomponent = false
         setIframdevid(val)
-        this.registerMessage() // 注册消息
+        // this.registerMessage() // 注册消息
         await this.getIntersectionInfo(val)
         this.$nextTick(() => {
           this.resetcomponent = true
@@ -249,7 +249,7 @@ export default {
     this.CrossDiagramMgr = new CrossDiagramMgr()
     this.agentId = this.AgentId
     setIframdevid(this.agentId)
-    this.registerMessage() // 注册消息
+    // this.registerMessage() // 注册消息
     this.getIntersectionInfo(this.agentId)
   },
   mounted () {
@@ -380,8 +380,8 @@ export default {
       })
     },
     registerMessage () {
-      registerMessage(this.agentId).then(data => {
-        if (!data.data.success) {
+      registerMessage(this.agentId, this.protocol).then(data => {
+        if (!data.data.success && this.protocol !== 'rcp') {
           // this.devStatus = 2
           if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
             let success = data.data.data.content.success
@@ -406,6 +406,20 @@ export default {
             this.reSend()
           }
           return
+        } else {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4210') {
+            let successArray = data.data.data.content
+            successArray.forEach(success => {
+              let dataType = this.$t('edge.common.datatype') + ':' + success.DataClass // 数据类
+              let objectID = this.$t('edge.common.objectid') + ':' + success.ObjectID // 对象
+              let propertyID = this.$t('edge.common.propertyid') + ':' + success.PropertyID // 属性
+              let elementID = this.$t('edge.common.elementid') + ':' + success.ElementID // 元素
+              let returnCode = this.$t('edge.common.returncode') + ':' + this.getError(success.ReturnCode) // 数据值
+              let errormsg = `${dataType} ${objectID} ${propertyID} ${elementID} ${returnCode}`
+              this.$message.error(this.$t(errormsg))
+            })
+            return
+          }
         }
         // this.devStatus = 3
         this.clearPatternInterval() // 清除其他定时器
@@ -418,6 +432,31 @@ export default {
         this.getPhase()
       })
     },
+    getError (val) {
+      if (val === 'Status_BadValue') {
+        return this.$t('edge.common.statusbadvalue')
+      } else if (val === 'Status_WrongLength') {
+        return this.$t('edge.common.statuswronglength')
+      } else if (val === 'Status_Overflow') {
+        return this.$t('edge.common.statusvverflow')
+      } else if (val === 'Status_ReadOnly') {
+        return this.$t('edge.common.statusreadonly')
+      } else if (val === 'Status_NullValue') {
+        return this.$t('edge.common.statusnullvalue')
+      } else if (val === 'Status_Error') {
+        return this.$t('edge.common.statuserror')
+      } else if (val === 'Status_ControlFail') {
+        return this.$t('edge.common.statuscontrolfail')
+      } else if (val === 'Status_AccessDenied') {
+        return this.$t('edge.common.statusaccessdenied')
+      } else if (val === 'Status_InvalidKey') {
+        return this.$t('edge.common.statusinvalidkey')
+      } else if (val === 'Status_ChecksumError') {
+        return this.$t('edge.common.statuschecksumerror')
+      } else {
+        return ''
+      }
+    },
     reSend () { // 设备掉线重连机制
       // this.devStatus = 1
       this.clearRegisterMessageTimer()
@@ -725,36 +764,36 @@ export default {
     reconnectionDev () {
       this.registerMessage()
     },
-    queryDevParams () {
-      queryDevice(this.AgentId).then(res => {
-        if (!res.data.success) {
-          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
-          return
-        }
-        let devParams = res.data.data.jsonparam
-        this.ip = devParams.ip
-        this.port = String(devParams.port)
-        this.protocol = res.data.data.protocol
-        this.agentId = res.data.data.agentid
-        if (res.data.data.name) {
-          this.agentName = res.data.data.name
-        }
-        this.platform = res.data.data.platform
-        let state = res.data.data.state
-        if (state === 'UP') {
-          this.stateName = this.$t('openatccomponents.overview.online')
-        } else {
-          this.stateName = this.$t('openatccomponents.overview.offline')
-        }
-        this.registerMessage() // 注册消息
-        this.initData()
-        // 配置工具没参数的时候
-        this.getIntersectionInfo(this.agentId)
-        if (this.curHomePage === 'Channelization') {
-          this.getDetectorStatus()
-        }
-      })
-    },
+    // queryDevParams () {
+    //   queryDevice(this.AgentId).then(res => {
+    //     if (!res.data.success) {
+    //       this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+    //       return
+    //     }
+    //     let devParams = res.data.data.jsonparam
+    //     this.ip = devParams.ip
+    //     this.port = String(devParams.port)
+    //     this.protocol = res.data.data.protocol
+    //     this.agentId = res.data.data.agentid
+    //     if (res.data.data.name) {
+    //       this.agentName = res.data.data.name
+    //     }
+    //     this.platform = res.data.data.platform
+    //     let state = res.data.data.state
+    //     if (state === 'UP') {
+    //       this.stateName = this.$t('openatccomponents.overview.online')
+    //     } else {
+    //       this.stateName = this.$t('openatccomponents.overview.offline')
+    //     }
+    //     this.registerMessage() // 注册消息
+    //     this.initData()
+    //     // 配置工具没参数的时候
+    //     this.getIntersectionInfo(this.agentId)
+    //     if (this.curHomePage === 'Channelization') {
+    //       this.getDetectorStatus()
+    //     }
+    //   })
+    // },
     getPhase () {
       uploadSingleTscParam('phase', this.agentId).then(data => {
         let res = data.data
@@ -800,6 +839,7 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        this.registerMessage() // 注册消息
       })
     },
     getDetectorStatus () {