npm - openatc-components - Versions diffs - 0.1.107 → 0.1.109 - Mend

openatc-components 0.1.107 → 0.1.109

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 (11) hide show

package/package.json CHANGED Viewed

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

package/src/i18n/language/en.js CHANGED Viewed

@@ -306,7 +306,8 @@ const en = {
       'confirmed': 'confirmed',
       'ignored': 'ignored',
       'untreated': 'untreated',
-      'item': 'item'
+      'item': 'item',
+      'noselectcontroltip': 'Please select a control method first!'
     },
     'phase': {
       'desc': 'LaneDirection',

package/src/i18n/language/zh.js CHANGED Viewed

@@ -322,7 +322,8 @@ const zh = {
       'confirmed': '已确认',
       'ignored': '已忽略',
       'untreated': '未处理',
-      'item': '条'
+      'item': '条',
+      'noselectcontroltip': '请先选择一种控制方式!'
     },
     'phase': {
       'desc': '车道方向',

package/src/icons/svg/prioritycontrol.svg ADDED Viewed

@@ -0,0 +1,21 @@
+<svg id="优先控制" xmlns="http://www.w3.org/2000/svg" width="54" height="29.12" viewBox="0 0 54 29.12">
+  <defs>
+    <style>
+      .cls-1, .cls-3 {
+        fill: #7ccc66;
+      }
+      .cls-2 {
+        fill: #f27979;
+      }
+      .cls-3 {
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <rect id="矩形_3708_拷贝_8" data-name="矩形 3708 拷贝 8" class="cls-1" x="20.6" y="15.81" width="33.4" height="9"/>
+  <rect id="矩形_3708_拷贝_8-2" data-name="矩形 3708 拷贝 8" class="cls-2" y="15.81" width="20.78" height="9"/>
+  <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)"/>
+  <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)"/>
+</svg>

package/src/icons/svg/tentativeplan.svg CHANGED Viewed

@@ -1,33 +1,28 @@
-<svg
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- width="54px" height="17px">
-<path fill-rule="evenodd"  fill="rgb(124, 204, 102)"
- 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"/>
-<path fill-rule="evenodd"  fill="rgb(249, 220, 106)"
- d="M39.000,-0.000 L47.000,-0.000 L47.000,8.000 L39.000,8.000 L39.000,-0.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M37.000,-0.000 L38.000,-0.000 L38.000,8.000 L37.000,8.000 L37.000,-0.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M35.000,-0.000 L36.000,-0.000 L36.000,8.000 L35.000,8.000 L35.000,-0.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M33.000,-0.000 L34.000,-0.000 L34.000,8.000 L33.000,8.000 L33.000,-0.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M31.000,-0.000 L32.000,-0.000 L32.000,8.000 L31.000,8.000 L31.000,-0.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(242, 121, 121)"
- d="M46.000,-0.000 L54.000,-0.000 L54.000,8.000 L46.000,8.000 L46.000,-0.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(124, 204, 102)"
- 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"/>
-<path fill-rule="evenodd"  fill="rgb(249, 220, 106)"
- d="M39.000,9.000 L47.000,9.000 L47.000,17.000 L39.000,17.000 L39.000,9.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M37.000,9.000 L38.000,9.000 L38.000,17.000 L37.000,17.000 L37.000,9.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M35.000,9.000 L36.000,9.000 L36.000,17.000 L35.000,17.000 L35.000,9.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M33.000,9.000 L34.000,9.000 L34.000,17.000 L33.000,17.000 L33.000,9.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
- d="M31.000,9.000 L32.000,9.000 L32.000,17.000 L31.000,17.000 L31.000,9.000 Z"/>
-<path fill-rule="evenodd"  fill="rgb(242, 121, 121)"
- d="M46.000,9.000 L54.000,9.000 L54.000,17.000 L46.000,17.000 L46.000,9.000 Z"/>
-</svg>
+<svg id="临时方案" xmlns="http://www.w3.org/2000/svg" width="54" height="9" viewBox="0 0 54 9">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #7ccc66;
+      }
+      .cls-2 {
+        fill: #f9dc6a;
+      }
+      .cls-3 {
+        fill: #fff;
+      }
+      .cls-4 {
+        fill: #f27979;
+      }
+    </style>
+  </defs>
+  <rect id="矩形_683_拷贝_3" data-name="矩形 683 拷贝 3" class="cls-1" width="39" height="9"/>
+  <rect id="矩形_683_拷贝_3-2" data-name="矩形 683 拷贝 3" class="cls-2" x="39" width="8" height="9"/>
+  <rect id="矩形_686_拷贝_4" data-name="矩形 686 拷贝 4" class="cls-3" x="37" width="1" height="9"/>
+  <rect id="矩形_686_拷贝_4-2" data-name="矩形 686 拷贝 4" class="cls-3" x="35" width="1" height="9"/>
+  <rect id="矩形_686_拷贝_4-3" data-name="矩形 686 拷贝 4" class="cls-3" x="33" width="1" height="9"/>
+  <rect id="矩形_686_拷贝_4-4" data-name="矩形 686 拷贝 4" class="cls-3" x="31" width="1" height="9"/>
+  <rect id="矩形_683_拷贝_3-3" data-name="矩形 683 拷贝 3" class="cls-4" x="46" width="8" height="9"/>
+</svg>

package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue CHANGED Viewed

@@ -327,7 +327,7 @@ export default {
       }, {
         id: 24,
         permission: 'configer:manual:preempt',
-        iconClass: 'tentativeplan'
+        iconClass: 'prioritycontrol'
       }, {
         id: 25,
         permission: 'configer:manual:optimize',
@@ -540,12 +540,16 @@ export default {
     patternCommit (manualInfo) {
       let that = this
       let control = {}
+      if (that.preselectModel === -1) {
+        this.$message.error(this.$t('openatccomponents.overview.noselectcontroltip'))
+        return
+      }
       that.ParamsMode.forEach(function (value, key, map) {
         if (that.controlData.mode === value) {
           control.mode = key
         }
       })
-      control.control = that.preselectModel === -1 ? that.currModel : that.preselectModel
+      control.control = that.preselectModel
       // control.terminal = isNaN(parseInt(manualInfo.tempPatternid)) ? Number(manualInfo.tempPatternid.replace(/[^0-9]/ig, '')) : manualInfo.tempPatternid
       control.terminal = Number(manualInfo.tempPatternid)
       control.delay = Number(manualInfo.tempDelay)

package/src/kisscomps/components/SchemeConfig/azimuthlocking/index.vue CHANGED Viewed

@@ -101,7 +101,7 @@
 <script>
 import { getPhase } from './utils'
-// import { getIframdevid } from '../../../../utils/auth'
+import { getIframdevid } from '../../../../utils/auth'
 import { getlockPhase, lockPhase } from '../../../../api/control'
 import Stages from '../../Stages/index'
 import RingDataModel from '../../../../utils/RingDataModel.js'
@@ -190,8 +190,9 @@ export default {
     },
     getLockPhase (val) {
       this.directions = [this.checkId(val)]
+      let iframdevid = getIframdevid()
       let param = {
-        'agentid': 'config_test',
+        'agentid': iframdevid,
         'direction': this.directions
       }
       getlockPhase(param).then(res => {
@@ -223,8 +224,9 @@ export default {
         this.$message.error(this.$t('openatccomponents.overview.directionnull'))
         return
       }
+      let iframdevid = getIframdevid()
       let submitdata = {
-        agentid: 'config_test',
+        agentid: iframdevid,
         direction: this.directions,
         greenflash: this.manualInfo.greenclear,
         duration: this.manualInfo.duration,

package/src/node_modules/.package_versions.json ADDED Viewed

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