openatc-components 0.2.55 → 0.2.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/package/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue +1 -1
  2. package/package/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +1 -1
  3. package/package/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue +31 -9
  4. package/package/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue +1 -1
  5. package/package/kissui.min.js +1 -1
  6. package/package.json +1 -1
  7. package/src/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue +1 -1
  8. package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +1 -1
  9. package/src/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue +31 -9
  10. package/src/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue +1 -1
  11. package/src/views/overView.vue +2 -2
  12. package/static/styles/schemeconfig.scss +23 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "openatc-components",
3
- "version": "0.2.55",
3
+ "version": "0.2.56",
4
4
  "description": "A Vue.js project",
5
5
  "author": "openatc developer",
6
6
  "private": false,
package/src/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue CHANGED
@@ -10,7 +10,7 @@
10
10
  * See the Mulan PSL v2 for more details.
11
11
  **/
12
12
  <template>
13
- <div class="manual-control-modal closephase-control">
13
+ <div class="manual-control-modal closephase-control manual-common-content">
14
14
  <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaseclosecontrol')}}</div> -->
15
15
  <el-row>
16
16
  <el-col :span="24">
package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue CHANGED
@@ -10,7 +10,7 @@
10
10
  * See the Mulan PSL v2 for more details.
11
11
  **/
12
12
  <template>
13
- <div class="lockingphase-control manual-control-modal">
13
+ <div class="lockingphase-control manual-common-content">
14
14
  <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div> -->
15
15
  <el-row>
16
16
  <el-col :span="12">
package/src/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue CHANGED
@@ -66,6 +66,16 @@
66
66
  @closePhaseBack="handleClose"
67
67
  @toAutoControl="toAutoControl"
68
68
  />
69
+
70
+ <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
71
+ <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
72
+ <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
73
+ <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
74
+ </div>
75
+ <div class="footer" v-if="!realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
76
+ <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
77
+ <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
78
+ </div>
69
79
  </el-tab-pane>
70
80
  <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol">
71
81
  <ControlModelGroup
@@ -90,6 +100,17 @@
90
100
  </el-form-item>
91
101
  </el-form>
92
102
  </div>
103
+
104
+ <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
105
+ <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
106
+ <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
107
+ <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
108
+ </div>
109
+ <div class="footer" v-if="!realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
110
+ <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
111
+ <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
112
+ </div>
113
+
93
114
  </el-tab-pane>
94
115
  <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection">
95
116
  <ControlModelGroup
@@ -148,6 +169,16 @@
148
169
  </pattern-list>
149
170
  </div>
150
171
  </div>
172
+
173
+ <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
174
+ <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
175
+ <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
176
+ <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
177
+ </div>
178
+ <div class="footer" v-if="!realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
179
+ <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
180
+ <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
181
+ </div>
151
182
  </el-tab-pane>
152
183
  <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
153
184
  <ControlModelGroup
@@ -192,15 +223,6 @@
192
223
  />
193
224
  </el-tab-pane>
194
225
  </el-tabs>
195
- <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
196
- <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
197
- <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
198
- <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
199
- </div>
200
- <div class="footer" v-if="!realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
201
- <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
202
- <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
203
- </div>
204
226
  </div>
205
227
  </template>
206
228
 
package/src/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue CHANGED
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div class="tentativeplan-control">
2
+ <div class="tentativeplan-control manual-common-content">
3
3
  <!-- <div class="title" style="margin-bottom: 18px">
4
4
  {{ $t('openatccomponents.overview.tentativeplan') }}
5
5
  </div> -->
package/src/views/overView.vue CHANGED
@@ -19,8 +19,8 @@ export default {
19
19
  isShowMode: true,
20
20
  modeName: '交警遥控',
21
21
  controlName: '步进',
22
- agentId: '18002',
23
- Token: 'eyJraWQiOiIxNzE2ODU5MDQ2ODAxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNjkwMjI0NiwiaWF0IjoxNzE2ODU5MDQ2fQ.UyPso-g6bF72m2Vsmr2IV7YoK9yHA7j2HWpgSc0ePiA',
22
+ agentId: '18001',
23
+ Token: 'eyJraWQiOiIxNzE3MDMyODA5ODg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNzA3NjAwOSwiaWF0IjoxNzE3MDMyODA5fQ.VaFXzkkp_N3D2LOvcbyh-LscfyPTNhwevVJByL7en9k',
24
24
  reqUrl: 'http://192.168.13.103:10003/openatc'
25
25
  }
26
26
  },
package/static/styles/schemeconfig.scss CHANGED
@@ -1,6 +1,7 @@
1
1
  // 方案配置面板
2
2
  .scheme-config {
3
3
  position: relative;
4
+ overflow: hidden;
4
5
  .iconfont {
5
6
  font-family: "iconfont" !important;
6
7
  font-size: 34PX;
@@ -219,6 +220,19 @@
219
220
  }
220
221
  }
221
222
  }
223
+ .manual-common-content {
224
+ height: calc(100% - 100PX);
225
+ overflow-y: auto;
226
+ }
227
+ .manual-common-content::-webkit-scrollbar {
228
+ width: 8px;
229
+ }
230
+ .manual-common-content::-moz-scrollbar {
231
+ width: 8px;
232
+ }
233
+ .manual-common-content::-ms-scrollbar {
234
+ width: 8px;
235
+ }
222
236
  }
223
237
  // 手动控制弹框
224
238
  .manual-control-modal{
@@ -284,6 +298,10 @@
284
298
  }
285
299
  .manual-control-modal-new {
286
300
  padding: 20PX 20PX 0 20PX;
301
+ height: 100%;
302
+ .el-tabs {
303
+ height: 100%;
304
+ }
287
305
  .el-tabs__nav.is-top {
288
306
  width: 100%;
289
307
  }
@@ -303,6 +321,10 @@
303
321
  }
304
322
  .el-tabs__content {
305
323
  overflow-x: auto;
324
+ height: calc(100% - 60PX);
325
+ }
326
+ .el-tab-pane {
327
+ height: 100%;
306
328
  }
307
329
  .group-control {
308
330
  margin-bottom: 20PX;
@@ -383,7 +405,7 @@
383
405
  // height: 100%;
384
406
  // padding: 21PX 0PX 21PX 28PX;
385
407
  // min-width: 360PX;
386
- overflow: hidden !important;
408
+ // overflow: hidden !important;
387
409
  .forbiddenstage{
388
410
  width: 77% !important;
389
411
  margin: 10px auto;
@@ -518,7 +540,6 @@
518
540
 
519
541
  .lockingphase-control {
520
542
  height: 100%;
521
- overflow: auto;
522
543
  .closephasekanban {
523
544
  width: 60%;
524
545
  margin: 0 auto;