openatc-components 0.2.55 → 0.2.57

package/package.json

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

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="manual-control-modal closephase-control">
+  <div class="manual-control-modal closephase-control  manual-common-content">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaseclosecontrol')}}</div> -->
     <el-row>
       <el-col :span="24">

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="lockingphase-control manual-control-modal">
+  <div class="lockingphase-control manual-common-content">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div> -->
     <el-row>
       <el-col :span="12">

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

@@ -66,6 +66,16 @@
            @closePhaseBack="handleClose"
            @toAutoControl="toAutoControl"
           />
+
+          <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
+            <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+            <el-button type="primary" plain @click="toAutoControl()" v-if="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 type="primary" plain @click="toAutoControl()" v-if="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>
       <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol">
         <ControlModelGroup
@@ -90,6 +100,17 @@
             </el-form-item>
            </el-form>
         </div>
+
+        <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
+          <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+          <el-button type="primary" plain @click="toAutoControl()" v-if="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 type="primary" plain @click="toAutoControl()" v-if="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>
       <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection">
         <ControlModelGroup
@@ -148,6 +169,16 @@
                 </pattern-list>
              </div>
           </div>
+
+          <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
+            <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+            <el-button type="primary" plain @click="toAutoControl()" v-if="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 type="primary" plain @click="toAutoControl()" v-if="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>
       <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
         <ControlModelGroup
@@ -192,15 +223,6 @@
         />
       </el-tab-pane>
     </el-tabs>
-  <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-    <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-    <el-button type="primary" plain @click="toAutoControl()" v-if="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 type="primary" plain @click="toAutoControl()" v-if="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>
   </div>
 </template>
 

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="tentativeplan-control">
+  <div class="tentativeplan-control manual-common-content">
     <!-- <div class="title" style="margin-bottom: 18px">
       {{ $t('openatccomponents.overview.tentativeplan') }}
     </div> -->

package/src/views/overView.vue

@@ -19,8 +19,8 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: '18002',
-      Token: 'eyJraWQiOiIxNzE2ODU5MDQ2ODAxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNjkwMjI0NiwiaWF0IjoxNzE2ODU5MDQ2fQ.UyPso-g6bF72m2Vsmr2IV7YoK9yHA7j2HWpgSc0ePiA',
+      agentId: 'jmlxhl',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },

package/static/styles/schemeconfig.scss

@@ -1,6 +1,7 @@
 // 方案配置面板
 .scheme-config {
   position: relative;
+  overflow: hidden;
   .iconfont {
     font-family: "iconfont" !important;
     font-size: 34PX;
@@ -219,6 +220,19 @@
         }
       }
     }
+    .manual-common-content {
+      height: calc(100% - 100PX);
+      overflow-y: auto;
+    }
+    .manual-common-content::-webkit-scrollbar {
+      width: 8px;
+    }
+    .manual-common-content::-moz-scrollbar {
+      width: 8px;
+    }
+    .manual-common-content::-ms-scrollbar {
+      width: 8px;
+    }
 }
 // 手动控制弹框
 .manual-control-modal{
@@ -284,6 +298,10 @@
 } 
 .manual-control-modal-new {
   padding: 20PX 20PX 0 20PX;
+  height: 100%;
+  .el-tabs {
+    height: 100%;
+  }
   .el-tabs__nav.is-top {
     width: 100%;
   }
@@ -303,6 +321,10 @@
   }
   .el-tabs__content {
     overflow-x: auto;
+    height: calc(100% - 60PX);
+  }
+  .el-tab-pane {
+    height: 100%;
   }
   .group-control {
     margin-bottom: 20PX;
@@ -340,7 +362,6 @@
 }
 .priority-control{
   height: 100%;
-  min-width: 360PX;
   overflow: auto;
   .title {
     margin-bottom: 24PX;
@@ -383,7 +404,7 @@
   // height: 100%;
   // padding: 21PX 0PX 21PX 28PX;
   // min-width: 360PX;
-  overflow: hidden !important;
+  // overflow: hidden !important;
   .forbiddenstage{
     width: 77% !important;
     margin: 10px auto;
@@ -518,7 +539,6 @@
 
 .lockingphase-control {
   height: 100%;
-  overflow: auto;
   .closephasekanban {
     width: 60%;
     margin: 0 auto;