From 7b1c746b8e0863b8f02f09d2e6c3ee386999a577 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Wed, 19 Jun 2024 21:16:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?flx=EF=BC=9A=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 6 +++--- src/store/index.js | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 7f845479..9f2483ad 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/' //彭洁远程 @@ -185,8 +185,8 @@ if (process.env.NODE_ENV == "development") { // 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://42.180.188.17:11211/' //鞍钢测试地址 + // 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/store/index.js b/src/store/index.js index e0b7a8b5..9521a122 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,14 +52,14 @@ 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/', //郭圣雄本地 + // 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.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/', //测试 + 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", //正式环境 @@ -67,7 +67,7 @@ export default new Vuex.Store({ // // 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", //鞍钢测试平台工作流地址 + WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl From 597402c6f4255315d86baceb6ebf709435544169 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 20 Jun 2024 18:15:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97=20=E9=A1=B9=E7=9B=AE=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E4=BF=A1=E6=81=AF=20=E7=BC=96=E8=BE=91=20=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=20=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/i18n/langs/cn/messageCenter.js | 34 +++++++++---------- src/assets/js/http.js | 6 ++-- src/store/index.js | 16 ++++----- .../projectSummary/extendInfo.vue | 2 ++ 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/assets/i18n/langs/cn/messageCenter.js b/src/assets/i18n/langs/cn/messageCenter.js index 55e36eed..013be9ec 100644 --- a/src/assets/i18n/langs/cn/messageCenter.js +++ b/src/assets/i18n/langs/cn/messageCenter.js @@ -10,58 +10,58 @@ export default { content: '内容', sendTime: '发送时间', noMsg: '暂无消息', - options:[{ + options: [{ label: "高空火警", value: "8" - },{ + }, { label: "考勤提醒", value: "1" - },{ + }, { label: "防疫人员通知", value: "2" - },{ + }, { label: "防疫车辆通知", value: "3" - },{ + }, { label: "访客通知", value: "16" - },{ + }, { label: "混凝土监测", value: "4" - },{ + }, { label: "卸料平台", value: "5" - },{ + }, { label: "配电箱", value: "6" - },{ + }, { label: "扬尘", value: "7" - },{ + }, { label: "标养室", value: "9" - },{ + }, { label: "安全检查", value: "10" - },{ + }, { label: "质量检查", value: "11" - },{ + }, { label: "塔吊", value: "12" - },{ + }, { label: "升降机", value: "13" - },{ + }, { label: "电表", value: "14" - },{ + }, { label: "水表", value: "15" }], msgCenter: '消息中心', hint: '提示', - hintContent: '此操作将永久删除该文件, 是否继续?', + hintContent: '此操作将永久删除该消息, 是否继续?', confirm: '确定', cancel: '取消', removeSuccess: '删除成功！', diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 9f2483ad..219ee7c8 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -183,9 +183,9 @@ 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://47.93.215.234:11211/'//鞍钢测试地址(弃用) - axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + 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/' //中科安信正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; diff --git a/src/store/index.js b/src/store/index.js index 9521a122..404bc275 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -58,16 +58,16 @@ export default new Vuex.Store({ // 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', //鞍钢平台工作流地址 - WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 + // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectFront/projectSummary/extendInfo.vue b/src/views/projectFront/projectSummary/extendInfo.vue index d94586ca..778587a9 100644 --- a/src/views/projectFront/projectSummary/extendInfo.vue +++ b/src/views/projectFront/projectSummary/extendInfo.vue @@ -234,6 +234,7 @@ clearable value-format="yyyy-MM-dd" format="yyyy-MM-dd" + style="width: 100%" @input="getContractTime" > @@ -251,6 +252,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" clearable + style="width: 100%" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @input="getRealTime"