openatc-components 0.1.107 → 0.1.108

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "openatc-components",
3
- "version": "0.1.107",
3
+ "version": "0.1.108",
4
4
  "description": "A Vue.js project",
5
5
  "author": "openatc developer",
6
6
  "private": false,
@@ -306,7 +306,8 @@ const en = {
306
306
  'confirmed': 'confirmed',
307
307
  'ignored': 'ignored',
308
308
  'untreated': 'untreated',
309
- 'item': 'item'
309
+ 'item': 'item',
310
+ 'noselectcontroltip': 'Please select a control method first!'
310
311
  },
311
312
  'phase': {
312
313
  'desc': 'LaneDirection',
@@ -322,7 +322,8 @@ const zh = {
322
322
  'confirmed': '已确认',
323
323
  'ignored': '已忽略',
324
324
  'untreated': '未处理',
325
- 'item': '条'
325
+ 'item': '条',
326
+ 'noselectcontroltip': '请先选择一种控制方式!'
326
327
  },
327
328
  'phase': {
328
329
  'desc': '车道方向',
@@ -0,0 +1,21 @@
1
+ <svg id="优先控制" xmlns="http://www.w3.org/2000/svg" width="54" height="29.12" viewBox="0 0 54 29.12">
2
+ <defs>
3
+ <style>
4
+ .cls-1, .cls-3 {
5
+ fill: #7ccc66;
6
+ }
7
+
8
+ .cls-2 {
9
+ fill: #f27979;
10
+ }
11
+
12
+ .cls-3 {
13
+ fill-rule: evenodd;
14
+ }
15
+ </style>
16
+ </defs>
17
+ <rect id="矩形_3708_拷贝_8" data-name="矩形 3708 拷贝 8" class="cls-1" x="20.6" y="15.81" width="33.4" height="9"/>
18
+ <rect id="矩形_3708_拷贝_8-2" data-name="矩形 3708 拷贝 8" class="cls-2" y="15.81" width="20.78" height="9"/>
19
+ <path id="形状_3710_拷贝_4" data-name="形状 3710 拷贝 4" class="cls-3" d="M2441.42,1012.4h1.8v17.71h-1.8V1012.4Z" transform="translate(-2421.31 -1001)"/>
20
+ <path id="形状_2767_拷贝_5" data-name="形状 2767 拷贝 5" class="cls-3" d="M2434,1007.87a1.582,1.582,0,1,0,1.39,1.57A1.491,1.491,0,0,0,2434,1007.87Zm0,2.67a1.109,1.109,0,1,1,.97-1.1A1.037,1.037,0,0,1,2434,1010.54Zm13.69-2.67a1.58,1.58,0,1,0,1.4,1.57A1.491,1.491,0,0,0,2447.69,1007.87Zm0,2.67a1.107,1.107,0,1,1,.98-1.1A1.043,1.043,0,0,1,2447.69,1010.54Zm4.59-9.55h-22.21a1.517,1.517,0,0,0-1.42,1.6v2.77l-0.65.33v3.14a0.494,0.494,0,0,0,.46.52h3.67a1.876,1.876,0,1,1,3.74,0h9.95a1.88,1.88,0,1,1,3.75,0h1.24c1.19-.32,3.23-0.87,4.19-1.11v-4.2A2.9,2.9,0,0,0,2452.28,1000.99Zm-20.84,6.96a0.571,0.571,0,0,1-.53.6h-0.82a0.572,0.572,0,0,1-.54-0.6v-5.09a0.575,0.575,0,0,1,.54-0.61h0.82a0.574,0.574,0,0,1,.53.61v5.09Zm5.69-3.41a0.381,0.381,0,0,1-.36.4h-3.96a0.38,0.38,0,0,1-.35-0.4v-1.91a0.38,0.38,0,0,1,.35-0.4h3.96a0.381,0.381,0,0,1,.36.4v1.91Zm5.38,0a0.381,0.381,0,0,1-.36.4h-3.96a0.38,0.38,0,0,1-.35-0.4v-1.91a0.38,0.38,0,0,1,.35-0.4h3.96a0.381,0.381,0,0,1,.36.4v1.91Zm5.38,0a0.38,0.38,0,0,1-.35.4h-3.96a0.381,0.381,0,0,1-.36-0.4v-1.91a0.381,0.381,0,0,1,.36-0.4h3.96a0.38,0.38,0,0,1,.35.4v1.91Zm5.38,0a0.38,0.38,0,0,1-.35.4h-3.96a0.381,0.381,0,0,1-.36-0.4v-1.91a0.381,0.381,0,0,1,.36-0.4h3.96a0.38,0.38,0,0,1,.35.4v1.91Z" transform="translate(-2421.31 -1001)"/>
21
+ </svg>
@@ -1,33 +1,28 @@
1
- <svg
2
- xmlns="http://www.w3.org/2000/svg"
3
- xmlns:xlink="http://www.w3.org/1999/xlink"
4
- width="54px" height="17px">
5
- <path fill-rule="evenodd" fill="rgb(124, 204, 102)"
6
- d="M-0.000,-0.000 L39.000,-0.000 L39.000,8.000 L-0.000,8.000 L-0.000,-0.000 Z"/>
7
- <path fill-rule="evenodd" fill="rgb(249, 220, 106)"
8
- d="M39.000,-0.000 L47.000,-0.000 L47.000,8.000 L39.000,8.000 L39.000,-0.000 Z"/>
9
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
10
- d="M37.000,-0.000 L38.000,-0.000 L38.000,8.000 L37.000,8.000 L37.000,-0.000 Z"/>
11
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
12
- d="M35.000,-0.000 L36.000,-0.000 L36.000,8.000 L35.000,8.000 L35.000,-0.000 Z"/>
13
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
14
- d="M33.000,-0.000 L34.000,-0.000 L34.000,8.000 L33.000,8.000 L33.000,-0.000 Z"/>
15
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
16
- d="M31.000,-0.000 L32.000,-0.000 L32.000,8.000 L31.000,8.000 L31.000,-0.000 Z"/>
17
- <path fill-rule="evenodd" fill="rgb(242, 121, 121)"
18
- d="M46.000,-0.000 L54.000,-0.000 L54.000,8.000 L46.000,8.000 L46.000,-0.000 Z"/>
19
- <path fill-rule="evenodd" fill="rgb(124, 204, 102)"
20
- d="M-0.000,9.000 L39.000,9.000 L39.000,17.000 L-0.000,17.000 L-0.000,9.000 Z"/>
21
- <path fill-rule="evenodd" fill="rgb(249, 220, 106)"
22
- d="M39.000,9.000 L47.000,9.000 L47.000,17.000 L39.000,17.000 L39.000,9.000 Z"/>
23
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
24
- d="M37.000,9.000 L38.000,9.000 L38.000,17.000 L37.000,17.000 L37.000,9.000 Z"/>
25
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
26
- d="M35.000,9.000 L36.000,9.000 L36.000,17.000 L35.000,17.000 L35.000,9.000 Z"/>
27
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
28
- d="M33.000,9.000 L34.000,9.000 L34.000,17.000 L33.000,17.000 L33.000,9.000 Z"/>
29
- <path fill-rule="evenodd" fill="rgb(255, 255, 255)"
30
- d="M31.000,9.000 L32.000,9.000 L32.000,17.000 L31.000,17.000 L31.000,9.000 Z"/>
31
- <path fill-rule="evenodd" fill="rgb(242, 121, 121)"
32
- d="M46.000,9.000 L54.000,9.000 L54.000,17.000 L46.000,17.000 L46.000,9.000 Z"/>
33
- </svg>
1
+ <svg id="临时方案" xmlns="http://www.w3.org/2000/svg" width="54" height="9" viewBox="0 0 54 9">
2
+ <defs>
3
+ <style>
4
+ .cls-1 {
5
+ fill: #7ccc66;
6
+ }
7
+
8
+ .cls-2 {
9
+ fill: #f9dc6a;
10
+ }
11
+
12
+ .cls-3 {
13
+ fill: #fff;
14
+ }
15
+
16
+ .cls-4 {
17
+ fill: #f27979;
18
+ }
19
+ </style>
20
+ </defs>
21
+ <rect id="矩形_683_拷贝_3" data-name="矩形 683 拷贝 3" class="cls-1" width="39" height="9"/>
22
+ <rect id="矩形_683_拷贝_3-2" data-name="矩形 683 拷贝 3" class="cls-2" x="39" width="8" height="9"/>
23
+ <rect id="矩形_686_拷贝_4" data-name="矩形 686 拷贝 4" class="cls-3" x="37" width="1" height="9"/>
24
+ <rect id="矩形_686_拷贝_4-2" data-name="矩形 686 拷贝 4" class="cls-3" x="35" width="1" height="9"/>
25
+ <rect id="矩形_686_拷贝_4-3" data-name="矩形 686 拷贝 4" class="cls-3" x="33" width="1" height="9"/>
26
+ <rect id="矩形_686_拷贝_4-4" data-name="矩形 686 拷贝 4" class="cls-3" x="31" width="1" height="9"/>
27
+ <rect id="矩形_683_拷贝_3-3" data-name="矩形 683 拷贝 3" class="cls-4" x="46" width="8" height="9"/>
28
+ </svg>
@@ -327,7 +327,7 @@ export default {
327
327
  }, {
328
328
  id: 24,
329
329
  permission: 'configer:manual:preempt',
330
- iconClass: 'tentativeplan'
330
+ iconClass: 'prioritycontrol'
331
331
  }, {
332
332
  id: 25,
333
333
  permission: 'configer:manual:optimize',
@@ -540,12 +540,16 @@ export default {
540
540
  patternCommit (manualInfo) {
541
541
  let that = this
542
542
  let control = {}
543
+ if (that.preselectModel === -1) {
544
+ this.$message.error(this.$t('openatccomponents.overview.noselectcontroltip'))
545
+ return
546
+ }
543
547
  that.ParamsMode.forEach(function (value, key, map) {
544
548
  if (that.controlData.mode === value) {
545
549
  control.mode = key
546
550
  }
547
551
  })
548
- control.control = that.preselectModel === -1 ? that.currModel : that.preselectModel
552
+ control.control = that.preselectModel
549
553
  // control.terminal = isNaN(parseInt(manualInfo.tempPatternid)) ? Number(manualInfo.tempPatternid.replace(/[^0-9]/ig, '')) : manualInfo.tempPatternid
550
554
  control.terminal = Number(manualInfo.tempPatternid)
551
555
  control.delay = Number(manualInfo.tempDelay)