Showing
1 changed file
with
1 additions
and
26 deletions
... | ... | @@ -209,40 +209,15 @@ |
209 | 209 | |
210 | 210 | const keys = attributes.length ? (attributes as any[]).at(0)?.value : ''; |
211 | 211 | |
212 | - // fix修改执行条件里的日期 | |
213 | - const tsObj: Recordable = {}; | |
214 | - | |
215 | - const { executeCondition } = data.record?.executeCondition as Recordable; | |
216 | - | |
217 | - if (!executeCondition) return; | |
218 | - | |
219 | - if ( | |
220 | - Reflect.has(executeCondition, 'prevStartTs') && | |
221 | - Reflect.has(executeCondition, 'prevEndTs') | |
222 | - ) { | |
223 | - // 有则取对应值 | |
224 | - tsObj.startTs = executeCondition?.prevStartTs; | |
225 | - tsObj.endTs = executeCondition?.prevEndTs; | |
226 | - } else { | |
227 | - // 使用之前的日期 | |
228 | - tsObj.startTs = executeCondition?.startTs; | |
229 | - tsObj.endTs = executeCondition?.endTs; | |
230 | - } | |
231 | - Reflect.deleteProperty(executeCondition, 'prevStartTs'); | |
232 | - Reflect.deleteProperty(executeCondition, 'prevEndTs'); | |
233 | - | |
234 | 212 | const sendParams = { |
235 | - ...executeCondition, | |
213 | + ...data.record.executeCondition.executeCondition, | |
236 | 214 | ...{ |
237 | 215 | keys, |
238 | 216 | }, |
239 | - ...tsObj, | |
240 | 217 | }; |
241 | 218 | |
242 | 219 | const result = await exportViewChartApi(device, sendParams); |
243 | - | |
244 | 220 | item.notFoundData = validateHasData(result); |
245 | - | |
246 | 221 | const { xAxisData, series } = getChartsOption(result as unknown as ResponsData); |
247 | 222 | |
248 | 223 | await nextTick(); | ... | ... |