openatc-components 0.3.114 → 0.3.116

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

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

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

@@ -92,7 +92,7 @@ export default {
           // }
           return
         }
-        if (JSON.stringify(data.data.data) === '{}') return
+        if (data.data.data === undefined || 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,6 +43,18 @@
           </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"/>
@@ -108,6 +120,18 @@
             </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"/>
@@ -330,6 +354,7 @@ export default {
     return {
       roadDir: 'right', // 道路行车方向，默认右行
       phaseCountdownList: [], // 相位倒计时列表
+      stageCountdownList: [], // 阶段倒计时列表
       statusData: null, // 信号机状态
       LanePhaseData: [], // 车道相位数据
       overlapLanePhaseData: [], // 车道跟随相位数据
@@ -397,12 +422,14 @@ 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') {
         // 城市道路和路段行人过街才显示人行道状态
@@ -486,6 +513,7 @@ export default {
         })
       }
       this.phaseCountdownList = []
+      this.stageCountdownList = []
       this.resetPhaseStatus()
     },
     handleSpecialControlStatus (Control) {
@@ -498,6 +526,11 @@ 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 => ({
@@ -697,6 +730,31 @@ 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,
@@ -740,6 +798,11 @@ 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) {

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

@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import CrossDiagram from './crossDirection/crossDiagram'
+import CrossDiagram from './crossDirection/crossDiagram.vue'
 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 107px 0 468px'}">
+<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 147px 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 :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
+    <div class="overview-component-content" :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="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
+        <div :class="{'changeWidth': graphicMode, 'tuxing-left': !onlyShowIntersectionMap}" 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 && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
+          <div class="pattern-status" v-if="!graphicMode && !onlyShowIntersectionMap && 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" >
+        <div ref="tuxingRight" class="tuxing-right" v-if="!onlyShowIntersectionMap">
           <scheme-config
             ref="rightpanel"
             :statusData="crossStatusData"
@@ -144,6 +144,10 @@ export default {
     isfromatc: {
       type: Boolean,
       default: true
+    },
+    onlyShowIntersectionMap: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -167,8 +171,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, '预留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']]),
+      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']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿'], [4, '绿闪']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green'], [4, 'Greenclear']]), // phaseType表示红，黄，绿
       ip: '--',
@@ -335,7 +339,7 @@ export default {
           return
         }
         // 路口已设置渠化，则总览默认显示渠化路口，未设置显示模版路口
-        if (_this.isfromatc === true && data.data.success === true && JSON.stringify(data.data.data) !== '{}') {
+        if (_this.isfromatc === true && data.data.success === true && data.data.data !== undefined && 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="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>
@@ -79,9 +79,13 @@ export default {
   },
   data () {
     return {
+      showStyle: {
+        left: '2px',
+        top: '0px'
+      },
       styles: {
         left: '1px',
-        top: '0'
+        top: '0px'
       },
       typeOptions: [{
         value: 'flow-split-opt'
@@ -97,6 +101,9 @@ export default {
       type: String,
       default: 'Header'
     },
+    id: {
+      type: Number
+    },
     rings: {
       type: Object
     },
@@ -209,6 +216,7 @@ export default {
                   }
                 }
               }
+              this.$emit('optimizesucess', this.id)
             }
           }).catch(error => {
             console.log(error)
@@ -232,6 +240,7 @@ export default {
                 }
               }
             }
+            this.$emit('optimizesucess', this.id)
           }
         }).catch(error => {
           console.log(error)

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

@@ -14,8 +14,9 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
-          <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'}">
+          <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'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -25,7 +26,18 @@
                     </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 class="ring-nums">{{item.split}}</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>
                   </div>
                 </el-tooltip>
@@ -41,7 +53,8 @@
               <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>
+            </div>
+          </draggable>
           </div>
         <div v-if="showBarrier">
           <div v-for="(item, index) in barrierList" :key="index + '1'">
@@ -100,6 +113,7 @@
 <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'
@@ -107,6 +121,7 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
+    draggable,
     xdrdirselector
   },
   data () {
@@ -114,6 +129,7 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
+      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
@@ -142,6 +158,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    isMove: {
+      type: Boolean,
+      default: true
+    },
     controlPhase: {
       type: Object
     },
@@ -343,11 +363,11 @@ export default {
       handler: function (val, oldVal) {
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
-          setTimeout(() => {
-            this.handleCurrentChange(this.patternStatusList)
-            this.handleBarrierHeight()
-          }, 10)
+          // setTimeout(() => {
+          this.handleCurrentChange(this.patternStatusList)
           this.handleBarrierHeight()
+          // }, 10)
+          // this.handleBarrierHeight()
         }
       },
       // 深度观察监听
@@ -375,6 +395,60 @@ 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) {
@@ -1179,6 +1253,7 @@ 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) {
@@ -1266,7 +1341,7 @@ export default {
             }
           }
           obj.split = split
-          obj.cycle = this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle
+          obj.cycle = cycle
           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

@@ -263,7 +263,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 +303,7 @@ export default {
         id: 9,
         iconClass: 'zishiying',
         permission: 'configer:manual:base',
-        iconName: '方案生成'
+        iconName: '自适应控制'
       }, {
         id: 10,
         iconClass: 'wuxianlan',
@@ -387,14 +387,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,6 +421,13 @@ 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: [

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

@@ -20,10 +20,10 @@
            :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>
+               :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.yellowflash')"
@@ -44,13 +44,11 @@
           label-position="left"
           :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>
-
+          <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.allred')"
                prop="intersection">

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

@@ -227,7 +227,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
       </g>
     </svg>
     <svg
-      v-if="type === '自适应'"
+      v-if="type === '单点感应'"
       version="1.1"
       id="图层_1"
       xmlns="http://www.w3.org/2000/svg"
@@ -266,7 +266,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
     </svg>
 
     <svg
-      v-if="type === '方案生成'"
+      v-if="type === '自适应控制'"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24.53 21.2"
       :width="iconWidth"
@@ -399,6 +399,38 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
         p-id="6532"
       ></path>
     </svg>
+
+    <svg
+      v-if="type === '感应式自适应'"
+      t="1734600340213"
+      class="icon"
+      viewBox="0 0 1252 1024"
+      version="1.1"
+      xmlns="http://www.w3.org/2000/svg"
+      p-id="12292"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      :width="iconWidth"
+      :height="iconHeight"
+    >
+      <path
+        :class="themeColor"
+        d="M48.597631 254.131387c22.423358 0 44.846715-18.686131 44.846715-44.846715V85.956204h130.80292c18.686131 0 41.109489-18.686131 41.109489-41.109489C265.356755 18.686131 242.933398 0 220.51004 0H48.597631C22.437047 0 3.750916 18.686131 3.750916 44.846715v168.175183c0 22.423358 18.686131 41.109489 44.846715 41.109489zM1203.400551 0h-168.175183c-22.423358 0-44.846715 18.686131-44.846715 44.846715 0 22.423358 18.686131 44.846715 44.846715 44.846716h123.328467v130.802919c0 22.423358 18.686131 44.846715 44.846716 44.846716 22.423358 0 44.846715-18.686131 44.846715-44.846716V44.846715C1244.51004 18.686131 1225.823908 0 1203.400551 0zM1203.400551 766.131387c-22.423358 0-44.846715 18.686131-44.846716 44.846715V934.306569h-130.802919c-22.423358 3.737226-41.109489 22.423358-41.109489 48.583942 3.737226 22.423358 18.686131 37.372263 41.109489 41.109489H1199.663325c22.423358 0 44.846715-18.686131 44.846715-44.846715v-168.175183c0-26.160584-18.686131-44.846715-41.109489-44.846715zM213.035587 930.569343H89.70712v-130.80292c0-22.423358-18.686131-44.846715-44.846715-44.846715-22.423358 0-44.846715 18.686131-44.846716 44.846715V971.678832c0 22.423358 18.686131 44.846715 44.846716 44.846715h168.175182c22.423358-3.737226 41.109489-22.423358 41.109489-48.583941-3.737226-18.686131-18.686131-33.635036-41.109489-37.372263zM556.860405 186.861314H328.889602C284.042887 186.861314 250.40785 224.233577 250.40785 269.080292v485.839416c0 44.846715 33.635036 78.481752 78.481752 78.481752h227.970803c44.846715 0 78.481752-33.635036 78.481752-78.481752v-485.839416C635.342157 224.233577 601.70712 186.861314 556.860405 186.861314z m18.686131 568.058394c0 11.211679-7.474453 18.686131-18.686131 18.686131H328.889602c-11.211679 0-18.686131-7.474453-18.686132-18.686131v-485.839416c0-11.211679 7.474453-18.686131 18.686132-18.686131h227.970803c7.474453 0 14.948905 7.474453 18.686131 18.686131v485.839416zM881.999091 235.445255l-7.474453-7.474452c-11.211679-11.211679-29.89781-11.211679-41.109489 0-11.211679 11.211679-11.211679 29.89781 0 41.109489 130.80292 130.80292 134.540146 343.824818 3.737227 474.627737l-3.737227 3.737226c-11.211679 11.211679-11.211679 29.89781 0 41.10949 7.474453 3.737226 14.948905 7.474453 22.423358 7.474452 7.474453 0 14.948905-3.737226 22.423358-7.474452 153.226277-145.751825 156.963504-396.145985 3.737226-553.10949z"
+        fill="#606266"
+        p-id="12293"
+      ></path>
+      <path
+        :class="themeColor"
+        d="M784.831208 336.350365c-7.474453-14.948905-26.160584-18.686131-41.109489-7.474453-14.948905 11.211679-14.948905 29.89781-7.474453 41.109489 0 3.737226 3.737226 3.737226 7.474453 7.474453 37.372263 33.635036 56.058394 82.218978 56.058394 130.80292s-18.686131 97.167883-56.058394 130.802919c-11.211679 11.211679-11.211679 29.89781 0 41.109489 7.474453 3.737226 14.948905 7.474453 22.423357 7.474453s14.948905-3.737226 22.423358-7.474453c44.846715-44.846715 71.007299-108.379562 71.007299-171.912408s-26.160584-123.328467-74.744525-171.912409z"
+        fill="#606266"
+        p-id="12294"
+      ></path>
+      <path
+        :class="themeColor"
+        d="M702.61223 467.153285c-18.686131 0-29.89781 11.211679-29.897811 26.160584v29.89781c0 14.948905 11.211679 26.160584 26.160584 26.160584h3.737227c14.948905 0 26.160584-11.211679 26.160584-26.160584v-33.635037c3.737226-11.211679-11.211679-22.423358-26.160584-22.423357z"
+        fill="#606266"
+        p-id="12295"
+      ></path>
+    </svg>
   </span>
 </template>