Merge branch 'master-v32-xwx' into 'master'

杭州-首页-屏蔽左上角魔镜图标单击事件



See merge request !110

@@ -162,7 +162,8 @@
 
 
                 {{#
                 {{#
                 var dataName = layui.setter.response.dataName;
                 var dataName = layui.setter.response.dataName;
-                var fisthref = "/index";
+<!--                //xwx add 删除单击事件-->
+                var fisthref = "";
                 var defaultMenu = d.str;
                 var defaultMenu = d.str;
                 var defaultModuleid = '';
                 var defaultModuleid = '';
                 var defaultPath = '';
                 var defaultPath = '';

@@ -32,20 +32,25 @@ export default {
                 }
                 }
             ],//机房布局html数据
             ],//机房布局html数据
             commandNameDataX:[
             commandNameDataX:[
+                // {
+                //     name:'萧山IDC二号机房',
+                //     htmlName:'xiaoshansecond',
+                //     val:'one'
+                // },
+                // {
+                //     name:'萧山IDC三号机房',
+                //     htmlName:'xiaoshanthird',
+                //     val:'two'
+                // },
+                // {
+                //     name:'萧山IDC七号机房',
+                //     htmlName:'xiaoshanseven',
+                //     val:'three'
+                // }
                 {
                 {
-                    name:'萧山IDC二号机房',
+                    name:'兴议二号机房',
                     htmlName:'xiaoshansecond',
                     htmlName:'xiaoshansecond',
                     val:'one'
                     val:'one'
-                },
-                {
-                    name:'萧山IDC三号机房',
-                    htmlName:'xiaoshanthird',
-                    val:'two'
-                },
-                {
-                    name:'萧山IDC七号机房',
-                    htmlName:'xiaoshanseven',
-                    val:'three'
                 }
                 }
             ],
             ],
             commandName:'',//下拉选择默认显示名称
             commandName:'',//下拉选择默认显示名称
@@ -93,11 +98,10 @@ export default {
         const isShowOuter=(item)=>{
         const isShowOuter=(item)=>{
             proxy.dialogMachineName=item.machineRoomName;
             proxy.dialogMachineName=item.machineRoomName;
             proxy.outerVisible = true;
             proxy.outerVisible = true;
-
             if(item.layout == 0){
             if(item.layout == 0){
                 proxy.commandNameData=proxy.commandNameDataH;//湖州机房布局数据
                 proxy.commandNameData=proxy.commandNameDataH;//湖州机房布局数据
             }else{
             }else{
-                // proxy.commandNameData=proxy.commandNameDataX;//兴议机房布局数据
+                proxy.commandNameData=proxy.commandNameDataX;//兴议机房布局数据
 
 
             }
             }
         }
         }