openatc-components 0.3.24 → 0.3.25

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

@@ -9,10 +9,10 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="74px"
+          label-width="90px"
         >
           <el-form-item
-            :label="$t('openatccomponents.overview.patternid') + ':'"
+            :label="$t('openatccomponents.overview.patternid')"
             prop="count"
           >
             <el-select
@@ -33,7 +33,7 @@
             <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
           <el-form-item
-            :label="$t('openatccomponents.overview.delay') + ':'"
+            :label="$t('openatccomponents.overview.delay')"
             prop="intersection"
           >
             <el-input-number
@@ -55,10 +55,10 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="74px"
+          label-width="90px"
         >
           <el-form-item
-            :label="$t('openatccomponents.overview.patternoffset') + ':'"
+            :label="$t('openatccomponents.overview.patternoffset')"
             prop="count"
           >
             <el-input-number
@@ -74,7 +74,7 @@
             <!-- <el-input v-model="manualInfo.offset" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
           <el-form-item
-            :label="$t('openatccomponents.overview.duration') + ':'"
+            :label="$t('openatccomponents.overview.duration')"
             prop="intersection"
           >
             <el-input-number
@@ -318,7 +318,7 @@
       <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>
@@ -327,7 +327,7 @@
       <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>
@@ -363,6 +363,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

package/src/views/schemeconfig.vue

@@ -12,30 +12,32 @@
 <template>
   <div>
     <el-button type="primary" @click="handleOpenConfigPanel" style="margin: 20px;">打开控制面板</el-button>
-    <el-dialog
+    <!-- <el-dialog
       refs="intersectionMapDialog"
       class="abow_dialog"
       :width="dialogWidth"
       :visible.sync="boxVisible"
       :close-on-click-modal="false"
       @close="oncancle"
-      append-to-body>
-      <scheme-config
-            ref="rightpanel"
-            :fromPage="fromPage"
-            :agentId="agentId"
-            :statusData="crossStatusData"
-            :phaseList="phaseList2"/>
+      append-to-body> -->
       <!-- <scheme-config
         ref="rightpanel"
+        :fromPage="fromPage"
         :agentId="agentId"
-        :lockPhaseBtnName="lockPhaseBtnName"
         :statusData="crossStatusData"
-        :phaseList="phaseList"
-        :realtimeStatusModalvisible="true"
-        roadDirection="left"
-         /> -->
-    </el-dialog>
+        :phaseList="phaseList2"/> -->
+    <!-- </el-dialog> -->
+
+    <div v-if="boxVisible" style="height: 700px;width: 450px;">
+      <scheme-config
+      ref="rightpanel"
+      :agentId="agentId"
+      :statusData="crossStatusData"
+      :phaseList="phaseList2"
+      :realtimeStatusModalvisible="false"
+      :isShowBack="false"
+      :isShowRecovery="false"/>
+    </div>
   </div>
 </template>
 <script>
@@ -62,7 +64,7 @@ export default {
       agentId: '1511_207',
       Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
       Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
-      boxVisible: true,
+      boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
     }