Browse Source

看板- 页面切换时,原页面定时请求需要取消

xiaost 1 year ago
parent
commit
77178f3145
34 changed files with 175 additions and 56 deletions
  1. 5 1
      src/components/assemblyechart/bottom/bottomLeft2Chart/chart.vue
  2. 6 1
      src/components/assemblyechart/bottom/bottomRightChart/index.vue
  3. 2 1
      src/components/assemblyechart/centerLeft/centerLeft1Chart/index.vue
  4. 5 1
      src/components/assemblyechart/centerRight/centerRightChart/index.vue
  5. 5 1
      src/components/dplechart/bottom/bottomLeft2Chart/chart.vue
  6. 7 3
      src/components/dplechart/bottom/bottomRightChart/index.vue
  7. 2 1
      src/components/dplechart/centerLeft/centerLeft1Chart/index.vue
  8. 5 1
      src/components/dplechart/centerRight/centerRightChart/index.vue
  9. 5 1
      src/components/packageechart/bottom/bottomLeft2Chart/chart.vue
  10. 6 2
      src/components/packageechart/bottom/bottomRightChart/index.vue
  11. 2 1
      src/components/packageechart/centerLeft/centerLeft1Chart/index.vue
  12. 5 1
      src/components/packageechart/centerRight/centerRightChart/index.vue
  13. 5 1
      src/components/smtechart/up/up1Chart/chart.vue
  14. 5 1
      src/components/smtechart/up/up1ChartOld/chart.vue
  15. 5 1
      src/components/smtechart/up/up2Chart/index.vue
  16. 5 1
      src/components/smtechart/up/up2ChartOld/chart.vue
  17. 3 2
      src/components/smtechart/up/up3Chart/index.vue
  18. 6 2
      src/views/assembly/bottomRight2.vue
  19. 5 1
      src/views/assembly/centerLeft_two.vue
  20. 6 2
      src/views/assembly/centerRight1.vue
  21. 6 3
      src/views/assembly/centerRight2.vue
  22. 6 3
      src/views/dpl/center.vue
  23. 5 1
      src/views/dpl/centerLeft_two.vue
  24. 6 2
      src/views/dpl/centerRight1.vue
  25. 6 3
      src/views/dpl/centerRight2Old.vue
  26. 6 3
      src/views/package/center.vue
  27. 5 1
      src/views/package/centerLeft_two.vue
  28. 6 2
      src/views/package/centerRight1.vue
  29. 6 3
      src/views/package/centerRight2Old.vue
  30. 6 2
      src/views/smt/bottom1.vue
  31. 6 2
      src/views/smt/bottom1Old.vue
  32. 6 2
      src/views/smt/bottom2.vue
  33. 5 1
      src/views/smt/up2.vue
  34. 5 2
      src/views/smt/up2old.vue

+ 5 - 1
src/components/assemblyechart/bottom/bottomLeft2Chart/chart.vue

@@ -17,6 +17,7 @@ import Echart from '@/common/echart'
 export default {
   data () {
     return {
+      timing : null,
       options:{
         tooltip: {
           trigger: 'axis',
@@ -165,9 +166,12 @@ export default {
     this.getdata();
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 6 - 1
src/components/assemblyechart/bottom/bottomRightChart/index.vue

@@ -97,7 +97,12 @@ export default {
       if (sessionStorage.getItem('li_code') == '所有'){
         caller2 = 'RadiusBadDuty!ZZ!ALL';
       }
-      await this.$http.get("kanban/datalist.action?caller="+caller2+"&_noc=1&page=1&pageSize=100&condition=1=1")
+      await this.$http.get("kanban/datalist.action?caller="+caller2+"&_noc=1&page=1&pageSize=100"
+          ,{
+            params: {
+              condition: "1=1",
+            }
+          })
               .then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let radarData = new Array();

+ 2 - 1
src/components/assemblyechart/centerLeft/centerLeft1Chart/index.vue

@@ -10,6 +10,7 @@ import { formatDate } from '../../../../utils/index.js';
 export default {
   data () {
     return {
+      intervalId :null,
       cdata: {
         xData:[],// ["data1", "data2", "data3", "data4", "data5", "data6"],
         seriesData:[] /* [
@@ -38,7 +39,7 @@ export default {
   },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.intervalId =setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/assemblyechart/centerRight/centerRightChart/index.vue

@@ -9,6 +9,7 @@ import Chart from './chart.vue';
 export default {
   data () {
     return {
+      timing : null,
       cdata: {
         indicatorData :[],
         dataRadius : []
@@ -54,10 +55,13 @@ export default {
   mounted () {
     this.drawTimingFn();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/dplechart/bottom/bottomLeft2Chart/chart.vue

@@ -19,6 +19,7 @@ import Echart from '@/common/echart'
 export default {
   data () {
     return {
+      timing : null,
       options:{
         tooltip: {
           trigger: 'axis',
@@ -167,9 +168,12 @@ export default {
     this.getdata();
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 7 - 3
src/components/dplechart/bottom/bottomRightChart/index.vue

@@ -94,11 +94,15 @@ export default {
                       }
               );
        //雷达图:
-      var caller2 = 'RadiusBadDuty';
+      var caller2 = 'DPL!RadiusBadDuty';
       if (sessionStorage.getItem('li_code') == '所有'){
-        caller2 = 'RadiusBadDuty!ALL';
+        caller2 = 'DPL!RadiusBadDuty!ALL';
       }
-      await this.$http.get("kanban/datalist.action?caller="+caller2+"&_noc=1&page=1&pageSize=100&condition=1=1")
+      await this.$http.get("kanban/datalist.action?caller="+caller2+"&_noc=1&page=1&pageSize=100",{
+        params: {
+          condition: "1=1",
+        }
+      })
               .then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let radarData = new Array();

+ 2 - 1
src/components/dplechart/centerLeft/centerLeft1Chart/index.vue

@@ -10,6 +10,7 @@ import { formatDate } from '../../../../utils/index.js';
 export default {
   data () {
     return {
+      intervalId :null,
       cdata: {
         xData:[],// ["data1", "data2", "data3", "data4", "data5", "data6"],
         seriesData:[] /* [
@@ -38,7 +39,7 @@ export default {
   },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.intervalId = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/dplechart/centerRight/centerRightChart/index.vue

@@ -9,6 +9,7 @@ import Chart from './chart.vue';
 export default {
   data () {
     return {
+      timing : null,
       cdata: {
         indicatorData :[],
         dataRadius : []
@@ -54,10 +55,13 @@ export default {
   mounted () {
     this.drawTimingFn();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/packageechart/bottom/bottomLeft2Chart/chart.vue

@@ -17,6 +17,7 @@ import Echart from '@/common/echart'
 export default {
   data () {
     return {
+      timing :null,
       options:{
         tooltip: {
           trigger: 'axis',
@@ -165,9 +166,12 @@ export default {
     this.getdata();
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 6 - 2
src/components/packageechart/bottom/bottomRightChart/index.vue

@@ -98,8 +98,12 @@ export default {
       if (sessionStorage.getItem('li_code') == '所有'){
         caller2 = 'RadiusBadDuty!ALL';
       }
-      await this.$http.get("kanban/datalist.action?caller="+caller2+"&_noc=1&page=1&pageSize=100&condition=1=1")
-              .then((result)=>{
+      await this.$http.get("kanban/datalist.action?caller="+caller2+"&_noc=1&page=1&pageSize=100",
+              {
+                params: {
+                  condition: "1=1",
+                }
+              }) .then((result)=>{
                         let dataList = JSON.parse(result.data.data);
                         let radarData = new Array();
                         let radarAvgData = new Array();

+ 2 - 1
src/components/packageechart/centerLeft/centerLeft1Chart/index.vue

@@ -11,6 +11,7 @@ export default {
   data () {
     return {
       cdata: {
+        intervalId :null,
         xData:[],// ["data1", "data2", "data3", "data4", "data5", "data6"],
         seriesData:[] /* [
           { value: 10, name: "data1" },
@@ -38,7 +39,7 @@ export default {
   },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.intervalId = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/packageechart/centerRight/centerRightChart/index.vue

@@ -9,6 +9,7 @@ import Chart from './chart.vue';
 export default {
   data () {
     return {
+      timing : null,
       cdata: {
         indicatorData :[],
         dataRadius : []
@@ -54,10 +55,13 @@ export default {
   mounted () {
     this.drawTimingFn();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/smtechart/up/up1Chart/chart.vue

@@ -17,6 +17,7 @@ import Echart from '@/common/echart'
 export default {
   data () {
     return {
+      timing: null,
       options:{
         tooltip: {
           trigger: 'axis',
@@ -171,9 +172,12 @@ export default {
     this.getdata();
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/smtechart/up/up1ChartOld/chart.vue

@@ -16,6 +16,7 @@ import Echart from '@/common/echart'
 export default {
   data () {
     return {
+      timing :null,
       options:{
         tooltip: {
           trigger: 'axis',
@@ -119,9 +120,12 @@ export default {
     this.getdata();
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/components/smtechart/up/up2Chart/index.vue

@@ -9,6 +9,7 @@ import Chart from './chart.vue';
 export default {
   data () {
     return {
+      timing :null,
       cdata: {
         indicatorData :[],
         dataRadius : []
@@ -21,10 +22,13 @@ export default {
   mounted () {
     this.drawTimingFn();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 10000);
     },

+ 5 - 1
src/components/smtechart/up/up2ChartOld/chart.vue

@@ -15,6 +15,7 @@ import Echart from '@/common/echart'
 export default {
   data () {
     return {
+      timing :null,
       options:{
         series: [
           {
@@ -218,9 +219,12 @@ export default {
     this.getdata();
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取-数据
       }, 30000);
     },

+ 3 - 2
src/components/smtechart/up/up3Chart/index.vue

@@ -11,6 +11,7 @@ import {formatDate} from "../../../../utils/index.js";
 export default {
   data () {
     return {
+      timing :null,
       cdata: {
         xData:[],
         seriesData:[]
@@ -25,14 +26,14 @@ export default {
     this.refreshdata();
   },
   beforeDestroy () {
-    clearInterval(this.intervalId);
+    clearInterval(this.timing);
     this.chart.dispose()
     this.chart.clear()
     this.chart=null
   },
   methods: {
     refreshdata() {
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取-数据
       }, 10000);
     },

+ 6 - 2
src/views/assembly/bottomRight2.vue

@@ -34,16 +34,20 @@ export default {
         index: true,
         columnWidth: [50,130],
         align: ['center']
-      }
+      },
+      timing : null
     }
   },
   mounted() {
     this.refreshdata()
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.getdata(); //获取-数据
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取--数据
       }, 30000);
     },

+ 5 - 1
src/views/assembly/centerLeft_two.vue

@@ -37,16 +37,20 @@ export default {
   data() {
     return {
       titleItem:[],
+      timing :null
     }
   },
   components: { centerRight2Chart1 },
   mounted() {
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.settestdata(); //获取数据
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.settestdata(); //获取-主题词
       }, 30000);
     },

+ 6 - 2
src/views/assembly/centerRight1.vue

@@ -31,12 +31,16 @@ export default {
         evenRowBGC: '#171c33', //偶数行
         columnWidth: [110,100,100,80,90,100,90],
         align: ['center']
-      }
+      },
+      timing :null
     }
   },
   mounted() {
     this.refreshdata()
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.getdata(); //获取-数据
@@ -50,7 +54,7 @@ export default {
               console.error(result)
          });*/
 
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取--数据
       }, 30000);
     },

+ 6 - 3
src/views/assembly/centerRight2.vue

@@ -45,18 +45,21 @@ export default {
                 }
               }
             }
-      ]
+      ],
+      timing : null
     }
   },
   components: { CenterChart },
   mounted () {
     this.drawTimingFn();
   },
-
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 6 - 3
src/views/dpl/center.vue

@@ -97,7 +97,8 @@ export default {
             }
           }
         }
-      ]
+      ],
+      timing :null
     }
   },
   components: {
@@ -106,11 +107,13 @@ export default {
   mounted () {
     this.drawTimingFn();
   },
-
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/views/dpl/centerLeft_two.vue

@@ -37,16 +37,20 @@ export default {
   data() {
     return {
       titleItem:[],
+      timing : null,
     }
   },
   components: { centerRight2Chart1 },
   mounted() {
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.settestdata(); //获取数据
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.settestdata(); //获取-主题词
       }, 30000);
     },

+ 6 - 2
src/views/dpl/centerRight1.vue

@@ -31,12 +31,16 @@ export default {
         evenRowBGC: '#171c33', //偶数行
         columnWidth: [150,90,100,80,90,90,90],
         align: ['center']
-      }
+      },
+      timing : null
     }
   },
   mounted() {
     this.refreshdata()
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.getdata(); //获取-数据
@@ -50,7 +54,7 @@ export default {
               console.error(result)
          });*/
 
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取--数据
       }, 30000);
     },

+ 6 - 3
src/views/dpl/centerRight2Old.vue

@@ -45,18 +45,21 @@ export default {
                 }
               }
             }
-      ]
+      ],
+      timing :null
     }
   },
   components: { CenterChart },
   mounted () {
     this.drawTimingFn();
   },
-
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 6 - 3
src/views/package/center.vue

@@ -97,7 +97,8 @@ export default {
             }
           }
         }
-      ]
+      ],
+      timing:null,
     }
   },
   components: {
@@ -106,11 +107,13 @@ export default {
   mounted () {
     this.drawTimingFn();
   },
-
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 5 - 1
src/views/package/centerLeft_two.vue

@@ -37,16 +37,20 @@ export default {
   data() {
     return {
       titleItem:[],
+      timing : null,
     }
   },
   components: { centerRight2Chart1 },
   mounted() {
     this.refreshdata();
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.settestdata(); //获取数据
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.settestdata(); //获取-主题词
       }, 30000);
     },

+ 6 - 2
src/views/package/centerRight1.vue

@@ -31,12 +31,16 @@ export default {
         evenRowBGC: '#171c33', //偶数行
         columnWidth: [110,100,100,80,90,100,90],
         align: ['center']
-      }
+      },
+      timing : null,
     }
   },
   mounted() {
     this.refreshdata()
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.getdata(); //获取-数据
@@ -50,7 +54,7 @@ export default {
               console.error(result)
          });*/
 
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取--数据
       }, 30000);
     },

+ 6 - 3
src/views/package/centerRight2Old.vue

@@ -45,18 +45,21 @@ export default {
                 }
               }
             }
-      ]
+      ],
+      timing :null
     }
   },
   components: { CenterChart },
   mounted () {
     this.drawTimingFn();
   },
-
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     drawTimingFn () {
       this.setData();
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.setData(); //获取-数据
       }, 30000);
     },

+ 6 - 2
src/views/smt/bottom1.vue

@@ -58,16 +58,20 @@
                     evenRowBGC: '#171c33', //偶数行
                     columnWidth: [200,170,170,200,170,100],
                     align: ['center']
-                }
+                },
+                timing:null,
             }
         },
         mounted() {
             this.refreshdata()
         },
+        beforeDestroy () {
+            clearInterval(this.timing)
+        },
         methods: {
             refreshdata() {
                 this.getdata(); //获取-数据
-                setInterval(() => {
+                this.timing = setInterval(() => {
                     this.getdata(); //获取--数据
                 }, 10000);
             },

+ 6 - 2
src/views/smt/bottom1Old.vue

@@ -42,16 +42,20 @@ export default {
         rowNum:7,
         columnWidth: [120,180,350,180,100,140,130,100,220,220,120],
         align: ['center']
-      }
+      },
+      timing:null,
     }
   },
   mounted() {
     this.refreshdata()
   },
+  beforeDestroy () {
+    clearInterval(this.timing)
+  },
   methods: {
     refreshdata() {
       this.getdata(); //获取-数据
-      setInterval(() => {
+      this.timing = setInterval(() => {
         this.getdata(); //获取--数据
       }, 30000);
     },

+ 6 - 2
src/views/smt/bottom2.vue

@@ -52,16 +52,20 @@
           evenRowBGC: '#171c33', //偶数行
           columnWidth: [200,90,280,150],
           align: ['center','center','center','center']
-        }
+        },
+        timing:null,
       }
     },
     mounted() {
       this.refreshdata()
     },
+    beforeDestroy () {
+      clearInterval(this.timing)
+    },
     methods: {
       refreshdata() {
         this.getdata(); //获取-数据
-        setInterval(() => {
+        this.timing = setInterval(() => {
           this.getdata(); //获取--数据
         }, 10000);
       },

+ 5 - 1
src/views/smt/up2.vue

@@ -42,16 +42,20 @@
     data() {
       return {
         titleItem:[],
+        timing:null,
       }
     },
     components: { Up2Chart },
     mounted() {
       this.refreshdata();
     },
+    beforeDestroy () {
+      clearInterval(this.timing)
+    },
     methods: {
       refreshdata() {
         this.settestdata(); //获取数据
-        setInterval(() => {
+        this.timing = setInterval(() => {
           this.settestdata(); //获取-主题词
         }, 10000);
       },

+ 5 - 2
src/views/smt/up2old.vue

@@ -29,6 +29,7 @@
         data() {
             return {
                 titleItem:[],
+                timing:null,
             }
         },
         components: {
@@ -37,11 +38,13 @@
         mounted () {
             this.drawTimingFn();
         },
-
+        beforeDestroy () {
+            clearInterval(this.timing)
+        },
         methods: {
             drawTimingFn () {
                 this.setData();
-                setInterval(() => {
+                this.timing = setInterval(() => {
                     this.setData(); //获取-数据
                 }, 30000);
             },