Skip to content

F
founder_vue
Commit 88f946b7 by 张超军
Options

Merge branch 'dev_zwxt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwxt

parents 85dd277e 3d9521cd
Showing with 80 additions and 46 deletions
src/api/base.js
/*
* @Author: your name
* @Date: 2022-02-18 14:48:35
* @LastEditTime: 2022-04-13 11:12:49
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\api\base.js
*/
var relUrlIp = window.location.host.substring(
0,
window.location.host.length - 5
......@@ -5,22 +13,23 @@ var relUrlIp = window.location.host.substring(
let base = {
BaseURL:'',
};
if (relUrlIp == "133.8.5.1"||
relUrlIp == "68.174.69.46" ||
relUrlIp == "68.175.7.118" ||
relUrlIp == "65.65.100.205" ||
relUrlIp == "68.175.7.150" ||
relUrlIp == "68.175.7.95" ||
relUrlIp == "68.174.25.98" ||
relUrlIp == "26.8.175.240" ||
relUrlIp == "133.8.5.67" ||
relUrlIp == "26.3.13.120") {
//------------------------------刑侦字典服务路径**公安网**--------------------------------
base.BaseURL="/apiZwxtGaw"
} else{
//------------------------------刑侦字典服务路径**阿里云**--------------------------------
base.BaseURL="/apiZwxt"
}
// if (relUrlIp == "133.8.5.1"||
// relUrlIp == "68.174.69.46" ||
// relUrlIp == "68.175.7.118" ||
// relUrlIp == "65.65.100.205" ||
// relUrlIp == "68.175.7.150" ||
// relUrlIp == "68.175.7.95" ||
// relUrlIp == "68.174.25.98" ||
// relUrlIp == "26.8.175.240" ||
// relUrlIp == "133.8.5.67" ||
// relUrlIp == "26.3.13.120") {
// //------------------------------刑侦字典服务路径**公安网**--------------------------------
// base.BaseURL="/apiZwxtGaw"
// } else{
// //------------------------------刑侦字典服务路径**阿里云**--------------------------------
// // base.BaseURL="/apiZwxt"
// base.BaseURL = 'http://localhost:8080'
// }
base.BaseURL = 'http://localhost:8080'
export default base;
src/main.js
/*
* @Author: your name
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-09-27 10:33:28
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-06-15 18:24:14
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\main.js
*/
......@@ -28,7 +28,28 @@ import axios from 'axios'
axios.defaults.retry = 9;
axios.defaults.retryDelay = 1000;
axios.interceptors.response.use(undefined, function axiosRetryInterceptor (err) {
axios.interceptors.request.use(
function (config) {
if (config.url == '/apiDelImg/dealImgStr') {
sessionStorage.setItem('dealImgStr', 1)
}
console.log(1);
return config;
},
function (error) {
// NProgress.start();
// Do something with request error
return Promise.reject(error);
}
);
axios.interceptors.response.use(function(response) {
if (response.config.url == '/apiDelImg/dealImgStr') {
sessionStorage.setItem('dealImgStr', 0)
console.log(0);
}
return response;
}, function axiosRetryInterceptor (err) {
var config = err.config;
// If config does not exist or the retry option is not set, reject
if (!config || !config.retry) return Promise.reject(err);
......
src/router/modules/index.js
export default[
{
path: "/",
redirect: "/fingerprintIndex6/R430yyuiury562016095020/张三"
redirect: "/fingerprintIndex6/R4301234567562016111111/张三"
},
{
path: "/fingerprintIndex",
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2022-02-18 16:14:26
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-06-16 18:13:29
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
*/
......@@ -85,7 +85,8 @@ module.exports = {
//******公安網絡 */
// "/apiDelImg": {
// target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
......@@ -94,7 +95,8 @@ module.exports = {
// }
// },
// "/apiMachine": {
// target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
......@@ -103,7 +105,8 @@ module.exports = {
// }
// },
// "/apiInfo": {
// target: "http://65.26.10.121/", // 统一的请求头部每次修改都要重启才会生效
// // target: "http://65.26.10.121/", // 统一的请求头部每次修改都要重启才会生效
// target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
......@@ -114,7 +117,8 @@ module.exports = {
// 新系统
"/apiInfo": {
target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
target: "http://127.0.0.1:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", // 新系统
// target: "http://39.103.132.86:9200", // 新系统
ws: true,
......@@ -125,7 +129,8 @@ module.exports = {
},
"/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
target: "http://192.168.128.105:8091", //新系统
// target: "http://172.18.109.63:8091", //新系统
target: "http://127.0.0.1:8091", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -167,24 +172,23 @@ module.exports = {
// '^/apiZwxt': '/'
// }
// },
"/apiZwxt": {
target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://172.18.108.206:8080/",
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiZwxt': '/'
}
},
"/apiZwxtGaw": {
target: "http://26.13.5.1:8001/", //公安网案件侦办地址
ws: true,
changeOrigin: true,
pathRewrite: {
'^/api': '/'
}
}
// "/apiZwxt": {
// target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://172.18.108.206:8080/",
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiZwxt': '/'
// }
// },
// "/apiZwxtGaw": {
// target: "http://26.13.5.1:8001/", //公安网案件侦办地址
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/api': '/'
// }
// }
},
},
css: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment