diff --git a/.env.development b/.env.development index a2b6e98..5ac2205 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # 定义变量 -VUE_APP_CITY_TYPE = '' +VUE_APP_CITY_TYPE = 'xj' # 开发环境接口调用前缀 # VUE_APP_BASE_API = '/dev-api' diff --git a/.env.production b/.env.production index f25cb5a..a255385 100644 --- a/.env.production +++ b/.env.production @@ -6,7 +6,7 @@ NODE_ENV=production # 测试0 生产1 VUE_APP_ENV = '1' # 定义变量 -VUE_APP_CITY_TYPE = 'ah' +VUE_APP_CITY_TYPE = 'xj' # base api VUE_APP_BASE_API = '' diff --git a/src/api/config.js b/src/api/config.js index 1ed3544..6177a3a 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -16,10 +16,10 @@ if (process.env.NODE_ENV === 'development') { } else { // 生产环境 // baseURL = '' // 本地 打包以后只需要空路径就行 - baseURL = '/proxy-ah' //安徽 打包以后的路径 + // baseURL = '/proxy-ah' //安徽 打包以后的路径 // baseURL = '/proxy-nx' //宁夏 打包以后的路径 // baseURL = '/proxy-xj' //新疆 打包以后的路径 - // baseURL = '/proxy-sx' //山西 打包以后的路径 + baseURL = '/proxy-sx' //山西 打包以后的路径 // baseURL = '/proxy-cq' //重庆 打包以后的路径 } diff --git a/src/settings.js b/src/settings.js index a8ea9d4..7e5c490 100644 --- a/src/settings.js +++ b/src/settings.js @@ -12,7 +12,7 @@ module.exports = { menuExclude: [], // ${process.env.VUE_APP_BASE_API} // https://portal.xt.nfjbill.ren:30004 - downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-ah/file/minio/download/`, + downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-sx/file/minio/download/`, // downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`, // downloadUrl: `http://172.29.69.38:19012/proxy-sx/file/minio/download/`, uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`, diff --git a/src/store/getters.js b/src/store/getters.js index fedf40a..eb2ac69 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -28,6 +28,7 @@ export default { cityIsNx: state => state.user.cityIsNx, imageRecognition: state => state.user.imageRecognition, validate: state => state.user.validate, + cityisXj: state => state.user.cityisXj, /** * 询问的数据 */ diff --git a/src/store/module/user.js b/src/store/module/user.js index 80bc03d..396ee31 100644 --- a/src/store/module/user.js +++ b/src/store/module/user.js @@ -41,6 +41,7 @@ const getDefaultState = () => ({ cityIsNx: process.env.VUE_APP_CITY_TYPE=='nx', //宁夏特供-公共机构配电获取 imageRecognition: process.env.VUE_APP_CITY_TYPE=='ah', // 图像识别 validate: process.env.VUE_APP_CITY_TYPE=='ah', // 大区间校验 + cityisXj: process.env.VUE_APP_CITY_TYPE=='xj', // 报告-二氧化碳系数 }) const state = getDefaultState() diff --git a/src/views/energyEfficiency/InitiateAppointment.vue b/src/views/energyEfficiency/InitiateAppointment.vue index a088da9..8107507 100644 --- a/src/views/energyEfficiency/InitiateAppointment.vue +++ b/src/views/energyEfficiency/InitiateAppointment.vue @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -82,6 +82,16 @@ export default { computedTime: "请选择" }; }, + computed:{ + maxDate(){ + const now = new Date() + return new Date(now.getFullYear(), 11, 31) + }, + minDate2(){ + return new Date(this.currentDate) + }, + + }, created() { let customer = sessionStorage.getItem("customer"); let customerMsg = JSON.parse(customer) @@ -109,6 +119,10 @@ export default { d = d < 10 ? "0" + d : d; this.dateTime = y + "-" + m + "-" + d; this.datePicker = false; + if (this.computedTime&&!(Date.parse(this.computedTime) > Date.parse(this.dateTime))) { + console.log('true'); + this.computedTime = '请选择' + } }, // 日期选择赋值 onConfirm2(val) { diff --git a/src/views/facilityManage/bursting/burstingDetail.vue b/src/views/facilityManage/bursting/burstingDetail.vue index f1e0fb0..1eb37ab 100644 --- a/src/views/facilityManage/bursting/burstingDetail.vue +++ b/src/views/facilityManage/bursting/burstingDetail.vue @@ -26,6 +26,7 @@ + @@ -65,6 +66,7 @@ + @@ -99,6 +101,7 @@ + @@ -228,7 +231,8 @@ export default { coldPerArea: '', equipEfficiency: '', produceDate:'', - cumulativeRunHours: '' + cumulativeRunHours: '', + dieoutNum: '' }, form1: { equipId:'', @@ -251,7 +255,8 @@ export default { heatPerArea: '', equipEfficiency: '', produceDate:'', - cumulativeRunHours: '' + cumulativeRunHours: '', + dieoutNum: '' }, formColumns: { refrigeType: "", @@ -772,6 +777,7 @@ export default { ele.ratedPower = this.edgl + "," + this.hyl // ele.unitType = this.form.refrigeType ele.unitType = this.form1.unitType + ele.dieoutNum = this.form1.dieoutNum ele.unitTypeName = this.formColumns.refrigeTypeName return ele } @@ -791,7 +797,6 @@ export default { this.form1.unitType = this.formColumns.refrigeType this.form1.unitTypeName = this.formColumns.refrigeTypeName this.heatPicArrtoStr() - console.log(this.form1.unitType, 'this.form1.unitType'); this.$store.getters.heatingUnitList.push(this.form1) this.clearPage() this.$router.push({ diff --git a/src/views/facilityManage/components/distributionSystem.vue b/src/views/facilityManage/components/distributionSystem.vue index b57a17b..ddc2a08 100644 --- a/src/views/facilityManage/components/distributionSystem.vue +++ b/src/views/facilityManage/components/distributionSystem.vue @@ -21,6 +21,7 @@ + @@ -257,6 +258,7 @@ export default { addModifyYear:'', produceDate:'', equipEfficiency: '', + dieoutNum: '', }, //页面展示的中文名称 formColumns: { diff --git a/src/views/facilityManage/components/fissionAir.vue b/src/views/facilityManage/components/fissionAir.vue index 4d57c78..10d8bcd 100644 --- a/src/views/facilityManage/components/fissionAir.vue +++ b/src/views/facilityManage/components/fissionAir.vue @@ -3,6 +3,7 @@
+ @@ -28,7 +29,7 @@ export default { runHours:'', runDays: '', coldPerArea: '', - // dieoutNum: '' + dieoutNum: '' }, eqid: '', diff --git a/src/views/facilityManage/components/multipleAir.vue b/src/views/facilityManage/components/multipleAir.vue index 280fb0f..f9d77cb 100644 --- a/src/views/facilityManage/components/multipleAir.vue +++ b/src/views/facilityManage/components/multipleAir.vue @@ -41,6 +41,7 @@ +
@@ -177,7 +178,8 @@ export default { backupExpl: '', equipEfficiency: '', cumulativeRunHours: '', - produceDate:'' + produceDate:'', + dieoutNum: '' }, /** diff --git a/src/views/industrialReport/components/utilizeDetail.vue b/src/views/industrialReport/components/utilizeDetail.vue index 36fec18..612b464 100644 --- a/src/views/industrialReport/components/utilizeDetail.vue +++ b/src/views/industrialReport/components/utilizeDetail.vue @@ -23,6 +23,7 @@ 名称 实物量 折标量(吨折煤) + 二氧化碳系数(千克) @@ -31,48 +32,56 @@ 外购电 {{ enterpriseEnergy81['电'].val }}(千瓦时) {{ enterpriseEnergy81['电'].standardVal }} + 2 天然气 {{ enterpriseEnergy81['天然气'].val }}(立方米) {{ enterpriseEnergy81['天然气'].standardVal }} + {{ enterpriseEnergy81['天然气'].co2 }} 3 外购低压蒸汽 {{ enterpriseEnergy81['低压蒸汽'].val }}(吨) {{ enterpriseEnergy81['低压蒸汽'].standardVal }} + 4 外购中压蒸汽 {{ enterpriseEnergy81['中压蒸汽'].val }}(吨) {{ enterpriseEnergy81['中压蒸汽'].standardVal }} + 5 外购高压蒸汽 {{ enterpriseEnergy81['高压蒸汽'].val }}(吨) {{ enterpriseEnergy81['高压蒸汽'].standardVal }} + 6 煤 {{ enterpriseEnergy81['煤'].val }}(吨) {{ enterpriseEnergy81['煤'].standardVal }} + {{ enterpriseEnergy81['煤'].co2 }} 7 汽油 {{ enterpriseEnergy81['汽油'].val }}(吨) {{ enterpriseEnergy81['汽油'].standardVal }} + {{ enterpriseEnergy81['汽油'].co2 }} 8 柴油 {{ enterpriseEnergy81['柴油'].val }}(吨) {{ enterpriseEnergy81['柴油'].standardVal }} + {{ enterpriseEnergy81['柴油'].co2 }} @@ -150,7 +159,7 @@