admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-06-04 11:27:03 +08:00
parent 90e93dae6a
commit 1faf7538d1
2 changed files with 346 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

286
src/assets/js/http.js
View File

@ -1,33 +1,33 @@
import Vue from 'vue' import Vue from "vue";
import axios from 'axios' import axios from "axios";
// import QS from 'qs' // import QS from 'qs'
import store from '@/store' import store from "@/store";
// import router from '../../router' // import router from '../../router'
import { Loading, Message, MessageBox } from 'element-ui' import { Loading, Message, MessageBox } from "element-ui";
Vue.prototype.$http = axios Vue.prototype.$http = axios;
// Vue.prototype.qs = QS; // Vue.prototype.qs = QS;
// Vue.use(ElementUI) // Vue.use(ElementUI)
var loading var loading;
let needLoadingRequestCount = 0 let needLoadingRequestCount = 0;
let showLoadingConfig = '' let showLoadingConfig = "";
var COMPANY = '' var COMPANY = "";
function getLang() { function getLang() {
let currentLanguage = store.state.currentLanguage let currentLanguage = store.state.currentLanguage;
let langParam = '' let langParam = "";
switch (currentLanguage) { switch (currentLanguage) {
case 'zh': case "zh":
langParam = 'zh_CN' langParam = "zh_CN";
break break;
case 'en': case "en":
langParam = 'en_US' langParam = "en_US";
break break;
} }
return langParam return langParam;
} }
// 环境的切换 // 环境的切换
if (process.env.NODE_ENV == 'development') { if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区 // axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区
// axios.defaults.baseURL = 'http://124.71.87.250/' // axios.defaults.baseURL = 'http://124.71.87.250/'
// axios.defaults.baseURL = 'http://139.9.66.234:30/' // axios.defaults.baseURL = 'http://139.9.66.234:30/'
@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地 axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = "http://192.168.34.155:19111/"; //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
@ -99,74 +99,73 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
} else if (process.env.NODE_ENV == "debug") {
} else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = "https://www.ceshi.com";
axios.defaults.baseURL = 'https://www.ceshi.com' } else if (process.env.NODE_ENV == "production") {
} else if (process.env.NODE_ENV == 'production') { let host = window.location.host;
let host = window.location.host
// axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址 // axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
axios.defaults.baseURL = window.location.protocol + '//' + host + '/' axios.defaults.baseURL = window.location.protocol + "//" + host + "/";
// axios.defaults.baseURL ='http://192.168.34.216:6023/' // axios.defaults.baseURL ='http://192.168.34.216:6023/'
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/`' // axios.defaults.baseURL = 'http://zhgd.loganwy.com/`'
} }
// tag: 河南 // tag: 河南
if (COMPANY == 'henan') { if (COMPANY == "henan") {
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 备注 2022 10 12 后端说作废 // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 备注 2022 10 12 后端说作废
axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 2022 10 12 邱平毅 创建的服务器地址 axios.defaults.baseURL = "http://139.9.66.234:6324/"; // 2022 10 12 邱平毅 创建的服务器地址
} }
// axios.defaults.baseURL = store.getters.BASEURL //'http://124.71.178.44:100/'axios.defaults.timeout = 600000; // axios.defaults.baseURL = store.getters.BASEURL //'http://124.71.178.44:100/'axios.defaults.timeout = 600000;
// console.log('store.state.userInfo',store) // console.log('store.state.userInfo',store)
if (store.state.userInfo) { if (store.state.userInfo) {
axios.defaults.headers.common['Authorization'] = axios.defaults.headers.common["Authorization"] =
'Bearer' + ' ' + store.state.userInfo.token "Bearer" + " " + store.state.userInfo.token;
axios.defaults.headers.common['operateId'] = store.state.userInfo.userId axios.defaults.headers.common["operateId"] = store.state.userInfo.userId;
} }
// http请求拦截器 // http请求拦截器
axios.interceptors.request.use( axios.interceptors.request.use(
(config) => { (config) => {
if (config.url.includes('downloadTemplate')) { if (config.url.includes("downloadTemplate")) {
config.headers.common['responseType'] = 'blob' config.headers.common["responseType"] = "blob";
} }
if (config.url.includes('live?port')) return config if (config.url.includes("live?port")) return config;
// 分屏插件兼容配置 // 分屏插件兼容配置
const screensBaseURL = sessionStorage.getItem('screens-baseURL') const screensBaseURL = sessionStorage.getItem("screens-baseURL");
if (config.url.indexOf(screensBaseURL) !== -1) { if (config.url.indexOf(screensBaseURL) !== -1) {
delete config.headers.common['operateId'] delete config.headers.common["operateId"];
if (config.url === screensBaseURL + '/login') { if (config.url === screensBaseURL + "/login") {
const Authorization = sessionStorage.getItem('screens-Authorization') const Authorization = sessionStorage.getItem("screens-Authorization");
config.headers.common['Authorization'] = Authorization config.headers.common["Authorization"] = Authorization;
} else { } else {
delete config.headers.common['Authorization'] delete config.headers.common["Authorization"];
const token = sessionStorage.getItem('screens-token') const token = sessionStorage.getItem("screens-token");
config.headers.common['token'] = token config.headers.common["token"] = token;
} }
return config return config;
} }
if (showLoadingConfig == '' || showLoadingConfig == undefined) { if (showLoadingConfig == "" || showLoadingConfig == undefined) {
// showFullScreenLoading() // showFullScreenLoading()
} }
return config return config;
}, },
(error) => { (error) => {
tryHideFullScreenLoading() tryHideFullScreenLoading();
// Message.error('加载超时'); // Message.error('加载超时');
return Promise.reject(error) return Promise.reject(error);
} }
) );
// 响应拦截器 // 响应拦截器
axios.interceptors.response.use( axios.interceptors.response.use(
(response) => { (response) => {
tryHideFullScreenLoading() tryHideFullScreenLoading();
if (response.status === 200) { if (response.status === 200) {
return Promise.resolve(response) return Promise.resolve(response);
} else { } else {
// alert('进入了哪里444') // alert('进入了哪里444')
return Promise.reject(response) return Promise.reject(response);
} }
}, },
// 服务器状态码不是2开头的的情况 // 服务器状态码不是2开头的的情况
@ -176,20 +175,20 @@ axios.interceptors.response.use(
(error) => { (error) => {
// tryHideFullScreenLoading() // tryHideFullScreenLoading()
if (error.response.status) { if (error.response.status) {
console.log('----------', error.response) console.log("----------", error.response);
let errorUrl = error.response.config.baseURL let errorUrl = error.response.config.baseURL;
console.log('-----------------', errorUrl) console.log("-----------------", errorUrl);
let screensUrl = sessionStorage.getItem('screens-baseURL') let screensUrl = sessionStorage.getItem("screens-baseURL");
const url = error.response.url const url = error.response.url;
if ( if (
errorUrl == screensUrl || errorUrl == screensUrl ||
url === '26938512:7zS9LX2X8u4tW4Ps0ZjN/login' url === "26938512:7zS9LX2X8u4tW4Ps0ZjN/login"
) { ) {
// alert('进入了哪里3') // alert('进入了哪里3')
return return;
} else { } else {
// alert('进入了哪里2') // alert('进入了哪里2')
switch (error.response.status) { switch (error.response.status) {
@ -199,92 +198,93 @@ axios.interceptors.response.use(
case 401: case 401:
// Message.error('会话已失效，请重新登录') // Message.error('会话已失效，请重新登录')
// logout() // logout()
let errorResponse = sessionStorage.getItem('errorResponse') let errorResponse = sessionStorage.getItem("errorResponse");
console.log('进入401', errorResponse) console.log("进入401", errorResponse);
if (errorResponse == null || errorResponse === 'null') { if (errorResponse == null || errorResponse === "null") {
sessionStorage.setItem('errorResponse', '1') sessionStorage.setItem("errorResponse", "1");
MessageBox.confirm('会话已失效，请重新登录', '提示', { MessageBox.confirm("会话已失效，请重新登录", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning', type: "warning",
}) })
.then(() => { .then(() => {
logout() logout();
}) })
.catch(() => { .catch(() => {
MessageBox.message({ MessageBox.message({
type: 'info', type: "info",
message: '已取消', message: "已取消",
}) });
}) });
} }
break break;
// 403 token过期 // 403 token过期
// 登录过期对用户进行提示 // 登录过期对用户进行提示
// 清除本地token和清空vuex中token对象 // 清除本地token和清空vuex中token对象
// 跳转登录页面 // 跳转登录页面
case 403: case 403:
Message.error('登录过期，请重新登录') Message.error("登录过期，请重新登录");
logout() logout();
break break;
// 404请求不存在 // 404请求不存在
case 404: case 404:
Message.error('网络请求不存在') Message.error("网络请求不存在");
break break;
case 500: case 500:
Message.error('服务器错误') Message.error("服务器错误");
break break;
} }
return Promise.reject(error.response) return Promise.reject(error.response);
} }
} }
} }
) );
/** /**
* get方法，对应get请求 * get方法，对应get请求
* @param {String} url [请求的url地址] * @param {String} url [请求的url地址]
* @param {Object} params [请求时携带的参数] * @param {Object} params [请求时携带的参数]
*/ */
function logout() { function logout() {
store.commit('setUserInfo', null) store.commit("setUserInfo", null);
store.commit('setMapBackArr', []) store.commit("setMapBackArr", []);
store.commit('setMoudle', null) store.commit("setMoudle", null);
store.commit('setProDetail', null) store.commit("setProDetail", null);
store.commit('setGroupTreeList', []) store.commit("setGroupTreeList", []);
store.commit('setSelectedGroupSn', null) store.commit("setSelectedGroupSn", null);
sessionStorage.clear() sessionStorage.clear();
sessionStorage.setItem('errorResponse', '1') sessionStorage.setItem("errorResponse", "1");
let json = { let json = {
name: '工作站', name: "工作站",
id: 1, id: 1,
url: '/projectV2/taskList', url: "/projectV2/taskList",
menuList: [{ menuList: [
{
id: 100000, id: 100000,
menuName: '任务清单', menuName: "任务清单",
path: '/projectV2/taskList', path: "/projectV2/taskList",
}, },
{ {
id: 100001, id: 100001,
menuName: '通知公告', menuName: "通知公告",
path: '/projectV2/noticeList', path: "/projectV2/noticeList",
}, },
{ {
id: 100002, id: 100002,
menuName: '工作日程', menuName: "工作日程",
path: '/projectV2/workerSchedule', path: "/projectV2/workerSchedule",
}, },
], ],
} };
this.$store.commit('setCurModule', json) this.$store.commit("setCurModule", json);
setTimeout(() => { setTimeout(() => {
window.location.href = '/index.html#/login' window.location.href = "/index.html#/login";
}, 1000) }, 1000);
} }
export function get(url, params, config) { export function get(url, params, config) {
showLoadingConfig = config showLoadingConfig = config;
url = url + '?lang=' + getLang() url = url + "?lang=" + getLang();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios axios
.get(url, { .get(url, {
@ -292,21 +292,21 @@ export function get(url, params, config) {
}) })
.then((res) => { .then((res) => {
if ( if (
res.config.url == '/xmgl/progressTask/downloadTemplate?lang=zh_CN' res.config.url == "/xmgl/progressTask/downloadTemplate?lang=zh_CN"
) { ) {
resolve(res.data) resolve(res.data);
return return;
} }
if (res.data.code == 200) { if (res.data.code == 200) {
resolve(res.data) resolve(res.data);
} else { } else {
Message.error(res.data.message) Message.error(res.data.message);
} }
}) })
.catch((err) => { .catch((err) => {
reject(err.data) reject(err.data);
}) });
}) });
} }
/** /**
@ -315,26 +315,26 @@ export function get(url, params, config) {
* @param {Object} params [请求时携带的参数] * @param {Object} params [请求时携带的参数]
*/ */
export function post(url, params, config) { export function post(url, params, config) {
showLoadingConfig = config showLoadingConfig = config;
url = url + '?lang=' + getLang() url = url + "?lang=" + getLang();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios axios
.post(url, params) .post(url, params)
.then((res) => { .then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
resolve(res.data) resolve(res.data);
} else { } else {
if (res.data.status !== 'SUCCESS') { if (res.data.status !== "SUCCESS") {
Message.error(res.data.message) Message.error(res.data.message);
} else { } else {
resolve(res.data) resolve(res.data);
} }
} }
}) })
.catch((err) => { .catch((err) => {
reject(err.data) reject(err.data);
}) });
}) });
} }
/** /**
* put方法，对应put请求 * put方法，对应put请求
@ -342,47 +342,47 @@ export function post(url, params, config) {
* @param {Object} params [请求时携带的参数] * @param {Object} params [请求时携带的参数]
*/ */
export function put(url, params, config) { export function put(url, params, config) {
showLoadingConfig = config showLoadingConfig = config;
url = url + '?lang=' + getLang() url = url + "?lang=" + getLang();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios axios
.put(url, params) .put(url, params)
.then((res) => { .then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
resolve(res.data) resolve(res.data);
} else { } else {
Message.error(res.data.message) Message.error(res.data.message);
} }
}) })
.catch((err) => { .catch((err) => {
reject(err.data) reject(err.data);
}) });
}) });
} }
export function showFullScreenLoading() { export function showFullScreenLoading() {
if (needLoadingRequestCount === 0) { if (needLoadingRequestCount === 0) {
startLoading() startLoading();
} }
needLoadingRequestCount++ needLoadingRequestCount++;
} }
export function tryHideFullScreenLoading() { export function tryHideFullScreenLoading() {
if (needLoadingRequestCount <= 0) return if (needLoadingRequestCount <= 0) return;
needLoadingRequestCount-- needLoadingRequestCount--;
if (needLoadingRequestCount === 0) { if (needLoadingRequestCount === 0) {
endLoading() endLoading();
} }
} }
function startLoading() { function startLoading() {
loading = Loading.service({ loading = Loading.service({
lock: true, lock: true,
text: '加载中...', text: "加载中...",
spinner: 'el-icon-loading', spinner: "el-icon-loading",
background: 'rgba(0, 0, 0, 0.5)', background: "rgba(0, 0, 0, 0.5)",
}) });
} }
function endLoading() { function endLoading() {
loading.close() loading.close();
} }

12
src/store/index.js
View File

@ -50,12 +50,12 @@ export default new Vuex.Store({
// FILEURL:' http://101.43.164.214:11111/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色
// UPLOADURL:'http://182.90.224.237:51234/upload/image/', // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地
FILEURL: "http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://192.168.34.155:19111/image/", //洁本地
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试