openatc-components 0.3.11 → 0.3.13

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 (13) hide show
  1. package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue +6 -0
  2. package/package/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue +4 -0
  3. package/package/kisscomps/components/Stages/index.vue +1 -1
  4. package/package/kisscomps/components/XRDDirSelector/XRDDirSelector.vue +1 -1
  5. package/package/kisscomps/components/patternConfig/index.vue +0 -145
  6. package/package/kissui.min.js +1 -1
  7. package/package.json +1 -1
  8. package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue +6 -0
  9. package/src/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue +4 -0
  10. package/src/kisscomps/components/Stages/index.vue +1 -1
  11. package/src/kisscomps/components/XRDDirSelector/XRDDirSelector.vue +1 -1
  12. package/src/kisscomps/components/patternConfig/index.vue +0 -145
  13. package/src/views/schemeconfig.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "openatc-components",
3
- "version": "0.3.11",
3
+ "version": "0.3.13",
4
4
  "description": "A Vue.js project",
5
5
  "author": "openatc developer",
6
6
  "private": false,
package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue CHANGED
@@ -635,6 +635,12 @@ export default {
635
635
  if (control.control === 0) {
636
636
  // 恢复自主控制（多时段）时，value为当前控制方式
637
637
  control.value = this.currModel
638
+ if (manualInfo && manualInfo.fromControl) {
639
+ const specialControlArr = [40, 4, 100, 101]
640
+ if (specialControlArr.includes(manualInfo.fromControl)) {
641
+ control.value = manualInfo.fromControl
642
+ }
643
+ }
638
644
  }
639
645
  if (!this.realtimeStatusModalvisible) {
640
646
  console.log(control)
package/src/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue CHANGED
@@ -799,6 +799,10 @@ export default {
799
799
  },
800
800
  selectModel (item) {
801
801
  this.preselecttype = item.type
802
+ this.manualInfo.fromControl = item.id
803
+ if (item.iconClass === 'jieduansuoding') {
804
+ this.manualInfo.fromControl = 40
805
+ }
802
806
  this.$emit('selectModel', item.id)
803
807
  },
804
808
  selectStages (value) {
package/src/kisscomps/components/Stages/index.vue CHANGED
@@ -30,7 +30,7 @@
30
30
  :Height="'40'" /> -->
31
31
  <xdr-dir-selector :Width="dirWidth" :Height="dirHeight" :Widths="dirWidths" :Heights="dirHeights" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
32
32
  <div style="display:flex;flex-direction:row;justify-content:center;align-items:end;" :style="{height: StageHeight}">
33
- <div class="current-stage-num" style="width:20%;" :style="{color: themeColor, fontSize: numSize}">{{index + 1}}</div>
33
+ <div class="current-stage-num" style="width:25%;" :style="{color: themeColor, fontSize: numSize}">{{index + 1}}</div>
34
34
  <div style="width:70%;">
35
35
  <i class="iconfont icon-feijidongche" :style="{color: themeColor, fontSize: iconSize}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
36
36
  <i class="iconfont icon-lukouzhilu" :style="{color: themeColor2, fontSize: iconSize2}" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
package/src/kisscomps/components/XRDDirSelector/XRDDirSelector.vue CHANGED
@@ -10,7 +10,7 @@
10
10
  * See the Mulan PSL v2 for more details.
11
11
  **/
12
12
  <template>
13
- <div :style="{position: 'reletive', width: '100%', height: '100%'}">
13
+ <div :style="{position: 'relative'}">
14
14
  <div :style="{position: 'absolute', left: Data?Data.left:0, top: Data?Data.top:0}">
15
15
  <svg
16
16
  version="1.1"
package/src/kisscomps/components/patternConfig/index.vue CHANGED
@@ -35,151 +35,6 @@
35
35
  @change="onConditionChange"
36
36
  />
37
37
  </div>
38
- <!-- <div class="filter">
39
- <span class="header-span">{{$t('edge.date.month')}}：</span>
40
- <el-select multiple
41
- v-model="item.month"
42
- style="width:70%;"
43
- :placeholder="$t('edge.common.select')"
44
- size="small"
45
- :collapse-tags="true"
46
- @change="handleMonth(item.month, index)"
47
- @visible-change="initOldOptions(item.month, $event)">
48
- <el-option
49
- v-for="item in months"
50
- :key="item.label"
51
- :label="item.label"
52
- :value="item.value">
53
- </el-option>
54
- </el-select>
55
- </div>
56
- <div class="filter">
57
- <span class="header-span">{{$t('edge.date.day') }}：</span>
58
- <el-select multiple
59
- style="width:70%;"
60
- v-model="item.day"
61
- :placeholder="$t('edge.common.select')"
62
- size="small"
63
- :collapse-tags="true"
64
- @change="handleDay(item.day, index)"
65
- @visible-change="initOldOptions(item.day, $event)">
66
- <el-option
67
- v-for="item in days"
68
- :key="item.label"
69
- :label="item.label"
70
- :value="item.value">
71
- </el-option>
72
- </el-select>
73
- </div>
74
- <div class="filter">
75
- <span class="header-span">{{$t('edge.date.date') }}：</span>
76
- <el-select multiple
77
- style="width:70%;"
78
- :collapse-tags="true"
79
- v-model="item.date"
80
- :placeholder="$t('edge.common.select')"
81
- size="small"
82
- @change="handleDate(item.date, index)"
83
- @visible-change="initOldOptions(item.date, $event)">
84
- <el-option
85
- v-for="item in dates"
86
- :key="item"
87
- :label="item"
88
- :value="item">
89
- </el-option>
90
- </el-select>
91
- </div>
92
- <div class="filter">
93
- <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.period')}}：</span>
94
- <template>
95
- <el-time-select
96
- style="width:35%;"
97
- size="small"
98
- v-model="item.plan.start"
99
- :picker-options="{
100
- start: '00:00',
101
- step: '00:05',
102
- end: '23:59'
103
- }">
104
- </el-time-select>
105
- <el-time-select
106
- style="width:35%;"
107
- size="small"
108
- v-model="item.plan.end"
109
- :picker-options="{
110
- start: '00:00',
111
- step: '00:05',
112
- end: '23:59',
113
- minTime: item.plan.start
114
- }">
115
- </el-time-select>
116
- </template>
117
- </div>
118
- <div class="filter">
119
- <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.coordinationstrategy')}}：</span>
120
- <el-select v-model="item.optstrategy"
121
- style="width:70%;"
122
- @change="onOptstrategyChange"
123
- :placeholder="$t('openatccomponents.common.placeholder')"
124
- size="small">
125
- <el-option
126
- v-for="item in optstrategyOptions"
127
- :key="item.value"
128
- :label="$t('openatccomponents.greenwaveoptimize.optstrategyoption' + item.id)"
129
- :value="item.value">
130
- </el-option>
131
- </el-select>
132
- </div>
133
- <div class="filter">
134
- <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.coordinationdirection')}}：</span>
135
- <el-select v-model="item.direction"
136
- :placeholder="$t('openatccomponents.common.placeholder')"
137
- size="small"
138
- style="width:70%;"
139
- @change="onDirectionChange">
140
- <el-option
141
- v-for="dir in directionOptions"
142
- :key="dir.value"
143
- :label="$t('openatccomponents.greenwaveoptimize.directionOption' + dir.id)"
144
- :disabled="item.optstrategy != 'green' && dir.value === 'all'"
145
- :value="dir.value">
146
- </el-option>
147
- </el-select>
148
- </div>
149
- <div class="filter">
150
- <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.keyintersection')}}：</span>
151
- <el-select v-model="item.keyintsid"
152
- :placeholder="$t('openatccomponents.common.placeholder')"
153
- style="width:70%;"
154
- size="small">
155
- <el-option
156
- v-for="item in keyintsidOptions"
157
- :key="item.value"
158
- :label="item.label"
159
- :value="item.value">
160
- </el-option>
161
- </el-select>
162
- </div>
163
- <div class="filter">
164
- <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.upspeed')}}：</span>
165
- <el-input-number :controls="false"
166
- style="width:70%;"
167
- :min="0"
168
- size="small"
169
- @change="onUpspeedChange"
170
- v-model="item.upspeed"
171
- ></el-input-number>
172
- </div>
173
- <div class="filter">
174
- <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.downspeed')}}：</span>
175
- <el-input-number :controls="false"
176
- style="width:70%;"
177
- :min="0"
178
- size="small"
179
- @change="onDownspeedChange"
180
- v-model="item.downspeed"
181
- ></el-input-number>
182
- </div> -->
183
38
  </div>
184
39
  </div>
185
40
  <div style="height: 94%;" class="table-container">
package/src/views/schemeconfig.vue CHANGED
@@ -59,7 +59,7 @@ export default {
59
59
  showWalk: [ 1, 2 ],
60
60
  sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
61
61
  lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
62
- agentId: 'gjnlahql',
62
+ agentId: '1511_207',
63
63
  Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
64
64
  Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
65
65
  boxVisible: true,