修改切换按钮bug

.gitignore

@@ -10,4 +10,4 @@ npm-debug.log
 npm-debug.log.*
 thumbs.db
 !.gitkeep
-/static
+static

src/renderer/components/Admin.vue

@@ -15,7 +15,7 @@
                     backgroundSize:'100% 100%',
                     backgroundColor:`#${windowJson[0] ? (windowJson[0].BrackgroupStr ? windowJson[0].BrackgroupStr.slice(3) : null) : ''}`,
                     margin:'0 auto'}"
-                ref="mainpage"
+             ref="mainpage"
         >
             <!--按钮-->
             <ButtonComponent />
@@ -35,6 +35,7 @@
             <!--滑块-->
             <SliderComponent />
         </div>
+
         <!--最小化和关闭按钮-->
         <div class="mini" @click="miniWindow">－</div>
         <div class="close" @click="closeWindow">×</div>

src/renderer/components/Button.vue

@@ -31,38 +31,26 @@
 
 <script>
     import {mapState} from 'vuex'
-    import PubSub from 'pubsub-js'
     import {getStaticFile} from "../../utils/tools"
 
     export default {
         data() {
             return {
-                count: 0,   // 音量计数器
-                count2: 0, // 预案管理模块计数器
-                count3: 0, // 管理控制按钮计数器
-                count4: 0, // 3个视频按钮计数器
-                count5: 0, // 安卓分布式按钮
                 buttonJson: [], // 所有按钮
                 slideJson: [], // 所有滑条
-                staticUrl:this.$store.state.staticUrl, // 资源路径
+                staticUrl:this.$store.state.staticUrl, // 静态资源路径
+                preBtns:[], // 上一次点击的按钮数组
             }
         },
 
         async mounted() {
             this.buttonJson = await getStaticFile('EnityButton.Data')
-            // 获取分屏按钮数组
-            this.arr = this.buttonJson.filter(item => (item.WindowID === '9a0dff23-8633-4e7f-89bf-cc4f68ec88e1' || item.WindowID === '08208721-41cc-4f1e-937b-3a1627389049' || item.WindowID === 'ab842585-0c91-4e65-bfed-a219bcaaeb43'))
-            // 获取功能按钮
-            this.funcBtnArr = this.buttonJson.filter(item => (item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5' || item.WindowID === 'cb2687fd-931a-4b38-a76d-9c3ea171b8d8' || item.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b' || item.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d' || item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5'))
-            // 获取电源管理和电脑控制按钮
-            this.powerAndCompBtns = this.buttonJson.filter(item => (item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5' || item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5') && item.ID !== '19554440-98bc-4644-83a0-d9cefd69153e')
-
-            /*this.labelJson = await getStaticFile('EnityLable.Data')
-            this.funcLabArr = this.labelJson.filter(item => (item.WindowID === 'd80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5' || item.WindowID === 'cb2687fd-931a-4b38-a76d-9c3ea171b8d8' || item.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b' || item.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d' || item.WindowID === 'd9868551-b579-4258-9bc7-7c1f733773f5'))
-            */
-
             this.slideJson = await getStaticFile('EnitySlider.Data')
-            this.funSliderArr = await getStaticFile('EnitySlider.Data')
+
+            // 默认按下的按钮
+            let preBtns = this.buttonJson.filter(item => (item.IsPressDown && item.IsVisibility))
+            console.log(preBtns)
+            this.preBtns = preBtns
 
             // 设置按钮背景图片
             const keyArr = Object.keys(this.$refs)
@@ -72,7 +60,7 @@
         },
 
         computed: {
-            ...mapState(['bigScale','labelJson','imageJson','bigshowJson']),
+            ...mapState(['bigScale','labelJson']),
         },
 
         methods: {
@@ -81,60 +69,65 @@
                 console.log(e)
 
                 // 控制按钮数组
-                const controlBtns = this.buttonJson.filter(item => item.ButtonType === 1 && item.WindowID === e.WindowID)
+                const controlBtns = this.buttonJson.filter(item => item.ButtonType === 1 && item.GroupNumber === e.GroupNumber)
                 if(controlBtns.some(item => item === e)){
                     // 1.当前按下的按钮处于激活状态
                     this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${e.ActionIcon}`) + ')'
 
-                    // 2.切换界面
-                    // 2.1 按钮
-                    this.buttonJson.forEach(item => {
-                        for(const btn of e.MouseDownActionList){
-                           if(btn.SourceID === item.WindowID){
-                               item.IsVisibility = true
-                           }
-                        }
-                    })
-                    // 2.2 label
-                    this.$store.state.labelJson.forEach(item => {
-                        for(const btn of e.MouseDownActionList){
-                            if(btn.SourceID === item.WindowID){
-                                item.IsVisibility = true
-                            }
-                        }
-                    })
-                    // 2.3 image
-                    this.$store.state.imageJson.forEach(item => {
-                        for(const btn of e.MouseDownActionList){
-                            if(btn.SourceID === item.WindowID){
-                                item.IsVisibility = true
-                            }
-                        }
-                    })
-                    // 2.4 大屏
-                    // this.$store.state.bigshowJson.forEach(item => {
-                    //     if(flag){
-                    //         for(const btn of this.preBtnSourceList){
-                    //             if(btn.SourceID === item.WindowID){
-                    //                 item.IsVisibility = false
-                    //             }
-                    //         }
-                    //     }
-                    //
-                    //     for(const btn of e.MouseDownActionList){
-                    //         if(btn.SourceID === item.WindowID){
-                    //             item.IsVisibility = true
-                    //         }
-                    //     }
-                    // })
-                    // 发布消息，更新当前要显示的大屏
-                    // PubSub.publish('updateCurrentBigScreen',this.$store.state.bigshowJson.filter(item => item.IsVisibility))
-
-                    // 3.其他按钮处于未激活状态
+                    // 2.同一组的其他按钮处于未激活状态
                     const otherBtns = controlBtns.filter(item => item !== e)
                     otherBtns.forEach(item => {
                         this.$refs[item.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${item.BackIcon}`) + ')'
                     })
+
+                    // 3.切换界面
+                    // 上一次点击的按钮
+                    const preBtn = this.preBtns.filter(a => a.ButtonType === 1 && a.GroupNumber === e.GroupNumber)
+
+                    if(preBtn.length){
+                        // 3.1 切换按钮
+                        this.buttonJson.forEach(item => {
+                            // 先隐藏
+                            if(preBtn[0].MouseDownActionList.length){
+                                for(const btn of preBtn[0].MouseDownActionList){
+                                    if(btn.SourceID === item.WindowID){
+                                        item.IsVisibility = false
+                                    }
+                                }
+                            }
+                            // 后显示
+                            if(e.MouseDownActionList.length){
+                                for(const btn of e.MouseDownActionList){
+                                    if(btn.SourceID === item.WindowID){
+                                        item.IsVisibility = true
+                                    }
+                                }
+                            }
+                        })
+
+                        // 3.2 切换label
+                        this.$store.state.labelJson.forEach(item => {
+                            if(preBtn[0].MouseDownActionList.length){
+                                for(const btn of preBtn[0].MouseDownActionList){
+                                    if(btn.SourceID === item.WindowID){
+                                        item.IsVisibility = false
+                                    }
+                                }
+                            }
+
+                            if(e.MouseDownActionList.length){
+                                for(const btn of e.MouseDownActionList){
+                                    if(btn.SourceID === item.WindowID){
+                                        item.IsVisibility = true
+                                    }
+                                }
+                            }
+                        })
+
+                        // 替换上一次点击的按钮
+                        const btnArr = this.preBtns.filter(b => b.ID !== preBtn[0].ID)
+                        this.preBtns = [...btnArr,e]
+                    }
                 }
 
                 // 音频菜单控制

static/Data/EnityLogin.Data

@@ -1,35 +1 @@
-[
-    {
-        "IsBorder":true,
-        "BorderStr":"#FFFFFFFF",
-        "ForegroundStr":"#FFD6D6D6",
-        "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#FF03A9F4",
-        "BackIconObjID":"",
-        "BackIcon":null,
-        "ActionIconObjID":"",
-        "ActionIcon":null,
-        "FontSize":16,
-        "IsPanel":false,
-        "ValidatType":1,
-        "EnityName":"Login",
-        "VerifyPassActionList":[
-
-        ],
-        "ID":"cb3c80b1-f1e4-459d-88ae-e2979666b5e3",
-        "Name":"V1--Login0",
-        "Left":294,
-        "Top":194,
-        "Width":411,
-        "Height":266,
-        "ZIndex":20100,
-        "GroupNumber":"",
-        "IsRunVisiable":true,
-        "IsVisibility":false,
-        "isSyn":false,
-        "WindowID":"b7872c9a-45ec-46c6-a388-f8d364a9f2d7",
-        "PanelID":null,
-        "IsLock":false,
-        "IsWindow":false
-    }
-]
+[]

static/Data/EnityMemory.Data

@@ -1,24 +1 @@
-[
-  {
-    "ID":"01",
-    "Code":"01",
-    "Name":"LoginUser",
-    "isInt":false,
-    "Value":null,
-    "IsSyn":false,
-    "IsSystem":false,
-    "Mark":null,
-    "ActionType":4
-  },
-  {
-    "ID":"02",
-    "Code":"02",
-    "Name":"LoginRole",
-    "isInt":false,
-    "Value":null,
-    "IsSyn":false,
-    "IsSystem":false,
-    "Mark":null,
-    "ActionType":4
-  }
-]
+[]

static/Data/EnitySlider.Data

@@ -1,230 +1 @@
-[
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"5",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"b3539067-d6ea-4dbf-9e43-fd6d043f8684",
-    "Name":"Slider0",
-    "Left":244,
-    "Top":472,
-    "Width":54,
-    "Height":226,
-    "ZIndex":10600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"228f105d-ebe4-45ba-a072-a1196bf6030e",
-    "Name":"Slider1",
-    "Left":307,
-    "Top":471,
-    "Width":56,
-    "Height":226,
-    "ZIndex":10900,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"a4ada37c-c564-45fe-a049-48650cf7d66e",
-    "Name":"Slider2",
-    "Left":374,
-    "Top":472,
-    "Width":61,
-    "Height":226,
-    "ZIndex":11000,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"42cf859e-bcd1-43b2-8eb0-63964eeab067",
-    "Name":"Slider3",
-    "Left":449,
-    "Top":472,
-    "Width":61,
-    "Height":227,
-    "ZIndex":11200,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"87f9e83f-38a5-4db6-82ca-76edc5a32e05",
-    "Name":"Slider4",
-    "Left":520,
-    "Top":472,
-    "Width":62,
-    "Height":230,
-    "ZIndex":11600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"96b74f03-87ce-48cf-80d8-718d21059530",
-    "Name":"Slider5",
-    "Left":593,
-    "Top":472,
-    "Width":59,
-    "Height":225,
-    "ZIndex":11700,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]
+[]

static/Data/EnityTimer.Data

@@ -1,16 +1 @@
-[
-  {
-    "ID":"f5f1217e-f606-4372-8650-4363931fa8e1",
-    "Code":"f5f1217e-f606-4372-8650-4363931fa8e1",
-    "Name":"500ms",
-    "ActionType":0,
-    "Milliseconds":500
-  },
-  {
-    "ID":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
-    "Code":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
-    "Name":"1s",
-    "ActionType":0,
-    "Milliseconds":1000
-  }
-]
+[{"ID":"d4469bbc-3ef3-4912-85a1-c43059b90b54","Code":"d4469bbc-3ef3-4912-85a1-c43059b90b54","Name":"延时1","ActionType":0,"Milliseconds":500},{"ID":"736ecb94-11a7-4315-9045-7f4f50fb2d89","Code":"736ecb94-11a7-4315-9045-7f4f50fb2d89","Name":"电源延时","ActionType":0,"Milliseconds":10000},{"ID":"bf9c0da6-85d0-4d9f-847c-130d34be7d12","Code":"bf9c0da6-85d0-4d9f-847c-130d34be7d12","Name":"会商延时","ActionType":0,"Milliseconds":1000}]

static/Data/EnityView.Data

@@ -1 +1 @@
-[]
+[]