openatc-components 0.2.36 → 0.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,
@@ -124,4 +124,4 @@
     "test": "test"
   },
   "license": "ISC"
-}
+}

package/src/i18n/language/en.js

@@ -193,7 +193,6 @@ const en = {
       'modelList2': 'Red Control',
       'modelList3': 'Dark Control',
       'modelList4': 'Step Control',
-      'modelList4-': 'Stage Control',
       'modelList5': 'Fixed_Cycle Control',
       'modelList6': 'Free Control',
       'modelList7': 'Coordinated Induction Control',
@@ -213,6 +212,7 @@ const en = {
       'modelList22': 'Priority Control',
       'modelList23': 'Close Phase',
       'modelList100': 'Tentative Plan',
+      'modelList101': 'Direction Lock',
       'modelList24': 'Priority Control',
       'modelList25': 'Azimuth locking',
       'controlType201': 'Scheme Update Frequency',
@@ -333,11 +333,7 @@ const en = {
       'ignored': 'ignored',
       'untreated': 'untreated',
       'item': 'item',
-      'noselectcontroltip': 'Please select a control method first!',
-      'residentcontrol': 'Resident Control',
-      'schemeselection': 'Pattern Select',
-      'others': 'Others',
-      'recovery': 'Recovery'
+      'noselectcontroltip': 'Please select a control method first!'
     },
     'phase': {
       'desc': 'LaneDirection',

package/src/i18n/language/zh.js

@@ -244,8 +244,7 @@ const zh = {
       'modelList1': '黄闪',
       'modelList2': '全红',
       'modelList3': '关灯',
-      'modelList4': '步进',
-      'modelList4-': '阶段锁定',
+      'modelList4': '阶段锁定',
       'modelList5': '定周期',
       'modelList6': '单点感应',
       'modelList7': '协调感应控制',
@@ -266,6 +265,7 @@ const zh = {
       'modelList25': '方位锁定',
       'modelList23': '相位放行控制',
       'modelList100': '临时方案',
+      'modelList101': '方向锁定',
       'modelList24': '优先控制',
       'modelList99': '设备维护',
       'controlType201': '方案更新频次',
@@ -333,11 +333,7 @@ const zh = {
       'ignored': '已忽略',
       'untreated': '未处理',
       'item': '条',
-      'noselectcontroltip': '请先选择一种控制方式!',
-      'residentcontrol': '驻留控制',
-      'schemeselection': '方案选择',
-      'others': '其他',
-      'recovery': '恢复'
+      'noselectcontroltip': '请先选择一种控制方式!'
     },
     'phase': {
       'desc': '车道方向',

package/src/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue

@@ -47,7 +47,7 @@
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
 import { uploadSingleTscParam } from '../../../api/param.js'
 import { getMessageByCode } from '../../../utils/responseMessage.js'
-import { getIntersectionInfo } from '../../../api/template.js'
+// import { getIntersectionInfo } from '../../../api/template.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 // import { getTheme } from '../../../utils/auth'
@@ -100,57 +100,57 @@ export default {
     }
   },
   methods: {
-    init () {
+    init (IntersectionInfo) {
       this.CrossDiagramMgr = new CrossDiagramMgr()
       this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
-      this.getIntersectionInfo() // 获取路口信息
+      this.getIntersectionInfo(IntersectionInfo) // 获取路口信息
     },
-    getIntersectionInfo () {
+    getIntersectionInfo (res) {
       // 获取路口信息
-      const agentid = this.agentId || '0'
-      getIntersectionInfo(agentid).then(res => {
-        if (!res.data.success) {
-          this.isLoaded = false
-          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
-          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
-          if (res.data.data) {
-            // 子类型错误
-            let childErrorCode = res.data.data.errorCode
-            if (childErrorCode) {
-              let childerror = getMessageByCode(res.data.data.errorCode, this.$i18n.locale)
-              msg = msg + ' - ' + childerror
-            }
-          }
-          msg = msg + ' - ' + commomMsg
-          this.$message.error(msg)
-          return
-        }
-        this.tempType = res.data.data.type
-        // 获取车道相位、行人相位信息（坐标、名称）
-        this.mainType = this.tempType.split('-')[0]
-        this.mainDirection = this.tempType.split('-')[1]
-        if (!this.isThirdSignal) {
-          // 可点击模式下，非第三方设备，按通道显示相位方向
-          this.getChannelInfo()
-          return
-        }
-        this.crossInfo = res.data.data.param
-        // 城市道路加载车道相位坐标和人行道坐标
-        this.getPhasePos()
-        this.getOverlapPhasePos()
-        this.getPedPhasePos()
-        this.getOverlapPedPhasePos()
-        if (this.isThirdSignal) {
-          // 第三方设备，按相位方向显示相位方向
-          this.compLanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
-          this.compSidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
-          let allDir = this.compLanePhaseData.map(ele => ele.id)
-          let allPedDir = this.compSidewalkPhaseData.map(ele => ele.id)
-          this.inneChoosedDirection = this.choosedDirection.filter(dir => allDir.indexOf(dir) !== -1)
-          this.inneChoosedPedDirection = this.choosedPedDirection.filter(dir => allPedDir.indexOf(dir) !== -1)
-          this.drawPhaseIcon()
-        }
-      })
+      // const agentid = this.agentId || '0'
+      // getIntersectionInfo(agentid).then(res => {
+      //   if (!res.data.success) {
+      //     this.isLoaded = false
+      //     let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
+      //     let msg = getMessageByCode(res.data.code, this.$i18n.locale)
+      //     if (res.data.data) {
+      //       // 子类型错误
+      //       let childErrorCode = res.data.data.errorCode
+      //       if (childErrorCode) {
+      //         let childerror = getMessageByCode(res.data.data.errorCode, this.$i18n.locale)
+      //         msg = msg + ' - ' + childerror
+      //       }
+      //     }
+      //     msg = msg + ' - ' + commomMsg
+      //     this.$message.error(msg)
+      //     return
+      //   }
+      this.tempType = res.data.data.type
+      // 获取车道相位、行人相位信息（坐标、名称）
+      this.mainType = this.tempType.split('-')[0]
+      this.mainDirection = this.tempType.split('-')[1]
+      if (!this.isThirdSignal) {
+        // 可点击模式下，非第三方设备，按通道显示相位方向
+        this.getChannelInfo()
+        return
+      }
+      this.crossInfo = res.data.data.param
+      // 城市道路加载车道相位坐标和人行道坐标
+      this.getPhasePos()
+      this.getOverlapPhasePos()
+      this.getPedPhasePos()
+      this.getOverlapPedPhasePos()
+      if (this.isThirdSignal) {
+        // 第三方设备，按相位方向显示相位方向
+        this.compLanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
+        this.compSidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
+        let allDir = this.compLanePhaseData.map(ele => ele.id)
+        let allPedDir = this.compSidewalkPhaseData.map(ele => ele.id)
+        this.inneChoosedDirection = this.choosedDirection.filter(dir => allDir.indexOf(dir) !== -1)
+        this.inneChoosedPedDirection = this.choosedPedDirection.filter(dir => allPedDir.indexOf(dir) !== -1)
+        this.drawPhaseIcon()
+      }
+      // })
     },
     getPhasePos () {
       // 车道相位信息
@@ -448,7 +448,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   }
 }
 </script>

package/src/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -1,19 +1,20 @@
 <template>
-  <div class="intersection-direction-selection">
+  <div class="intersection-direction-selection" v-if="isSpecialIntersection !== undefined">
     <intersection-base-map
-            v-if="!isSpecialIntersection"
+            v-if="!isSpecialIntersection && reset"
             ref="intersectionMap2"
             :crossStatusData="crossStatusData"
             :agentId="agentId"
             isVipRoute
-            clickMode
+            :clickMode="clickMode"
             :isThirdSignal="isThirdSignal"
             :choosedDirection="choosedDirection"
             :choosedPedDirection="choosedPedDirection"
             :roadDirection="roadDirection"
             @handleClickCrossIcon="handleClickCrossIcon" />
     <direction-list-configuration
-      v-if="isSpecialIntersection"
+      v-if="isSpecialIntersection && clickMode && reset"
+      ref="listConfiguration"
       :agentId="agentId"
       :isThirdSignal="isThirdSignal"
       :choosedDirection="choosedDirection"
@@ -34,8 +35,9 @@ export default {
   data () {
     return {
       crossStatusData: {},
-      isSpecialIntersection: false,
-      isThirdSignal: false
+      isSpecialIntersection: undefined,
+      isThirdSignal: false,
+      reset: true
     }
   },
   props: {
@@ -55,6 +57,23 @@ export default {
     },
     thirdSignal: { // 是否是第三方平台（可以直接传，也可以内部接口判断）
       type: Boolean
+    },
+    clickMode: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch: {
+    agentId: {
+      handler: function (val, oldVal) {
+        if (val) {
+          this.reset = false
+          this.$nextTick(() => {
+            this.reset = true
+            this.initSelection()
+          })
+        }
+      }
     }
   },
   methods: {
@@ -87,6 +106,11 @@ export default {
         this.mainType = this.tempType.split('-')[0]
         if (this.mainType === '999') {
           this.isSpecialIntersection = true
+          if (this.clickMode) {
+            this.$nextTick(() => {
+              this.$refs.listConfiguration.init(res)
+            })
+          }
         } else {
           this.isSpecialIntersection = false
         }
@@ -113,15 +137,22 @@ export default {
     },
     handleClickCrossIcon (allChoosedDir, curClickedPhase) {
       this.$emit('handleClickCrossIcon', allChoosedDir, curClickedPhase)
+    },
+    initSelection () {
+      this.getIntersectionInfo()
+      this.getPlatform()
     }
   },
   mounted () {
-    this.getIntersectionInfo()
-    this.getPlatform()
+    this.initSelection()
   },
   destroyed () {
   }
 }
 </script>
 <style lang='scss'>
+  .intersection-direction-selection {
+    width: 100%;
+    height: 100%
+  }
 </style>

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

@@ -15,7 +15,7 @@
       <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'}">
+            <div class="first-1" :class="item.mode===8?'masks': ''" :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">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -38,9 +38,9 @@
                   <i class="iconfont icon-youguidianche" style="position: absolute;top: 8px;left:70px;font-size:12px;color:#454545;" v-if="bus.controltype === 5 && bus.phaseid===item.id"></i>
                 </div>
               </div>
-              <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 class="first-1" :class="item.mode===8?'masks': ''" :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?'masks': ''" :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?'masks': ''" :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>
         <div v-if="showBarrier">
@@ -433,7 +433,7 @@ export default {
     getStage () {
       if (!this.stagesChange) return
       const globalParamModel = this.$store.getters.globalParamModel
-      let pattern = globalParamModel ? globalParamModel.getParamsByType('patternList') : this.allPatternList
+      let pattern = this.allPatternList ? this.allPatternList : globalParamModel.getParamsByType('patternList')
       let mapAdd = pattern.map(item => item.stagesList).map(item => {
         return item.map(val => {
           return val.stageSplit ? val.stageSplit : val.split
@@ -1471,9 +1471,6 @@ export default {
 .masks {
   background: rgb(242, 121, 121) !important;
 }
-.yellowClass {
-  background: #f9dc6a !important;
-}
 .first-1 {
   float: left;
   // text-align: center;

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

@@ -16,36 +16,8 @@
           <transition name="fade-right" mode="out-in"
           :enter-active-class="toPage === 1 ? 'animated fadeInRight' : 'animated fadeInLeft'"
           :leave-active-class="toPage === 1 ? 'animated fadeOutRight' : 'animated fadeOutLeft' ">
-            <div class="new" style="position: absolute;width: 100%;height:100%;"  v-show="(isOperation && !isClosePhase)">
-              <ManualControlModalNew
-              ref="ManualControlModalNew"
-              :residentControlList="residentControlList"
-              :specialControlList="specialControlList"
-              :patternChooseControlList="patternChooseControlList"
-              :othersControlList="othersControlList"
-              :controlData="controlData"
-              :patternAll="patternAll"
-              :crossStatusData="crossStatusData"
-              :preselectModel="preselectModel"
-              :preselectStages="preselectStages"
-              :realtimeStatusModalvisible="realtimeStatusModalvisible"
-              :roadDirection="roadDirection"
-              :closePhaseRings="phaseRings"
-              :sidewalkPhaseData="sidewalkPhaseData"
-              :phaseList="phaseList"
-              :statusData="statusData"
-              :lockPhaseBtnName="lockPhaseBtnName"
-              :overlap="overlap"
-              :patternSelect="patternSelect"
-              :allPatternList="allPatternList"
-              @closeManualModal="closeManualModal"
-              @selectModel="selectModel"
-              @selectStages="selectStages"
-              @patternCommit="patternCommit"
-              @closePhaseBack="closePhaseBack"
-              @closePhaseControl="closePhaseControl"
-              @selectSpecialModel="selectSpecialModelNew" />
-             <!-- <ManualControlModal
+            <div style="position: absolute;width: 100%;height:100%;"  v-show="(isOperation && !isClosePhase)">
+             <ManualControlModal
                :controlData="controlData"
                :modelList="modelList"
                :patternSelect="patternSelect"
@@ -63,10 +35,10 @@
                @selectModel="selectModel"
                @selectStages="selectStages"
                @patternCommit="patternCommit"
-               @selectSpecialModel="selectSpecialModel" /> -->
+               @selectSpecialModel="selectSpecialModel" />
             </div>
           </transition>
-          <!-- <transition name="fade-left" mode="out-in"
+          <transition name="fade-left" mode="out-in"
           enter-active-class="animated fadeInRight"
           leave-active-class="animated fadeOutRight">
             <div style="position: absolute;width: 100%;height:100%" v-show="(isOperation && isClosePhase)">
@@ -78,16 +50,16 @@
                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
                 :roadDirection="roadDirection"
                 @closePhaseBack="closePhaseBack"
-                @closePhaseControl="closePhaseControl" /> -->
-              <!-- <LockingPhaseControlModal
+                @closePhaseControl="closePhaseControl" />
+              <LockingPhaseControlModal
                 v-if="specialPage === 'lockingphase'"
                 :roadDirection="roadDirection"
                 :phaseList="phaseList"
                 :patternStatus="statusData"
                 :lockPhaseBtnName="lockPhaseBtnName"
                 @closePhaseBack="closePhaseBack"
-                @closePhaseControl="closePhaseControl" /> -->
-                <!-- <TentativePlanControlModal
+                @closePhaseControl="closePhaseControl" />
+                <TentativePlanControlModal
                  v-if="specialPage === 'tentativeplan'"
                  :realtimeStatusModalvisible="realtimeStatusModalvisible"
                  :controlData="controlData"
@@ -104,17 +76,17 @@
                 :phaseList="phaseList"
                  @closePhaseBack="closePhaseBack"
                  @closePhaseControl="closePhaseControl"
-                /> -->
-                <!-- <AzimuthLocking
+                />
+                <AzimuthLocking
                 v-if="specialPage === 'azimuthlocking'"
                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
                 :phaseList="phaseList"
                 :patternStatus="statusData"
                  @closePhaseBack="closePhaseBack"
                  @closePhaseControl="closePhaseControl"
-                /> -->
-            <!-- </div>
-          </transition> -->
+                />
+            </div>
+          </transition>
 
           <transition name="fade-left" mode="out-in"
           enter-active-class="animated fadeInLeft"
@@ -150,7 +122,6 @@ import { putTscControl } from '../../../api/control.js'
 import { uploadSingleTscParam } from '../../../api/param.js'
 import RealtimeStatusModal from './realtimeStatusModal'
 import ManualControlModal from './manualControlModal'
-import ManualControlModalNew from './manualControlModalNew'
 import ClosePhaseControlModal from './closePhaselControlModal'
 import LockingPhaseControlModal from './lockingPhaselControlModal'
 import TentativePlanControlModal from './tentativeplancontrolmodal'
@@ -161,10 +132,9 @@ import { getMessageByCode } from '../../../utils/responseMessage'
 import { GetAllFaultRange } from '../../../api/fault'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
-import { setToken, setHost, getTheme } from '../../../utils/auth.js'
+import { setToken, setHost } from '../../../utils/auth.js'
 import RingDataModel from '../../../utils/RingDataModel.js'
 import { getIntersectionInfo } from '../../../api/template'
-
 export default {
   name: 'scheme-config',
   components: {
@@ -174,8 +144,7 @@ export default {
     LockingPhaseControlModal,
     priorityControl,
     AzimuthLocking,
-    TentativePlanControlModal,
-    ManualControlModalNew
+    TentativePlanControlModal
   },
   props: {
     phaseList: {
@@ -335,132 +304,6 @@ export default {
         permission: 'configer:manual:base',
         iconName: '感应式行人过街控制'
       }],
-      residentControlList: [
-        {
-          type: '步进',
-          id: 4,
-          iconClass: 'bujin',
-          permission: 'configer:manual:dwell',
-          iconName: this.$t('openatccomponents.overview.modelList4'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        },
-        {
-          type: '阶段锁定',
-          id: 4,
-          iconClass: 'jieduansuoding',
-          permission: 'configer:manual:dwell',
-          iconName: this.$t('openatccomponents.overview.modelList4-'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        },
-        {
-          type: '相位锁定',
-          id: 22,
-          iconClass: 'xiangweisuoding',
-          permission: 'configer:manual:dwell',
-          iconName: this.$t('openatccomponents.overview.modelList22'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        },
-        {
-          type: '方向锁定',
-          id: 25,
-          iconClass: 'fangxiangsuoding',
-          permission: 'configer:manual:dwell',
-          iconName: this.$t('openatccomponents.overview.modelList25'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }
-      ],
-      specialControlList: [
-        {
-          type: '黄闪',
-          id: 1,
-          iconClass: 'huangshan',
-          permission: 'configer:manual:senior',
-          iconName: this.$t('openatccomponents.overview.modelList1'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '全红',
-          id: 2,
-          iconClass: 'quanhong',
-          permission: 'configer:manual:senior',
-          iconName: this.$t('openatccomponents.overview.modelList2'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '关灯',
-          id: 3,
-          iconClass: 'guandeng',
-          permission: 'configer:manual:senior',
-          iconName: this.$t('openatccomponents.overview.modelList3'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }
-      ],
-      patternChooseControlList: [
-        {
-          type: '定周期',
-          id: 5,
-          iconClass: 'dingzhouqi',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList5'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '单点感应',
-          id: 6,
-          iconClass: 'ganyingkongzhi',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList6'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '自适应控制',
-          id: 9,
-          iconClass: 'zishiying',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList9'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '无电缆协调',
-          id: 10,
-          iconClass: 'wuxianlan',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList10'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '行人过街',
-          id: 12,
-          iconClass: 'xingrenguojie',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList12'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '感应式行人过街',
-          id: 19,
-          iconClass: 'ganyingshixingrenguojie',
-          permission: 'configer:manual:base',
-          iconName: this.$t('openatccomponents.overview.modelList19'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }
-      ],
-      othersControlList: [
-        { // 特殊控制
-          type: '相位关断',
-          id: 23,
-          permission: 'configer:manual:optimize',
-          iconClass: 'closephase',
-          iconName: this.$t('openatccomponents.overview.modelList23'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '临时方案',
-          id: 100,
-          permission: 'configer:manual:optimize',
-          iconClass: 'tentativeplan',
-          iconName: this.$t('openatccomponents.overview.modelList100'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }, {
-          type: '优先控制',
-          id: 24,
-          permission: 'configer:manual:preempt',
-          iconClass: 'prioritycontrol',
-          iconName: this.$t('openatccomponents.overview.modelList24'),
-          bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        }],
       currModel: -1,
       preselectModel: -1, // 预选方案
       preselectStages: -1, // 预选阶段
@@ -639,7 +482,15 @@ export default {
     changeStatus () {
       this.toPage = 1
       this.isOperation = true
-      this.$refs.ManualControlModalNew.init()
+      if (this.modelList.filter(ele => ele.id === 0).length === 0) {
+        let autonomyControl = {
+          id: 0,
+          iconClass: 'zizhukongzhi',
+          permission: 'configer:manual:renew',
+          iconName: '自主控制'
+        }
+        this.modelList.push(autonomyControl)
+      }
     },
     handleGetData (data) {
       let that = this
@@ -716,7 +567,7 @@ export default {
       })
       control.control = that.preselectModel
       // control.terminal = isNaN(parseInt(manualInfo.tempPatternid)) ? Number(manualInfo.tempPatternid.replace(/[^0-9]/ig, '')) : manualInfo.tempPatternid
-      control.terminal = manualInfo.tempPatternid === undefined ? null : Number(manualInfo.tempPatternid)
+      control.terminal = Number(manualInfo.tempPatternid)
       // control.delay = Number(manualInfo.tempDelay)
       control.duration = Number(manualInfo.tempDuration)
       control.value = that.preselectStages === -1 ? 0 : that.preselectStages
@@ -825,10 +676,6 @@ export default {
         this.closePhase = []
       }
     },
-    selectSpecialModelNew () {
-      let ringDataModel = new RingDataModel(this.statusData, this.phaseList)
-      this.phaseRings = ringDataModel.initRingPhaseData()
-    },
     selectSpecialModel (id) {
       let ringDataModel = new RingDataModel(this.statusData, this.phaseList)
       if (id === 23) {