new

18d5f26c · CRS · 11dc5ad1 · 18d5f26c · 18d5f26c · 18d5f26c
--- a/config.js
+++ b/config.js
@@ -4,7 +4,7 @@

 // 服务地址
 const IP = 'http://120.55.57.35'; // 刘杰
-// const IP = 'http://192.168.0.114'; // 刘杰
+// const IP = 'http://192.168.1.104'; // 刘杰

 // 请求目标服务器域名配置
 const DOMAIN_NAME = {

--- a/src/components/admittance/company/company.vue
+++ b/src/components/admittance/company/company.vue
@@ -140,7 +140,7 @@ export default {
                this.allData = res.data.data.rows;
                this.totalLength = res.data.data.total;
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+               console.log(err);
            })
        },
        // 点击分页

--- a/src/components/admittance/company/newCompany.vue
+++ b/src/components/admittance/company/newCompany.vue
@@ -90,7 +90,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('单位新建失败！');
+                console.log(err);
            })
        }
    },

--- a/src/components/admittance/product/newProduct.vue
+++ b/src/components/admittance/product/newProduct.vue
@@ -118,7 +118,7 @@ export default {
                        this.$message.error(this.text + '失败！');
                    }
                }).catch(err => {
-                    this.$message.error(this.text + '失败！');
+                    console.log(err);
                })
            } else {
                this.$server.postProduceAdd(data).then(res => {
@@ -129,7 +129,7 @@ export default {
                        this.$message.error(this.text + '失败！');
                    }
                }).catch(err => {
-                    this.$message.error(this.text + '失败！');
+                    console.log(err);
                })
            }
        }

--- a/src/components/admittance/product/product.vue
+++ b/src/components/admittance/product/product.vue
@@ -131,7 +131,7 @@ export default {
            this.$server.getTechFindAll().then(res => { // 请求技术路线
                this.techList = res.data.data
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 产品分类转换
@@ -173,10 +173,14 @@ export default {
                t: message
            };
            this.$server.postProduceSearchAccess(data).then(res => {
+                if (res.data.code === 200) {
                    this.allData = res.data.data.rows;
                    this.totalLength = res.data.data.total;
+                } else {
+                    this.$message.error(res.data.msg);
+                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 点击分页

--- a/src/components/admittance/product/technology.vue
+++ b/src/components/admittance/product/technology.vue
@@ -59,7 +59,7 @@ export default {
                console.log(res)
                this.techNameList = res.data.data
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+               console.log(err);
            })
        }
    },

--- a/src/components/admittance/technical/addTechnical.vue
+++ b/src/components/admittance/technical/addTechnical.vue
@@ -128,7 +128,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }
        }
@@ -157,7 +157,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            } else { // 新增技术路线
                this.$server.postTechAdd(val).then((res) => { // 数据请求
@@ -169,7 +169,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }

@@ -199,7 +199,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            } else {
                this.allProduct[index].product2 = '';
@@ -225,7 +225,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }
        }

--- a/src/components/admittance/technical/technical.vue
+++ b/src/components/admittance/technical/technical.vue
@@ -109,7 +109,7 @@ export default {
            }
            console.log(res.data.data)
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
        this.init();
    },
@@ -142,7 +142,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索栏

--- a/src/components/basicInformation/company/company.vue
+++ b/src/components/basicInformation/company/company.vue
@@ -165,7 +165,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 点击分页
@@ -216,7 +216,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('导入单位失败！');
+               console.log(err);
            })
        },
        // 单位查看详情

--- a/src/components/basicInformation/company/newCompany.vue
+++ b/src/components/basicInformation/company/newCompany.vue
@@ -90,7 +90,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('单位新建失败！');
+                console.log(err);
            })
        }
    },

--- a/src/components/basicInformation/person/addPerson.vue
+++ b/src/components/basicInformation/person/addPerson.vue
@@ -109,7 +109,7 @@ export default {
                            this.$message.error(res.data.msg);
                        }
                    }).catch(err => {
-                        this.$message.error('数据请求失败！');
+                        console.log(err);
                    })
                } else {
                    return false;
@@ -139,7 +139,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 打开上传功能

--- a/src/components/basicInformation/person/person.vue
+++ b/src/components/basicInformation/person/person.vue
@@ -141,11 +141,11 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
    },
    methods: {
@@ -178,7 +178,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索栏

--- a/src/components/basicInformation/person/personPage.vue
+++ b/src/components/basicInformation/person/personPage.vue
@@ -125,13 +125,13 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            } else {
                this.$message.error(res.data.msg);
            }
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })

    },
@@ -158,7 +158,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 返回
@@ -183,7 +183,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })

        },

--- a/src/components/basicInformation/product/newProduct.vue
+++ b/src/components/basicInformation/product/newProduct.vue
@@ -115,7 +115,7 @@ export default {
                        this.$message.error(this.text + '失败！');
                    }
                }).catch(err => {
-                    this.$message.error(this.text + '失败！');
+                    console.log(err);
                })
            } else {
                this.$server.postProduceAdd(data).then(res => {
@@ -126,7 +126,7 @@ export default {
                        this.$message.error(this.text + '失败！');
                    }
                }).catch(err => {
-                    this.$message.error(this.text + '失败！');
+                    console.log(err);
                })
            }
        }

--- a/src/components/basicInformation/product/product.vue
+++ b/src/components/basicInformation/product/product.vue
@@ -155,7 +155,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+               console.log(err);
            })
        },
        // 产品分类转换
@@ -208,7 +208,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+               console.log(err);
            })
        },
        // 点击分页
@@ -253,7 +253,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('产品导入失败！');
+               console.log(err);
            })
        },
        // 产品详情

--- a/src/components/basicInformation/product/technology.vue
+++ b/src/components/basicInformation/product/technology.vue
@@ -62,7 +62,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        }
    },

--- a/src/components/basicInformation/role/authority.vue
+++ b/src/components/basicInformation/role/authority.vue
@@ -59,7 +59,7 @@ export default {
                this.$message.error(res.data.msg);
            }
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
    },
    methods: {
@@ -110,7 +110,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            } else {
                let val = {
@@ -125,7 +125,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }


--- a/src/components/basicInformation/role/role.vue
+++ b/src/components/basicInformation/role/role.vue
@@ -113,7 +113,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索栏

--- a/src/components/complaint/complaint/addComplaint.vue
+++ b/src/components/complaint/complaint/addComplaint.vue
@@ -146,13 +146,13 @@ export default {
            console.log(res.data.data)
            this.project = res.data.data;
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
        this.$server.getProduceFindAll().then(res => {
            console.log(res.data.data)
            this.product = res.data.data;
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
    },
    methods: {
@@ -193,7 +193,7 @@ export default {
                            this.$message.error(res.data.msg);
                        }
                    }).catch(err => {
-                        this.$message.error('数据请求失败！');
+                        console.log(err);
                    })
                } else {
                    return false;
@@ -223,7 +223,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        }
    },

--- a/src/components/complaint/complaint/complaint.vue
+++ b/src/components/complaint/complaint/complaint.vue
@@ -134,7 +134,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索栏

--- a/src/components/complaint/complaint/complaintDetail.vue
+++ b/src/components/complaint/complaint/complaintDetail.vue
@@ -106,7 +106,7 @@ export default {
            console.log(res.data.data)
            this.unit = res.data.data;
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
        let value = this.$route.params.value;
        if (value !== '' || value !== undefined) {

--- a/src/components/complaint/complaintManagement/addComplaintManagement.vue
+++ b/src/components/complaint/complaintManagement/addComplaintManagement.vue
@@ -145,13 +145,13 @@ export default {
            console.log(res.data.data)
            this.project = res.data.data;
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
        this.$server.getProduceFindAll().then(res => {
            console.log(res.data.data)
            this.product = res.data.data;
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
    },
    methods: {
@@ -192,7 +192,7 @@ export default {
                            this.$message.error(res.data.msg);
                        }
                    }).catch(err => {
-                        this.$message.error('数据请求失败！');
+                        console.log(err);
                    })
                } else {
                    return false;
@@ -222,7 +222,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        }
    },

--- a/src/components/complaint/complaintManagement/complaintManagement.vue
+++ b/src/components/complaint/complaintManagement/complaintManagement.vue
@@ -135,7 +135,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索栏

--- a/src/components/complaint/complaintManagement/complaintManagementDetail.vue
+++ b/src/components/complaint/complaintManagement/complaintManagementDetail.vue
@@ -132,7 +132,7 @@ export default {
            console.log(res.data.data)
            this.unit = res.data.data;
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
        let value = this.$route.params.value;
        if (value !== '' || value !== undefined) {
@@ -176,7 +176,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        cancel() {

--- a/src/components/evaluationReport/evaluationReport.vue
+++ b/src/components/evaluationReport/evaluationReport.vue
@@ -123,7 +123,7 @@ export default {
                    item.createDate = item.createDate === '' ? '暂无' : this.time(item.createDate);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索栏
@@ -197,7 +197,7 @@ export default {
                    });
                    this.init()
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }).catch(() => {
                this.$message({

--- a/src/components/header/header.vue
+++ b/src/components/header/header.vue
@@ -19,7 +19,7 @@
                    <span class="font">{{this.$store.getters.getUserData.name}}</span>
                </span>
                <span class="line"></span>
-                <span class="logout" @click="jump('login')">退出</span>
+                <span class="logout" @click="loginOut">退出</span>
            </span>
            <span class="user" v-if="this.$store.getters.getUserData.name === undefined">
                <span class="admin login" @click="jump('login')">请登录</span>
@@ -96,6 +96,14 @@ export default {
                $(va).addClass('menuClick')
            }
        },
+        // 退出
+        loginOut() {
+            this.$server.getloginOut(this.$store.getters.getUserData.sessionId).then((res) => { // 数据请求
+            }).catch(err => {
+                console.log(err);
+            })
+            this.$router.push({name: 'login'});
+        },
        // 首页跳转
        go() {
            console.log(this.sidebar.path)

--- a/src/components/keyTechnology/keyTechnology.vue
+++ b/src/components/keyTechnology/keyTechnology.vue
@@ -116,7 +116,7 @@ export default {
                this.allData = res.data.rows;
                this.totleLength = res.data.total;
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索栏

--- a/src/components/keyTechnology/keyTechnologyAdd.vue
+++ b/src/components/keyTechnology/keyTechnologyAdd.vue
@@ -140,7 +140,7 @@ export default {
                                this.$message.error(res.data.msg);
                            }
                        }).catch(err => {
-                            this.$message.error('数据请求失败！');
+                            console.log(err);
                        })
                    }
                } else {

--- a/src/components/login/login.vue
+++ b/src/components/login/login.vue
@@ -49,7 +49,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('用户登录失败');
+              console.log(err);
            })
        }
    },

--- a/src/components/parameterConfiguration/parameterConfiguration.vue
+++ b/src/components/parameterConfiguration/parameterConfiguration.vue
@@ -136,7 +136,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }
        }

--- a/src/components/projectManagement/document/document.vue
+++ b/src/components/projectManagement/document/document.vue
@@ -182,7 +182,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('文件上传失败！');
+                console.log(err);
            })
        },
        // 时间转换

--- a/src/components/projectManagement/hardware/hardware.vue
+++ b/src/components/projectManagement/hardware/hardware.vue
@@ -107,7 +107,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索

--- a/src/components/projectManagement/journal/journal.vue
+++ b/src/components/projectManagement/journal/journal.vue
@@ -103,7 +103,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索

--- a/src/components/projectManagement/project/projectAdd.vue
+++ b/src/components/projectManagement/project/projectAdd.vue
@@ -378,7 +378,7 @@ export default {
                    })
                })
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
            let arr = [5, 4, 8, 3];
            arr.map(item => {
@@ -523,7 +523,7 @@ export default {
                    }
                }).catch(err => {
                    this.errorData();
-                    this.$message.error('项目新增失败！');
+                    console.log(err);
                })
            } else {
                this.errorData();

--- a/src/components/projectManagement/project/projectManagement.vue
+++ b/src/components/projectManagement/project/projectManagement.vue
@@ -133,7 +133,7 @@ export default {
                      this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            } else {
                this.$server.PostProjectSearch(val).then((res) => { // 数据请求
@@ -151,7 +151,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            }


--- a/src/components/projectManagement/projectInformation/projectInformation.vue
+++ b/src/components/projectManagement/projectInformation/projectInformation.vue
@@ -189,7 +189,7 @@ export default {
                        this.$message.error(res.data.msg);
                    }
                }).catch(err => {
-                    this.$message.error('数据请求失败！');
+                    console.log(err);
                })
            },30)
        },

--- a/src/components/projectManagement/software/software.vue
+++ b/src/components/projectManagement/software/software.vue
@@ -109,7 +109,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        },
        // 搜索

--- a/src/components/projectManagement/technicalRoute/technicalRoute.vue
+++ b/src/components/projectManagement/technicalRoute/technicalRoute.vue
@@ -99,7 +99,7 @@ export default {
                    this.$message.error(res.data.msg);
                }
            }).catch(err => {
-                this.$message.error('数据请求失败！');
+                console.log(err);
            })
        }
    },

--- a/src/components/roleDispose/roleDispose.vue
+++ b/src/components/roleDispose/roleDispose.vue
@@ -102,7 +102,7 @@ export default {
            console.log(res)
            this.allList = res.data
        }).catch(err => {
-            this.$message.error('数据请求失败！');
+            console.log(err);
        })
        this.search();
    },
@@ -127,8 +127,9 @@ export default {
                obj = {}
            }
            this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
-                this.tableData = res.data.objects;
-                this.tablePageSize = res.data.totalElement;
+                console.log(res)
+                this.tableData = res.data.rows;
+                this.tablePageSize = res.data.total;
            })
        },
        // 修改

--- a/src/services/axios.js
+++ b/src/services/axios.js
@@ -2,6 +2,9 @@ import axios from 'axios';
 // import Qs from 'qs';
 import baseUrl from '../../config';
 import store from '../store';
+import router from '../router/index';
+import Vue from 'vue'
+let v = new Vue();
 // axios.defaults.withCredentials = true;
 // 添加请求拦截器
 axios.interceptors.request.use(function (config) {
@@ -23,7 +26,20 @@ axios.interceptors.request.use(function (config) {

 // 添加响应拦截器
 axios.interceptors.response.use(function (response) {
+    console.log(response.data)
+    if (response.data.code === 403) {
+        v.$message.error(response.data.msg);
+        setTimeout(function () {
+            router.push({name: 'login'})
+        }, 500)
+    } else if (response.data.code === 400) {
+        v.$message.error(response.data.msg);
+        setTimeout(function () {
+            router.push({name: 'login'})
+        }, 500)
+    } else {
        return response;
+    }
 }, function (error) {
    // 预处理响应错误（error)
    // alert(error);

--- a/src/services/server.js
+++ b/src/services/server.js
@@ -12,6 +12,11 @@ import axios from '@/services/axios';
 import qs from 'qs';
 const assess = 'http://120.55.57.35:8079'
 const server = {
+    getloginOut(id) { // 用户退出
+        return axios('/user/loginOut/' + id, {
+            method: 'get'
+        });
+    },
    getfindAll() { // 获取权限列表
        return axios('/authority/findAll', {
            method: 'get'