openatc-components 0.3.24 → 0.3.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.3.24",
+  "version": "0.3.26",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/i18n/language/en.js

@@ -149,8 +149,8 @@ const en = {
       'patternnum': 'Pattern Number',
       'details': 'Details',
       'autocontrol': 'Multi Period',
-      'yellowflash': 'Yellow light',
-      'allred': 'Red Control',
+      'yellowflash': 'Yellow light(s)',
+      'allred': 'Red Control(s)',
       'step': 'Step Control',
       'fixedperiod': 'Fixed_Cycle Control',
       'inductioncontrol': 'Free Control',
@@ -272,17 +272,17 @@ const en = {
       'levelOption5': '5',
       'modelList99': 'Device Mantenance',
       'tips': 'Tips',
-      'mingreen': 'MinGreen',
+      'mingreen': 'MinGreen(s)',
       'azimuthlocking': 'Azimuth Locking',
       'indirection': 'Inlet direction',
-      'greenclear': 'GreenClear',
+      'greenclear': 'GreenClear(s)',
       'exitmanul': 'It is necessary to restore self-control before exiting. Do you want to exit?',
       'canceled': 'Cancelled',
       'nextcycleeffic': 'Successful execution, the next cycle will take effect!',
       'transitioneffic': 'The execution is successful. It will take effect after the transition switch!',
       'controlnumerrormess': 'When the control mode is user-defined, the control mode number cannot be empty!',
-      'delay': 'Delay time',
-      'duration': 'Duration',
+      'delay': 'Delay time(s)',
+      'duration': 'Duration(s)',
       'curModel': 'Current Model',
       'curStage': 'Current Stage',
       'curPhase': 'Current Phase',

package/src/i18n/language/zh.js

@@ -201,8 +201,8 @@ const zh = {
       'patternnum': '方案编号',
       'details': '详情',
       'autocontrol': '多时段',
-      'yellowflash': '黄灯',
-      'allred': '全红',
+      'yellowflash': '黄灯(s)',
+      'allred': '全红(s)',
       'step': '步进',
       'fixedperiod': '定周期',
       'inductioncontrol': '感应控制',
@@ -273,16 +273,16 @@ const zh = {
       'modelList99': '设备维护',
       'controlType201': '方案更新频次',
       'tips': '提示',
-      'mingreen': '最小绿',
-      'greenclear': '绿闪',
+      'mingreen': '最小绿(s)',
+      'greenclear': '绿闪(s)',
       'indirection': '进口方向',
       'exitmanul': '退出前需要先恢复自主控制, 是否退出?',
       'canceled': '已取消',
       'nextcycleeffic': '执行成功，下周期生效！',
       'transitioneffic': '执行成功，过渡切换后生效！',
       'controlnumerrormess': '控制方式为自定义时，控制方式编号不能为空！',
-      'delay': '延迟时间',
-      'duration': '持续时间',
+      'delay': '延迟时间(s)',
+      'duration': '持续时间(s)',
       'curModel': '控制方式',
       'curStage': '当前阶段',
       'curPhase': '当前相位',

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

@@ -10,6 +10,7 @@
         <PatternStatus
         :showBarrier="showBarrier"
         :controlPhase="controlPhase"
+        :isShowTip="isShowTip"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
         :contrloType="contrloType"
@@ -71,6 +72,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    isShowTip: {
+      type: Boolean,
+      default: true
+    },
     showBarrier: {
       type: Boolean,
       default: false

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

@@ -17,7 +17,7 @@
           <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 slot="content" v-if="isShowTip">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
@@ -131,6 +131,10 @@ export default {
     }
   },
   props: {
+    isShowTip: {
+      type: Boolean,
+      default: true
+    },
     cycleChange: {
       type: Boolean,
       default: true

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

@@ -12,7 +12,7 @@
 <template>
   <div class="PhasePedSelect">
     <div class="item">
-      <div class="name">{{$t('openatccomponents.channel.phaseVehicle')}}：</div>
+      <div class="name">{{$t('openatccomponents.channel.phaseVehicle')}}</div>
       <div class="content">
         <template v-for="(ring, index) in phaseDirection">
           <div :class="ring.selected ? 'card-selected' : 'card'" :key="ring" @click="onCardClick(ring, index)" :style="getStyle(ring)">
@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="item">
-      <div class="name">{{$t('openatccomponents.channel.phasePedestrian')}}：</div>
+      <div class="name">{{$t('openatccomponents.channel.phasePedestrian')}}</div>
       <div class="content">
         <template v-for="(ring, index) in pedDirection">
           <div :class="ring.selected ? 'card-selected' : 'card'" :key="ring" @click="onCardClick(ring, index)">

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

@@ -12,7 +12,8 @@
 <template>
   <div class="scheme-config openatc-scheme-config" style="height: 100%;">
     <fault-detail-modal ref="faultDetail" :agentId="agentId" :isFromAtc="isFromAtc" @refreshFault="getFaultById"></fault-detail-modal>
-        <div style="height: 100%;">
+        <!-- 带实时面板的完整功能（带动画） -->
+        <div style="height: 100%;" v-if="realtimeStatusModalvisible">
           <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' ">
@@ -39,6 +40,7 @@
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
               :isShowBack="isShowBack"
+              :isShowRecovery="isShowRecovery"
               @closeManualModal="closeManualModal"
               @selectModel="selectModel"
               @selectStages="selectStages"
@@ -75,6 +77,41 @@
             </div>
           </transition>
         </div>
+        <!-- 只有控制功能（无动画） -->
+        <div v-else style="height: 100%;">
+          <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"
+            :isShowBack="isShowBack"
+            :isShowRecovery="isShowRecovery"
+            @closeManualModal="closeManualModal"
+            @selectModel="selectModel"
+            @selectStages="selectStages"
+            @patternCommit="patternCommit"
+            @closePhaseBack="closePhaseBack"
+            @closePhaseControl="closePhaseControl"
+            @selectSpecialModel="selectSpecialModelNew" />
+          </div>
+        </div>
   </div>
 </template>
 
@@ -177,6 +214,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -7,19 +7,19 @@
              ref="manual"
              label-position="left"
              :model="manualInfo"
-             label-width="74px">
+             label-width="90px">
              <el-form-item
-                  :label="$t('openatccomponents.overview.duration') + ':'"
+                  :label="$t('openatccomponents.overview.duration')"
                   prop="count">
                   <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.duration" size="small"></el-input-number>
               </el-form-item>
               <el-form-item
-                  :label="$t('openatccomponents.overview.yellowflash') + ':'"
+                  :label="$t('openatccomponents.overview.yellowflash')"
                   prop="intersection">
                   <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.yellowflash" size="small"></el-input-number>
               </el-form-item>
               <el-form-item
-                  :label="$t('openatccomponents.overview.mingreen') + ':'"
+                  :label="$t('openatccomponents.overview.mingreen')"
                   prop="intersection">
                   <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.mingreen" size="small"></el-input-number>
               </el-form-item>
@@ -30,14 +30,14 @@
              ref="manual"
              label-position="left"
              :model="manualInfo"
-             label-width="74px">
+             label-width="90px">
              <el-form-item
-                  :label="$t('openatccomponents.overview.greenclear') + ':'"
+                  :label="$t('openatccomponents.overview.greenclear')"
                   prop="count">
                   <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.greenclear" size="small"></el-input-number>
               </el-form-item>
               <el-form-item
-                  :label="$t('openatccomponents.overview.allred') + ':'"
+                  :label="$t('openatccomponents.overview.allred')"
                   prop="intersection">
                   <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.allred" size="small"></el-input-number>
               </el-form-item>
@@ -46,7 +46,7 @@
       </el-row>
       <el-row style="margin-top: 6px;">
         <el-col :span="24">
-            <span class="model-label-title">{{$t('openatccomponents.overview.indirection')}}:</span>
+            <span class="model-label-title">{{$t('openatccomponents.overview.indirection')}}</span>
         </el-col>
         <el-col :span="24">
             <div class="control-model" v-for="(item, index) in imgs" :key="index">
@@ -80,7 +80,7 @@
         </el-col>
       </el-row>
       <!-- <div class="model-label" style="width: auto;overflow: hidden;">
-        <span class="intitle">{{$t('openatccomponents.overview.indirection')}}:</span>
+        <span class="intitle">{{$t('openatccomponents.overview.indirection')}}</span>
         <div class="control-model" v-for="(item, index) in imgs" :key="index">
             <div :class="{'single-model-select':spanIndex.indexOf(index)>-1}" class="single-model"  @click="boxShow(index,item)">
                 <div v-if="item.class" :class="item.class" style="border:0px"></div>
@@ -90,12 +90,12 @@
       </div> -->
       <div class="footer" v-if="realtimeStatusModalvisible">
           <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-          <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+          <el-button v-if="isShowRecovery && isHasPermission('configer:manual:renew')" @click="toAutoControl()">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
       </div>
       <div class="footer" v-if="!realtimeStatusModalvisible">
           <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-          <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+          <el-button v-if="isShowRecovery && isHasPermission('configer:manual:renew')" @click="toAutoControl()">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
       </div>
     </div>
@@ -121,6 +121,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

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

@@ -18,14 +18,14 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="74px">
+           label-width="90px">
             <el-form-item
-                :label="$t('openatccomponents.overview.delay') + ':'"
+                :label="$t('openatccomponents.overview.delay')"
                 prop="intersection">
               <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDelay" size="small"></el-input-number>
             </el-form-item>
             <el-form-item
-                :label="$t('openatccomponents.overview.duration') + ':'"
+                :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>
@@ -33,7 +33,7 @@
       </el-col>
     </el-row>
     <el-row>
-        <div class="model-label">{{$t('openatccomponents.overview.mode')}}:</div>
+        <div class="model-label">{{$t('openatccomponents.overview.mode')}}</div>
         <div style="width: 100%; overflow: hidden;margin-top: 20px;">
           <common-kanban
             v-for="ring in closePhaseRings"
@@ -62,12 +62,12 @@
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
         <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
         <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
@@ -122,6 +122,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -18,21 +18,21 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="74px">
+           label-width="90px">
            <el-form-item
-                :label="$t('openatccomponents.phase.greenclear') + ':'"
+                :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') + ':'"
+                :label="$t('openatccomponents.overview.yellowflash')"
                 prop="intersection">
               <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempYellow" size="small"></el-input-number>
             </el-form-item>
 
             <el-form-item
-                :label="$t('openatccomponents.phase.mingreen') + ':'"
+                :label="$t('openatccomponents.overview.mingreen')"
                 prop="count">
               <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempMingreen" size="small"></el-input-number>
             </el-form-item>
@@ -43,16 +43,16 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="74px">
+          label-width="90px">
 
            <el-form-item
-               :label="$t('openatccomponents.overview.duration') + ':'"
+               :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') + ':'"
+               :label="$t('openatccomponents.overview.allred')"
                prop="intersection">
              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempRedclear" size="small"></el-input-number>
            </el-form-item>
@@ -92,7 +92,7 @@
     </el-row>
     <div class="footer">
         <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleLockPhase()">{{lockPhaseBtnName}}</el-button>
     </div>
   </div>
@@ -127,6 +127,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -27,9 +27,9 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="74px">
+           label-width="90px">
             <el-form-item
-                :label="$t('openatccomponents.overview.duration') + ':'"
+                :label="$t('openatccomponents.overview.duration')"
                 prop="count">
               <el-input-number style="width: 170px;" v-model="manualInfo.tempDuration" :controls="false" :max="65535" :min="0" :precision="0" :step="1" :placeholder="$t('openatccomponents.common.input')" size="small"></el-input-number>
             </el-form-item>
@@ -37,7 +37,7 @@
         </div>
 
         <div class="stage-part" v-if="preselecttype === '阶段锁定'">
-          <div class="stage-label">{{$t('openatccomponents.overview.stage')}}:</div>
+          <div class="stage-label">{{$t('openatccomponents.overview.stage')}}</div>
           <div style="width: 100%; height: auto;overflow: hidden;" v-if="isHasPermission('configer:manual:dwell')">
             <Stages :crossStatusData="manuals?manualsStage:realtimeStage"
                     :phaseList="phaseList"
@@ -55,6 +55,7 @@
           :patternStatus="statusData"
           :lockPhaseBtnName="lockPhaseBtnName"
           :isShowBack="isShowBack"
+          :isShowRecovery="isShowRecovery"
           @closePhaseBack="handleClose"
           @closePhaseControl="closePhaseControl"
           @toAutoControl="toAutoControl" />
@@ -65,17 +66,18 @@
           :phaseList="phaseList"
           :patternStatus="statusData"
           :isShowBack="isShowBack"
+          :isShowRecovery="isShowRecovery"
            @closePhaseBack="handleClose"
            @toAutoControl="toAutoControl"
           />
 
           <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
             <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-            <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+            <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
             <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
           </div>
           <div class="footer" v-if="!realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-            <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+            <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
             <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
           </div>
       </el-tab-pane>
@@ -94,9 +96,9 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="74px">
+           label-width="90px">
             <el-form-item
-                :label="$t('openatccomponents.overview.duration') + ':'"
+                :label="$t('openatccomponents.overview.duration')"
                 prop="count">
               <el-input-number style="width: 170px;" v-model="manualInfo.tempDuration" :controls="false" :max="65535" :min="0" :precision="0" :step="1" :placeholder="$t('openatccomponents.common.input')" size="small"></el-input-number>
             </el-form-item>
@@ -105,11 +107,11 @@
 
         <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
           <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-          <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+          <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
         </div>
         <div class="footer" v-if="!realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-          <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+          <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
 
@@ -129,14 +131,14 @@
              ref="manual"
              label-position="left"
              :model="manualInfo"
-             label-width="74px">
+             label-width="90px">
               <el-form-item
-                  :label="$t('openatccomponents.overview.duration') + ':'"
+                  :label="$t('openatccomponents.overview.duration')"
                   prop="count">
                 <el-input-number style="width: 170px;" v-model="manualInfo.tempDuration" :controls="false" :max="65535" :min="0" :precision="0" :step="1" :placeholder="$t('openatccomponents.common.input')" size="small"></el-input-number>
               </el-form-item>
               <el-form-item
-              :label="$t('openatccomponents.overview.controlnumber') + ':'"
+              :label="$t('openatccomponents.overview.controlnumber')"
               prop="shape">
                   <el-select style="width: 170px;" v-model="manualInfo.tempPatternid" @change="handleSelectPatternOption" class="col-inner"  size="small" :placeholder="$t('openatccomponents.common.select')">
                     <el-option
@@ -174,11 +176,11 @@
 
           <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
             <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-            <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+            <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
             <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
           </div>
           <div class="footer" v-if="!realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-            <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+            <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
             <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
           </div>
       </el-tab-pane>
@@ -201,6 +203,7 @@
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :roadDirection="roadDirection"
         :isShowBack="isShowBack"
+        :isShowRecovery="isShowRecovery"
         @closePhaseBack="handleClose"
         @closePhaseControl="closePhaseControl"
         @toAutoControl="toAutoControl" />
@@ -213,6 +216,7 @@
          :patternSelect="patternSelect"
          :allPatternList="allPatternList"
          :isShowBack="isShowBack"
+         :isShowRecovery="isShowRecovery"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
@@ -222,6 +226,7 @@
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :phaseList="phaseList"
         :isShowBack="isShowBack"
+        :isShowRecovery="isShowRecovery"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
@@ -342,6 +347,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

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

@@ -7,15 +7,15 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="74px">
+           label-width="90px">
             <el-form-item
-                :label="$t('openatccomponents.overview.delay') + ':'"
+                :label="$t('openatccomponents.overview.delay')"
                 prop="intersection">
                 <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.delay" size="small"></el-input-number>
                <!-- <el-input v-model="manualInfo.tempDelay" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
             <el-form-item
-                :label="$t('openatccomponents.overview.priorityType') + ':'"
+                :label="$t('openatccomponents.overview.priorityType')"
                 prop="count">
                 <el-select v-model="manualInfo.type" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
                   <el-option
@@ -34,15 +34,15 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="74px">
+           label-width="90px">
             <el-form-item
-                :label="$t('openatccomponents.overview.duration') + ':'"
+                :label="$t('openatccomponents.overview.duration')"
                 prop="intersection">
                 <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.duration" size="small"></el-input-number>
                <!-- <el-input v-model="manualInfo.duration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
             <el-form-item
-                :label="$t('openatccomponents.overview.priorityPhase') + ':'"
+                :label="$t('openatccomponents.overview.priorityPhase')"
                 prop="count">
                 <el-select v-model="manualInfo.phase" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
                   <el-option
@@ -67,10 +67,10 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="74px">
+           label-width="90px">
             <el-form-item
                 style="margin-bottom: 0;"
-                :label="$t('openatccomponents.overview.level') + ':'"
+                :label="$t('openatccomponents.overview.level')"
                 prop="count">
                 <el-select v-model="manualInfo.level" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
                   <el-option
@@ -87,12 +87,12 @@
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
         <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
         <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
@@ -118,6 +118,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   data () {