Browse Source

修改消息跳转

Shannon_mu 3 years ago
parent
commit
1ae8f36efd

+ 3 - 32
energyManagement/src/components/common/Header.vue

@@ -95,38 +95,9 @@ export default {
     },
     methods: {
         toUrl(type) {
-            let url, appId;
-            if (type == 1 || type == 2) {
-                url = this.envConfig.warnDetailUrl;
-                appId = '1002';
-            } else if (type == 4) {
-                url = this.envConfig.taskManagementUrl;
-                appId = '1003';
-            } else if (type == 3 || type == 7) {
-                url = this.envConfig.eventHiddenDangerUrl;
-                appId = '1003';
-            } else if (type == 9) {
-                // url=this.envConfig.eventHiddenDangerUrl;
-                appId = '1012';
-                this.$router.push({
-                    path: '/msg'
-                });
-                return;
-            }
-            this.$http
-                .postForm('/sc-message/message/judgingTheMessageJumpPermission', {
-                    url: url.split('/')[url.split('/').length - 1],
-                    appId: appId
-                })
-                .then(({ status, data, msg }) => {
-                    url = url + '&access_token=' + localStorage.getItem('SC_token');
-                    window.open(url);
-                    // if(status==0&&data==0){
-                    //     window.open(url);
-                    // }else{
-                    //     this.$message.error("您没有该系统权限")
-                    // }
-                });
+            this.$router.push({
+                path: '/msg'
+            });
         },
         // 退出登录
         logOut() {

+ 10 - 10
energyManagement/src/views/messages/index.vue

@@ -157,18 +157,18 @@ export default {
             this.mixins_search();
         },
         toUrl(id, type, sceneType, urllink) {
+            debugger;
             this.$http.post('/sc-message/message/updateMultiple', { ids: [id], messageStatus: 1 }).then(({ status, data, msg }) => {});
             let url, appId;
-            if (type == 1 || type == 2) {
-                url = urllink || this.envConfig.warnDetailUrl;
-                appId = this.sceneTypes[sceneType] || '1002';
-            } else if (type == 4) {
-                url = this.envConfig.taskManagementUrl;
-                appId = '1003';
-            } else if (type == 3 || type == 7) {
-                url = this.envConfig.eventHiddenDangerUrl;
-                appId = '1003';
-            }
+            url = urllink;
+            appId = '1003';
+            // if (type == 1 || type == 2) {
+            //     appId = this.sceneTypes[sceneType] || '1003';
+            // } else if (type == 4) {
+            //     appId = '1003';
+            // } else if (type == 3 || type == 7) {
+            //     appId = '1003';
+            // }
             //查询linkpath能不能跳转
             this.$http
                 .postForm('/sc-message/message/judgingTheMessageJumpPermission', {

+ 3 - 32
operationSupport/src/components/common/Header.vue

@@ -94,38 +94,9 @@ export default {
     },
     methods: {
         toUrl(type) {
-            let url, appId;
-            if (type == 1 || type == 2) {
-                url = this.envConfig.warnDetailUrl;
-                appId = '1002';
-            } else if (type == 4) {
-                url = this.envConfig.taskManagementUrl;
-                appId = '1003';
-            } else if (type == 3 || type == 7) {
-                url = this.envConfig.eventHiddenDangerUrl;
-                appId = '1003';
-            } else if (type == 9) {
-                // url=this.envConfig.eventHiddenDangerUrl;
-                appId = '1012';
-                this.$router.push({
-                    path: '/msg'
-                });
-                return;
-            }
-            this.$http
-                .postForm('/sc-message/message/judgingTheMessageJumpPermission', {
-                    url: url.split('/')[url.split('/').length - 1],
-                    appId: appId
-                })
-                .then(({ status, data, msg }) => {
-                    url = url + '&access_token=' + localStorage.getItem('SC_token');
-                    window.open(url);
-                    // if(status==0&&data==0){
-                    //     window.open(url);
-                    // }else{
-                    //     this.$message.error("您没有该系统权限")
-                    // }
-                });
+            this.$router.push({
+                path: '/msg'
+            });
         },
         // 退出登录
         logOut() {

+ 10 - 10
operationSupport/src/views/messages/index.vue

@@ -157,18 +157,18 @@ export default {
             this.mixins_search();
         },
         toUrl(id, type, sceneType, urllink) {
+            debugger;
             this.$http.post('/sc-message/message/updateMultiple', { ids: [id], messageStatus: 1 }).then(({ status, data, msg }) => {});
             let url, appId;
-            if (type == 1 || type == 2) {
-                url = urllink || this.envConfig.warnDetailUrl;
-                appId = this.sceneTypes[sceneType] || '1002';
-            } else if (type == 4) {
-                url = this.envConfig.taskManagementUrl;
-                appId = '1003';
-            } else if (type == 3 || type == 7) {
-                url = this.envConfig.eventHiddenDangerUrl;
-                appId = '1003';
-            }
+            url = urllink;
+            appId = '1003';
+            // if (type == 1 || type == 2) {
+            //     appId = this.sceneTypes[sceneType] || '1003';
+            // } else if (type == 4) {
+            //     appId = '1003';
+            // } else if (type == 3 || type == 7) {
+            //     appId = '1003';
+            // }
             //查询linkpath能不能跳转
             this.$http
                 .postForm('/sc-message/message/judgingTheMessageJumpPermission', {

+ 3 - 30
userCenter/src/components/common/Header.vue

@@ -95,36 +95,9 @@ export default {
     },
     methods: {
         toUrl(type) {
-            let url, appId;
-            if (type == 1 || type == 2) {
-                url = this.envConfig.warnDetailUrl;
-                appId = '1002';
-            } else if (type == 4) {
-                url = this.envConfig.taskManagementUrl;
-                appId = '1003';
-            } else if (type == 3 || type == 7) {
-                url = this.envConfig.eventHiddenDangerUrl;
-                appId = '1003';
-            } else if (type == 9) {
-                // url=this.envConfig.eventHiddenDangerUrl;
-                appId = '1012';
-                this.$router.push({
-                    path: '/msg'
-                });
-                return;
-            }
-            this.$http
-                .postForm('/sc-message/message/judgingTheMessageJumpPermission', {
-                    url: url.split('/')[url.split('/').length - 1],
-                    appId: appId
-                })
-                .then(({ status, data, msg }) => {
-                    if (status == 0 && data == 0) {
-                        window.open(url);
-                    } else {
-                        this.$message.error('您没有该系统权限');
-                    }
-                });
+            this.$router.push({
+                path: '/msg'
+            });
         },
         // 退出登录
         logOut() {

+ 59 - 56
userCenter/src/views/messages/index.vue

@@ -33,7 +33,8 @@
                     <span v-if="messageStatus == 0">({{ item.cn }})</span>
                 </div>
             </div>
-            <zz-table ref="table"
+            <zz-table
+                ref="table"
                 :cols="cols"
                 :settings="{ showCheckbox: true, stripe: true }"
                 :data="mixins_list"
@@ -43,7 +44,11 @@
                 @selection-change="selectionChange"
             >
                 <template slot-scope="scope" slot="messageContent">
-                    <p @click="toUrl(scope.row.id,scope.row.typeId,scope.row.sceneType,scope.row.url)" :class="{ active: scope.row.url!==null}" style="cursor: pointer;">
+                    <p
+                        @click="toUrl(scope.row.id, scope.row.typeId, scope.row.sceneType, scope.row.url)"
+                        :class="{ active: scope.row.url !== null }"
+                        style="cursor: pointer"
+                    >
                         <span v-if="!scope.row.messageStatus" class="point"></span>
                         <span v-else class="unpoint"></span>
                         {{ scope.row.messageContent }}
@@ -92,21 +97,16 @@ export default {
             typeId: -1,
             typeList: [],
             selectRow: [],
-            sceneTypes:{"1":"1014",
-            "2":"1014",
-            "3":"1016",
-            "4":"1015",
-            "5":"1014"
-            },
+            sceneTypes: { 1: '1014', 2: '1014', 3: '1016', 4: '1015', 5: '1014' },
             cols: [
                 {
                     label: '消息内容',
                     prop: 'messageContent',
-                    slot: 'messageContent',
+                    slot: 'messageContent'
                 },
                 {
                     label: '消息类型',
-                    prop: 'typeName',
+                    prop: 'typeName'
                 },
                 {
                     label: '创建时间',
@@ -115,17 +115,17 @@ export default {
             ]
         };
     },
-   computed:{
-       ...mapState(['messageStatus'])
-   },
-   watch:{
-       messageStatus(){
-           this.search();
-       }
-   },
+    computed: {
+        ...mapState(['messageStatus'])
+    },
+    watch: {
+        messageStatus() {
+            this.search();
+        }
+    },
     methods: {
         setType(id) {
-            this.$store.commit('setmessageStatus',id);
+            this.$store.commit('setmessageStatus', id);
             this.selectRow = [];
             this.search();
         },
@@ -156,38 +156,42 @@ export default {
             this.getUnreadNumber();
             this.mixins_search();
         },
-        toUrl(id,type,sceneType,urllink) {
+        toUrl(id, type, sceneType, urllink) {
+            debugger;
             this.$http.post('/sc-message/message/updateMultiple', { ids: [id], messageStatus: 1 }).then(({ status, data, msg }) => {});
-            let url,appId;
-            if(type==1||type==2){
-                url=urllink||this.envConfig.warnDetailUrl;
-                appId=this.sceneTypes[sceneType]||'1002'
-            }else if(type==4){
-                url=this.envConfig.taskManagementUrl;
-                appId="1003";
-            }else if(type==3||type==7){
-                url=this.envConfig.eventHiddenDangerUrl;
-                appId="1003";
-            }
+            let url, appId;
+            url = urllink;
+            appId = '1003';
+            // if (type == 1 || type == 2) {
+            //     appId = this.sceneTypes[sceneType] || '1003';
+            // } else if (type == 4) {
+            //     appId = '1003';
+            // } else if (type == 3 || type == 7) {
+            //     appId = '1003';
+            // }
             //查询linkpath能不能跳转
-            this.$http.postForm('/sc-message/message/judgingTheMessageJumpPermission',{
-                url:url.split('/')[url.split('/').length - 1],
-                appId:appId
-            }).then(({ status, data, msg })=>{
-                if(status==0&&data==0){
+            this.$http
+                .postForm('/sc-message/message/judgingTheMessageJumpPermission', {
+                    url: url.split('/')[url.split('/').length - 1],
+                    appId: appId
+                })
+                .then(({ status, data, msg }) => {
+                    url = url + '&access_token=' + localStorage.getItem('SC_token');
                     window.open(url);
-                }else{
-                    this.$message.error("您没有该系统权限")
-                }
-            })
+                    // if(status==0&&data==0){
+                    //     window.open(url);
+                    // }else{
+                    //     this.$message.error("您没有该系统权限")
+                    // }
+                });
         },
         selectionChange(val) {
-            let arr=[];
+            let arr = [];
             if (val.length) {
                 val.map((item, index) => {
                     arr.push(item.id);
                 });
-                this.selectRow=arr;
+                this.selectRow = arr;
                 return;
             }
             this.selectRow = [];
@@ -245,7 +249,6 @@ export default {
                             this.$message.success('标记全部消息成功');
                         }
                     });
-
                 })
                 .catch((err) => {});
         },
@@ -258,9 +261,9 @@ export default {
                         sum = sum + item.cn;
                     });
                     this.unreadNum = sum;
-                    if(sum==0){
+                    if (sum == 0) {
                         this.$store.commit('setmessageNumber', false);
-                    }else{
+                    } else {
                         this.$store.commit('setmessageNumber', true);
                     }
                     data.unshift({ type: '全部类型', cn: sum, typeId: -1 });
@@ -269,13 +272,13 @@ export default {
             });
         },
         //获取最新消息列表
-        getMessageList(){
-            this.$http.postForm('/sc-message/message/queryLastMessage',{num:'5'}).then(({ status, data, msg }) => {
+        getMessageList() {
+            this.$http.postForm('/sc-message/message/queryLastMessage', { num: '5' }).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.$store.commit('setmessageList', data);
                 }
             });
-        },
+        }
     },
     created() {
         this.mixins_dataUrl = '/sc-message/message/selectPage';
@@ -294,7 +297,7 @@ export default {
         // float: left;
         width: 200px;
         height: 730px;
-        border-right: 1px solid #F6F6F6;
+        border-right: 1px solid #f6f6f6;
         box-sizing: border-box;
         background: #ffffff;
         .title {
@@ -338,10 +341,10 @@ export default {
         }
         .disabled {
             height: 30px;
-            background: #F8FCFF;
-            border: 1px solid #D8D8D8;
+            background: #f8fcff;
+            border: 1px solid #d8d8d8;
             border-radius: 4px;
-            color: #D8D8D8;
+            color: #d8d8d8;
         }
     }
 }
@@ -352,13 +355,13 @@ export default {
 .point {
     width: 4px;
     height: 4px;
-    background: #FE7271;
+    background: #fe7271;
     border-radius: 50%;
     display: inline-block;
     margin-right: 5px;
     vertical-align: middle;
 }
-.unpoint{
+.unpoint {
     width: 4px;
     height: 4px;
     border-radius: 50%;
@@ -368,7 +371,7 @@ export default {
 }
 /deep/ .el-table {
     border: none;
-    border-top: 1px solid #F6F6F6;
+    border-top: 1px solid #f6f6f6;
     height: 670px;
     overflow: auto;
 }
@@ -385,7 +388,7 @@ export default {
         }
     }
 }
-/deep/ .el-table__header .el-table_1_column_2 .cell span{
+/deep/ .el-table__header .el-table_1_column_2 .cell span {
     margin-left: 10px;
 }
 </style>