From 1b1e389a803a75674ed8ee4c031fff1755213269 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 13 Jun 2024 18:43:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat=EF=BC=9A=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=BC=B9=E7=AA=97=E5=BB=B6=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 4 +- src/assets/js/http.js | 4 +- src/components/header.vue | 3 +- src/components/message.vue | 14 +- src/store/index.js | 22 +- .../laborManage/dataValidation.vue | 2 +- .../specialWork/blindPlugWork.vue | 195 ++++++++++++++---- 7 files changed, 179 insertions(+), 65 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index daf807cd..eb27157a 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,8 +18,8 @@ var COMPANY = ""; //通用 // COMPANY = 'jlw'//金林湾 // COMPANY = 'shzj' //上海张江 // COMPANY = 'shjg'//上海优益（上海建工） -// COMPANY = "agjt"; //鞍钢集团 -COMPANY = 'zkax' //中科安信 +COMPANY = "agjt"; //鞍钢集团 +// COMPANY = 'zkax' //中科安信 var PROJECT = { local_test: "common", // 普通版 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 55638d51..9efc7b34 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -172,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/' //彭洁远程 @@ -186,7 +186,7 @@ if (process.env.NODE_ENV == "development") { // 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") { diff --git a/src/components/header.vue b/src/components/header.vue index 67f7aee3..42c43eba 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -141,10 +141,11 @@ 指挥部大屏

--> +

{ + this.$emit('sendMsg', message) + this.$notify({ + title: message.title, + message: message.content, + position: 'bottom-right' + }) + }, 500) }) // 断开发起重连 // client.on("reconnect", (error) => { diff --git a/src/store/index.js b/src/store/index.js index 186e2862..14a2b32f 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/", //正式环境 + // 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',//鞍钢平台工作流地址 diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue index f958f35b..4817ea3d 100644 --- a/src/views/projectFront/laborManage/dataValidation.vue +++ b/src/views/projectFront/laborManage/dataValidation.vue @@ -52,7 +52,7 @@ prop="workerName" label="人员姓名"> -