openatc-components 0.2.70 → 0.2.72

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">
@@ -61,13 +61,13 @@
         </div>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-        <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 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 type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
-        <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 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 type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
@@ -118,6 +118,10 @@ export default {
     },
     roadDirection: {
       type: String
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -10,12 +10,11 @@
  * 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">
          <el-form
-          :inline="true"
            ref="manual"
            label-position="left"
            :model="manualInfo"
@@ -41,7 +40,6 @@
       </el-col>
       <el-col :span="12">
         <el-form
-         :inline="true"
           ref="manual"
           label-position="left"
           :model="manualInfo"
@@ -90,8 +88,8 @@
         </div>
     </el-row>
     <div class="footer">
-        <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 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 type="primary" @click="handleLockPhase()">{{lockPhaseBtnName}}</el-button>
     </div>
   </div>
@@ -118,6 +116,10 @@ export default {
     },
     roadDirection: {
       type: String
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -54,6 +54,7 @@
           :phaseList="phaseList"
           :patternStatus="statusData"
           :lockPhaseBtnName="lockPhaseBtnName"
+          :isShowBack="isShowBack"
           @closePhaseBack="handleClose"
           @closePhaseControl="closePhaseControl"
           @toAutoControl="toAutoControl" />
@@ -63,9 +64,20 @@
           :realtimeStatusModalvisible="realtimeStatusModalvisible"
           :phaseList="phaseList"
           :patternStatus="statusData"
+          :isShowBack="isShowBack"
            @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 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 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 +102,17 @@
             </el-form-item>
            </el-form>
         </div>
+
+        <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 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 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 +171,16 @@
                 </pattern-list>
              </div>
           </div>
+
+          <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 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 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
@@ -167,6 +200,7 @@
         :sidewalkPhaseData="sidewalkPhaseData"
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :roadDirection="roadDirection"
+        :isShowBack="isShowBack"
         @closePhaseBack="handleClose"
         @closePhaseControl="closePhaseControl"
         @toAutoControl="toAutoControl" />
@@ -178,6 +212,7 @@
          :overlap="overlap"
          :patternSelect="patternSelect"
          :allPatternList="allPatternList"
+         :isShowBack="isShowBack"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
@@ -186,21 +221,13 @@
         v-if="preselecttype === '优先控制'"
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :phaseList="phaseList"
+        :isShowBack="isShowBack"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
         />
       </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>
 
@@ -274,7 +301,7 @@ export default {
     specialcontrolList: {
       type: Array
     },
-    realtimeStatusModalvisible: {
+    realtimeStatusModalvisible: { // 区分是保存方案还是提交方案，保存方案没有路口实时信息
       type: Boolean,
       default: true
     },
@@ -311,6 +338,10 @@ export default {
     },
     patternChooseControlList: {
       type: Array
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="priority-control">
+  <div class="priority-control manual-common-content">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.prioritycontrol')}}</div> -->
     <el-row>
       <el-col :span="12">
@@ -86,13 +86,13 @@
       </el-col>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-        <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 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 type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
-        <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 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 type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
@@ -114,6 +114,10 @@ export default {
     },
     phaseList: {
       type: Array
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div>
+<div style="overflow: hidden;">
   <div class="cross-mess">{{$t('openatccomponents.overview.crossinfo')}}</div>
   <div class="cross-module">
     <div class="cross-content">

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> -->
@@ -92,7 +92,7 @@
         </el-form>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row style="margin-top: 20px;">
       <el-radio v-model="isRing" :label="false" @change="changeRing">{{
         $t('openatccomponents.common.ringStyle')
       }}</el-radio>
@@ -126,14 +126,14 @@
       >
       </pattern-list>
     </el-row>
-    <el-row>
+    <el-row style="margin-top: 20px;">
       <el-tabs v-model="activeTab" type="card">
         <el-tab-pane
           v-if="!isRing"
           :label="$t('openatccomponents.pattern.ringConfig')"
           name="kanban"
         >
-          <div style="width: 100%; overflow: hidden; margin-top: 20px">
+          <div style="width: 100%; overflow: hidden;">
             <kan-ban
               v-for="n in ringCount"
               :key="n"
@@ -315,19 +315,19 @@
       </el-tabs>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-      <el-button @click="handleClose()">{{
+      <el-button v-if="isShowBack" @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 @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">
-      <el-button @click="handleClose()">{{
+      <el-button v-if="isShowBack" @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 @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
       <el-button type="primary" @click="handleManualControl()">{{
         $t('openatccomponents.overview.comfirm')
       }}</el-button>
@@ -359,6 +359,10 @@ export default {
     },
     patternSelect: {
       type: Array
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

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

@@ -298,6 +298,7 @@ export default {
     dirListSetTheme (list) {
       let dirArr = []
       let color = getTheme() === 'light' ? '#606266' : '#F1F3F4'
+      let pedColor = getTheme() === 'light' ? '#606266' : 'rgba(255, 255, 255, 0.6)'
       for (let rec of list) {
         let recd = {
           ...rec,
@@ -305,7 +306,7 @@ export default {
         }
         dirArr.push(recd)
         for(let i=0;i<rec.peddirection.length;i++) {
-          rec.peddirection[i].color = color
+          rec.peddirection[i].color = pedColor
         }
       }
       return dirArr

package/src/kisscomps/components/patternList/patternList.vue

@@ -3,7 +3,6 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
-    :patternType="patternType"
     :stagesChange="stagesChange"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
@@ -537,9 +536,6 @@ export default {
     patternStatusList: {
       type: Array
     },
-    patternType: {
-      type: String
-    },
     patternId: {
       type: Number
     },

package/src/views/overView.vue

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

package/static/styles/commonkanban.scss

@@ -57,7 +57,7 @@
   overflow: hidden;
   text-align: center;
   padding: 0 6PX;
-  margin-bottom: -20PX;
+  margin-bottom: -10PX;
   font-size: 12PX;
   color: $--color-info;
   background-color: $--color-black;
@@ -141,10 +141,10 @@
     cursor: pointer;
     width: 100%;
     height: 48PX;
-    margin: 5PX 0;
+    // margin: 5PX 0;
     // background-color: rgba(31,46,46,0.9);
     text-align: left;
-    line-height: 40PX;
+    line-height: 37PX;
     padding: 1PX 1PX;
     box-sizing: border-box;
     // cursor: pointer;

package/static/styles/overview.scss

@@ -109,7 +109,7 @@
     margin-left: 15PX;
     margin-top: 15PX;
     height: 20PX;
-    font-size: 20PX;
+    font-size: 18PX;
     font-weight: normal;
     font-stretch: normal;
     line-height: 22PX;
@@ -130,7 +130,7 @@
     float: right;
     color: $--color-text-regular;
     .el-checkbox__label {
-      font-size: 16PX;
+      font-size: 14PX;
       color: $--color-text-regular;
       font-weight: normal;
       font-stretch: normal;

package/static/styles/schemeconfig.scss

@@ -1,6 +1,7 @@
 // 方案配置面板
 .scheme-config {
   position: relative;
+  overflow: hidden;
   .iconfont {
     font-family: "iconfont" !important;
     font-size: 34PX;
@@ -14,12 +15,13 @@
   .right-control-part {
     min-width: 300PX;
     overflow: auto;
+    height: 100%;
   }
   .cross-mess {
     margin-left: 15PX;
     margin-top: 15PX;
     height: 20PX;
-    font-size: 20PX;
+    font-size: 18PX;
     font-weight: normal;
     font-stretch: normal;
     line-height: 22PX;
@@ -219,11 +221,18 @@
         }
       }
     }
+    .manual-common-content {
+      height: calc(100% - 100PX);
+      overflow-y: auto;
+    }
+    .manual-common-content::-webkit-scrollbar {
+      width: 8PX;
+    }
 }
 // 手动控制弹框
 .manual-control-modal{
   // padding: 21PX 0PX 21PX 28PX;
-  min-width: 360PX;
+  // min-width: 360PX;
   overflow: auto;
   .title {
     margin-bottom: 24PX;
@@ -284,6 +293,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 +316,14 @@
   }
   .el-tabs__content {
     overflow-x: auto;
+    height: calc(100% - 60PX);
+  }
+  .el-tab-pane {
+    height: 100%;
+  }
+  .el-form-item__label {
+    font-size: 14PX;
+    color: $--color-text-secondary;
   }
   .group-control {
     margin-bottom: 20PX;
@@ -310,9 +331,6 @@
   }
 
   .common-config {
-    .el-form-item__label {
-      color: $--color-text-secondary;
-    }
     .el-form-item {
       margin-bottom: 0PX;
     }
@@ -340,7 +358,6 @@
 }
 .priority-control{
   height: 100%;
-  min-width: 360PX;
   overflow: auto;
   .title {
     margin-bottom: 24PX;
@@ -361,13 +378,11 @@
     width: 90%;
   }
   .el-form-item {
-    margin-bottom: 10PX;
+    margin-bottom: 0PX;
     margin-right: 10PX;
   }
   .el-form-item__label {
-    font-size: 14PX;
     font-weight: 700;
-    color: $--color-text-secondary;
   }
   .el-input-number {
     width: 100%;
@@ -375,16 +390,20 @@
       text-align: left;
     }
   }
+  .el-select {
+    width: 100%;
+  }
 }
 .tentativeplan-control{
   // height: 100%;
   // padding: 21PX 0PX 21PX 28PX;
-  min-width: 360PX;
-  overflow: hidden !important;
+  // min-width: 360PX;
+  // overflow: hidden !important;
   .forbiddenstage{
     width: 77% !important;
     margin: 10px auto;
     color: $--color-text-primary;
+    font-size: 14PX;
   }
   .stage-panel-contener {
     display: flex;
@@ -443,10 +462,6 @@
     margin-bottom: 0PX;
     margin-right: 10PX;
   }
-  .el-form-item__label {
-    font-size: 14PX;
-    color: $--color-text-secondary;
-  }
   .el-dialog__footer {
     padding: 10PX 72PX 38PX 0;
   }
@@ -491,6 +506,9 @@
       text-align: center;
     }
   }
+  .el-select {
+    width: 100%;
+  }
 }
 .closephase-control{
   height: 100%;
@@ -511,16 +529,17 @@
 
 .lockingphase-control {
   height: 100%;
-  min-width: 430PX;
-  overflow: auto;
   .closephasekanban {
     width: 60%;
     margin: 0 auto;
     margin-bottom: 13PX;
   }
   .el-form-item {
-    width: 45%;
-    min-width: 180PX;
+    margin-bottom: 0;
+    margin-right: 10PX;
+  }
+  .el-input-number {
+    width: 100%;
   }
   .el-input-number--mini{
     width: 100%;
@@ -528,8 +547,4 @@
   .el-input {
     width: 100%;
   }
-  .el-form-item__content {
-    width: calc(100% - 120PX);
-    min-width: 80PX;
-  }
 }

package/src/node_modules/.package_versions.json

@@ -1 +0,0 @@
-{}