diff --git a/public/js/config.js b/public/js/config.js index 84f2320b..6549dbb4 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,5 +1,5 @@ //-------项目配置标识------- -var COMPANY = ""; //通用 +// var COMPANY = ""; //通用 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -21,7 +21,7 @@ var COMPANY = ""; //通用 // COMPANY = "agjt"; //鞍钢集团 // COMPANY = 'zkax' //中科安信 // COMPANY = 'hfqc' //乌丹站舍(合肥启程) -// COMPANY = 'mulei' //木垒 +COMPANY = 'mulei' //木垒 var PROJECT = { local_test: "common", // 普通版 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 503a752e..39de0d66 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -195,6 +195,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工 + // axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/components/account.vue b/src/components/account.vue index ef3934cb..2a5eba2f 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -148,7 +148,7 @@
diff --git a/src/store/index.js b/src/store/index.js index 116ff0dc..d450b432 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,8 +46,8 @@ export default new Vuex.Store({ state: { PAGESIZRS: [10, 20, 30, 50], - // UPLOADURL: "http://10.11.13.202:6080/upload/image/", // 木垒 - // FILEURL: "http://10.11.13.202:6080/image/", //木垒 + UPLOADURL: "http://222.80.185.228:6090/upload/image/", // 木垒 + FILEURL: "http://222.80.185.228:6090/image/", //木垒 // UPLOADURL: 'http://192.168.9.249:9820/upload/image/', // 四川网城 // FILEURL: ' http://192.168.9.249:9820/image/', // 四川网城 // UPLOADURL: 'http://192.168.9.249:9809/upload/image/', // 同济 @@ -60,8 +60,8 @@ export default new Vuex.Store({ // FILEURL: ' http://101.43.164.214:11111/image/', // 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // 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://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.216:88/#/workspace/forms", //jiayu工作流地址(本地) diff --git a/src/views/companyFront/environManage/overview.vue b/src/views/companyFront/environManage/overview.vue index 4165151d..05c3a076 100644 --- a/src/views/companyFront/environManage/overview.vue +++ b/src/views/companyFront/environManage/overview.vue @@ -310,7 +310,7 @@ export default { grid: { top: 40, left: 0, - bottom: 20, + bottom: 45, right: 20, containLabel: true, }, @@ -347,10 +347,36 @@ export default { axisLabel: { color: "#9fa2ad", fontSize: 12, - }, + interval:0, + // rotate: -10 // 表示倾斜的角度 + triggerEvent: true, + formatter: function(value) { + // 如果标签长度超过4，将剩余的文字替换为省略号 + if (value.length > 4) { + return value.slice(0, 4) + '...'; + } else { + return value; + } + } + } + }, + ], + dataZoom: [ + { + id: 'dataZoomX', + type: 'inside', + xAxisIndex: [0], + filterMode: 'filter', + height: 6, + }, + { + id: 'dataZoomY', + type: 'slider', + xAxisIndex: [0], + filterMode: 'empty', + height: 6, }, ], - yAxis: { name: that.$t("message.firmEnviron.realTimeAlarmDistribution"), type: "value", @@ -407,7 +433,7 @@ export default { grid: { top: 40, left: 0, - bottom: 20, + bottom: 45, right: 20, containLabel: true, }, @@ -444,7 +470,34 @@ export default { axisLabel: { color: "#9fa2ad", fontSize: 12, - }, + interval:0, + // rotate: -10 // 表示倾斜的角度 + triggerEvent: true, + formatter: function(value) { + // 如果标签长度超过4，将剩余的文字替换为省略号 + if (value.length > 4) { + return value.slice(0, 4) + '...'; + } else { + return value; + } + } + } + }, + ], + dataZoom: [ + { + id: 'dataZoomX', + type: 'inside', + xAxisIndex: [0], + filterMode: 'filter', + height: 6, + }, + { + id: 'dataZoomY', + type: 'slider', + xAxisIndex: [0], + filterMode: 'empty', + height: 6, }, ], yAxis: { @@ -499,7 +552,7 @@ export default { grid: { top: 30, left: 0, - bottom: 0, + bottom: 45, right: 20, containLabel: true, }, @@ -524,7 +577,34 @@ export default { axisLabel: { color: "#9fa2ad", fontSize: 12, - }, + interval:0, + // rotate: -10 // 表示倾斜的角度 + triggerEvent: true, + formatter: function(value) { + // 如果标签长度超过4，将剩余的文字替换为省略号 + if (value.length > 4) { + return value.slice(0, 4) + '...'; + } else { + return value; + } + } + } + }, + ], + dataZoom: [ + { + id: 'dataZoomX', + type: 'inside', + xAxisIndex: [0], + filterMode: 'filter', + height: 6, + }, + { + id: 'dataZoomY', + type: 'slider', + xAxisIndex: [0], + filterMode: 'empty', + height: 6, }, ], yAxis: { diff --git a/src/views/companyFront/peopleManage/peopleManage.vue b/src/views/companyFront/peopleManage/peopleManage.vue index 6c536f52..51bea7fb 100644 --- a/src/views/companyFront/peopleManage/peopleManage.vue +++ b/src/views/companyFront/peopleManage/peopleManage.vue @@ -265,8 +265,8 @@
{{ ( - (statictisData.workercount.blacklistPersonTotal / - statictisData.workercount.totalPerson) * + (statictisData.workercount.blacklistPersonTotal || 0 / + statictisData.workercount.totalPerson || 0) * 100 ).toFixed(2) }}% diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue index c6006d4a..360765d8 100644 --- a/src/views/home/login_v2.vue +++ b/src/views/home/login_v2.vue @@ -586,7 +586,7 @@ export default { // debugger; this.$store.commit("setUid", true); // let str = window.location.href.split("UID=")[1]; - let uid = window.location.href.split("UID=")[1]; + let uid = this.GetParam("UID"); // let uid = str.substring(0, str.length - 7); let data = { uid, @@ -601,12 +601,13 @@ export default { } }); } else if (window.location.href.indexOf("token") != -1) { - const newToken = window.location.href.split("token=")[1]; + const newToken = this.GetParam("token"); + let projectSn = this.GetParam("projectSn"); const data = { token: newToken }; jumpLargeUserInfoApi(data).then((res) => { if (res.code == 200) { //赋值 - this.parseLoginData(res.result, true); + this.parseLoginData(res.result, true, projectSn); } else { this.$message.error(res.message); } @@ -691,6 +692,24 @@ export default { // } // }, methods: { + GetParam(paraName) { + var url = document.location.toString(); + console.log(url); + var arrObj = url.split("?"); + if (arrObj.length > 1) { + var arrPara = arrObj[1].split("&"); + var arr; + for (var i = 0; i < arrPara.length; i++) { + arr = arrPara[i].split("="); + if (arr != null && arr[0] == paraName) { + return arr[1]; + } + } + return ""; + } else { + return ""; + } + }, // 去登录 goLogin() { this.loginType = this.registerType; @@ -1076,7 +1095,7 @@ export default { }); }); }, - parseLoginData(data, isOutside) { + parseLoginData(data, isOutside, projectSn) { // debugger; if (this.projectType == "zjsj") { this.$store.commit("setProjectSn", data.sn); @@ -1094,6 +1113,12 @@ export default { var moduleList = data.menuAuthority.moduleList ? data.menuAuthority.moduleList : []; + // 木垒项目,免登录跳转看板 + if(projectSn) { + console.info('进来了') + this.$store.commit("setProjectSn", projectSn); + return this.$router.push('/project/dataBoard/index') + } var companyModule = []; var projectModule = []; if (