Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/views/LightMatrix/LightMatrix.vue

@@ -74,7 +74,7 @@
               <span>{{ sourceMap.fczbmap[pItem[pIndex].wpId].name }}</span>
               <div
                 class="sub-title-item"
-                v-for="(data, index) of tables.subTitleDatas"
+                v-for="(data, index) of tables[0].subTitleDatas"
                 :key="index"
               >
                 <span class="sub-title">{{ data.text }}</span>

src/views/NewPages/iframe4.vue

@@ -133,6 +133,7 @@ export default {
     },
   },
   created() {},
+  unmounted(){}
 };
 </script>
 

src/views/SandTable/component/hls.vue

@@ -121,6 +121,9 @@ export default {
   mounted() {
     // 渲染后
   },
+  beforeUnmount(){
+    this.hls && this.hls.destroy()
+  },
   beforeUpdate() {},
   updated() {},
   watch: {

src/views/WindSite/components/boosterstation/BoosterStation.js

@@ -2070,7 +2070,7 @@ export class BoosterStation {
 	getDatas(station, action) {
 		var currentStation = this.tags[station]
 		var tags = this.getTags(currentStation);
-
+		axios.defaults.withCredentials = true  //设定携带cookie (默认axios不携带cookie)
 		axios.get(`${config.adapterUrl}ts/latest?keys=${tags}`)
 			.then(msg => {
 				var datas = msg.data;

src/views/WindSite/components/boosterstation/ak.vue

@@ -4504,6 +4504,9 @@ export default {
     this.refreshTPData();
     this.interval = setInterval(this.refreshTPData, 1000);
   },
+  beforeUnmount(){
+			this.closed()
+		},
   methods: {
     // 获取组件属性
     getAttr(id) {

src/views/WindSite/components/boosterstation/dwk.vue

@@ -2124,6 +2124,9 @@
 			this.refreshTPData();
 			this.interval = setInterval(this.refreshTPData, 1000);
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/hzj.vue

@@ -1468,6 +1468,9 @@
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/mch.vue

@@ -2772,6 +2772,9 @@
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/mhs.vue

@@ -3398,6 +3398,9 @@
 			this.refreshTPData();
 			this.interval = setInterval(this.refreshTPData, 1000);
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/nss.vue

@@ -5422,6 +5422,9 @@
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/pl1.vue

@@ -1864,6 +1864,9 @@
 			this.refreshTPData();
 			this.interval = setInterval(this.refreshTPData, 1000);
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/pl2.vue

@@ -3513,6 +3513,9 @@
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/qs.vue

@@ -2657,6 +2657,9 @@
 			this.refreshTPData();
 			this.interval = setInterval(this.refreshTPData, 1000);
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/sbdl.vue

@@ -1857,6 +1857,9 @@
 			this.refreshTPData();
 			this.interval = setInterval(this.refreshTPData, 1000);
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/sbq.vue

@@ -5228,6 +5228,9 @@
 			this.refreshTPData()
 			this.interval = setInterval(this.refreshTPData, 3000)
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/xh.vue

@@ -4317,6 +4317,9 @@
 			this.refreshTPData();
 			this.interval = setInterval(this.refreshTPData, 1000);
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {

src/views/WindSite/components/boosterstation/xs.vue

@@ -3914,6 +3914,9 @@
 			this.refreshTPData();
 			this.interval = setInterval(this.refreshTPData, 1000);
 		},
+		beforeUnmount(){
+			this.closed()
+		},
 		mounted() {
 			this.$nextTick(() => {
 				if (this.$store.state.themeName === "light") {