diff --git a/public/js/config.js b/public/js/config.js index 5e4a71cd..daf807cd 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,174 +1,174 @@ //-------项目配置标识------- -var COMPANY = '' //通用 - // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 - // var COMPANY='hezhan'; //合展-宿迁 - // var COMPANY='nanchang'; //南昌地铁、衢州 - // var COMPANY='longguang'; //龙光地产 - // var COMPANY='zhengwu';//政务 - // var COMPANY='shenbai'; //沈白高铁 - // COMPANY = 'henan' // 河南春笋 - // COMPANY = 'xingxuan'//星璇 - // COMPANY = 'hengtong'//瑞士恒通 - // COMPANY = 'yunlian'//云联万物 - // COMPANY = 'neimenggu'//内蒙古项目 - // COMPANY = 'zjsj'//中建四局 - // COMPANY = 'zjwj'//中建五局 - // COMPANY = 'sccr'//四川成润 - // COMPANY = 'pssh'//坪山沙湖项目 - // COMPANY = 'jlw'//金林湾 - // COMPANY = 'shzj' //上海张江 - // COMPANY = 'shjg'//上海优益（上海建工） - // COMPANY = 'agjt'//鞍钢集团 +var COMPANY = ""; //通用 +// var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 +// var COMPANY='hezhan'; //合展-宿迁 +// var COMPANY='nanchang'; //南昌地铁、衢州 +// var COMPANY='longguang'; //龙光地产 +// var COMPANY='zhengwu';//政务 +// var COMPANY='shenbai'; //沈白高铁 +// COMPANY = 'henan' // 河南春笋 +// COMPANY = 'xingxuan'//星璇 +// COMPANY = 'hengtong'//瑞士恒通 +// COMPANY = 'yunlian'//云联万物 +// COMPANY = 'neimenggu'//内蒙古项目 +// COMPANY = 'zjsj'//中建四局 +// COMPANY = 'zjwj'//中建五局 +// COMPANY = 'sccr'//四川成润 +// COMPANY = 'pssh'//坪山沙湖项目 +// COMPANY = 'jlw'//金林湾 +// COMPANY = 'shzj' //上海张江 +// COMPANY = 'shjg'//上海优益（上海建工） +// COMPANY = "agjt"; //鞍钢集团 COMPANY = 'zkax' //中科安信 var PROJECT = { - local_test: 'common', // 普通版 - online_hq: 'hengqin', // 横琴 - online_zjsj: 'zjsj', // 中建四局 - online_gxlt: 'gxlt', // 广西联通 -} + local_test: "common", // 普通版 + online_hq: "hengqin", // 横琴 + online_zjsj: "zjsj", // 中建四局 + online_gxlt: "gxlt", // 广西联通 +}; -var PROJECT_TYPE = PROJECT.local_test -var headerShow = true // 是否显示头部 -var tabsShow = true // 是否显示tabs -if (COMPANY == 'xingxuan') { - headerShow = false // 是否显示头部 - tabsShow = false // 是否显示tabs +var PROJECT_TYPE = PROJECT.local_test; +var headerShow = true; // 是否显示头部 +var tabsShow = true; // 是否显示tabs +if (COMPANY == "xingxuan") { + headerShow = false; // 是否显示头部 + tabsShow = false; // 是否显示tabs } -var LOGO = '' -var LOGO_white = '' - // var LOGO = 'logo'; - // var LOGO_white = 'logo_white'; -var baseUrl = window.location.protocol + '//' + window.location.host + '/' -var LOGINTYPE = 1 // 1.通用 2.只支持企业账号登录 3.只支持项目账号登录 -var showNotBuyMoudle = false //是否展示未解锁产品 -var isDockingToWoer = false //是否是和沃尔平台对接 - // var mqttUrl = 'mqtt://jxj.zhgdyun.com:1883/ws' -var mqttUrl = 'ws://jxj.zhgdyun.com:8083/mqtt' - // var mqttUrl = 'ws://10.139.72.12:8083/mqtt' //longguang -if (COMPANY == 'longguang') { +var LOGO = ""; +var LOGO_white = ""; +// var LOGO = 'logo'; +// var LOGO_white = 'logo_white'; +var baseUrl = window.location.protocol + "//" + window.location.host + "/"; +var LOGINTYPE = 1; // 1.通用 2.只支持企业账号登录 3.只支持项目账号登录 +var showNotBuyMoudle = false; //是否展示未解锁产品 +var isDockingToWoer = false; //是否是和沃尔平台对接 +// var mqttUrl = 'mqtt://jxj.zhgdyun.com:1883/ws' +var mqttUrl = "ws://jxj.zhgdyun.com:8083/mqtt"; +// var mqttUrl = 'ws://10.139.72.12:8083/mqtt' //longguang +if (COMPANY == "longguang") { // mqttUrl = 'ws://182.90.224.147:8083/mqtt' // mqttUrl = 'ws://10.139.72.12:8083/mqtt' // mqttUrl = 'ws://121.35.243.71:8083/mqtt' - mqttUrl = 'ws://zhgdmqtt.loganwy.com:80/mqtt' -} else if (COMPANY == 'henan') { - mqttUrl = 'ws://182.90.224.147:8083/mqtt' + mqttUrl = "ws://zhgdmqtt.loganwy.com:80/mqtt"; +} else if (COMPANY == "henan") { + mqttUrl = "ws://182.90.224.147:8083/mqtt"; } -var enabledProjectV2 = 2 //是否用精益建造版 1：精益建造版(黑色) 2： 最初版（白色） 3：数据看板UI蓝色版（白色） 4:湛蓝色 +var enabledProjectV2 = 2; //是否用精益建造版 1：精益建造版(黑色) 2： 最初版（白色） 3：数据看板UI蓝色版（白色） 4:湛蓝色 var CONSTRUCTIONSTAGE = [{ - id: 1, - name: '施工证获取', - }, - { - id: 2, - name: '土方开挖', - }, - { - id: 3, - name: '桩基', - }, - { - id: 4, - name: '支护开始', - }, - { - id: 5, - name: '垫层完成', - }, - { - id: 6, - name: '正负零', - }, - { - id: 7, - name: '工程达到预售条件', - }, - { - id: 8, - name: '主体施工', - }, - { - id: 9, - name: '主体封顶', - }, - { - id: 10, - name: '装饰装修', - }, - { - id: 11, - name: '景观园林', - }, - { - id: 12, - name: '主体交付', - }, - { - id: 13, - name: '预售证获取', - }, - { - id: 14, - name: '规划验收', - }, - { - id: 15, - name: '竣工备案完成', - }, - ] //施工阶段 - // if (COMPANY != '') { - // LOGO = 'logo_' + COMPANY; - // if(COMPANY == 'longguang'){ - // LOGO_white = '' - // } else{ - // LOGO_white = 'logo_' + COMPANY + '_white'; - // } + id: 1, + name: "施工证获取", + }, + { + id: 2, + name: "土方开挖", + }, + { + id: 3, + name: "桩基", + }, + { + id: 4, + name: "支护开始", + }, + { + id: 5, + name: "垫层完成", + }, + { + id: 6, + name: "正负零", + }, + { + id: 7, + name: "工程达到预售条件", + }, + { + id: 8, + name: "主体施工", + }, + { + id: 9, + name: "主体封顶", + }, + { + id: 10, + name: "装饰装修", + }, + { + id: 11, + name: "景观园林", + }, + { + id: 12, + name: "主体交付", + }, + { + id: 13, + name: "预售证获取", + }, + { + id: 14, + name: "规划验收", + }, + { + id: 15, + name: "竣工备案完成", + }, +]; //施工阶段 +// if (COMPANY != '') { +// LOGO = 'logo_' + COMPANY; +// if(COMPANY == 'longguang'){ +// LOGO_white = '' +// } else{ +// LOGO_white = 'logo_' + COMPANY + '_white'; +// } // } -if (COMPANY == 'hezhan') { - showNotBuyMoudle = false +if (COMPANY == "hezhan") { + showNotBuyMoudle = false; var CONSTRUCTIONSTAGE = [{ id: 1, - name: '临时设施', + name: "临时设施", }, { id: 2, - name: '土方工程', + name: "土方工程", }, { id: 3, - name: '市政施工', + name: "市政施工", }, { id: 4, - name: '景观桥梁', + name: "景观桥梁", }, { id: 5, - name: '配套服务用房', + name: "配套服务用房", }, { id: 6, - name: '园林绿化', + name: "园林绿化", }, { id: 7, - name: '园路广场', + name: "园路广场", }, { id: 8, - name: '景观小品', + name: "景观小品", }, { id: 9, - name: '水电智能化安装', + name: "水电智能化安装", }, { id: 10, - name: '竣工验收', + name: "竣工验收", }, - ] + ]; } // if (COMPANY == 'zhongjian') { // isDockingToWoer = true; diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 919a2014..55638d51 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -1,34 +1,33 @@ -import Vue from 'vue' -import axios from 'axios' +import Vue from "vue"; +import axios from "axios"; // import QS from 'qs' -import store from '@/store' +import store from "@/store"; // import router from '../../router' -import { Loading, Message, MessageBox } from 'element-ui' - -Vue.prototype.$http = axios - // Vue.prototype.qs = QS; - // Vue.use(ElementUI) -var loading -let needLoadingRequestCount = 0 -var COMPANY = '' +import { Loading, Message, MessageBox } from "element-ui"; +Vue.prototype.$http = axios; +// Vue.prototype.qs = QS; +// Vue.use(ElementUI) +var loading; +let needLoadingRequestCount = 0; +var COMPANY = ""; export function showFullScreenLoading() { if (needLoadingRequestCount === 0) { - startLoading() + startLoading(); } - needLoadingRequestCount++ + needLoadingRequestCount++; } export function tryHideFullScreenLoading() { - if (needLoadingRequestCount <= 0) return - needLoadingRequestCount-- + if (needLoadingRequestCount <= 0) return; + needLoadingRequestCount--; if (needLoadingRequestCount === 0) { - endLoading() + endLoading(); } } export function get(url, params, config) { - url = url + '?lang=' + getLang() + url = url + "?lang=" + getLang(); return new Promise((resolve, reject) => { axios .get(url, { @@ -36,21 +35,21 @@ export function get(url, params, config) { }) .then((res) => { if ( - res.config.url == '/xmgl/progressTask/downloadTemplate?lang=zh_CN' + res.config.url == "/xmgl/progressTask/downloadTemplate?lang=zh_CN" ) { - resolve(res.data) - return + resolve(res.data); + return; } if (res.data.code == 200) { - resolve(res.data) + resolve(res.data); } else { - Message.error(res.data.message) + Message.error(res.data.message); } }) .catch((err) => { - reject(err.data) - }) - }) + reject(err.data); + }); + }); } /** @@ -59,25 +58,25 @@ export function get(url, params, config) { * @param {Object} params [请求时携带的参数] */ export function post(url, params, config) { - url = url + '?lang=' + getLang() + url = url + "?lang=" + getLang(); return new Promise((resolve, reject) => { axios .post(url, params) .then((res) => { if (res.data.code == 200) { - resolve(res.data) + resolve(res.data); } else { - if (res.data.status !== 'SUCCESS') { - Message.error(res.data.message) + if (res.data.status !== "SUCCESS") { + Message.error(res.data.message); } else { - resolve(res.data) + resolve(res.data); } } }) .catch((err) => { - reject(err.data) - }) - }) + reject(err.data); + }); + }); } /** * put方法，对应put请求 @@ -85,35 +84,35 @@ export function post(url, params, config) { * @param {Object} params [请求时携带的参数] */ export function put(url, params, config) { - url = url + '?lang=' + getLang() + url = url + "?lang=" + getLang(); return new Promise((resolve, reject) => { axios .put(url, params) .then((res) => { if (res.data.code == 200) { - resolve(res.data) + resolve(res.data); } else { - Message.error(res.data.message) + Message.error(res.data.message); } }) .catch((err) => { - reject(err.data) - }) - }) + reject(err.data); + }); + }); } function getLang() { - let currentLanguage = store.state.currentLanguage - let langParam = '' + let currentLanguage = store.state.currentLanguage; + let langParam = ""; switch (currentLanguage) { - case 'zh': - langParam = 'zh_CN' - break - case 'en': - langParam = 'en_US' - break + case "zh": + langParam = "zh_CN"; + break; + case "en": + langParam = "en_US"; + break; } - return langParam + return langParam; } // 环境的切换 if (process.env.NODE_ENV == "development") { @@ -173,7 +172,7 @@ if (process.env.NODE_ENV == "development") { // 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: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://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 @@ -184,29 +183,10 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 + // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 - // 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:28889/' //郭圣雄本地 - axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 - // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 - // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 - // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 - // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 - // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 - // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 - + axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { @@ -219,182 +199,182 @@ if (process.env.NODE_ENV == "development") { } // tag: 河南 -if (COMPANY == 'henan') { +if (COMPANY == "henan") { // 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; // console.log('store.state.userInfo',store) if (store.state.userInfo) { - axios.defaults.headers.common['Authorization'] = - 'Bearer' + ' ' + store.state.userInfo.token - axios.defaults.headers.common['operateId'] = store.state.userInfo.userId + axios.defaults.headers.common["Authorization"] = + "Bearer" + " " + store.state.userInfo.token; + axios.defaults.headers.common["operateId"] = store.state.userInfo.userId; } // http请求拦截器 axios.interceptors.request.use( - (config) => { - if (config.url.includes('downloadTemplate')) { - config.headers.common['responseType'] = 'blob' - } - if (config.url.includes('live?port')) return config - // 分屏插件兼容配置 - const screensBaseURL = sessionStorage.getItem('screens-baseURL') - if (config.url.indexOf(screensBaseURL) !== -1) { - delete config.headers.common['operateId'] - if (config.url === screensBaseURL + '/login') { - const Authorization = sessionStorage.getItem('screens-Authorization') - config.headers.common['Authorization'] = Authorization - } else { - delete config.headers.common['Authorization'] - const token = sessionStorage.getItem('screens-token') - config.headers.common['token'] = token - } - return config - } - return config - }, - (error) => { - tryHideFullScreenLoading() - // Message.error('加载超时'); - return Promise.reject(error) + (config) => { + if (config.url.includes("downloadTemplate")) { + config.headers.common["responseType"] = "blob"; } - ) - // 响应拦截器 -axios.interceptors.response.use( - (response) => { - tryHideFullScreenLoading() - if (response.status === 200) { - return Promise.resolve(response) + if (config.url.includes("live?port")) return config; + // 分屏插件兼容配置 + const screensBaseURL = sessionStorage.getItem("screens-baseURL"); + if (config.url.indexOf(screensBaseURL) !== -1) { + delete config.headers.common["operateId"]; + if (config.url === screensBaseURL + "/login") { + const Authorization = sessionStorage.getItem("screens-Authorization"); + config.headers.common["Authorization"] = Authorization; } else { - // alert('进入了哪里444') - return Promise.reject(response) + delete config.headers.common["Authorization"]; + const token = sessionStorage.getItem("screens-token"); + config.headers.common["token"] = token; } - }, - // 服务器状态码不是2开头的的情况 - // 这里可以跟你们的后台开发人员协商好统一的错误状态码 - // 然后根据返回的状态码进行一些操作，例如登录过期提示，错误提示等等 - // 下面列举几个常见的操作，其他需求可自行扩展 - (error) => { - // tryHideFullScreenLoading() - if (error.response.status) { - console.log('----------', error.response) - let errorUrl = error.response.config.baseURL - console.log('-----------------', errorUrl) - let screensUrl = sessionStorage.getItem('screens-baseURL') + return config; + } + return config; + }, + (error) => { + tryHideFullScreenLoading(); + // Message.error('加载超时'); + return Promise.reject(error); + } +); +// 响应拦截器 +axios.interceptors.response.use( + (response) => { + tryHideFullScreenLoading(); + if (response.status === 200) { + return Promise.resolve(response); + } else { + // alert('进入了哪里444') + return Promise.reject(response); + } + }, + // 服务器状态码不是2开头的的情况 + // 这里可以跟你们的后台开发人员协商好统一的错误状态码 + // 然后根据返回的状态码进行一些操作，例如登录过期提示，错误提示等等 + // 下面列举几个常见的操作，其他需求可自行扩展 + (error) => { + // tryHideFullScreenLoading() + if (error.response.status) { + console.log("----------", error.response); + let errorUrl = error.response.config.baseURL; + console.log("-----------------", errorUrl); + let screensUrl = sessionStorage.getItem("screens-baseURL"); - const url = error.response.url + const url = error.response.url; - if ( - errorUrl == screensUrl || - url === '26938512:7zS9LX2X8u4tW4Ps0ZjN/login' - ) { - // alert('进入了哪里3') + if ( + errorUrl == screensUrl || + url === "26938512:7zS9LX2X8u4tW4Ps0ZjN/login" + ) { + // alert('进入了哪里3') - return - } else { - // alert('进入了哪里2') - switch (error.response.status) { - // 401: 未登录 - // 未登录则跳转登录页面，并携带当前页面的路径 - // 在登录成功后返回当前页面，这一步需要在登录页操作。 - case 401: - // Message.error('会话已失效，请重新登录') - // logout() - let errorResponse = sessionStorage.getItem('errorResponse') - console.log('进入401', errorResponse) - if (errorResponse == null || errorResponse === 'null') { - sessionStorage.setItem('errorResponse', '1') - MessageBox.confirm('会话已失效，请重新登录', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - }) - .then(() => { - logout() - }) - .catch(() => { - MessageBox.message({ - type: 'info', - message: '已取消', - }) - }) - } - break + return; + } else { + // alert('进入了哪里2') + switch (error.response.status) { + // 401: 未登录 + // 未登录则跳转登录页面，并携带当前页面的路径 + // 在登录成功后返回当前页面，这一步需要在登录页操作。 + case 401: + // Message.error('会话已失效，请重新登录') + // logout() + let errorResponse = sessionStorage.getItem("errorResponse"); + console.log("进入401", errorResponse); + if (errorResponse == null || errorResponse === "null") { + sessionStorage.setItem("errorResponse", "1"); + MessageBox.confirm("会话已失效，请重新登录", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + logout(); + }) + .catch(() => { + MessageBox.message({ + type: "info", + message: "已取消", + }); + }); + } + break; - // 403 token过期 - // 登录过期对用户进行提示 - // 清除本地token和清空vuex中token对象 - // 跳转登录页面 - case 403: - Message.error('登录过期，请重新登录') - logout() - break - // 404请求不存在 - case 404: - Message.error('网络请求不存在') - break - case 500: - Message.error('服务器错误') - break - } - return Promise.reject(error.response) + // 403 token过期 + // 登录过期对用户进行提示 + // 清除本地token和清空vuex中token对象 + // 跳转登录页面 + case 403: + Message.error("登录过期，请重新登录"); + logout(); + break; + // 404请求不存在 + case 404: + Message.error("网络请求不存在"); + break; + case 500: + Message.error("服务器错误"); + break; } + return Promise.reject(error.response); } } - ) - /** - * get方法，对应get请求 - * @param {String} url [请求的url地址] - * @param {Object} params [请求时携带的参数] - */ + } +); +/** + * get方法，对应get请求 + * @param {String} url [请求的url地址] + * @param {Object} params [请求时携带的参数] + */ function logout() { - store.commit('setUserInfo', null) - store.commit('setMapBackArr', []) - store.commit('setMoudle', null) - store.commit('setProDetail', null) - store.commit('setGroupTreeList', []) - store.commit('setSelectedGroupSn', null) - sessionStorage.clear() - sessionStorage.setItem('errorResponse', '1') + store.commit("setUserInfo", null); + store.commit("setMapBackArr", []); + store.commit("setMoudle", null); + store.commit("setProDetail", null); + store.commit("setGroupTreeList", []); + store.commit("setSelectedGroupSn", null); + sessionStorage.clear(); + sessionStorage.setItem("errorResponse", "1"); let json = { - name: '工作站', + name: "工作站", id: 1, - url: '/projectV2/taskList', + url: "/projectV2/taskList", menuList: [{ id: 100000, - menuName: '任务清单', - path: '/projectV2/taskList', + menuName: "任务清单", + path: "/projectV2/taskList", }, { id: 100001, - menuName: '通知公告', - path: '/projectV2/noticeList', + menuName: "通知公告", + path: "/projectV2/noticeList", }, { id: 100002, - menuName: '工作日程', - path: '/projectV2/workerSchedule', + menuName: "工作日程", + path: "/projectV2/workerSchedule", }, ], - } - this.$store.commit('setCurModule', json) + }; + this.$store.commit("setCurModule", json); setTimeout(() => { - window.location.href = '/index.html#/login' - }, 1000) + window.location.href = "/index.html#/login"; + }, 1000); } function startLoading() { loading = Loading.service({ lock: true, - text: '加载中...', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.5)', - }) + text: "加载中...", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.5)", + }); } function endLoading() { - loading.close() + loading.close(); } \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 6cb7d067..186e2862 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,19 +52,19 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 - UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 - FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 - // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) + // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 + WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试 - // BASEURL: baseUrl ? - // baseUrl : - // window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl ? + baseUrl : + window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址