From 862fe20760b891562b6757d1470aae043f100cad Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Fri, 12 Apr 2024 08:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E6=BA=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 36 ++++++------------- .env.prod | 9 +---- .env.stage | 9 ++--- .../energy/analysis/trendAnalysis/index.vue | 14 +++++--- .../energy/monitoring/energyLimit/index.vue | 3 +- 5 files changed, 25 insertions(+), 46 deletions(-) diff --git a/.env.dev b/.env.dev index 882a92fe..25e4022b 100644 --- a/.env.dev +++ b/.env.dev @@ -1,10 +1,3 @@ -### - # @Author: Do not edit - # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2024-04-10 16:58:06 - # @LastEditors: zhp - # @Description: -### # 开发环境配置 ENV = 'development' @@ -12,27 +5,18 @@ ENV = 'development' VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 -# VUE_APP_BASE_API = 'http://100.64.0.26:48082' -# VUE_APP_BASE_API = 'http://10.70.2.2:8080' -# VUE_APP_BASE_API = 'http://192.168.1.20:48080' -# VUE_APP_BASE_API = 'http://192.168.2.173:48080' -# VUE_APP_BASE_API = 'http://192.168.1.49:48082' -# VUE_APP_BASE_API = 'http://192.168.1.8:48082' -# VUE_APP_BASE_API = 'http://192.168.4.173:9001' -# VUE_APP_BASE_API = 'http://192.168.1.104:48082' -# VUE_APP_BASE_API = 'http://192.168.0.33:48082' -# VUE_APP_BASE_API = 'http://192.168.1.62:48082' -# VUE_APP_BASE_API = 'http://192.168.1.78:48082' -# VUE_APP_BASE_API = 'http://192.168.1.47:48082' -VUE_APP_BASE_API = 'http://192.168.1.78:48082' -# socket地址 -# VUE_APP_Socket_API = 'ws://10.70.2.2:8080' -# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' -VUE_APP_Socket_API = 'ws://192.168.0.33:48082' -VUE_APP_Socket_Dcs_API = 'ws://192.168.0.33:8080' +VUE_APP_BASE_API = 'http://192.168.0.33:48082' # 积木报表指向地址 -VUE_APP_JIMU_API = 'http://10.70.2.22:8080' +VUE_APP_JIMU_API = 'http://192.168.0.33:48082' + +# socket地址(现场) +# VUE_APP_Socket_API = 'ws://10.70.2.2:8080' +# socket地址(公司线上) +VUE_APP_Socket_API = 'ws://192.168.0.33:48082' +# socket dcs地址(只有现场) +VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.prod b/.env.prod index 0148da16..3d67235d 100644 --- a/.env.prod +++ b/.env.prod @@ -1,11 +1,4 @@ -### - # @Author: zhp - # @Date: 2023-11-07 19:11:40 - # @LastEditTime: 2023-11-16 16:40:59 - # @LastEditors: zhp - # @Description: -### -# 生产环境配置 +# 生产环境配置（许昌现场） ENV = 'production' # 页面标题 diff --git a/.env.stage b/.env.stage index 1e29f627..c56a3a79 100644 --- a/.env.stage +++ b/.env.stage @@ -1,4 +1,4 @@ -# 生产环境配置 +# 公司线上环境（33服务器） ENV = 'production' # 页面标题 @@ -7,15 +7,12 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' -# dcs地址 -VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' -# socket地址 -VUE_APP_Socket_API = 'ws://10.70.2.2:8080' - # 积木报表指向地址 VUE_APP_JIMU_API = 'http://192.168.0.33:48082' # socket地址 VUE_APP_Socket_API = 'ws://192.168.0.33:48082' +# dcs地址（只有现场的） +VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' # 根据服务器或域名修改 diff --git a/src/views/energy/analysis/trendAnalysis/index.vue b/src/views/energy/analysis/trendAnalysis/index.vue index d42b7b55..a40aaea7 100644 --- a/src/views/energy/analysis/trendAnalysis/index.vue +++ b/src/views/energy/analysis/trendAnalysis/index.vue @@ -57,10 +57,14 @@ export default { let listObj = { useNum: '消耗量' }; // 数据 for (let i = 0; i < arr.length; i++) { let obj = {}; - let fName = arr[i].time.slice(0, 4); - let lName = arr[i].time.slice(4, 6); + if (this.timeDim === '3') { + let fName = arr[i].time.slice(0, 4); + let lName = arr[i].time.slice(4, 6); + obj.label = fName + ' 第 ' + lName + ' 周'; + } else { + obj.label = arr[i].time; + } obj.prop = arr[i].time; - obj.label = fName + ' 第 ' + lName + ' 周'; obj.minWidth = 100; tempX.push(obj); listObj[arr[i].time] = arr[i].useNum || null; @@ -97,10 +101,10 @@ export default { }, }; - \ No newline at end of file + diff --git a/src/views/energy/monitoring/energyLimit/index.vue b/src/views/energy/monitoring/energyLimit/index.vue index 008f9bf6..4067d6fd 100644 --- a/src/views/energy/monitoring/energyLimit/index.vue +++ b/src/views/energy/monitoring/energyLimit/index.vue @@ -266,8 +266,9 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { + console.log(row); this.$modal - .confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?') + .confirm('是否确认删除第"' + row._pageIndex + '"条数据项?') .then(function () { return deleteEnergyLimit(row.id); })