zc

src/utils/menuLink.js

@@ -140,56 +140,6 @@ export function isAuthNoCarryLink(item) {
       window.open(item.linkUrl,item.skipType?'_blank':'_self')
     })
   }
-  //
-  // //链接请求跳转
-  // let formData = new FormData();
-  // params.requestArgument.forEach((item)=>{
-  //   if(item.type == 1){
-  //     //数据-键值对
-  //     formData.append(item.key,item.value);
-  //   }else if(item.type == 2){
-  //     //读取cookie
-  //     formData.append(item.value,Cookies.get(item.key));
-  //   }else if(item.type == 3){
-  //     //读取localStorage
-  //     formData.append(item.value,localStorage.getItem(item.key));
-  //   }else if(item.type == 4){
-  //     //读取sessionStorage
-  //     formData.append(item.value,sessionStorage.getItem(item.key));
-  //   }else if(item.type == 5){
-  //     //生成时间戳-区分13位或者10位
-  //     if(item.num == '10'){
-  //       formData.append(item.key,Date.parse(new Date())/1000);
-  //     }else if(item.num == '13'){
-  //       formData.append(item.key,Date.parse(new Date()));
-  //     }
-  //   }
-  // })
-  // let xhr = new XMLHttpRequest();
-  // xhr.onreadystatechange = function() {
-  //   if (xhr.readyState === XMLHttpRequest.DONE) {
-  //     if (xhr.status === 200) {
-  //       let data = JSON.parse(xhr.response)
-  //       if(data.code == 200){
-  //         window.open(item.linkUrl,item.skipType?'_blank':'_self')
-  //       }else{
-  //         Message({
-  //           message: '操作失败,请联系管理员',
-  //           type: 'error',
-  //           offset:100
-  //         })
-  //       }
-  //     } else {
-  //       Message({
-  //         message: '操作失败,请联系管理员',
-  //         type: 'error',
-  //         offset:100
-  //       })
-  //     }
-  //   }
-  // };
-  // xhr.open(item.reqMethod,urlText+item.reqApi);
-  // xhr.send(formData)
 }
 //验证/携参-跳转
 export function isAuthCarryLink(item) {

src/views/basicsModules/home.vue

@@ -65,6 +65,7 @@
   import router from '@/router'
   import backAnimation from "./components/backAnimation"
   import homeNavbar from './components/homeNavbar.vue'
+  import { xmlRequestLink } from "@/utils/menuLink";
   export default {
     name: "home",
     components: {
@@ -112,30 +113,19 @@
     methods: {
       //跳转按钮
       goPage(item){
-        let self = this;
         if(item.buttonType){
-          if(item.isFrame){
-            //外部链接-暂定为获取当前大屏地址跳转
-            for(let i=0;i<self.routeData.length;i++){
-              if(item.path == self.routeData[i].name){
-                window.open(localStorage.getItem('screenUrl') + '?identity=' + localStorage.getItem('identity'));
-                return
-              }
+          let path = this.circularCallNameSkip(item.path,this.routeData,false);
+          if(path){
+            if(item.isFrame){
+              xmlRequestLink(path);
+            }else{
+              this.$router.push({ path: path });
             }
+          }else{
             this.$alert('没有"'+item.menuName+'"系统权限，如有疑问，请联系管理员', {
               confirmButtonText: '确定',
               callback: action => {}
             });
-          }else{
-            let path = this.circularCallNameSkip(item.path,this.routeData,false);
-            if(path){
-              this.$router.push({ path: path });
-            }else{
-              this.$alert('没有"'+item.menuName+'"系统权限，如有疑问，请联系管理员', {
-                confirmButtonText: '确定',
-                callback: action => {}
-              });
-            }
           }
         }else{
           this.$alert(item.buttonName+'暂未开放', {
@@ -212,11 +202,17 @@
                 return list[i].path + '/' + text
               }
             }else if(!list[i].alwaysShow && !list[i].hidden){
-              return list[i].path
+              if(list[i].isFrame){
+                return list[i]
+              }else{
+                return list[i].path
+              }
             }
           }else{
             if(skipName == list[i].name){
-              if(list[i].children){
+              if(list[i].isFrame){
+                return list[i]
+              }else if(list[i].children){
                 let text = self.circularCallNameSkip(skipName,list[i].children,true)
                 if(text){
                   return list[i].path + '/' + text

src/views/iotDevice/monitoringWarning/receiver/index.vue

@@ -28,7 +28,7 @@
           <p class="page-add-common-style-button"
              style="float: right;"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
+             v-hasPermiRouter="['iot:alarmReceive:add']"
           >新增</p>
         </el-form>
       </div>
@@ -70,11 +70,11 @@
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+                   v-hasPermiRouter="['iot:alarmReceive:edit']"
                 >编辑</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+                   v-hasPermiRouter="['iot:alarmReceive:del']"
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>

src/views/systemManagement/publicConfig/homeConfig.vue

@@ -540,10 +540,10 @@
           let list = [];
           let newList = []
           for(let i=0;i<response.data.length;i++){
-            if(!response.data[i].isFrame && response.data[i].component){
+            if(response.data[i].status&&response.data[i].visible&&!response.data[i].isFrame && response.data[i].component){
               list.push(response.data[i])
             }
-            if(response.data[i].component == 'Layout'){
+            if(response.data[i].status&&response.data[i].visible&&response.data[i].component == 'Layout'){
               newList.push(response.data[i])
             }
           }