openatc-components 0.0.101 → 0.0.104

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

@@ -84,6 +84,8 @@
           <el-button type="primary" @click="handleReset()">{{$t('openatccomponents.button.reset')}}</el-button>
           <!-- <el-button type="primary" @click="cancledraw()">{{$t('openatccomponents.button.Cancel')}}</el-button> -->
           <el-button type="primary" @click="savedraw()">{{$t('openatccomponents.button.save')}}</el-button>
+          <el-button type="primary" @click="importFromFile()">{{$t('openatccomponents.main.import')}}</el-button>
+          <el-button type="primary" @click="exportToFile()">{{$t('openatccomponents.main.export')}}</el-button>
         </div>
       </div>
       <div class="custom-edit" ref="customEdit">
@@ -111,7 +113,28 @@
         />
       </div>
     </el-row> -->
-  </div>
+    <!-- 从文件导入弹窗 -->
+    <el-dialog
+      :title="$t('openatccomponents.main.tip')"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <input
+        type="file"
+        id="file"
+      />
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button @click="dialogVisible = false">{{$t('openatccomponents.common.cancel')}}</el-button>
+        <el-button
+          type="primary"
+          @click="readAsText"
+        >{{$t('openatccomponents.common.confirm')}}</el-button>
+      </span>
+    </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -127,9 +150,7 @@ import ImportDialog from './importDialog'
 import Messagebox from '../../MessageBox/index'
 
 import { mapState } from 'vuex'
-import PhaseDataMgr from '../phaseDataMgr.js'
 
-// import { getIframdevid } from '../../../../utils/auth.js'
 import { saveChannelizatonChart } from '../../../../api/cross'
 import { getMessageByCode } from '../../../../utils/responseMessage.js'
 
@@ -145,8 +166,7 @@ export default {
   },
   computed: {
     ...mapState({
-      phaseList: state => state.globalParam.tscParam.phaseList,
-      PhaseDataMgr: state => state.globalParam.PhaseDataMgr
+      phaseList: state => state.globalParam.tscParam.phaseList
     })
   },
   props: {
@@ -169,6 +189,7 @@ export default {
     loadedChannelizatonData: {
       handler: function (val) {
         // 平台设备切换时，重载当前路口保存的渠化配置
+        this.LoadedChannelizatonData = JSON.parse(JSON.stringify(val))
         this.load('all')
       },
       deep: true
@@ -281,7 +302,9 @@ export default {
         [3, '右转'],
         [4, '掉头']
       ]),
-      phaseAssociatedMap: new Map() // 关联相位Map: key 是相位ID， value 是车道数据包含direction
+      phaseAssociatedMap: new Map(), // 关联相位Map: key 是相位ID， value 是车道数据包含direction
+      dialogVisible: false,
+      LoadedChannelizatonData: {} // 从接口获取到的渠化参数，用于作为加载数据，从文件导入可修改
     }
   },
   methods: {
@@ -307,10 +330,6 @@ export default {
           break
         case 'vehile':
           this.changeMotorwayItem(iconObj, changefield)
-          if (changefield.indexOf('phaseid') !== -1) {
-            // 相位关联成功后，生成最新的相位关联map数据
-            this.PhaseDataMgr.updateLanePhaseAssociatedMap(this.Motorways)
-          }
           break
         case 'ped':
           this.changePedItem(iconObj, changefield)
@@ -343,8 +362,6 @@ export default {
           this.Pedwalk[i].phasetype = undefined
         }
       }
-      // 更新模型内初始相位列表数据
-      this.PhaseDataMgr.updateLanePhaseAssociatedMap(this.Motorways)
     },
 
     // 添加不同类型的车道图标
@@ -761,8 +778,7 @@ export default {
     cancleSetting () {
       this.canclesettingvisible = false
     },
-    // 保存
-    savedraw () {
+    handleSaveParams () {
       let temp = {}
       console.log(this.customlist)
       for (const item of this.customlist) {
@@ -775,12 +791,18 @@ export default {
       if (this.CrossMapData.svgstr !== '' || this.CrossMapData.imgfilesrc !== '') {
         temp.crossMap = this.CrossMapData
       }
+      return temp
+    },
+    // 保存
+    savedraw () {
+      let temp = {}
+      temp = this.handleSaveParams()
       this.saveChannelizatonChart(temp)
     },
     // 加载
     load (type) {
       this.curChooseIconIndex = -1
-      let savedTemp = JSON.parse(JSON.stringify(this.loadedChannelizatonData))
+      let savedTemp = JSON.parse(JSON.stringify(this.LoadedChannelizatonData))
       let arr = []
       for (const [key, value] of Object.entries(savedTemp)) {
         if (key === 'vehile') {
@@ -801,6 +823,9 @@ export default {
         }
         if (key === 'crossMap') {
           this.CrossMapData = JSON.parse(JSON.stringify(value))
+          if (value.icontype === undefined) {
+            this.CrossMapData.icontype = 'crossmap'
+          }
         } else {
           if (value.length > 1) {
             arr = [...arr, ...value]
@@ -852,6 +877,12 @@ export default {
         agentid: this.AgentId,
         data: ChannelizatonData
       }
+      if (ChannelizatonData.crossMap.type === 'vectorgraph') {
+        ChannelizatonData.crossMap.imgfilesrc = ''
+      }
+      if (ChannelizatonData.crossMap.type === 'picture') {
+        ChannelizatonData.crossMap.svgstr = ''
+      }
       saveChannelizatonChart(params).then(data => {
         this.$emit('saveCallback', data)
         if (!data.data.success) {
@@ -909,11 +940,46 @@ export default {
     },
     handleLockCrossMap () {
       this.isLockedCrossMap = !this.isLockedCrossMap
+    },
+    importFromFile () {
+      this.dialogVisible = true
+    },
+    readAsText () {
+      let _this = this
+      var file = document.getElementById('file').files[0]
+      var reader = new FileReader()
+      reader.async = true
+      // 将文件以文本形式读入页面
+      reader.readAsText(file)
+      reader.onload = function (f) {
+        setTimeout(() => {
+          _this.LoadedChannelizatonData = {}
+          _this.handleReset()
+          _this.dialogVisible = false
+          _this.LoadedChannelizatonData = JSON.parse(this.result)
+          _this.load()
+          _this.$alert(_this.$t('openatccomponents.common.uploadsuccess'), { type: 'success' })
+        }, 50)
+      }
+    },
+    async exportToFile () {
+      let tscParam = this.handleSaveParams()
+      let content = new Blob([JSON.stringify(tscParam)])
+      // 生成url对象
+      let urlObject = window.URL || window.webkitURL || window
+      let url = urlObject.createObjectURL(content)
+      // 生成<a></a>DOM元素
+      let el = document.createElement('a')
+      // 链接赋值
+      el.href = url
+      el.download = 'ChanelizationParam.json'
+      // 必须点击否则不会下载
+      el.click()
+      // 移除链接释放资源
+      urlObject.revokeObjectURL(url)
     }
   },
   mounted () {
-    let PhaseData = new PhaseDataMgr(this.phaseList)
-    this.$store.dispatch('InitPhaseDataMgr', PhaseData)
     this.handleClickSketchpad()
   }
 }

package/package/kisscomps/components/DrawChannelization/drawsvg/utils/loadutils.js

@@ -25,11 +25,6 @@ export default class Svgmethods {
       return
     }
     if (filetype === 'image/svg+xml') {
-      reader.readAsText(file, 'UTF-8')
-      reader.addEventListener('load', async (readerEvent) => {
-        const content = readerEvent.target.result
-        call('vectorgraph', content)
-      })
       reader2.readAsDataURL(file)
       reader2.addEventListener('load', async (readerEvent) => {
         const imageSrc = readerEvent.target.result
@@ -41,6 +36,11 @@ export default class Svgmethods {
             height
           }
           call2('vectorgraph', svgsize)
+          reader.readAsText(file, 'UTF-8')
+          reader.addEventListener('load', async (readerEvent) => {
+            const content = readerEvent.target.result
+            call('vectorgraph', content)
+          })
         })
       })
     }
@@ -48,9 +48,6 @@ export default class Svgmethods {
       reader.readAsDataURL(file)
       reader.addEventListener('load', async (readerEvent) => {
         // 图片的 base64 格式, 可以直接当成 img 的 src 属性值
-        const _base64 = reader.result
-        const content = _base64
-        call('picture', content)
         const imageSrc = readerEvent.target.result
         // 调用计算图片大小的方法
         calculateImageSize(imageSrc).then(function ({width, height}) {
@@ -60,6 +57,9 @@ export default class Svgmethods {
             height
           }
           call2('picture', pngsize)
+          const _base64 = reader.result
+          const content = _base64
+          call('picture', content)
         })
       })
     }

package/package/kisscomps/components/KanBan/kanban.vue

@@ -180,7 +180,7 @@ export default {
         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'))
+          // this.$message.error(this.$t('openatccomponents.pattern.splitCheckMsg'))
         }
       }
     },
@@ -202,12 +202,12 @@ export default {
       }
       return maxCycle
     },
-    doChange (val) {
-      // if (val.mode === 7) {
-      //   val.value = 0
-      // } else {
-      //   val.value = 30
-      // }
+    doChange (e) {
+      if (e) {
+        let n = this.index
+        this.$emit('handleMode', n)
+        this.$forceUpdate()
+      }
     }
   }
 }

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

@@ -43,7 +43,7 @@
               <div class="first-1" :style="{'width':item.redWidth,'height':'34px','background':'#f27979'}"></div>
               </div>
           </div>
-        <div v-for="(item, index) in barrierList" :key="index + '1'">
+        <div v-if="showBarrier" v-for="(item, index) in barrierList" :key="index + '1'">
           <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
         </div>
         <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
@@ -123,6 +123,10 @@ export default {
     patternList: {
       type: Array
     },
+    showBarrier: {
+      type: Boolean,
+      default: false
+    },
     localPatternList: {
       type: Array
     },
@@ -162,10 +166,10 @@ export default {
       return res
     },
     timeNumDevide () {
-      if (this.newCycle && this.newCycle > 0) {
-        let res = (this.newCycle - this.syncTime) + '/' + this.newCycle
-        return res
-      }
+      // if (this.newCycle && this.newCycle > 0) {
+      //   let res = (this.newCycle - this.syncTime) + '/' + this.newCycle
+      //   return res
+      // }
       if (this.cycle && this.cycle > 0) {
         let res = (this.cycle - this.syncTime) + '/' + this.cycle
         return res
@@ -191,7 +195,7 @@ export default {
         this.getPedPhasePos()
         this.getBusPos()
         this.getStage()
-        this.handlePatternData()
+        // this.handlePatternData()
       },
       // 深度观察监听
       deep: true
@@ -407,63 +411,174 @@ export default {
       this.newList = []
       if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
       if (!this.controlData.phase) return
-      let cycle = this.controlData.cycle
+      // let cycle = this.controlData.cycle
       if (!this.controlData.rings) return
+      let newValue = []
       for (let rings of this.controlData.rings) {
         let phase = this.controlData.phase
-        let list = []
+        // let list = []
+        let obj = {}
+        for (let key in rings.sequence) {
+          obj[key] = rings.sequence[key]
+        }
+        let newObj = Object.keys(obj).map(val => ({
+          id: obj[val]
+        }))
+        newValue.push(newObj)
         for (let sequ of rings.sequence) {
           let obj = {}
           obj.id = sequ
           let split = phase.filter((item) => {
             return item.id === sequ
           })[0].split
+          newValue.map(d => {
+            d.map(r => {
+              if (r.id === sequ) {
+                r.value = split
+              }
+            })
+          })
+          // let currPhase = this.phaseList.filter((item) => {
+          //   if (item.id === sequ && item.controltype === 99) {
+          //     obj.controltype = item.controltype
+          //   }
+          //   return item.id === sequ
+          // })[0]
+          // if (currPhase) {
+          //   obj.redWidth = (currPhase.redclear / cycle * 100).toFixed(3) + '%'
+          //   obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
+          //   obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
+          //   obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
+          //   // obj.peddirection = currPhase.peddirection
+          //   let peddirections = []
+          //   for (let walk of this.sidewalkPhaseData) {
+          //     for (let ped of currPhase.peddirection) {
+          //       // if (stg === walk.phaseid) {
+          //       let objs = {}
+          //       objs.name = walk.name
+          //       objs.id = walk.id
+          //       if (ped === walk.id) {
+          //         peddirections.push(objs)
+          //         peddirections = Array.from(new Set(peddirections))
+          //       }
+          //       // }
+          //     }
+          //   }
+          //   obj.peddirection = peddirections
+          //   obj.split = split
+          //   obj.direction = currPhase.direction.map(item => {
+          //     return {
+          //       id: item,
+          //       color: '#454545'
+          //     }
+          //   })
+          //   list.push(obj)
+          // }
+        }
+        // this.newList.push(list)
+        // this.patternInfo = [...this.newList]
+      }
+      this.handleOverViewChange(newValue)
+    },
+    handleBarrierHeight () { // 屏障高度
+      if (!this.patternInfo) return
+      let patternLength = this.patternInfo.length
+      this.barrierHeight = (patternLength * 35 + 21) + 'px'
+    },
+    handleOverViewChange (val) {
+      if (val === null || val.length === 0) return
+      this.patternInfo = []
+      let currentArr = []
+      let newPattern = []
+      val.map(i => {
+        newPattern.push(...i)
+      })
+      if (this.phaseList.length === 0) return
+      for (let patternStatus of val[0]) {
+        if (patternStatus.mode !== 7) {
+          let concurrent = this.phaseList.filter((item) => {
+            return item.id === patternStatus.id // patternStatus.id当前相位id concurrent当前相位的并发相位
+          })[0].concurrent// 当前相位的并发相位
+          if (concurrent) {
+            let obj = {
+              id: patternStatus.id,
+              current: concurrent.sort()
+            }
+            currentArr.push(obj)
+          }
+        }
+      }
+      if (currentArr.length !== 0) {
+        let newCurrent = this.tranform(currentArr)
+        let ringTeam = this.step1(this.phaseList, newCurrent)
+        this.fillGap(ringTeam, val)
+      }
+      let cycle = this.controlData.cycle
+      for (let rings of val) {
+        if (rings.length === 0) continue
+        let list = []
+        for (let ring of rings) {
+          if (ring.value === 0) continue
+          let obj = {}
+          let split = ring.value
+          obj.id = ring.id
+          // obj.split = split
           let currPhase = this.phaseList.filter((item) => {
-            if (item.id === sequ && item.controltype === 99) {
+            if (item.id === ring.id && item.controltype === 99) {
               obj.controltype = item.controltype
             }
-            return item.id === sequ
+            return item.id === ring.id
           })[0]
-          if (currPhase) {
-            obj.redWidth = (currPhase.redclear / cycle * 100).toFixed(3) + '%'
-            obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
-            obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
-            obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
-            // obj.peddirection = currPhase.peddirection
-            let peddirections = []
-            for (let walk of this.sidewalkPhaseData) {
-              for (let ped of currPhase.peddirection) {
-                // if (stg === walk.phaseid) {
-                let objs = {}
-                objs.name = walk.name
-                objs.id = walk.id
-                if (ped === walk.id) {
-                  peddirections.push(objs)
-                  peddirections = Array.from(new Set(peddirections))
-                }
-                // }
+          if (ring.desc) {
+            obj.direction = ring.desc.map(item => { // 虚相位desc为空
+              return {
+                id: item.id,
+                color: '#454545'
               }
-            }
-            obj.peddirection = peddirections
-            obj.split = split
+            })
+          } else {
             obj.direction = currPhase.direction.map(item => {
               return {
                 id: item,
                 color: '#454545'
               }
             })
+          }
+          if (ring.sum) {
+            obj.split = split
+            obj.redWidth = (currPhase.redclear + ring.sum / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          } else {
+            obj.split = split
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          }
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          // obj.peddirection = currPhase.peddirection
+          let peddirections = []
+          for (let walk of this.sidewalkPhaseData) {
+            for (let ped of currPhase.peddirection) {
+            // if (stg === walk.phaseid) {
+              let objs = {}
+              objs.name = walk.name
+              objs.id = walk.id
+              if (ped === walk.id) {
+                peddirections.push(objs)
+                peddirections = Array.from(new Set(peddirections))
+              }
+            // }
+            }
+          }
+          obj.peddirection = peddirections
+          // 忽略相位不显示
+          let mode = ring.mode
+          if (mode !== 7) { // 忽略相位不显示
             list.push(obj)
           }
         }
-        this.newList.push(list)
-        this.patternInfo = [...this.newList]
+        this.patternInfo.push(list)
       }
     },
-    handleBarrierHeight () { // 屏障高度
-      if (!this.patternInfo) return
-      let patternLength = this.patternInfo.length
-      this.barrierHeight = (patternLength * 35 + 21) + 'px'
-    },
     handleCurrentChange (val) { // 两个ring的数据
       if (val === null || val.length === 0) return
       this.patternInfo = []

package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -69,6 +69,12 @@
                  @closePhaseBack="closePhaseBack"
                  @closePhaseControl="closePhaseControl"
                 />
+                <priorityControl
+                v-if="specialPage === 'prioritycontrol'"
+                :phaseList="phaseList"
+                 @closePhaseBack="closePhaseBack"
+                 @closePhaseControl="closePhaseControl"
+                />
             </div>
           </transition>
 
@@ -110,6 +116,7 @@ import ManualControlModal from './manualControlModal'
 import ClosePhaseControlModal from './closePhaselControlModal'
 import LockingPhaseControlModal from './lockingPhaselControlModal'
 import TentativePlanControlModal from './tentativeplancontrolmodal'
+import priorityControl from './priorityControl'
 // import { getFaultMesZh, getFaultMesEn } from '../../utils/faultcode.js'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import { GetAllFaultRange } from '../../../api/fault'
@@ -125,6 +132,7 @@ export default {
     ManualControlModal,
     ClosePhaseControlModal,
     LockingPhaseControlModal,
+    priorityControl,
     TentativePlanControlModal
   },
   props: {
@@ -292,6 +300,9 @@ export default {
       }, {
         id: 100,
         iconClass: 'tentativeplan'
+      }, {
+        id: 24,
+        iconClass: 'tentativeplan'
       }],
       phaseRings: [],
       curFaultList: [],
@@ -620,6 +631,11 @@ export default {
         this.isClosePhase = true
         this.phaseRings = ringDataModel.initRingPhaseData()
         this.specialPage = 'tentativeplan'
+      } else if (id === 24) {
+        this.toPage = 3
+        this.isClosePhase = true
+        this.phaseRings = ringDataModel.initRingPhaseData()
+        this.specialPage = 'prioritycontrol'
       } else {
         this.isClosePhase = false
         this.specialPage = ''