openatc-components 0.0.95 → 0.0.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.0.95",
+  "version": "0.0.98",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,
@@ -21,24 +21,25 @@
     "npm2yuanqu": "npm config set registry http://nexus.ctsp.kedacom.com/content/groups/npm-host-yuanqu/"
   },
   "dependencies": {
+    "@minogin/vue-drag-resize-rotate": "^1.0.5",
+    "@openatc/edgebase-front": "^2.4.0",
+    "animate.css": "^3.7.2",
+    "axios": "0.21.1",
+    "echarts": "^4.9.0",
+    "element-ui": "^2.7.2",
     "flatpickr": "^4.5.1",
     "jquery": "^3.3.1",
+    "js-cookie": "2.2.0",
+    "localStorage": "^1.0.4",
+    "moment": "^2.24.0",
     "pend": "^1.2.0",
+    "scss-loader": "0.0.1",
     "v-tooltip": "^2.0.0-rc.33",
     "vue": "^2.5.2",
-    "vue-router": "^3.0.1",
-    "element-ui": "^2.7.2",
-    "moment": "^2.24.0",
-    "axios": "0.21.1",
-    "js-cookie": "2.2.0",
-    "localStorage": "^1.0.4",
     "vue-i18n": "^8.7.0",
-    "vuex": "3.0.1",
-    "scss-loader": "0.0.1",
+    "vue-router": "^3.0.1",
     "vuedraggable": "^2.16.0",
-    "animate.css": "^3.7.2",
-    "echarts": "^4.9.0",
-    "@minogin/vue-drag-resize-rotate": "^1.0.5"
+    "vuex": "3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

package/src/i18n/language/en.js

@@ -129,6 +129,7 @@ const en = {
       'phaseclose': 'Close Phase',
       'phaselocking': 'Priority Control',
       'tentativeplan': 'Tentative Plan',
+      'prioritycontrol': 'Priority Control',
       'implement': 'Execute',
       'comfirm': 'Comfirm',
       'ipaddress': 'IP',
@@ -206,7 +207,34 @@ const en = {
       'modelList22': 'Priority Control',
       'modelList23': 'Close Phase',
       'modelList100': 'Tentative Plan',
-      'modelList24': 'Emergency Control',
+      'modelList24': 'Priority Control',
+      'priorityType': 'Priority Type',
+      'priorityPhase': 'Priority Phase',
+      'typeOption0': 'Regular Priority',
+      'typeOption1': 'Urgent Priority',
+      'es': 'East-Straight',
+      'el': 'East-Left',
+      'er': 'East-Right',
+      'eb': 'East-Back',
+      'ws': 'West-Straight',
+      'wl': 'West-Left',
+      'wr': 'West-Right',
+      'wb': 'West-Back',
+      'ns': 'North-Straight',
+      'nl': 'North-Left',
+      'nr': 'North-Right',
+      'nb': 'North-Back',
+      'ss': 'South-Straight',
+      'sl': 'South-Left',
+      'sr': 'South-Right',
+      'sb': 'South-Back',
+      'level': 'Level',
+      'levelOption': 'LevelOption',
+      'levelOption1': '1',
+      'levelOption2': '2',
+      'levelOption3': '3',
+      'levelOption4': '4',
+      'levelOption5': '5',
       'modelList99': 'Device Mantenance',
       'tips': 'Tips',
       'exitmanul': 'It is necessary to restore self-control before exiting. Do you want to exit?',

package/src/i18n/language/zh.js

@@ -129,6 +129,34 @@ const zh = {
       'phaseclose': '相位关断',
       'phaselocking': '相位锁定',
       'tentativeplan': '临时方案',
+      'prioritycontrol': '优先控制',
+      'priorityType': '优先类型',
+      'priorityPhase': '优先相位',
+      'typeOption0': '常规优先',
+      'typeOption1': '紧急优先',
+      'es': '东直行',
+      'el': '东左转',
+      'er': '东右转',
+      'eb': '东掉头',
+      'ws': '西直行',
+      'wl': '西左转',
+      'wr': '西右转',
+      'wb': '西掉头',
+      'ns': '北直行',
+      'nl': '北左转',
+      'nr': '北右转',
+      'nb': '北掉头',
+      'ss': '南直行',
+      'sl': '南左转',
+      'sr': '南右转',
+      'sb': '南掉头',
+      'level': '优先级',
+      'levelOption': 'levelOption',
+      'levelOption1': '1',
+      'levelOption2': '2',
+      'levelOption3': '3',
+      'levelOption4': '4',
+      'levelOption5': '5',
       'implement': '执行',
       'comfirm': '确定',
       'ipaddress': 'IP地址',
@@ -206,7 +234,7 @@ const zh = {
       'modelList22': '相位锁定',
       'modelList23': '相位关断',
       'modelList100': '临时方案',
-      'modelList24': '紧急控制',
+      'modelList24': '优先控制',
       'modelList99': '设备维护',
       'tips': '提示',
       'exitmanul': '退出前需要先恢复自主控制, 是否退出?',

package/src/kisscomps/components/BoardCard/BoardCard.vue

@@ -8,6 +8,7 @@
         :patternStatusList="patternStatusList">
         </StageStatus>
         <PatternStatus
+        :showBarrier="showBarrier"
         :localPatternList="localPatternList"
         :contrloType="contrloType"
         :stagesChange="stagesChange"
@@ -17,7 +18,7 @@
         :phaseList="phaseList"
         :cycle="cycle"
         :syncTime="syncTime"
-        :style="{'margin-top':cycle ? '25px':'0'}"
+        :style="{'margin-top':(cycle || !showBarrier)? '25px':'0'}"
         :patternStatusList="patternStatusList"
         :patternId="patternId"
         :cycles="cycles">
@@ -52,6 +53,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    showBarrier: {
+      type: Boolean,
+      default: false
+    },
     phaseList: {
       type: Array
     },

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

@@ -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('handleSplit', n)
+        this.$forceUpdate()
+      }
     }
   }
 }

package/src/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
@@ -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/src/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 = ''

package/src/kisscomps/components/SchemeConfig/priorityControl/index.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="priority-control">
+    <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.prioritycontrol')}}</div>
+    <el-row>
+      <el-col :span="12">
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+            <el-form-item
+                :label="$t('openatccomponents.overview.delay') + ':'"
+                prop="intersection">
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.delay" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+            <el-form-item
+                :label="$t('openatccomponents.overview.priorityType') + ':'"
+                prop="count">
+                <el-select v-model="manualInfo.type" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
+                  <el-option
+                    v-for="item in typeSelect"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
+      </el-col>
+      <el-col :span="12">
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+            <el-form-item
+                :label="$t('openatccomponents.overview.duration') + ':'"
+                prop="intersection">
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.duration" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.duration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+            <el-form-item
+                :label="$t('openatccomponents.overview.priorityPhase') + ':'"
+                prop="count">
+                <el-select v-model="manualInfo.phase" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
+                  <el-option
+                    v-for="(item, index) in phaseSelect"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value">
+                    <div class="single-model">
+                        <xdrdirselector Width="40px" Height="40px" :showlist="item.item"></xdrdirselector>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                    </div>
+                  </el-option>
+                </el-select>
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+            <el-form-item
+                :label="$t('openatccomponents.overview.level') + ':'"
+                prop="count">
+                <el-select v-model="manualInfo.level" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
+                  <el-option
+                    v-for="item in levelOption"
+                    :key="item.value"
+                    :label="$t('openatccomponents.overview.levelOption' + item.value)"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
+      </el-col>
+    </el-row>
+    <div class="footer">
+        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
+import { getTheme } from '../../../../utils/auth'
+import { getDirName } from './utils'
+export default {
+  name: 'prioritycontrol',
+  components: {
+    xdrdirselector
+  },
+  props: {
+    phaseList: {
+      type: Array
+    }
+  },
+  data () {
+    return {
+      levelOption: [{
+        value: 1,
+        label: 1
+      }, {
+        value: 2,
+        label: 2
+      }, {
+        value: 3,
+        label: 3
+      }, {
+        value: 4,
+        label: 4
+      }, {
+        value: 5,
+        label: 5
+      }],
+      typeSelect: [{
+        value: 0,
+        label: this.$t('openatccomponents.overview.typeOption0')
+      }, {
+        value: 1,
+        label: this.$t('openatccomponents.overview.typeOption1')
+      }],
+      phaseSelect: [],
+      manualInfo: {
+        level: 1,
+        phase: 1,
+        type: 0,
+        duration: 300,
+        delay: 0
+      }
+    }
+  },
+  created () {
+    this.getSelect(this.phaseList)
+  },
+  methods: {
+    getSelect (list) {
+      let color = getTheme() === 'light' ? '#1E1E1E' : '#F1F3F4'
+      this.phaseSelect = list.map((item, index) => {
+        let dirArr = []
+        for (let rec of item.direction) {
+          let recd = {
+            id: rec,
+            color: color
+          }
+          dirArr.push(recd)
+        }
+        let nameArr = getDirName(dirArr)
+        let name = ''
+        nameArr = nameArr.map(record => this.$t(record))
+        name = nameArr.join(',')
+        return {
+          label: name,
+          item: dirArr,
+          value: item.id
+        }
+      })
+    },
+    handleClose () {
+      this.$emit('closePhaseBack')
+    },
+    handleManualControl () {
+      let submitdata = {
+        control: 24,
+        delay: this.manualInfo.delay,
+        duration: this.manualInfo.duration,
+        type: this.manualInfo.type,
+        phase: this.manualInfo.phase,
+        level: this.manualInfo.level
+      }
+      console.log(submitdata, 'submitdata')
+      this.$emit('closePhaseControl', submitdata)
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>