diff --git a/ruoyi-ui/src/components/complex/basic/scrollTable.vue b/ruoyi-ui/src/components/complex/basic/scrollTable.vue index 398c5cd..5c48909 100644 --- a/ruoyi-ui/src/components/complex/basic/scrollTable.vue +++ b/ruoyi-ui/src/components/complex/basic/scrollTable.vue @@ -75,7 +75,6 @@ export default { methods: { async getData(e) { let data = await this.$getFinalData(this.defaultData.requests) - console.log('data', data) this.$set(this, 'networkData', data) }, getOption() { diff --git a/ruoyi-ui/src/components/modelComponents/srcollTable/srcollTable.vue b/ruoyi-ui/src/components/modelComponents/srcollTable/srcollTable.vue index fdaea9b..088306b 100644 --- a/ruoyi-ui/src/components/modelComponents/srcollTable/srcollTable.vue +++ b/ruoyi-ui/src/components/modelComponents/srcollTable/srcollTable.vue @@ -87,9 +87,12 @@ export default { props: ['defaultData', 'isDialog'], watch: { 'defaultData.requests': { - handler() { + async handler() { + setTimeout(async ()=>{ + await this.getData() + this.dataChange() + },1000) console.log('this.networkData1122') - this.dataChange() }, deep: true }, @@ -109,12 +112,12 @@ export default { this.dataChange() setInterval(async () => { await this.getData() - }, 1000 * 10) + }, 1000 * 60) }, methods: { async getData(e) { + console.log('data1-1', data) let data = await this.$getFinalData(this.defaultData.requests) - console.log('data', data) this.$set(this, 'networkData', data) }, async onSubmit() { diff --git a/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue b/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue index 10802eb..0a2901b 100644 --- a/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue +++ b/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue @@ -404,6 +404,7 @@ export default { this.$set(this.requests[k], 'endTime', new Date(this.equipmentIntervalForm.time[1]).getTime()) } }) + this.setIntervalDialogVisible = false }, subtractRequest(key) { if (this.requests?.length > 1) { @@ -438,8 +439,6 @@ export default { this.addRequestForm = {} }, addEquipmentConfirm() { - console.log('123123,345345,12313',this.addEquipmentForm) - console.log('123123,345345,12313',this.requests) if (this.updateDeviceFlag) { this.$set(this.requests, this.updateDeviceIndex, Vue.observable({ ...this.addEquipmentForm,