openatc-components 0.4.88 → 0.4.90

package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/sidePos.json

@@ -4,7 +4,6 @@
       "name": "东人行横道",
       "ename": "East-Pedestrian",
       "desc": "东行人",
-      "commondesc": "openatccomponents.phase.eped",
       "svgid": "东行人",
       "x": "310px",
       "y": "198px"
@@ -14,7 +13,6 @@
       "name": "西人行横道",
       "ename": "West-Pedestrian",
       "desc": "西行人",
-      "commondesc": "openatccomponents.phase.wped",
       "svgid": "西行人",
       "x": "310px",
       "y": "198px"
@@ -24,7 +22,6 @@
       "name": "南人行横道",
       "ename": "South-Pedestrian",
       "desc": "南行人",
-      "commondesc": "openatccomponents.phase.sped",
       "svgid": "南行人",
       "x": "310px",
       "y": "198px"
@@ -34,7 +31,6 @@
       "name": "北人行横道",
       "ename": "North-Pedestrian",
       "desc": "北行人",
-      "commondesc": "openatccomponents.phase.nped",
       "svgid": "北行人",
       "x": "310px",
       "y": "198px"
@@ -44,7 +40,6 @@
       "name": "东人行横道-上",
       "ename": "East-Top-Pedestrian",
       "desc": "东行人上",
-      "commondesc": "openatccomponents.phase.etped",
       "svgid": "东行人上",
       "x": "310px",
       "y": "198px"
@@ -54,7 +49,6 @@
       "name": "东人行横道-下",
       "ename": "East-Bottom-Pedestrian",
       "desc": "东行人下",
-      "commondesc": "openatccomponents.phase.ebped",
       "svgid": "东行人下",
       "x": "310px",
       "y": "198px"
@@ -64,7 +58,6 @@
       "name": "西人行横道-上",
       "ename": "West-Top-Pedestrian",
       "desc": "西行人上",
-      "commondesc": "openatccomponents.phase.wtped",
       "svgid": "西行人上",
       "x": "310px",
       "y": "198px"
@@ -74,7 +67,6 @@
       "name": "西人行横道-下",
       "ename": "West-Bottom-Pedestrian",
       "desc": "西行人下",
-      "commondesc": "openatccomponents.phase.wbped",
       "svgid": "西行人下",
       "x": "310px",
       "y": "198px"
@@ -84,7 +76,6 @@
       "name": "南人行横道-左",
       "ename": "South-Left-Pedestrian",
       "desc": "南行人左",
-      "commondesc": "openatccomponents.phase.slped",
       "svgid": "南行人左",
       "x": "310px",
       "y": "198px"
@@ -94,7 +85,6 @@
       "name": "南人行横道-右",
       "ename": "South-Right-Pedestrian",
       "desc": "南行人右",
-      "commondesc": "openatccomponents.phase.srped",
       "svgid": "南行人右",
       "x": "310px",
       "y": "198px"
@@ -104,7 +94,6 @@
       "name": "北人行横道-左",
       "ename": "North-Left-Pedestrian",
       "desc": "北行人左",
-      "commondesc": "openatccomponents.phase.nlped",
       "svgid": "北行人左",
       "x": "310px",
       "y": "198px"
@@ -114,7 +103,6 @@
       "name": "北人行横道-右",
       "ename": "North-Right-Pedestrian",
       "desc": "北行人右",
-      "commondesc": "openatccomponents.phase.nrped",
       "svgid": "北行人右",
       "x": "310px",
       "y": "198px"
@@ -124,7 +112,6 @@
       "name": "X人行横道-/",
       "ename": "X-/-Pedestrian",
       "desc": "/行人",
-      "commondesc": "openatccomponents.phase.xrped",
       "svgid": "斜杠行人",
       "x": "310px",
       "y": "198px"
@@ -134,7 +121,6 @@
       "name": "X人行横道-\\",
       "ename": "X-\\-Pedestrian",
       "desc": "\\行人",
-      "commondesc": "openatccomponents.phase.xlped",
       "svgid": "反斜杠行人",
       "x": "310px",
       "y": "198px"
@@ -144,7 +130,6 @@
       "name": "南北路段人行横道",
       "ename": "East-West-Pedestrian",
       "desc": "南北路段行人",
-      "commondesc": "openatccomponents.phase.snped",
       "svgid": "南北路段行人",
       "x": "310px",
       "y": "198px"
@@ -154,7 +139,6 @@
       "name": "东西路段人行横道",
       "ename": "South-North-Pedestrian",
       "desc": "东西路段行人",
-      "commondesc": "openatccomponents.phase.ewped",
       "svgid": "东西路段行人",
       "x": "310px",
       "y": "198px"

package/package/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -42,6 +42,7 @@
       :isThirdSignal="isThirdSignal"
       :channelType="channelType"
       :isShowMessage ="isShowMessage"
+      :isRcp="isRcp"
       @handleClickCrossIcon="handleClickCrossIcon" />
   </div>
 </div>
@@ -134,6 +135,10 @@ export default {
     channelType: {
       type: Boolean,
       default: false
+    },
+    isRcp: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {

package/package/kisscomps/components/OverviewComponent/index.vue

@@ -668,22 +668,48 @@ export default {
     handleGetData (data) {
       let that = this
       if (data.name === '') {
-        data.name = this.$t('openatccomponents.pattern.plan') + data.patternid
+        if (that.$i18n.locale === 'en') {
+          data.name = 'Pattern' + data.patternid
+        } else if (that.$i18n.locale === 'zh') {
+          data.name = '方案' + data.patternid
+        }
       }
       Object.keys(data).forEach(function (key) {
-         if (key === 'mode') {
-          if (data[key] > 0 && data[key] < 9) {
-              data[key] = that.$t('openatccomponents.overview.ParamsMode' + data[key])
+        if (that.$i18n.locale === 'en') {
+          if (key === 'mode') {
+            if (data[key] > 0 && data[key] < 6) {
+              data[key] = that.ParamsModeEn.get(data[key])
             } else {
-              data[key] = that.$t('openatccomponents.overview.ParamsMode0')
+              data[key] = that.ParamsModeEn.get(0)
             }
           }
+          // if (key === 'control') {
+          //   data[key] = that.ParamsControlEn.get(data[key])
+          // }
           if (key === 'phase' || key === 'overlap') {
             for (let val of data[key]) {
-              val.typestr = that.$t('openatccomponents.overview.phaseType' + val.type)
-              val.pedtypestr = that.$t('openatccomponents.overview.phaseType' + val.pedtype)
+              val.typestr = that.phaseTypeEn.get(val.type)
+              val.pedtypestr = that.phaseTypeEn.get(val.pedtype)
+            }
+          }
+        } else if (that.$i18n.locale === 'zh') {
+          if (key === 'mode') {
+            if (data[key] > 0 && data[key] < 6) {
+              data[key] = that.ParamsMode.get(data[key])
+            } else {
+              data[key] = that.ParamsMode.get(0)
             }
           }
+          // if (key === 'control') {
+          //   data[key] = that.ParamsControl.get(data[key])
+          // }
+          if (key === 'phase' || key === 'overlap') {
+            for (let val of data[key]) {
+              val.typestr = that.phaseType.get(val.type)
+              val.pedtypestr = that.phaseType.get(val.pedtype)
+            }
+          }
+        }
       })
       return data
     },

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

@@ -11,8 +11,33 @@
  **/
 <template>
     <div class="main-patternstatus">
+      <!-- rcp模式 -->
+      <div v-if="patternType === 'rcp'">
+        <div class="ring-first" v-for="(list, index1) in patternRcp" :key="index1">
+          <div style="position: relative" :style="{height: '34px',paddingRight: '1px',float: 'left',width:
+              ((item.split + (item.sum ? item.sum : 0)) /(item.cycle > cycles ? item.cycle : cycles)) *100 +'%',}"
+              v-for="(item, index2) in list" :key="index2">
+            <div class="first-1" :style="{ width:
+                  (Number(item.greenWidth.replace('%', '')) /
+                    Number((((item.split + (item.sum ? item.sum : 0)) /
+                  (item.cycle > cycles ? item.cycle : cycles)) * 100 + '%').replace('%', ''))) * 100 + '%', height: '34px',background: '#7ccc66'}">
+            </div>
+            <el-tooltip placement="top-start" effect="light">
+                <div v-if="item.id" slot="content">P{{ item.id }}:{{ item.split }}</div>
+                <div v-if="item.id" style="cursor: pointer">
+                  <div
+                    class="box"
+                    style="position: absolute; width:40px; left: 0; top: 5px"
+                  >
+                    <div class="ring-nums">P{{ item.id }}:{{ item.split }}</div>
+                  </div>
+                </div>
+              </el-tooltip>
+          </div>
+      </div>
+      </div>
       <!-- 环模式true -->
-      <div v-if="this.contrloType === 'ring' || !this.contrloType">
+      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
             <div style="position: relative;" :style="{'height': '35px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode === 7 ? 'direction' : isBorder ? 'hovercell' : ''">
@@ -134,6 +159,7 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
+      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -170,6 +196,9 @@ export default {
     controlPhase: {
       type: Object
     },
+    patternType: {
+      type: String
+    },
     contrloType: {
       type: String
     },
@@ -342,6 +371,9 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
       },
       // 深度观察监听
       deep: true
@@ -366,6 +398,9 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           // setTimeout(() => {
@@ -398,6 +433,9 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
+    if (this.patternType === 'rcp') {
+      this.handleRcp(this.patternStatusList)
+    }
   },
   methods: {
     move (e) {
@@ -485,6 +523,48 @@ export default {
       }
       return ped
     },
+    handleRcp (val) {
+      this.patternRcp = []
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.splitchain
+        })
+      })
+      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)// 每个环的周期最大值
+      for (let rings of val) {
+        if (rings.length === 0) continue
+        let list = []
+        for (let ring of rings) {
+          if (ring.splitchain === 0) continue
+          let obj = {}
+          let split = ring.splitchain
+          obj.split = split
+          obj.cycle = cycle
+          obj.id = ring.phases
+          // if (ring.sum) {
+          //   obj.sum = ring.sum
+          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // } else {
+          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // }
+          // obj.mode = ring.mode
+          obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
+          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // 忽略相位不显示
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
+        }
+        this.patternRcp.push(list)
+      }
+    },
     handleStageData (data) {
       if (!data) return
       let peddirections = this.getPed(data)

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

@@ -135,6 +135,7 @@ import LockingPhaseControlModal from './lockingPhaselControlModal'
 import TentativePlanControlModal from './tentativeplancontrolmodal'
 import AzimuthLocking from './azimuthlocking'
 import priorityControl from './priorityControl'
+// import { getFaultMesZh, getFaultMesEn } from '../../utils/faultcode.js'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import { GetAllFaultRange } from '../../../api/fault'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
@@ -674,24 +675,46 @@ export default {
     handleGetData (data) {
       let that = this
       if (data.name === '') {
-        data.name = this.$t('openatccomponents.pattern.plan') + data.patternid
+        if (that.$i18n.locale === 'en') {
+          data.name = 'Pattern' + data.patternid
+        } else if (that.$i18n.locale === 'zh') {
+          data.name = '方案' + data.patternid
+        }
       }
       Object.keys(data).forEach(function (key) {
-        if (key === 'mode') {
-          if (data[key] > 0 && data[key] < 9) {
-              data[key] = that.$t('openatccomponents.overview.ParamsMode' + data[key])
+        if (that.$i18n.locale === 'en') {
+          if (key === 'mode') {
+            if (that.ParamsModeEn.get(data[key]) !== undefined) {
+              data[key] = that.ParamsModeEn.get(data[key])
             } else {
-              data[key] = that.$t('openatccomponents.overview.ParamsMode0')
+              data[key] = that.ParamsModeEn.get(0)
+            }
+          }
+          // if (key === 'control') {
+          //   data[key] = that.ParamsControlEn.get(data[key])
+          // }
+          if (key === 'phase') {
+            for (let val of data[key]) {
+              val.type = that.phaseTypeEn.get(val.type)
+            }
+          }
+        } else if (that.$i18n.locale === 'zh') {
+          if (key === 'mode') {
+            if (that.ParamsMode.get(data[key]) !== undefined) {
+              data[key] = that.ParamsMode.get(data[key])
+            } else {
+              data[key] = that.ParamsMode.get(0)
             }
           }
           if (key === 'control') {
-            data[key] = that.$t('openatccomponents.overview.modelList' + data[key])
+            data[key] = that.ParamsControl.get(data[key])
           }
           if (key === 'phase') {
             for (let val of data[key]) {
-              val.type = that.$t('openatccomponents.overview.phaseType' + val.type)
+              val.type = that.phaseType.get(val.type)
             }
           }
+        }
       })
       return data
     },

package/package/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue

@@ -1217,6 +1217,25 @@ export default {
       }
       return maxCycle
     },
+    // checkPatternRules (rings) {
+    //   if (!this.isRingCycleEqual(rings)) {
+    //     this.patternCycleEqual = false
+    //   } else {
+    //     this.patternCycleEqual = true
+    //   }
+    //   if (!this.patternCycleEqual) {
+    //     let mess = `方案中存在环周期时长不一致`
+    //     if (this.$i18n.locale === 'en') {
+    //       mess = `Inconsistent loop cycle durations exist in the scheme`
+    //     }
+    //     this.$message({
+    //       message: mess,
+    //       type: 'error',
+    //       dangerouslyUseHTMLString: true
+    //     })
+    //     return false
+    //   }
+    // },
     handleManualControl () {
       let submitdata = {
         control: 100,

package/package/kisscomps/components/overView/index.vue

@@ -89,6 +89,7 @@ import { setIframdevid, getStageTypes, setToken, setHost } from '../../../utils/
 // import BoardCard from '@/components/BoardCard'
 // import OverLap from '@/components/OverLap'
 import { getIntersectionInfo } from '../../../api/template'
+// import { getFaultMesZh, getFaultMesEn } from '../../utils/faultcode.js'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr'
@@ -546,24 +547,46 @@ export default {
     handleGetData (data) {
       let that = this
       if (data.name === '') {
-        data.name = this.$t('openatccomponents.pattern.plan') + data.patternid
+        if (that.$i18n.locale === 'en') {
+          data.name = 'Pattern' + data.patternid
+        } else if (that.$i18n.locale === 'zh') {
+          data.name = '方案' + data.patternid
+        }
       }
       Object.keys(data).forEach(function (key) {
-        if (key === 'mode') {
-          if (data[key] > 0 && data[key] < 9) {
-              data[key] = that.$t('openatccomponents.overview.ParamsMode' + data[key])
+        if (that.$i18n.locale === 'en') {
+          if (key === 'mode') {
+            if (that.ParamsModeEn.get(data[key]) !== undefined) {
+              data[key] = that.ParamsModeEn.get(data[key])
             } else {
-              data[key] = that.$t('openatccomponents.overview.ParamsMode0')
+              data[key] = that.ParamsModeEn.get(0)
             }
           }
           if (key === 'control') {
-            data[key] = that.$t('openatccomponents.overview.modelList' + data[key])
+            data[key] = that.ParamsControlEn.get(data[key])
           }
           if (key === 'phase') {
             for (let val of data[key]) {
-              val.type = that.$t('openatccomponents.overview.phaseType' + val.type)
+              val.type = that.phaseTypeEn.get(val.type)
+            }
+          }
+        } else if (that.$i18n.locale === 'zh') {
+          if (key === 'mode') {
+            if (that.ParamsMode.get(data[key]) !== undefined) {
+              data[key] = that.ParamsMode.get(data[key])
+            } else {
+              data[key] = that.ParamsMode.get(0)
             }
           }
+          if (key === 'control') {
+            data[key] = that.ParamsControl.get(data[key])
+          }
+          if (key === 'phase') {
+            for (let val of data[key]) {
+              val.type = that.phaseType.get(val.type)
+            }
+          }
+        }
       })
       return data
     },

package/package/kisscomps/components/patternList/patternList.vue

@@ -3,6 +3,7 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
+    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
     :isBorder="isBorder"
@@ -552,6 +553,9 @@ export default {
     patternStatusList: {
       type: Array
     },
+    patternType: {
+      type: String
+    },
     patternId: {
       type: Number
     },

package/package/kisscomps/index.js

@@ -35,12 +35,11 @@ import IntersectionDirectionSelection from './components/IntersectionDirectionSe
 import PhaseLegend from './components/PhaseLegend/index.js'
 import OverviewComponent from './components/OverviewComponent/index.js'
 import IntersectionMapDirSelect from './components/IntersectionMapDirSelect/index.js'
-import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions, setLanguage, getLanguage } from '../utils/auth.js'
+import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions } from '../utils/auth.js'
 import componentsGlobalParam from '../store/modules/globalParam'
 
 import en from '../i18n/language/en'
 import zh from '../i18n/language/zh'
-import ru from '../i18n/language/ru'
 // 第三方插件
 import VTooltip from 'v-tooltip'
 
@@ -85,13 +84,10 @@ const components = {
 
 const language = {
   en,
-  zh,
-  ru
+  zh
 }
 
 const func = {
-  getLanguage,
-  setLanguage,
   setHost,
   setToken,
   setUserRoles,