openatc-components 0.3.97 → 0.3.99

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 (52) hide show
  1. package/config/index.js +0 -1
  2. package/package/kisscomps/components/BoardCard/BoardCard.vue +11 -0
  3. package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue +46 -145
  4. package/package/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +4 -4
  5. package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +3 -7
  6. package/package/kisscomps/components/IntersectionMap/intersectionmap.vue +0 -5
  7. package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue +12 -17
  8. package/package/kisscomps/components/OverviewComponent/index.vue +22 -29
  9. package/package/kisscomps/components/PatternOptimize/PatternOptimize.vue +11 -2
  10. package/package/kisscomps/components/PatternStatus/PatternStatus.vue +92 -33
  11. package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue +8 -3
  12. package/package/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
  13. package/package/kisscomps/components/SchemeConfig/manualControlModalNew/controlModelGroup.vue +1 -2
  14. package/package/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue +1 -1
  15. package/package/kisscomps/components/patternConfig/index.vue +1 -1
  16. package/package/kisscomps/components/patternConfig/pattern/patternTable.vue +13 -33
  17. package/package/kisscomps/components/patternConfig/planContent.vue +3 -3
  18. package/package/kisscomps/components/patternList/patternList.vue +11 -0
  19. package/package/kissui.min.js +1 -1
  20. package/package.json +1 -1
  21. package/src/i18n/language/en.js +4 -2
  22. package/src/i18n/language/zh.js +4 -2
  23. package/src/kisscomps/components/BoardCard/BoardCard.vue +11 -0
  24. package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue +46 -145
  25. package/src/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue +4 -4
  26. package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +3 -7
  27. package/src/kisscomps/components/IntersectionMap/intersectionmap.vue +0 -5
  28. package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue +12 -17
  29. package/src/kisscomps/components/OverviewComponent/index.vue +22 -29
  30. package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue +11 -2
  31. package/src/kisscomps/components/PatternStatus/PatternStatus.vue +92 -33
  32. package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue +8 -3
  33. package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue +9 -11
  34. package/src/kisscomps/components/SchemeConfig/manualControlModalNew/controlModelGroup.vue +1 -2
  35. package/src/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue +1 -1
  36. package/src/kisscomps/components/patternConfig/index.vue +1 -1
  37. package/src/kisscomps/components/patternConfig/pattern/patternTable.vue +13 -33
  38. package/src/kisscomps/components/patternConfig/planContent.vue +3 -3
  39. package/src/kisscomps/components/patternList/patternList.vue +11 -0
  40. package/src/views/intersection.vue +7 -6
  41. package/src/views/intersection2.vue +2 -2
  42. package/src/views/overView.vue +23 -5
  43. package/src/views/patternConfig.vue +8 -38
  44. package/src/views/schemeconfig.vue +6 -4
  45. package/static/styles/common.scss +3 -3
  46. package/static/styles/dark/theme/element-dark.scss +1 -1
  47. package/static/styles/intersection.scss +5 -15
  48. package/static/styles/light/theme/element-light.scss +1 -1
  49. package/static/styles/schemeconfig.scss +6 -3
  50. package/package/kisscomps/components/OptimizeKanban/index.js +0 -2
  51. package/package/kisscomps/components/OptimizeKanban/index.vue +0 -369
  52. package/src/node_modules/.package_versions.json +0 -1
@@ -20,10 +20,10 @@
20
20
  :model="manualInfo"
21
21
  label-width="90px">
22
22
  <el-form-item
23
- :label="$t('openatccomponents.overview.greenclear')"
24
- prop="intersection">
25
- <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
26
- </el-form-item>
23
+ :label="$t('openatccomponents.overview.duration')"
24
+ prop="count">
25
+ <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
26
+ </el-form-item>
27
27
 
28
28
  <el-form-item
29
29
  :label="$t('openatccomponents.overview.yellowflash')"
@@ -44,13 +44,11 @@
44
44
  label-position="left"
45
45
  :model="manualInfo"
46
46
  label-width="90px">
47
-
48
- <el-form-item
49
- :label="$t('openatccomponents.overview.duration')"
50
- prop="count">
51
- <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
52
- </el-form-item>
53
-
47
+ <el-form-item
48
+ :label="$t('openatccomponents.overview.greenclear')"
49
+ prop="intersection">
50
+ <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
51
+ </el-form-item>
54
52
  <el-form-item
55
53
  :label="$t('openatccomponents.overview.allred')"
56
54
  prop="intersection">
@@ -76,8 +76,7 @@ export default {
76
76
  return {
77
77
  preselecttype: '',
78
78
  controllist: [],
79
- specialControl: [23, 22, 100, 24, 25],
80
- basicFuncControlId: [0, 1, 4, 5] // 基础功能包含的控制方式: 自主控制(手动下)、黄闪、步进、定周期
79
+ specialControl: [23, 22, 100, 24, 25]
81
80
  }
82
81
  },
83
82
  computed: {
@@ -179,7 +179,7 @@
179
179
  </el-tab-pane>
180
180
  <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
181
181
  <ControlModelGroup
182
- v-if="activeName === 'others' && funcSort === 'allFunc'"
182
+ v-if="activeName === 'others'"
183
183
  ref="ControlModelGroup"
184
184
  className="otherscontrol"
185
185
  othersControl
@@ -11,7 +11,7 @@
11
11
  **/
12
12
  <template>
13
13
  <div class="patternConfig">
14
- <el-container v-if="!isShowSingle" style="height: 100%;" >
14
+ <el-container v-if="!isShowSingle" >
15
15
  <div class="main-container" style="height: 100%;width: 100%;">
16
16
  <el-tabs v-model="editableTabsValue" type="card" @edit="handleTabsEdit" :before-leave="beforeLeave" style="height: 100%;">
17
17
  <el-tab-pane
@@ -12,7 +12,7 @@
12
12
  <template>
13
13
  <div class="app-container" ref="pattern-container">
14
14
  <el-table :data="newPatternList" :max-height="tableHeight" id="footerBtn" :show-header="isShowTableHeader">
15
- <el-table-column :type="isAllowedExpand ? 'expand' : ''" v-if="isAllowedExpand">
15
+ <el-table-column type="expand" v-if="isAllowedExpand">
16
16
  <template slot-scope="scope">
17
17
  <div v-if="isAllowedExpand && isSingleCrossMode" class="optimizetype">
18
18
  <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
@@ -51,14 +51,14 @@
51
51
  <span>{{scope.row.agentid}}</span>
52
52
  </template>
53
53
  </el-table-column>
54
- <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
54
+ <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
55
55
  <template slot-scope="scope">
56
- <span>{{getDevName(scope.row)}}</span>
56
+ <span>{{getPeriod(scope.row)}}</span>
57
57
  </template>
58
58
  </el-table-column>
59
- <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
59
+ <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
60
60
  <template slot-scope="scope">
61
- <span>{{getPeriod(scope.row)}}</span>
61
+ <span>{{getDevName(scope.row)}}</span>
62
62
  </template>
63
63
  </el-table-column>
64
64
  <el-table-column property="isValid" :label="$t('openatccomponents.token.isValid')" align="center" width="80" prop="isused" v-if="isShowColumn('isused')">
@@ -200,9 +200,7 @@ export default {
200
200
  },
201
201
  watch: {
202
202
  maxTableHeight: function () {
203
- this.$nextTick(() => {
204
- this.tableHeight = this.maxTableHeight // 动态更新高度
205
- })
203
+ this.tableHeight = this.maxTableHeight
206
204
  },
207
205
  optList: {
208
206
  handler: function (val) {
@@ -223,6 +221,11 @@ export default {
223
221
  }
224
222
  },
225
223
  mounted: function () {
224
+ // var _this = this
225
+ // _this.$nextTick(function () {
226
+ // _this.tableHeight = _this.maxTableHeight
227
+ // })
228
+ // _this.tableHeight = _this.maxTableHeight
226
229
  },
227
230
  methods: {
228
231
  onOptimizeClick (row, index) {
@@ -313,7 +316,7 @@ export default {
313
316
  return res
314
317
  },
315
318
  getPeriod (row) {
316
- let period = row.timeperiodrange || row.period
319
+ let period = row.period || row.timeperiodrange
317
320
  let res = ''
318
321
  if (period && period.length > 0) {
319
322
  res = period[0].substring(0, 5) + '-' + period[1].substring(0, 5)
@@ -342,30 +345,9 @@ export default {
342
345
  // this.phaseList = phaseList
343
346
  this.handlePatternList(routeData, patternList, phaseList)
344
347
  },
345
- // 依据anengid获取设备信息,同时兼容单路口数据按序index取值
346
- getDevFromDevsOrIndex (devs, agentid, index) {
347
- let res
348
- // check special
349
- let isSingleCrossMode = false
350
- if (devs && devs.length > 1 && devs[0].agentid === devs[1].agentid) {
351
- isSingleCrossMode = true
352
- // check errData
353
- if (index === undefined || index === null) {
354
- console.log('getDevFromDevsOrIndex Err: index is null')
355
- }
356
- }
357
- if (!isSingleCrossMode) {
358
- res = devs.filter(ist => ist.agentid === agentid)[0]
359
- } else {
360
- res = devs[index]
361
- console.log('getDevByIndex:', res)
362
- }
363
- return res
364
- },
365
348
  handlePatternList (routeData, patternList, phaseList) {
366
349
  this.newPatternList = []
367
350
  let devs = routeData.devs
368
- let index = 0
369
351
  for (let pattern of patternList) {
370
352
  let obj = {}
371
353
  let id = pattern.agentid
@@ -373,9 +355,7 @@ export default {
373
355
  let count = [] // 计算相位有几个环
374
356
  if (pattern.feature !== undefined && pattern.feature.patternList.length !== 0) {
375
357
  let currPatternList = pattern.feature.patternList
376
- // let dev = devs.filter(ist => ist.agentid === id)[0]
377
- let dev = this.getDevFromDevsOrIndex(devs, id, index)
378
- index = index + 1
358
+ let dev = devs.filter(ist => ist.agentid === id)[0]
379
359
  let patternId = dev.patternid
380
360
  let currPattern
381
361
  if (Array.isArray(currPatternList)) {
@@ -115,7 +115,7 @@ export default {
115
115
  // this.getRouteInfo()
116
116
  this.routeData = editableTab
117
117
  let patternList = this.getPatternListFromTab(editableTab, this.patternList)
118
- let phaseList = this.getPhaseListFromTab(editableTab, this.phaseList)
118
+ let phaseList = this.getPatternListFromTab(editableTab, this.patternList)
119
119
  if (patternList && patternList.length > 0 && phaseList && phaseList.length > 0) {
120
120
  this.patternList = patternList
121
121
  this.phaseList = phaseList
@@ -153,14 +153,14 @@ export default {
153
153
  return res
154
154
  }
155
155
  }
156
- let devPhaseList = devs.map(item => {
156
+ let devPatternList = devs.map(item => {
157
157
  let pattern = {
158
158
  agentid: item.agentid,
159
159
  feature: item.feature
160
160
  }
161
161
  return pattern
162
162
  })
163
- res = devPhaseList
163
+ res = devPatternList
164
164
  return res
165
165
  },
166
166
  closeInterval () {
@@ -5,6 +5,7 @@
5
5
  :contrloType="contrloType"
6
6
  :stagesChange="stagesChange"
7
7
  :isShowTip="isShowTip"
8
+ :isMove="isMove"
8
9
  :patternStatusList="patternStatusList"
9
10
  :cycles="cycles"
10
11
  :cycle="cycle"
@@ -19,6 +20,7 @@
19
20
  :agentId="agentId"
20
21
  :controlData="controlData"
21
22
  :syncTime="syncTime"
23
+ @handleSplitMove="handleSplitMove"
22
24
  :isPhase="isPhase"
23
25
  >
24
26
  </BoardCard>
@@ -502,6 +504,10 @@ export default {
502
504
  type: Boolean,
503
505
  default: true
504
506
  },
507
+ isMove: {
508
+ type: Boolean,
509
+ default: true
510
+ },
505
511
  contrloType: {
506
512
  type: String
507
513
  },
@@ -581,6 +587,11 @@ export default {
581
587
  // if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
582
588
  // this.resetCrossDiagram()
583
589
  // }
590
+ },
591
+ methods: {
592
+ handleSplitMove (data) {
593
+ this.$emit('handleSplitMove', data)
594
+ }
584
595
  }
585
596
  }
586
597
  </script>
@@ -1,15 +1,16 @@
1
1
  <template>
2
2
  <div>
3
+ <intersection-with-interface :AgentId="agentId" />
3
4
  <h2 class="text">实时通道路口图</h2>
4
- <channel-realtime-intersection
5
+ <!-- <channel-realtime-intersection
5
6
  :agentId="this.agentId"
6
7
  :roadDirection="roadDirection"
7
8
  :channelRealtimeStatusData="channelRealtimeStatusData"
8
- />
9
+ /> -->
9
10
 
10
11
  <!-- 按通道获取相位的方向选择列表,特殊路口显示列表,普通路口显示模版路口图 -->
11
12
  <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
12
- <intersection-direction-selection
13
+ <!-- <intersection-direction-selection
13
14
  :agentId="this.agentId"
14
15
  :choosedDirection="[14,6,13,8]"
15
16
  :choosedPedDirection="[1]"
@@ -25,7 +26,7 @@
25
26
  :choosedPedDirection="[1,2]"
26
27
  :roadDirection="roadDirection"
27
28
  @handleClickCrossIcon="handleClickCrossIcon" />
28
- </div>
29
+ </div> -->
29
30
 
30
31
  <!-- 显示按通道获取相位的模版路口图 -->
31
32
  <h2 class="text">显示配置的相位路口图</h2>
@@ -161,12 +162,12 @@ export default {
161
162
  return {
162
163
  roadDirection: 'right',
163
164
  // reqUrl: 'http://192.168.13.103:10003/openatc',
164
- agentId: 'tjblfql',
165
+ agentId: '32050101041121000001',
165
166
  // agentId: '13013',
166
167
  // agentId: '12007_390',
167
168
  // agentId: '12014',
168
169
  reqUrl: 'http://192.168.13.103:10003/openatc',
169
- Token: 'eyJraWQiOiIxNzIxOTc3OTkzMTY4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk4MTU5MywiaWF0IjoxNzIxOTc0MzkzfQ.vjgAFMJlM4FEHxT9K9lJQ_VsUx1fDubr4tYgMaVffS0',
170
+ Token: 'eyJraWQiOiIxNzMzODkzOTEyNDQwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5NzUxMiwiaWF0IjoxNzMzODkwMzEyfQ.OItRhpJG9WM4KRZ04Nhzedyj1WhTKw2r-oKCQN8dA04',
170
171
  // agentId: '30003-352',
171
172
  // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
172
173
  // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -102,12 +102,12 @@ export default {
102
102
  return {
103
103
  roadDirection: 'left',
104
104
  // reqUrl: 'http://192.168.13.103:10003/openatc',
105
- agentId: 'cllzpl',
105
+ agentId: '32050101041121000001',
106
106
  // agentId: '13013',
107
107
  // agentId: '12007_390',
108
108
  // agentId: '12014',
109
109
  reqUrl: 'http://192.168.13.103:10003/openatc',
110
- Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
110
+ Token: 'eyJraWQiOiIxNjkzMjkyMzI0NzUyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA5MjEzNDQwMCwiaWF0IjoxNjkwODE5MjAwfQ.97bSPcUdh4xgAqkbw96Q-NfLVhFbgK0Yo1S8KYkSwz8',
111
111
  // agentId: '30003-352',
112
112
  // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
113
113
  // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -1,13 +1,16 @@
1
1
  <template>
2
2
  <div id="test1">
3
- <overview
3
+ <!-- <overview
4
4
  :AgentId="agentId"
5
5
  :reqUrl="reqUrl"
6
6
  :modeName="modeName"
7
7
  :controlName="controlName"
8
8
  :isShowState="isShowState"
9
9
  :isShowMode="isShowMode"
10
- :Token="Token"></overview>
10
+ :Token="Token"></overview> -->
11
+ <el-button @click="handleChangeOverview">切换overview组件</el-button>
12
+ <el-button @click="reverseOverviewBtMap">切换路口图和overview</el-button>
13
+ <overview-component :AgentId="agentId" :onlyShowIntersectionMap="isOnlyMap" />
11
14
  </div>
12
15
  </template>
13
16
 
@@ -19,12 +22,27 @@ export default {
19
22
  isShowMode: true,
20
23
  modeName: '交警遥控',
21
24
  controlName: '步进',
22
- agentId: 'jmlxhl',
23
- Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
24
- reqUrl: 'http://192.168.13.103:10003/openatc'
25
+ agentId: '13013',
26
+ agentid1: 'gjnlahql',
27
+ agentid2: '13013',
28
+ sum: 0,
29
+ Token: 'eyJraWQiOiIxNzMzODg3MDYyMjgwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5MDY2MiwiaWF0IjoxNzMzODgzNDYyfQ.qUJZ4lKv0WU3s3lWfYwl5ZM77n2rriYeFQ8qOwRFuzk',
30
+ reqUrl: 'http://192.168.13.103:10003/openatc',
31
+ isOnlyMap: true
25
32
  }
26
33
  },
27
34
  methods: {
35
+ handleChangeOverview () {
36
+ if (this.sum % 2 === 0) {
37
+ this.agentId = this.agentid1
38
+ } else {
39
+ this.agentId = this.agentid2
40
+ }
41
+ this.sum++
42
+ },
43
+ reverseOverviewBtMap () {
44
+ this.isOnlyMap = !this.isOnlyMap
45
+ }
28
46
  },
29
47
  watch: {
30
48
  },
@@ -72,14 +72,14 @@ export default {
72
72
  // },
73
73
  data () {
74
74
  return {
75
- tableColums: ['agentid', 'name', 'period', 'pattern'], // greenWave, period
75
+ tableColums: ['agentid', 'period', 'offset', 'cycle', 'pattern'], // greenWave, period
76
76
  // tableColums: ['no', 'id', 'period', 'name', 'isUsed', 'patternId', 'offset', 'cycle', 'pattern'], // greenWave, period
77
- isShowSingle: false,
77
+ isShowSingle: true,
78
78
  isOnlyOneTab: false,
79
- isSingleCrossMode: false,
79
+ isSingleCrossMode: true,
80
80
  isShowTableHeader: true,
81
- isAllowedExpand: false,
82
- // isAllowedExpand: true,
81
+ // isAllowedExpand: false,
82
+ isAllowedExpand: true,
83
83
  // agentids: ['gjnlgjxl'],
84
84
  agentids4: [
85
85
  'tjblxyl',
@@ -165,7 +165,6 @@ export default {
165
165
  agentId: '12008_835',
166
166
  // agentId: '0351-01',
167
167
  reqUrl: 'http://192.168.13.103:10003/openatc',
168
- Token135: 'eyJraWQiOiIxNzIzMDgzMDcxMzIxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTk4NTQ0MzIwMCwiaWF0IjoxNzIyNDM4MDAwfQ.i-RVHcxmtgvD9boQECpBCz7T1fJ0TAjzO5BWin3VdoY',
169
168
  Token: 'eyJraWQiOiIxNzAwMjAwNDQ4MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2NzExMDQwMCwiaWF0IjoxNjk5Mjg2NDAwfQ.AyVJCGmVQVafdWBDQ7TMhVQ5Dvjy13NeuQ8rimTPgtc',
170
169
  // reqUrl: 'http://192.168.13.113:10003/openatc',
171
170
  // Token: 'eyJraWQiOiIxNjkxMzcxMTc5ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDE0NzIwMCwiaWF0IjoxNjkwODE5MjAwfQ.AhUj9taw4_IpP77AmP5bvCE87dDQ4-ZdsEJzrlWXKF8',
@@ -198,36 +197,8 @@ export default {
198
197
  ]
199
198
  },
200
199
  agentids6: ['tjblsxl-ticp6'],
201
- agentids5: ['tjllybj', 'tjlzsdj', 'tjlhaj', 'tjlyhddj'],
202
- opt5: {
203
- 'optPatternList': [
204
- {
205
- 'name': '仿真实例 1',
206
- 'devs': [
207
- {
208
- 'agentid': 'tjllybj',
209
- 'patternid': 1,
210
- 'isused': true
211
- },
212
- {
213
- 'agentid': 'tjlzsdj',
214
- 'patternid': 1,
215
- 'isused': true
216
- },
217
- {
218
- 'agentid': 'tjlhaj',
219
- 'patternid': 1,
220
- 'isused': true
221
- },
222
- {
223
- 'agentid': 'tjlyhddj',
224
- 'patternid': 1,
225
- 'isused': true
226
- }
227
- ]
228
- }
229
- ]
230
- },
200
+ agentids5: ['cllytl'],
201
+ opt5: {},
231
202
  agentids: ['gjnlgjxl'],
232
203
  opt: {
233
204
  'optPatternList': [
@@ -14738,8 +14709,7 @@ export default {
14738
14709
  // // _this.agentId = 'scats1'
14739
14710
  // _this.agentids = ['gjnlahql', 'gjnlgjxl']
14740
14711
  // }, 5 * 1000)
14741
- this.setPropsToken(this.Token135)
14742
- // this.setPropsToken(this.Token)
14712
+ this.setPropsToken(this.Token)
14743
14713
  window.onresize = () => {
14744
14714
  return (() => {
14745
14715
  // this.setDialogWidth()
@@ -61,9 +61,9 @@ export default {
61
61
  showWalk: [ 1, 2 ],
62
62
  sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
63
63
  lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
64
- agentId: '32050101041121000001',
64
+ agentId: '1511_207',
65
65
  Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
66
- Token103: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
66
+ Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
67
67
  boxVisible: false,
68
68
  dialogWidth: '80%',
69
69
  crossStatusData: {} // 路口状态数据
@@ -138,8 +138,11 @@ export default {
138
138
  }
139
139
  return
140
140
  }
141
+ console.log(data.data.data)
141
142
  this.crossStatusData = JSON.parse(JSON.stringify(data.data.data.data))
142
- console.log('this.crossStatusData:', this.crossStatusData)
143
+ // debugger
144
+ console.log(this.crossStatusData)
145
+ // debugger
143
146
  }).catch(error => {
144
147
  console.log(error)
145
148
  })
@@ -148,7 +151,6 @@ export default {
148
151
  // 获取路口信息
149
152
  getIntersectionInfo(agentid).then(res => {
150
153
  this.phaseList = res.data.data.param.phaseList
151
- console.log('this.phaseList:', this.phaseList)
152
154
  })
153
155
  },
154
156
  setPropsToken (token) {
@@ -11,12 +11,12 @@
11
11
 
12
12
  // 全局滚动条样式
13
13
  ::-webkit-scrollbar {
14
- width: 12PX;
15
- height: 12PX;
14
+ width: 6PX;
15
+ height: 6PX;
16
16
  }
17
17
  ::-webkit-scrollbar-thumb {
18
18
  // 滚动条的滑块
19
- border-radius: 4px;
19
+ border-radius: 3PX;
20
20
  background: rgba(144, 147, 153, 0.3);
21
21
  }
22
22
  ::-webkit-scrollbar-corner{
@@ -34,7 +34,7 @@ $--button-danger-font-color: #FFFFFF;
34
34
  $--button-success-font-color: #FFFFFF;
35
35
  $--radio-button-checked-font-color: #FFFFFF;
36
36
  $--radio-font-color: $--color-text-secondary;
37
- $--tag-info-color: $--color-text-placeholder;
37
+ $--tag-info-color: #FFFFFF;
38
38
  $--tooltip-color: $--color-white;
39
39
  $--checkbox-font-color: $--color-text-secondary;
40
40
 
@@ -38,9 +38,6 @@
38
38
  zoom: 0.9;
39
39
 
40
40
  }
41
- .centerText .text {
42
- font-size: 14px;
43
- }
44
41
  }
45
42
  /*当屏幕小于等于1440px的屏幕样式*/
46
43
  @media only screen and (max-width: 1440px){
@@ -49,9 +46,6 @@
49
46
  zoom: 0.8;
50
47
 
51
48
  }
52
- .centerText .text {
53
- font-size: 18px;
54
- }
55
49
  }
56
50
  /*当屏幕小于等于1280px的屏幕样式*/
57
51
  @media only screen and (max-width: 1280px){
@@ -59,9 +53,6 @@
59
53
  // transform: scale(0.65);
60
54
  zoom: 0.65;
61
55
  }
62
- .centerText .text {
63
- font-size: 20px;
64
- }
65
56
  }
66
57
  /*当屏幕小于等于960px的屏幕样式*/
67
58
  @media only screen and (max-width: 960px){
@@ -69,9 +60,6 @@
69
60
  // transform: scale(0.5);
70
61
  zoom: 0.5;
71
62
  }
72
- .centerText .text {
73
- font-size: 14px;
74
- }
75
63
  }
76
64
  /*当屏幕小于等于720px的屏幕样式*/
77
65
  @media only screen and (max-width: 720px){
@@ -79,9 +67,6 @@
79
67
  // transform: scale(0.45);
80
68
  zoom: 0.45;
81
69
  }
82
- .centerText .text {
83
- font-size: 14px;
84
- }
85
70
  }
86
71
  // 小屏幕打开首页适配样式
87
72
  .minifont {
@@ -188,4 +173,9 @@
188
173
  color: $--color-text-primary;
189
174
  font-size:30PX;
190
175
  }
176
+ .centerText {
177
+ .text {
178
+ font-size: 18PX;
179
+ }
180
+ }
191
181
  }
@@ -34,7 +34,7 @@ $--card-background-selected: #c1e0ff;
34
34
  // $--button-success-font-color: #FFFFFF;
35
35
  // $--radio-button-checked-font-color: #FFFFFF;
36
36
  // $--radio-font-color: $--color-text-secondary;
37
- // $--tag-info-color: $--color-text-placeholder;
37
+ $--tag-info-color: #303133;
38
38
  // $--tooltip-color: $--color-white;
39
39
  // $--checkbox-font-color: $--color-text-secondary;
40
40
 
@@ -226,7 +226,7 @@
226
226
  overflow-y: auto;
227
227
  }
228
228
  .manual-common-content::-webkit-scrollbar {
229
- width: 8PX;
229
+ width: 6PX;
230
230
  }
231
231
  }
232
232
  // 手动控制弹框
@@ -498,12 +498,12 @@
498
498
  width: 85% !important;
499
499
  }
500
500
  .el-input.is-disabled .el-input__inner {
501
- text-align: center;
501
+ text-align: left;
502
502
  }
503
503
  .el-input-number {
504
504
  width: 100%;
505
505
  .el-input__inner {
506
- text-align: center;
506
+ text-align: left;
507
507
  }
508
508
  }
509
509
  .el-select {
@@ -540,6 +540,9 @@
540
540
  }
541
541
  .el-input-number {
542
542
  width: 100%;
543
+ .el-input__inner {
544
+ text-align: left;
545
+ }
543
546
  }
544
547
  .el-input-number--mini{
545
548
  width: 100%;
@@ -1,2 +0,0 @@
1
- import OptimizeKanban from './OptimizeKanban.vue'
2
- export default OptimizeKanban