openatc-components 0.2.39 → 0.2.40

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.
@@ -28,8 +28,8 @@
28
28
  :showWalk="item[0].peddirection"
29
29
  :Width="'40'"
30
30
  :Height="'40'" /> -->
31
- <xdr-dir-selector Width="75PX" Height="75PX" Widths="65px" Heights="65px" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
32
- <div style="height:80px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
31
+ <xdr-dir-selector :Width="dirWidth" :Height="dirHeight" :Widths="dirWidths" :Heights="dirHeights" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
32
+ <div style="display:flex;flex-direction:row;justify-content:center;align-items:end;" :style="{height: StageHeight}">
33
33
  <div class="current-stage-num" style="width:20%;" :style="{color: themeColor}">{{index + 1}}</div>
34
34
  <div style="width:70%;">
35
35
  <i class="iconfont icon-feijidongche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
@@ -105,7 +105,23 @@ export default {
105
105
  StageHeight: {
106
106
  type: String,
107
107
  default: '80px'
108
- }
108
+ },
109
+ dirWidth: {
110
+ type: String,
111
+ default: '75PX'
112
+ },
113
+ dirHeight: {
114
+ type: String,
115
+ default: '75PX'
116
+ },
117
+ dirWidths: {
118
+ type: String,
119
+ default: '65PX'
120
+ },
121
+ dirHeights: {
122
+ type: String,
123
+ default: '65PX'
124
+ },
109
125
  },
110
126
  data () {
111
127
  return {
@@ -153,6 +169,18 @@ export default {
153
169
  }
154
170
  },
155
171
  watch: {
172
+ // phaseList: {
173
+ // handler: function (val, oldVal) {
174
+ // console.log(val, 'phaseList')
175
+ // // debugger
176
+ // }
177
+ // },
178
+ // crossStatusData: {
179
+ // handler: function (val, oldVal) {
180
+ // console.log(val, 'crossStatusData')
181
+ // // debugger
182
+ // }
183
+ // },
156
184
  preselectStages: {
157
185
  handler: function (val, oldVal) {
158
186
  if(this.preselectStages === -1 && this.preselectModel !== -1) {
@@ -1034,7 +1034,9 @@ export default {
1034
1034
  for (let j = 0; j < this.peoplestatus.length; j++) {
1035
1035
  if (showlist[0].peddirection[i].name === this.peoplestatus[j].name) {
1036
1036
  this.peoplestatus[j].isshow = true
1037
- this.peoplestatus[j].color = showlist[0].peddirection[i].color
1037
+ if (showlist[0].peddirection[i].color) {
1038
+ this.peoplestatus[j].color = showlist[0].peddirection[i].color
1039
+ }
1038
1040
  }
1039
1041
  }
1040
1042
  }