待完善多屏操作

src/renderer/components/BigShow.vue

@@ -170,7 +170,7 @@
 
             // 缩放结束
             async resizeSignal(obj,itemV) {
-                const arr = this.$data.streamWindows
+                /*const arr = this.$data.streamWindows
                 // 找出当前改动的信号源
                 const currentItem = arr.filter(item => item.sourceId === itemV.sourceId)
                 currentItem[0].width = obj.width
@@ -180,7 +180,7 @@
                 const otherItems = arr.filter(item => item.sourceId !== itemV.sourceId)
                 const newStreamWindows = [...currentItem,...otherItems]
                 this.streamWindows = newStreamWindows
-                this.reqRefreshBigScreen(newStreamWindows)
+                this.reqRefreshBigScreen(newStreamWindows)*/
             },
 
             // 关闭信号源
@@ -240,28 +240,35 @@
                 set(arr) {
                     const val = this.$store.state.bigScreenObj
                     const bigscreenId = this.$store.state.curOpeBigscreenId
-
+                    const bigScale = this.$store.state.bigScale
+                    const positionNum = this.$store.state.positionNum
+                    
                     let len = arr.length
                     if(len){
-                        const signals = []
+                        /*const signals = []
                         arr.forEach(item => {signals.push(JSON.parse(JSON.stringify(item)))})
                         // 删除数据的最后一项，重新赋值再添加
-                        signals.pop()
+                        signals.pop()*/
 
                         // 给新增的信号源进行赋值
-                        const signalObj = arr[len-1]
-                        signalObj.Id = guId()
-                        signalObj.splitScreenStatus = val[bigscreenId].splitStatus + 1
-                        signalObj.width = val[bigscreenId].width * bigScale / signalObj.splitScreenStatus
-                        signalObj.height = val[bigscreenId].height * bigScale / signalObj.splitScreenStatus
-                        signalObj.widthScale = signalObj.width / (val[bigscreenId].width * bigScale)
-                        signalObj.heightScale = signalObj.height / (val[bigscreenId].height * bigScale)
-                        const positionInfo = elePosition(signalObj.width,signalObj.height,positionNum,this.screenPosition[bigscreenId].top,this.screenPosition[bigscreenId].left,val[bigscreenId].splitStatus+1)
-                        signalObj.top = positionInfo.top - this.screenPosition[bigscreenId].top
-                        signalObj.left = positionInfo.left- this.screenPosition[bigscreenId].left
+                        // const signalObj = arr[len-1]
 
-                        console.log([...signals,signalObj],val)
-                        // this.$store.dispatch('secondUpdateBigscreenObj',[...signals,signalObj])
+
+                        /*arr[len-1].Id = guId()
+                        arr[len-1].splitScreenStatus = val[bigscreenId].splitStatus + 1
+                        arr[len-1].width = val[bigscreenId].width * bigScale / arr[len-1].splitScreenStatus
+                        arr[len-1].height = val[bigscreenId].height * bigScale / arr[len-1].splitScreenStatus
+                        arr[len-1].widthScale = arr[len-1].width / (val[bigscreenId].width * bigScale)
+                        arr[len-1].heightScale = arr[len-1].height / (val[bigscreenId].height * bigScale)
+                        const positionInfo = elePosition(arr[len-1].width,arr[len-1].height,positionNum,this.screenPosition[bigscreenId].top,this.screenPosition[bigscreenId].left,val[bigscreenId].splitStatus+1)
+                        arr[len-1].top = positionInfo.top - this.screenPosition[bigscreenId].top
+                        arr[len-1].left = positionInfo.left- this.screenPosition[bigscreenId].left
+
+                        this.$store.dispatch('updateBigscreenObj',val)*/
+                        
+                        /*signals.push(signalObj)
+                        console.log(val)
+                        this.$store.dispatch('updateBigscreenObj',val)*/
                     }
                 }
             },
@@ -295,7 +302,7 @@
         watch: {
             // 监视大屏对象的变化(深度监视)
             bigScreenObj: {
-                /*handler: function (val, oldVal) {
+                handler: function (val, oldVal) {
                     const bigscreenId = this.$store.state.curOpeBigscreenId
                     const bigScale = this.$store.state.bigScale
                     const positionNum = this.$store.state.positionNum
@@ -305,7 +312,8 @@
 
                         if(len){
                             const signals = []
-                            arr.forEach(item => {signals.push(JSON.parse(JSON.stringify(item)))})
+                            arr.forEach(item => signals.push(JSON.parse(JSON.stringify(item))))
+                            
                             // 删除数据的最后一项，重新赋值再添加
                             signals.pop()
 
@@ -320,13 +328,19 @@
                             const positionInfo = elePosition(signalObj.width,signalObj.height,positionNum,this.screenPosition[bigscreenId].top,this.screenPosition[bigscreenId].left,val[bigscreenId].splitStatus+1)
                             signalObj.top = positionInfo.top - this.screenPosition[bigscreenId].top
                             signalObj.left = positionInfo.left- this.screenPosition[bigscreenId].left
+                            signals.push(signalObj)
+
+                            const newVal = {...val}
+                            console.log(newVal)
+
+                            // console.log(signals,val)
 
                             // console.log([...signals,signalObj],val)
                             // this.$store.dispatch('secondUpdateBigscreenObj',[...signals,signalObj])
                         }
                     }
                 },
-                deep:true*/
+                deep:true
             },
 
             // 监视大屏中的信号源，只要变动，就调用回调函数