openatc-components 0.3.117 → 0.3.119

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

@@ -212,8 +212,8 @@ export default {
       Detector: [], // 管理所有检测器
       DetectorChart: [], // 管理所有检测器统计图
       motorwayicon: '',
-      IconLengh: 33,
-      IconWdith: 109,
+      IconLengh: 60,
+      IconWdith: 134,
       textareaW: 200,
       textareaH: 100,
       pedW: 206,
@@ -389,8 +389,8 @@ export default {
         h: this.IconWdith,
         angle: 0
       }
-      this.IconLengh = 33
-      this.IconWdith = 109
+      this.IconLengh = 60
+      this.IconWdith = 134
       let Motorwaysitem = {
         index: this.index,
         id: this.motorid,

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

@@ -92,7 +92,7 @@ export default {
           // }
           return
         }
-        if (data.data.data === undefined || JSON.stringify(data.data.data) === '{}') return
+        if (JSON.stringify(data.data.data) === '{}') return
         _this.pageindex = 2
         _this.loadedChannelizatonData = JSON.parse(JSON.stringify(data.data.data))
       })

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

@@ -43,18 +43,6 @@
           </div>
         </div>
       </div>
-      <!-- 阶段倒计时 -->
-      <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && contrloType === 'stage'" :class="{'countdownBg': isLoaded}">
-        <div v-for="curStage in stageCountdownList" :key="curStage.id" :style="{color: curStage.phaseCountdownColor}">
-          <div style="overflow: hidden;margin-bottom: 4px;">
-            <span style="float: left;width: 42px;height: 42px;position: relative;border: 1px solid rgba(255, 255, 255, 0.1);margin-right: 5px;">
-              <xdr-dir-selector :Data="xdrData" :Datas="xdrpedData" Width="55px" Height="55px" Widths="55px" Heights="55px" :showlist="curStage.showlist" :roadDirection="roadDirection"></xdr-dir-selector>
-            </span>
-            <span style="float: left;color: #fff;margin-right: 8px;width: 30px;">S{{crossStatusData.current_stage}}:</span>
-            <span style="float: left;font-size: 25px;">{{crossStatusData.current_stagecd}}</span>
-          </div>
-        </div>
-      </div>
       <!-- 手动刷新 -->
       <div v-if="!isLoaded">
         <RefreshSvg @click.native="refresh"/>
@@ -120,18 +108,6 @@
             </div>
           </div>
         </div>
-        <!-- 阶段倒计时 -->
-      <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && contrloType === 'stage'" :class="{'countdownBg': isLoaded}">
-        <div v-for="curStage in stageCountdownList" :key="curStage.id" :style="{color: curStage.phaseCountdownColor}">
-          <div style="overflow: hidden;margin-bottom: 4px;">
-            <span style="float: left;width: 42px;height: 42px;position: relative;border: 1px solid rgba(255, 255, 255, 0.1);margin-right: 5px;">
-              <xdr-dir-selector :Data="xdrData" :Datas="xdrpedData" Width="55px" Height="55px" Widths="55px" Heights="55px" :showlist="curStage.showlist" :roadDirection="roadDirection"></xdr-dir-selector>
-            </span>
-            <span style="float: left;color: #fff;margin-right: 8px;width: 30px;">S{{crossStatusData.current_stage}}:</span>
-            <span style="float: left;font-size: 25px;">{{crossStatusData.current_stagecd}}</span>
-          </div>
-        </div>
-      </div>
         <!-- 手动刷新 -->
         <div v-if="!isLoaded">
           <RefreshSvg @click.native="refresh"/>
@@ -354,7 +330,6 @@ export default {
     return {
       roadDir: 'right', // 道路行车方向，默认右行
       phaseCountdownList: [], // 相位倒计时列表
-      stageCountdownList: [], // 阶段倒计时列表
       statusData: null, // 信号机状态
       LanePhaseData: [], // 车道相位数据
       overlapLanePhaseData: [], // 车道跟随相位数据
@@ -422,14 +397,12 @@ export default {
         return
       }
       this.curPhase = val.current_phase
-      this.curStage = val.current_stage
       this.isHasPhase = true
       this.createPhaseStatusMap()
       // 正常情况下，获取车道相位、车道跟随相位、相位倒计时、行人相位、行人跟随相位 的状态
       this.getPhaseStatus()
       this.getOverlapPhaseStatus()
       this.getCurPhaseCountdown()
-      this.getCurStageCountdown()
       this.getBusPhaseStatus()
       if (this.mainType === '100' || this.mainType === '101' || this.mainType === '104') {
         // 城市道路和路段行人过街才显示人行道状态
@@ -513,7 +486,6 @@ export default {
         })
       }
       this.phaseCountdownList = []
-      this.stageCountdownList = []
       this.resetPhaseStatus()
     },
     handleSpecialControlStatus (Control) {
@@ -526,11 +498,6 @@ export default {
           item.id = ''
           item.phaseCountdownColor = '#fff'
         })
-        this.stageCountdownList.forEach(item => {
-          item.phaseCountdown = ''
-          item.id = ''
-          item.phaseCountdownColor = '#fff'
-        })
       }
       if (this.compLanePhaseData.length) {
         const compLanePhaseData = this.compLanePhaseData.map(data => ({
@@ -730,31 +697,6 @@ export default {
         })
       })
     },
-    getCurStageCountdown () {
-      // 获取当前相位倒计时颜色
-      this.stageCountdownList = []
-      this.phaseStatusList.forEach(phaseInfo => {
-        if (phaseInfo.id === this.curStage) {
-          let countdownObj = {}
-          countdownObj.id = phaseInfo.id
-          countdownObj.phaseCountdown = phaseInfo.countdown
-          countdownObj.phaseCountdownColor = this.ColorMap.get(phaseInfo.type)
-          let curphasedir = this.phaseDirMap.get(phaseInfo.id)
-          if (curphasedir !== undefined) {
-            countdownObj.showlist = curphasedir.direction.map(dir => {
-              return {
-                id: dir,
-                peddirection: this.getshowped(curphasedir.peddirection),
-                color: '#fff'
-              }
-            })
-          } else {
-            countdownObj.showlist = []
-          }
-          this.stageCountdownList.push(countdownObj)
-        }
-      })
-    },
     getshowped (peddirection) {
       let peddirarr = peddirection.map(peddir => ({
         id: peddir,
@@ -780,7 +722,10 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          // this.isShowMessage && this.$message.error(msg)
+          if (this.isShowMessage) {
+            console.log(msg)
+          }
           return
         }
         this.isLoaded = true
@@ -798,11 +743,6 @@ export default {
           return
         }
         this.getTempCrossInfo(res)
-        // 显示阶段的判断条件
-        this.allPatternList = res.data.data.param.patternList
-        if (this.allPatternList[0].rings === undefined || this.allPatternList[0].rings.length === 0) {
-          this.contrloType = 'stage'
-        }
       })
     },
     getTempCrossInfo (res) {
@@ -1107,10 +1047,16 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            // this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            if (this.isShowMessage) {
+              console.log(this.$t('openatccomponents.errorTip.devicenotonline'))
+            }
             return
           }
-          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          // this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          if (this.isShowMessage) {
+            console.log(getMessageByCode(data.data.code, this.$i18n.locale))
+          }
           return
         }
         let channelList = res.data.data.channelList.filter(ele => ele.type !== undefined)

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

@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import CrossDiagram from './crossDirection/crossDiagram.vue'
+import CrossDiagram from './crossDirection/crossDiagram'
 import { setToken } from '../../../utils/auth.js'
 export default {
   name: 'intersection-base-map',

package/src/kisscomps/components/OverLap/OverLap.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 147px 0 468px'}">
+<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 107px 0 468px'}">
     <div class="ring-first" v-for="(list, index1) in this.overlapDatas" :key="index1">
         <div v-for="(item,index2) in list.stageLists" :key="index2" >
           <!-- {{list.peddirection}} -->

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

@@ -11,9 +11,9 @@
  **/
 <template>
   <div class="container-main">
-    <div class="overview-component-content" :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
+    <div :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
       <div class="tuxingjiemian" v-show="curHomePage === 'Graphical' || curHomePage === 'Channelization'" :class="{'minifont': curBodyWidth <= 650}">
-        <div :class="{'changeWidth': graphicMode, 'tuxing-left': !onlyShowIntersectionMap}" ref="tuxingLeft">
+        <div class="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
           <intersection-base-map
             v-if="curHomePage === 'Graphical'"
             ref="intersectionMap"
@@ -29,7 +29,7 @@
             :AgentId="agentId"
             :crossStatusData="crossStatusData"
             :detectorStatusData="detectorStatusData" />
-          <div class="pattern-status" v-if="!graphicMode && !onlyShowIntersectionMap && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
+          <div class="pattern-status" v-if="!graphicMode && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
             <div class="pattern-name cross-mess">{{$t('openatccomponents.overviewcomponent.patternstate')}}</div>
             <div class="pattern-message">({{$t('openatccomponents.overviewcomponent.cycle')}}: {{controlData.cycle}}  {{$t('openatccomponents.overviewcomponent.patternoffset')}}: {{controlData.patternoffset}} {{$t('openatccomponents.overviewcomponent.coordinationtime')}}: {{controlData.offset}})</div>
               <span class="pattern-explain"><el-checkbox v-model="checked">{{$t('openatccomponents.overviewcomponent.overLap')}}</el-checkbox></span>
@@ -93,7 +93,7 @@
           </div>
         </div>
 
-        <div ref="tuxingRight" class="tuxing-right" v-if="!onlyShowIntersectionMap">
+        <div ref="tuxingRight" class="tuxing-right" >
           <scheme-config
             ref="rightpanel"
             :statusData="crossStatusData"
@@ -144,10 +144,6 @@ export default {
     isfromatc: {
       type: Boolean,
       default: true
-    },
-    onlyShowIntersectionMap: {
-      type: Boolean,
-      default: false
     }
   },
   data () {
@@ -171,8 +167,8 @@ export default {
       detectorStatusTimer: null, // 检测器定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '感应式自适应'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
-      ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Inductive Adaptive'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿'], [4, '绿闪']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green'], [4, 'Greenclear']]), // phaseType表示红，黄，绿
       ip: '--',
@@ -339,7 +335,7 @@ export default {
           return
         }
         // 路口已设置渠化，则总览默认显示渠化路口，未设置显示模版路口
-        if (_this.isfromatc === true && data.data.success === true && data.data.data !== undefined && JSON.stringify(data.data.data) !== '{}') {
+        if (_this.isfromatc === true && data.data.success === true && JSON.stringify(data.data.data) !== '{}') {
           _this.curHomePage = 'Channelization'
         } else {
           _this.curHomePage = 'Graphical'

package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -50,7 +50,7 @@
             <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>
+                <xdrdirselector Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>
@@ -79,13 +79,9 @@ export default {
   },
   data () {
     return {
-      showStyle: {
-        left: '2px',
-        top: '0px'
-      },
       styles: {
         left: '1px',
-        top: '0px'
+        top: '0'
       },
       typeOptions: [{
         value: 'flow-split-opt'
@@ -101,9 +97,6 @@ export default {
       type: String,
       default: 'Header'
     },
-    id: {
-      type: Number
-    },
     rings: {
       type: Object
     },
@@ -216,7 +209,6 @@ export default {
                   }
                 }
               }
-              this.$emit('optimizesucess', this.id)
             }
           }).catch(error => {
             console.log(error)
@@ -240,7 +232,6 @@ export default {
                 }
               }
             }
-            this.$emit('optimizesucess', this.id)
           }
         }).catch(error => {
           console.log(error)

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

@@ -14,9 +14,8 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <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': '34px','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': ''">
-              <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+          <div style="position: relative;" :style="{'height': '34px','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': ''">
+            <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -26,18 +25,7 @@
                     </div>
                     <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
                       <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
-                      <div v-if="isMove" class="ring-nums">{{item.split}}</div>
-                      <el-input-number
-                        v-if="!isMove"
-                        class="ring-nums"
-                        size="small"
-                        :controls="false"
-                        :min="0"
-                        :step="1"
-                        v-model.number="item.split"
-                        @change="handleEdit(item)"
-                        style="width: 24px"
-                      ></el-input-number>
+                      <div class="ring-nums">{{item.split}}</div>
                     </div>
                   </div>
                 </el-tooltip>
@@ -53,8 +41,7 @@
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
-            </div>
-          </draggable>
+              </div>
           </div>
         <div v-if="showBarrier">
           <div v-for="(item, index) in barrierList" :key="index + '1'">
@@ -113,7 +100,6 @@
 <script>
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
-import draggable from 'vuedraggable'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
@@ -121,7 +107,6 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
-    draggable,
     xdrdirselector
   },
   data () {
@@ -129,7 +114,6 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
-      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
@@ -158,10 +142,6 @@ export default {
     stagesChange: {
       type: Array
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     controlPhase: {
       type: Object
     },
@@ -363,11 +343,11 @@ export default {
       handler: function (val, oldVal) {
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
-          // setTimeout(() => {
-          this.handleCurrentChange(this.patternStatusList)
+          setTimeout(() => {
+            this.handleCurrentChange(this.patternStatusList)
+            this.handleBarrierHeight()
+          }, 10)
           this.handleBarrierHeight()
-          // }, 10)
-          // this.handleBarrierHeight()
         }
       },
       // 深度观察监听
@@ -395,60 +375,6 @@ export default {
     }
   },
   methods: {
-    move (e) {
-      // 这里的e表示即将停靠的元素。
-      let result = this.barrierArr.filter(item => item.includes(e.relatedContext.element.id))[0]
-      if (!result.includes(e.draggedContext.element.id)) {
-        return false
-      }
-    },
-    endDrag (index) {
-      // 拖动后对原数据排序
-      const idIndexMap = {}
-      this.patternInfo.forEach((subArray, subArrayIndex) => {
-        subArray.forEach((item, index) => {
-          idIndexMap[item.id] = { subArrayIndex, index }
-        })
-      })
-      this.patternStatusList.forEach((subArray, subArrayIndex) => {
-        if (subArray.length > 0) {
-          subArray.sort((aItem, bItem) => {
-            const aIndex = idIndexMap[aItem.id] ? idIndexMap[aItem.id].index : Infinity
-            const bIndex = idIndexMap[bItem.id] ? idIndexMap[bItem.id].index : Infinity
-            return aIndex - bIndex
-          })
-        }
-      })
-    },
-    handleEdit (val) {
-      this.patternStatusList.map(d => {
-        d.map(r => {
-          if (r.id === val.id) {
-            r.value = val.split
-          }
-        })
-      })
-      // this.handleCurrentChange(this.patternStatusList)
-      this.$emit('handleSplitMove', this.patternId)
-    },
-    getMaxCycle (pattern) {
-      // let rings = pattern.rings
-      let maxCycle = 0
-      for (let ring of pattern) {
-        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
-    },
     getPed (data) {
       let ped = []
       for (let stg of data) {
@@ -1139,6 +1065,17 @@ export default {
             j.value = this.controlPhase.phase.filter(item => item.id === j.id)[0].split
           })
         })
+        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
+        this.fixCycle = Math.max(...splitCycle)// 每个环的周期最大值
       }
       // 按环序分组
       let ringlength = []
@@ -1160,7 +1097,6 @@ export default {
         }) : 0
       }) : 0
       let cycle = Math.max(...splitCycle)// 每个环的周期最大值
-      this.fixCycle = cycle// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
@@ -1253,7 +1189,6 @@ export default {
           }
         }
         let resArr = ringArr.map(item => item.data)
-        this.barrierArr = resArr
         let ringTeam = this.step1(this.phaseList, resArr)
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         if (this.patternList) {
@@ -1341,7 +1276,7 @@ export default {
             }
           }
           obj.split = split
-          obj.cycle = cycle
+          obj.cycle = this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle
           const isZero = split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen
           const allAdd = split + currPhase.redclear + currPhase.yellow + currPhase.flashgreen
           if (isZero <= 0) {

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

@@ -64,6 +64,7 @@
                 :currModel="currModel"
                 :ip="ip"
                 :platform="platform"
+                :firm="firm"
                 :responseTime="responseTime"
                 :curFaultList="curFaultList"
                 :confirmedFault="confirmedFault"
@@ -198,6 +199,9 @@ export default {
     platform: {
       type: String
     },
+    firm: {
+      type: String
+    },
     realtimeStatusModalvisible: {
       type: Boolean,
       default: true
@@ -263,7 +267,7 @@ export default {
       faultTimer: null, // 当前故障定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
       ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]), // phaseType表示红，黄，绿
@@ -303,7 +307,7 @@ export default {
         id: 9,
         iconClass: 'zishiying',
         permission: 'configer:manual:base',
-        iconName: '自适应控制'
+        iconName: '方案生成'
       }, {
         id: 10,
         iconClass: 'wuxianlan',
@@ -387,14 +391,14 @@ export default {
           iconName: this.$t('openatccomponents.overview.modelList5'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }, {
-          type: '单点感应',
+          type: '自适应',
           id: 6,
           iconClass: 'ganyingkongzhi',
           permission: 'configer:manual:base',
           iconName: this.$t('openatccomponents.overview.modelList6'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }, {
-          type: '自适应控制',
+          type: '方案生成',
           id: 9,
           iconClass: 'zishiying',
           permission: 'configer:manual:base',
@@ -421,13 +425,6 @@ export default {
           permission: 'configer:manual:base',
           iconName: this.$t('openatccomponents.overview.modelList19'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '感应式自适应',
-          id: 18,
-          iconClass: 'ganyingshizishiying',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList18'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }
       ],
       othersControlList: [
@@ -635,7 +632,8 @@ export default {
       GetRoleByName(`thirdparty--${this.platform}`).then(res => {
         if (!res.data.success) {
           let msg = getMessageByCode(res.data.code, this.$i18n.locale)
-          this.$message.error(msg)
+          // this.$message.error(msg)
+          console.log(msg)
           return
         }
         this.funcSort = 'thirdPartyFunc'
@@ -973,7 +971,8 @@ export default {
       }
       GetAllFaultRange(param).then(res => {
         if (res.data.success !== true) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          // this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          console.log(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         this.curFaultList = res.data.data.content

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

@@ -213,7 +213,8 @@ export default {
       let iframdevid = getIframdevid()
       getAllDerection(iframdevid).then((res) => {
         if (res.data.success !== true) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          // this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          console.log(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         this.allDirection = res.data.data.map(item => {

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

@@ -20,10 +20,10 @@
            :model="manualInfo"
            label-width="90px">
            <el-form-item
-               :label="$t('openatccomponents.overview.duration')"
-               prop="count">
-             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
-           </el-form-item>
+                :label="$t('openatccomponents.overview.greenclear')"
+                prop="intersection">
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
+            </el-form-item>
 
             <el-form-item
                 :label="$t('openatccomponents.overview.yellowflash')"
@@ -44,11 +44,13 @@
           label-position="left"
           :model="manualInfo"
           label-width="90px">
-          <el-form-item
-              :label="$t('openatccomponents.overview.greenclear')"
-              prop="intersection">
-            <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
-          </el-form-item>
+
+           <el-form-item
+               :label="$t('openatccomponents.overview.duration')"
+               prop="count">
+             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+           </el-form-item>
+
            <el-form-item
                :label="$t('openatccomponents.overview.allred')"
                prop="intersection">