From c9e7cd4157b131bd0c1fff6bd6a54c3d511736af Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 4 Jun 2024 22:42:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 678 +++++++++++++++++++++--------------------- 1 file changed, 339 insertions(+), 339 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 192af073..6fe707d4 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -1,312 +1,312 @@ -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' +import { Loading, Message, MessageBox } from "element-ui"; -Vue.prototype.$http = axios - // Vue.prototype.qs = QS; - // Vue.use(ElementUI) -var loading -let needLoadingRequestCount = 0 -let showLoadingConfig = '' -var COMPANY = '' +Vue.prototype.$http = axios; +// Vue.prototype.qs = QS; +// Vue.use(ElementUI) +var loading; +let needLoadingRequestCount = 0; +let showLoadingConfig = ""; +var COMPANY = ""; function getLang() { - let currentLanguage = store.state.currentLanguage - let langParam = '' - switch (currentLanguage) { - case 'zh': - langParam = 'zh_CN' - break - case 'en': - langParam = 'en_US' - break - } - return langParam + let currentLanguage = store.state.currentLanguage; + let langParam = ""; + switch (currentLanguage) { + case "zh": + langParam = "zh_CN"; + break; + case "en": + langParam = "en_US"; + break; + } + return langParam; } // 环境的切换 -if (process.env.NODE_ENV == 'development') { - // axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区 - // axios.defaults.baseURL = 'http://124.71.87.250/' - // axios.defaults.baseURL = 'http://139.9.66.234:30/' - // axios.defaults.baseURL = 'http://14.29.220.211:6023/' - // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 - // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' - // axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321 - // axios.defaults.baseURL = 'http://192.168.34.125:6023/' - // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 - // tag: 本地 - // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址 - // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧 - // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; - // axios.defaults.baseURL = 'http://139.9.66.234:8/'; - // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 - // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 - // axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲 - // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; // - // axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上 - // axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁 - // axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期 - // axios.defaults.baseURL = 'http://124.71.178.44:30/'; - // axios.defaults.baseURL = 'http://192.168.34.125:9090/'; - // axios.defaults.baseURL = 'http://192.168.88.220:6023/'; - // axios.defaults.baseURL = 'http://124.71.178.44:9000/'; //中建 cscec101 123456 - // axios.defaults.baseURL = 'https://jk.cscec1b1.com:5138/';//沃尔 - // axios.defaults.baseURL = 'http://61.190.32.219:9050/' - // axios.defaults.baseURL = 'http://183.95.84.54:5800/'//合展-宿迁 zxsd 123456 - // axios.defaults.baseURL = 'http://183.95.84.54:9500/'//贵州-敏尚 17512075572 123456 - // axios.defaults.baseURL = 'http://183.95.84.34:7185/' //测试服 - // axios.defaults.baseURL = 'http://183.60.227.61:30246/' - // axios.defaults.baseURL = 'http://183.60.227.61:30249/' //测试服2 - // axios.defaults.baseURL = 'http://183.60.227.61:20561/' //龙光地产 龙光地产 123456 - // axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456 - // axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789 - // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 - // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 - // axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上 - // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 - // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 - // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 - // axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上 - // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) - // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 - // axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/· - // axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 - // axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖 - // axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址 - // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 - // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 - // 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://jxj.zhgdyun.com:19814/'//测试地址 - -} else if (process.env.NODE_ENV == 'debug') { - axios.defaults.baseURL = 'https://www.ceshi.com' -} else if (process.env.NODE_ENV == 'production') { - let host = window.location.host - // axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址 - axios.defaults.baseURL = window.location.protocol + '//' + host + '/' - // axios.defaults.baseURL ='http://192.168.34.216:6023/' - // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" - // axios.defaults.baseURL = 'http://zhgd.loganwy.com/`' +if (process.env.NODE_ENV == "development") { + // axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区 + // axios.defaults.baseURL = 'http://124.71.87.250/' + // axios.defaults.baseURL = 'http://139.9.66.234:30/' + // axios.defaults.baseURL = 'http://14.29.220.211:6023/' + // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 + // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' + // axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321 + // axios.defaults.baseURL = 'http://192.168.34.125:6023/' + // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 + // tag: 本地 + // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 + // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址 + // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧 + // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; + // axios.defaults.baseURL = 'http://139.9.66.234:8/'; + // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 + // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 + // axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲 + // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; // + // axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上 + // axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁 + // axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期 + // axios.defaults.baseURL = 'http://124.71.178.44:30/'; + // axios.defaults.baseURL = 'http://192.168.34.125:9090/'; + // axios.defaults.baseURL = 'http://192.168.88.220:6023/'; + // axios.defaults.baseURL = 'http://124.71.178.44:9000/'; //中建 cscec101 123456 + // axios.defaults.baseURL = 'https://jk.cscec1b1.com:5138/';//沃尔 + // axios.defaults.baseURL = 'http://61.190.32.219:9050/' + // axios.defaults.baseURL = 'http://183.95.84.54:5800/'//合展-宿迁 zxsd 123456 + // axios.defaults.baseURL = 'http://183.95.84.54:9500/'//贵州-敏尚 17512075572 123456 + // axios.defaults.baseURL = 'http://183.95.84.34:7185/' //测试服 + // axios.defaults.baseURL = 'http://183.60.227.61:30246/' + // axios.defaults.baseURL = 'http://183.60.227.61:30249/' //测试服2 + // axios.defaults.baseURL = 'http://183.60.227.61:20561/' //龙光地产 龙光地产 123456 + // axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456 + // axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789 + // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 + // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 + // axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上 + // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 + // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 + // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 + // axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上 + // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) + // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 + // axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/· + // axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 + // axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖 + // axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址 + // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 + // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 + // 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://jxj.zhgdyun.com:19814/'//测试地址 +} else if (process.env.NODE_ENV == "debug") { + axios.defaults.baseURL = "https://www.ceshi.com"; +} else if (process.env.NODE_ENV == "production") { + let host = window.location.host; + // axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址 + axios.defaults.baseURL = window.location.protocol + "//" + host + "/"; + // axios.defaults.baseURL ='http://192.168.34.216:6023/' + // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" + // axios.defaults.baseURL = 'http://zhgd.loganwy.com/`' } // tag: 河南 -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 邱平毅 创建的服务器地址 +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 = 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 - } - - if (showLoadingConfig == '' || showLoadingConfig == undefined) { - // showFullScreenLoading() - } - 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 - - 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 - - // 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 [请求时携带的参数] - */ -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') - - let json = { - name: '工作站', - id: 1, - url: '/projectV2/taskList', - menuList: [{ - id: 100000, - menuName: '任务清单', - path: '/projectV2/taskList', - }, - { - id: 100001, - menuName: '通知公告', - path: '/projectV2/noticeList', - }, - { - id: 100002, - menuName: '工作日程', - path: '/projectV2/workerSchedule', - }, - ], + (config) => { + if (config.url.includes("downloadTemplate")) { + config.headers.common["responseType"] = "blob"; } - this.$store.commit('setCurModule', json) - setTimeout(() => { - window.location.href = '/index.html#/login' - }, 1000) + 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; + } + + if (showLoadingConfig == "" || showLoadingConfig == undefined) { + // showFullScreenLoading() + } + 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; + + 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; + + // 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 [请求时携带的参数] + */ +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"); + + let json = { + name: "工作站", + id: 1, + url: "/projectV2/taskList", + menuList: [ + { + id: 100000, + menuName: "任务清单", + path: "/projectV2/taskList", + }, + { + id: 100001, + menuName: "通知公告", + path: "/projectV2/noticeList", + }, + { + id: 100002, + menuName: "工作日程", + path: "/projectV2/workerSchedule", + }, + ], + }; + this.$store.commit("setCurModule", json); + setTimeout(() => { + window.location.href = "/index.html#/login"; + }, 1000); } export function get(url, params, config) { - showLoadingConfig = config - url = url + '?lang=' + getLang() - return new Promise((resolve, reject) => { - axios - .get(url, { - params: params, - }) - .then((res) => { - if ( - res.config.url == '/xmgl/progressTask/downloadTemplate?lang=zh_CN' - ) { - resolve(res.data) - return - } - if (res.data.code == 200) { - resolve(res.data) - } else { - Message.error(res.data.message) - } - }) - .catch((err) => { - reject(err.data) - }) - }) + showLoadingConfig = config; + url = url + "?lang=" + getLang(); + return new Promise((resolve, reject) => { + axios + .get(url, { + params: params, + }) + .then((res) => { + if ( + res.config.url == "/xmgl/progressTask/downloadTemplate?lang=zh_CN" + ) { + resolve(res.data); + return; + } + if (res.data.code == 200) { + resolve(res.data); + } else { + Message.error(res.data.message); + } + }) + .catch((err) => { + reject(err.data); + }); + }); } /** @@ -315,26 +315,26 @@ export function get(url, params, config) { * @param {Object} params [请求时携带的参数] */ export function post(url, params, config) { - showLoadingConfig = config - url = url + '?lang=' + getLang() - return new Promise((resolve, reject) => { - axios - .post(url, params) - .then((res) => { - if (res.data.code == 200) { - resolve(res.data) - } else { - if (res.data.status !== 'SUCCESS') { - Message.error(res.data.message) - } else { - resolve(res.data) - } - } - }) - .catch((err) => { - reject(err.data) - }) - }) + showLoadingConfig = config; + url = url + "?lang=" + getLang(); + return new Promise((resolve, reject) => { + axios + .post(url, params) + .then((res) => { + if (res.data.code == 200) { + resolve(res.data); + } else { + if (res.data.status !== "SUCCESS") { + Message.error(res.data.message); + } else { + resolve(res.data); + } + } + }) + .catch((err) => { + reject(err.data); + }); + }); } /** * put方法，对应put请求 @@ -342,47 +342,47 @@ export function post(url, params, config) { * @param {Object} params [请求时携带的参数] */ export function put(url, params, config) { - showLoadingConfig = config - url = url + '?lang=' + getLang() - return new Promise((resolve, reject) => { - axios - .put(url, params) - .then((res) => { - if (res.data.code == 200) { - resolve(res.data) - } else { - Message.error(res.data.message) - } - }) - .catch((err) => { - reject(err.data) - }) - }) + showLoadingConfig = config; + url = url + "?lang=" + getLang(); + return new Promise((resolve, reject) => { + axios + .put(url, params) + .then((res) => { + if (res.data.code == 200) { + resolve(res.data); + } else { + Message.error(res.data.message); + } + }) + .catch((err) => { + reject(err.data); + }); + }); } export function showFullScreenLoading() { - if (needLoadingRequestCount === 0) { - startLoading() - } - needLoadingRequestCount++ + if (needLoadingRequestCount === 0) { + startLoading(); + } + needLoadingRequestCount++; } export function tryHideFullScreenLoading() { - if (needLoadingRequestCount <= 0) return - needLoadingRequestCount-- - if (needLoadingRequestCount === 0) { - endLoading() - } + if (needLoadingRequestCount <= 0) return; + needLoadingRequestCount--; + if (needLoadingRequestCount === 0) { + endLoading(); + } } function startLoading() { - loading = Loading.service({ - lock: true, - text: '加载中...', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.5)', - }) + loading = Loading.service({ + lock: true, + text: "加载中...", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.5)", + }); } function endLoading() { - loading.close() + loading.close(); } From fecca362c4dc841269ff09b9398908758ef499b1 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 5 Jun 2024 10:32:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/laborPerson.js | 2 + src/store/index.js | 657 +++++----- .../carManage/carCameraDev.vue | 1087 +++++++++-------- .../projectFront/carManage/carManage.vue | 21 +- .../laborManage/personDetails.vue | 2 + .../personModule/administration.vue | 20 +- .../personModule/laborComponent.vue | 9 +- src/views/projectFront/laborManage/roster.vue | 4 +- .../projectFront/laborManage/rosterNew.vue | 22 +- 9 files changed, 999 insertions(+), 825 deletions(-) diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index ee1c7673..fcc96250 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -63,6 +63,8 @@ export const editDepartmentInfo = data => post('xmgl/departmentInfo/edit', data) //劳务管理 --- 新增设备 export const getProjectUfaceConfigInfo = data => post('xmgl/projectUfaceConfig/getProjectUfaceConfigInfo', data); //查询项目的对应的人脸设备配置信息 export const projectUfaceConfigEdit = data => post('xmgl/projectUfaceConfig/edit', data); //编辑项目对应的人脸设备配置信息 +export const projectCarConfigInfoList = data => get('xmgl/projectCarCameraConfig/list', data); //查询车辆项目初始化 +export const projectCarConfigInfoEdit = data => post('xmgl/projectCarCameraConfig/saveProjectCarCameraConfig', data); //编辑车辆项目初始化配置 export const ufaceDevAdd = data => post('xmgl/ufaceDev/add', data); //添加人脸设备信息 export const ufaceDevEdit = data => post('xmgl/ufaceDev/edit', data); //编辑人脸设备信息 export const ufaceDevDelete = data => post('xmgl/ufaceDev/delete', data); //删除人脸设备信息 diff --git a/src/store/index.js b/src/store/index.js index e6e656be..75e88989 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -8,41 +8,41 @@ Vue.use(Vuex); // import imgReview from './module/imgReview' export default new Vuex.Store({ - plugins: [ - createPersistedState({ - storage: window.sessionStorage, - reducer(val) { - console.log("---------存进去", val); - return { - userInfo: val.userInfo, - currentUrl: val.currentUrl, - menuList: val.menuList, - projectManageMenuList: val.projectManageMenuList, - isShowBackIndex: val.isShowBackIndex, - projectSn: val.projectSn, - selectedGroupSn: val.selectedGroupSn, - groupTreeList: val.groupTreeList, - currentLanguage: val.currentLanguage, - currentProDetail: val.currentProDetail, - currentMoudle: val.currentMoudle, - mapBackArr: val.mapBackArr, - themeType: val.themeType, - chartOptions: val.chartOptions, - menuIndex: val.menuIndex, - subMenuIndex: val.subMenuIndex, - UPLOADURL: val.UPLOADURL, - FILEURL: val.FILEURL, - mouduleIndex: val.mouduleIndex, - secondMenuIndex: val.secondMenuIndex, - curModule: val.curModule, - thirdMenuIndex: val.thirdMenuIndex, - fourMenuIndex: val.fourMenuIndex, - uid: val.uid, - reloadPage: val.reloadPage, - }; - }, - }), - ], + plugins: [ + createPersistedState({ + storage: window.sessionStorage, + reducer(val) { + console.log("---------存进去", val); + return { + userInfo: val.userInfo, + currentUrl: val.currentUrl, + menuList: val.menuList, + projectManageMenuList: val.projectManageMenuList, + isShowBackIndex: val.isShowBackIndex, + projectSn: val.projectSn, + selectedGroupSn: val.selectedGroupSn, + groupTreeList: val.groupTreeList, + currentLanguage: val.currentLanguage, + currentProDetail: val.currentProDetail, + currentMoudle: val.currentMoudle, + mapBackArr: val.mapBackArr, + themeType: val.themeType, + chartOptions: val.chartOptions, + menuIndex: val.menuIndex, + subMenuIndex: val.subMenuIndex, + UPLOADURL: val.UPLOADURL, + FILEURL: val.FILEURL, + mouduleIndex: val.mouduleIndex, + secondMenuIndex: val.secondMenuIndex, + curModule: val.curModule, + thirdMenuIndex: val.thirdMenuIndex, + fourMenuIndex: val.fourMenuIndex, + uid: val.uid, + reloadPage: val.reloadPage, + }; + }, + }), + ], state: { PAGESIZRS: [10, 20, 30, 50], @@ -54,307 +54,312 @@ export default new Vuex.Store({ // FILEURL: "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", //罗峰工作流地址(本地) + 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/", //正式环境 + // // 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',//鞍钢平台工作流地址 + // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + //--------------------------------------------------------------------------------------------- + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/api/upload/image", //金林湾部署地址 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 + // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', + // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', + /* 2022-05-16 */ + // tag: 部署河南项目时，需要打开这两行代码 - // 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',//鞍钢平台工作流地址 - // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 - //--------------------------------------------------------------------------------------------- - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/api/upload/image", //金林湾部署地址 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 - // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', - // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', - /* 2022-05-16 */ - // tag: 部署河南项目时，需要打开这两行代码 + // 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',//鞍钢平台工作流地址 + // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + //--------------------------------------------------------------------------------------------- + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/api/upload/image", //金林湾部署地址 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 + // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', + // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', + /* 2022-05-16 */ + // tag: 部署河南项目时，需要打开这两行代码 + // UPLOADURL: 'http://139.9.66.234:6324/upload/image', + // FILEURL: 'http://139.9.66.234:6324/image/', + /* 2022-06-06 广西本地的*/ // FILEURL: 'http://182.90.224.237:7000/image/', + // 邱平毅的 + // BASEURL:'http://192.168.34.116:6023/', + // UPLOADURL: 'http://192.168.34.116:6023/upload/image', + // FILEURL: 'http://192.168.34.116:6023/image/', + // UPLOADURL: 'http://116.169.63.183:7070/upload/image', + // FILEURL: 'http:/116.169.63.183:7070/image/', + //--- + // UPLOADURL: 'http://192.168.34.125:6023/upload/image', + // FILEURL: 'http://192.168.34.125:6023/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',//鞍钢平台工作流地址 - // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 - //--------------------------------------------------------------------------------------------- - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/api/upload/image", //金林湾部署地址 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 - // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', - // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', - /* 2022-05-16 */ - // tag: 部署河南项目时，需要打开这两行代码 + // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 + // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 + // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 + // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 + // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 + // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 + // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:12350/upload/image',//金林湾本地 + // FILEURL: 'http://192.168.34.221:12350/image/',//郭圣雄本地 + // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 + // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 + // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 + // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 + // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上) + // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上） + // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式） + // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） + // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 + // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 + // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 + // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 + // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 + // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 - // UPLOADURL: 'http://139.9.66.234:6324/upload/image', - // FILEURL: 'http://139.9.66.234:6324/image/', - /* 2022-06-06 广西本地的*/ // FILEURL: 'http://182.90.224.237:7000/image/', - // 邱平毅的 - // BASEURL:'http://192.168.34.116:6023/', - // UPLOADURL: 'http://192.168.34.116:6023/upload/image', - // FILEURL: 'http://192.168.34.116:6023/image/', - // UPLOADURL: 'http://116.169.63.183:7070/upload/image', - // FILEURL: 'http:/116.169.63.183:7070/image/', - //--- - // UPLOADURL: 'http://192.168.34.125:6023/upload/image', - // FILEURL: 'http://192.168.34.125:6023/image/', - - // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 - // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 - // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 - // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 - // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 - // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 - // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 - // UPLOADURL: 'http://192.168.34.221:12350/upload/image',//金林湾本地 - // FILEURL: 'http://192.168.34.221:12350/image/',//郭圣雄本地 - // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 - // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 - // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 - // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 - // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上) - // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上） - // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式） - // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） - // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 - // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 - // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 - // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 - // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 - // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 - - ACCOUNTTYPE: [ - "系统管理员", - "企业一级管理员", - "企业二级管理员", - "企业三级管理员", - "项目管理员", - ], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号 - userInfo: null, //登录返回的账号信息 - // currentUrl:'',//当前路由地址 - menuList: [], //当前菜单列表 - projectManageMenuList: [], // 项目管理页菜单列表 - isShowBackIndex: false, - projectSn: null, //项目后台 里的 项目 sn - selectedGroupSn: "", - groupTreeList: [], - currentLanguage: "zh", - currentProDetail: null, - currentMoudle: null, - mapBackArr: [], - themeType: "white", - chartOptions: { - labelColor: "rgba(38, 45, 72, 0.56)", - }, - menuIndex: 0, - subMenuIndex: 0, - isExpand: false, - //档案管理 - sideMenu: { - isFolder: sessionStorage.getItem("isFolder"), // 左侧栏是否折叠，0不折叠，1折叠 - storageValue: 0, // 已使用存储容量 - storageMaxValue: Math.pow(1024, 3) * 100, // 最大存储容量，100GB - }, - - fileList: { - operaColumnExpand: sessionStorage.getItem("operaColumnExpand"), // 操作列是否展开，0不展开，1展开 - selectedColumnList: sessionStorage.getItem("selectedColumnList"), // 列显隐 - fileModel: sessionStorage.getItem("fileModel"), // 文件展示模式，0列表模式，1网格模式 2时间线模式 - }, - - imgReview: { - imgReviewVisible: false, // 图片查看组件显隐状态 - imgReviewList: [], // 图片列表 - defaultActiveIndex: 0, // 默认当前打开的图片的索引 - }, - mouduleIndex: 0, - secondMenuIndex: 0, - thirdMenuIndex: 0, - fourMenuIndex: 0, - curModule: { - name: "工作站", - id: 1, - url: "/projectV2/taskList", - menuList: [{ - id: 100000, - menuName: "任务清单", - path: "/projectV2/taskList", - }, - { - id: 100001, - menuName: "通知公告", - path: "/projectV2/noticeList", - }, - { - id: 100002, - menuName: "工作日程", - path: "/projectV2/workerSchedule", - }, - ], - }, - uid: false, //是否第三方免码登录 true为免码登录 - reloadPage: false, //重载页面 因为动态加载资源 要刷新页面 + ACCOUNTTYPE: [ + "系统管理员", + "企业一级管理员", + "企业二级管理员", + "企业三级管理员", + "项目管理员", + ], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号 + userInfo: null, //登录返回的账号信息 + // currentUrl:'',//当前路由地址 + menuList: [], //当前菜单列表 + projectManageMenuList: [], // 项目管理页菜单列表 + isShowBackIndex: false, + projectSn: null, //项目后台 里的 项目 sn + selectedGroupSn: "", + groupTreeList: [], + currentLanguage: "zh", + currentProDetail: null, + currentMoudle: null, + mapBackArr: [], + themeType: "white", + chartOptions: { + labelColor: "rgba(38, 45, 72, 0.56)", }, - mutations: { - setUPLOADURL(state, data) { - state.UPLOADURL = data; - }, - setFILEURL(state, data) { - state.FILEURL = data; - }, - setUserInfo(state, data) { - state.userInfo = data; - }, - setMenuList(state, data) { - state.menuList = data; - }, - setIsShowBackIndex(state, data) { - state.isShowBackIndex = data; - }, - setProjectManageMenuList(state, data) { - state.projectManageMenuList = data; - }, - // setCurrentUrl(state,data){ - // state.currentUrl = data - // } - setProjectSn(state, data) { - state.projectSn = data; - }, - setSelectedGroupSn(state, data) { - state.selectedGroupSn = data; - }, - setGroupTreeList(state, data) { - state.groupTreeList = data; - }, - setLang(state, data) { - state.currentLanguage = data; - }, - setProDetail(state, data) { - state.currentProDetail = data; - }, - setMoudle(state, data) { - state.currentMoudle = data; - }, - setMapBackArr(state, data) { - state.mapBackArr = data; - }, - setThemeType(state, data) { - state.themeType = data; - }, - setChartOptions(state, data) { - state.chartOptions = data; - }, - setMenuIndex(state, data) { - state.menuIndex = data; - }, - setSubMenuIndex(state, data) { - state.subMenuIndex = data; - }, - setIsExpand(state, data) { - state.isExpand = data; - }, - //档案管理 - changeOperaColumnExpand(state, data) { - sessionStorage.setItem("operaColumnExpand", data); - state.fileList.operaColumnExpand = data; - }, - changeSelectedColumnList(state, data) { - sessionStorage.setItem("selectedColumnList", data.toString()); - state.fileList.selectedColumnList = data.toString(); - }, - changeFileModel(state, data) { - sessionStorage.setItem("fileModel", data); - state.fileList.fileModel = data; - }, - setImgReviewData(state, data) { - if (data.imgReviewVisible) { - state.imgReview.imgReviewVisible = data.imgReviewVisible; - state.imgReview.imgReviewList = data.imgReviewList; - state.imgReview.defaultActiveIndex = data.activeIndex; - } else { - state.imgReview.imgReviewVisible = data.false; - state.imgReview.imgReviewList = []; - state.imgReview.defaultActiveIndex = 0; - } - }, - changeIsFolder(state, data) { - sessionStorage.setItem("isFolder", data); - state.sideMenu.isFolder = data; - }, - changeMouduleIndex(state, data) { - state.mouduleIndex = data; - }, - changeSecondMenuIndex(state, data) { - state.secondMenuIndex = data; - }, - changeThirdMenuIndex(state, data) { - state.thirdMenuIndex = data; - }, - changeFourMenuIndex(state, data) { - state.fourMenuIndex = data; - }, - setCurModule(state, data) { - state.curModule = data; - }, - setUid(state, data) { - state.uid = data; - }, - setReloadPage(state, data) { - state.reloadPage = data; - }, + menuIndex: 0, + subMenuIndex: 0, + isExpand: false, + //档案管理 + sideMenu: { + isFolder: sessionStorage.getItem("isFolder"), // 左侧栏是否折叠，0不折叠，1折叠 + storageValue: 0, // 已使用存储容量 + storageMaxValue: Math.pow(1024, 3) * 100, // 最大存储容量，100GB }, - getters: { - BASEURL: (state) => state.BASEURL, - UPLOADURL: (state) => state.UPLOADURL, - FILEURL: (state) => state.FILEURL, - isLogin: (state) => state.user.isLogin, - username: (state) => state.user.username, - userId: (state) => state.user.userId, - userImgUrl: (state) => state.user.userImgUrl, - userInfoObj: (state) => state.user.userInfoObj, - isFolder: (state) => Number(state.sideMenu.isFolder), // 左侧栏是否折叠，0不折叠，1折叠 - operaColumnExpand: (state) => - state.fileList.operaColumnExpand !== null ? - Number(state.fileList.operaColumnExpand) : document.body.clientWidth > 1280 ? - 1 : 0, // 操作列是否展开，0不展开，1展开 - selectedColumnList: (state) => - state.fileList.selectedColumnList === null ? ["extendName", "fileSize", "uploadTime", "deleteTime"] : state.fileList.selectedColumnList.split(","), // 列显隐 - fileModel: (state) => - state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), // 文件展示模式，0列表模式，1网格模式 2 时间线模式 + + fileList: { + operaColumnExpand: sessionStorage.getItem("operaColumnExpand"), // 操作列是否展开，0不展开，1展开 + selectedColumnList: sessionStorage.getItem("selectedColumnList"), // 列显隐 + fileModel: sessionStorage.getItem("fileModel"), // 文件展示模式，0列表模式，1网格模式 2时间线模式 }, - actions: { - // currentUrl({commit},args) { - // commit('setCurrentUrl',args) - // } + + imgReview: { + imgReviewVisible: false, // 图片查看组件显隐状态 + imgReviewList: [], // 图片列表 + defaultActiveIndex: 0, // 默认当前打开的图片的索引 }, - modules: { - // user, - // fileList, - // sideMenu, - // imgReview + mouduleIndex: 0, + secondMenuIndex: 0, + thirdMenuIndex: 0, + fourMenuIndex: 0, + curModule: { + name: "工作站", + id: 1, + url: "/projectV2/taskList", + menuList: [ + { + id: 100000, + menuName: "任务清单", + path: "/projectV2/taskList", + }, + { + id: 100001, + menuName: "通知公告", + path: "/projectV2/noticeList", + }, + { + id: 100002, + menuName: "工作日程", + path: "/projectV2/workerSchedule", + }, + ], }, -}); \ No newline at end of file + uid: false, //是否第三方免码登录 true为免码登录 + reloadPage: false, //重载页面 因为动态加载资源 要刷新页面 + }, + mutations: { + setUPLOADURL(state, data) { + state.UPLOADURL = data; + }, + setFILEURL(state, data) { + state.FILEURL = data; + }, + setUserInfo(state, data) { + state.userInfo = data; + }, + setMenuList(state, data) { + state.menuList = data; + }, + setIsShowBackIndex(state, data) { + state.isShowBackIndex = data; + }, + setProjectManageMenuList(state, data) { + state.projectManageMenuList = data; + }, + // setCurrentUrl(state,data){ + // state.currentUrl = data + // } + setProjectSn(state, data) { + state.projectSn = data; + }, + setSelectedGroupSn(state, data) { + state.selectedGroupSn = data; + }, + setGroupTreeList(state, data) { + state.groupTreeList = data; + }, + setLang(state, data) { + state.currentLanguage = data; + }, + setProDetail(state, data) { + state.currentProDetail = data; + }, + setMoudle(state, data) { + state.currentMoudle = data; + }, + setMapBackArr(state, data) { + state.mapBackArr = data; + }, + setThemeType(state, data) { + state.themeType = data; + }, + setChartOptions(state, data) { + state.chartOptions = data; + }, + setMenuIndex(state, data) { + state.menuIndex = data; + }, + setSubMenuIndex(state, data) { + state.subMenuIndex = data; + }, + setIsExpand(state, data) { + state.isExpand = data; + }, + //档案管理 + changeOperaColumnExpand(state, data) { + sessionStorage.setItem("operaColumnExpand", data); + state.fileList.operaColumnExpand = data; + }, + changeSelectedColumnList(state, data) { + sessionStorage.setItem("selectedColumnList", data.toString()); + state.fileList.selectedColumnList = data.toString(); + }, + changeFileModel(state, data) { + sessionStorage.setItem("fileModel", data); + state.fileList.fileModel = data; + }, + setImgReviewData(state, data) { + if (data.imgReviewVisible) { + state.imgReview.imgReviewVisible = data.imgReviewVisible; + state.imgReview.imgReviewList = data.imgReviewList; + state.imgReview.defaultActiveIndex = data.activeIndex; + } else { + state.imgReview.imgReviewVisible = data.false; + state.imgReview.imgReviewList = []; + state.imgReview.defaultActiveIndex = 0; + } + }, + changeIsFolder(state, data) { + sessionStorage.setItem("isFolder", data); + state.sideMenu.isFolder = data; + }, + changeMouduleIndex(state, data) { + state.mouduleIndex = data; + }, + changeSecondMenuIndex(state, data) { + state.secondMenuIndex = data; + }, + changeThirdMenuIndex(state, data) { + state.thirdMenuIndex = data; + }, + changeFourMenuIndex(state, data) { + state.fourMenuIndex = data; + }, + setCurModule(state, data) { + state.curModule = data; + }, + setUid(state, data) { + state.uid = data; + }, + setReloadPage(state, data) { + state.reloadPage = data; + }, + }, + getters: { + BASEURL: (state) => state.BASEURL, + UPLOADURL: (state) => state.UPLOADURL, + FILEURL: (state) => state.FILEURL, + isLogin: (state) => state.user.isLogin, + username: (state) => state.user.username, + userId: (state) => state.user.userId, + userImgUrl: (state) => state.user.userImgUrl, + userInfoObj: (state) => state.user.userInfoObj, + isFolder: (state) => Number(state.sideMenu.isFolder), // 左侧栏是否折叠，0不折叠，1折叠 + operaColumnExpand: (state) => + state.fileList.operaColumnExpand !== null + ? Number(state.fileList.operaColumnExpand) + : document.body.clientWidth > 1280 + ? 1 + : 0, // 操作列是否展开，0不展开，1展开 + selectedColumnList: (state) => + state.fileList.selectedColumnList === null + ? ["extendName", "fileSize", "uploadTime", "deleteTime"] + : state.fileList.selectedColumnList.split(","), // 列显隐 + fileModel: (state) => + state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), // 文件展示模式，0列表模式，1网格模式 2 时间线模式 + }, + actions: { + // currentUrl({commit},args) { + // commit('setCurrentUrl',args) + // } + }, + modules: { + // user, + // fileList, + // sideMenu, + // imgReview + }, +}); diff --git a/src/views/equipmentCenter/carManage/carCameraDev.vue b/src/views/equipmentCenter/carManage/carCameraDev.vue index d9a4ccbe..8127d1da 100644 --- a/src/views/equipmentCenter/carManage/carCameraDev.vue +++ b/src/views/equipmentCenter/carManage/carCameraDev.vue @@ -1,190 +1,284 @@ \ No newline at end of file +.yj-dialogFormBox { + width: 462px; +} +.personItem { + margin-top: 10px; + .phone { + width: 150px !important; + margin-right: 10px; + } + .name { + width: 100px !important; + } +} +.el-icon-remove { + font-size: 22px; + margin-left: 10px; + margin-top: 7px; + vertical-align: top; + cursor: pointer; +} +.searchBox { + position: relative; +} +.downloadBtn { + position: absolute; + right: 20px; + top: 30px; + text-decoration: underline; + cursor: pointer; +} + diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index 4448462d..3f3a6271 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -23,7 +23,7 @@ - + 多次 - +