diff --git a/.env.production b/.env.production
index 4033a7a..f25cb5a 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,7 @@ NODE_ENV=production
# 测试0 生产1
VUE_APP_ENV = '1'
# 定义变量
-VUE_APP_CITY_TYPE = 'sx'
+VUE_APP_CITY_TYPE = 'ah'
# base api
VUE_APP_BASE_API = ''
diff --git a/src/api/config.js b/src/api/config.js
index 36be298..1ed3544 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -16,10 +16,11 @@ 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/mixins/mixin.js b/src/mixins/mixin.js
index ee827b0..bf17fa3 100644
--- a/src/mixins/mixin.js
+++ b/src/mixins/mixin.js
@@ -29,6 +29,7 @@ const mixin = {
datePicker: false,
currentDate: new Date(),
maxDate: new Date(),
+ minDate: new Date('1900/1/1'),
equipTypeOption: {
'01':[
{value: "0101", text: "螺杆式空压机"},
diff --git a/src/settings.js b/src/settings.js
index 7e5c490..a8ea9d4 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-sx/file/minio/download/`,
+ downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-ah/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/views/energyEfficiency/taskManage.vue b/src/views/energyEfficiency/taskManage.vue
index 2dddfdb..5976264 100644
--- a/src/views/energyEfficiency/taskManage.vue
+++ b/src/views/energyEfficiency/taskManage.vue
@@ -178,6 +178,11 @@
+
+
+ {{checkStateObj[item.checkState]}}
+
+
-
+
diff --git a/src/views/enterprise/fengjiSystemAddEdit.vue b/src/views/enterprise/fengjiSystemAddEdit.vue
index 7d8ae6a..e402282 100644
--- a/src/views/enterprise/fengjiSystemAddEdit.vue
+++ b/src/views/enterprise/fengjiSystemAddEdit.vue
@@ -39,7 +39,7 @@
-
+
diff --git a/src/views/enterprise/generalEnergyAddEdit.vue b/src/views/enterprise/generalEnergyAddEdit.vue
index 2346371..3056e90 100644
--- a/src/views/enterprise/generalEnergyAddEdit.vue
+++ b/src/views/enterprise/generalEnergyAddEdit.vue
@@ -52,7 +52,7 @@
-
+
diff --git a/src/views/enterprise/kongyajiSystemAddEdit.vue b/src/views/enterprise/kongyajiSystemAddEdit.vue
index 208ae6b..a0e7980 100644
--- a/src/views/enterprise/kongyajiSystemAddEdit.vue
+++ b/src/views/enterprise/kongyajiSystemAddEdit.vue
@@ -39,7 +39,7 @@
-
+
diff --git a/src/views/facilityManage/bursting/burstingDetail.vue b/src/views/facilityManage/bursting/burstingDetail.vue
index 8e89b6d..f1e0fb0 100644
--- a/src/views/facilityManage/bursting/burstingDetail.vue
+++ b/src/views/facilityManage/bursting/burstingDetail.vue
@@ -123,7 +123,7 @@
-
+
diff --git a/src/views/facilityManage/components/distributionSystem.vue b/src/views/facilityManage/components/distributionSystem.vue
index 64e174b..b57a17b 100644
--- a/src/views/facilityManage/components/distributionSystem.vue
+++ b/src/views/facilityManage/components/distributionSystem.vue
@@ -183,7 +183,7 @@
-
+
@@ -405,7 +405,40 @@ export default {
//定时器
edSet: null,
modifyTimer:null,
- required: false
+ required: false,
+ voltageLevelData:[
+ {
+ text:'10kV',name:'10kV',
+ value:'1',code:'1',
+ },{
+ text:'380V',name:'380V',
+ value:'2',code:'2',
+ },{
+ text:'6kV',name:'6kV',
+ value:'3',code:'3',
+ },{
+ text:'35kV',name:'35kV',
+ value:'4',code:'4',
+ },{
+ text:'110kV',name:'110kV',
+ value:'5',code:'5',
+ },{
+ text:'220kV',name:'220kV',
+ value:'6',code:'6',
+ },{
+ text:'20kV',name:'20kV',
+ value:'7',code:'7',
+ },{
+ text:'200V',name:'200V',
+ value:'8',code:'8',
+ },{
+ text:'66kV',name:'66kV',
+ value:'9',code:'9',
+ },{
+ text:'330kV',name:'330kV',
+ value:'10',code:'10',
+ },
+ ],
// notData: {
// charging: {
// formColumnsField: ['deviceTypeName', 'computeName'],
@@ -507,11 +540,12 @@ export default {
//获取系统码表返回值数据
//电压等级
async getList() {
- const dydj = {
- id: 80000001022,
- type: 'dydj',
- }
- const level = await getCodeCommon(dydj)
+ // const dydj = {
+ // id: 80000001022,
+ // type: 'dydj',
+ // }
+ // const level = await getCodeCommon(dydj)
+ const level = this.voltageLevelData
console.log(level,335);
level.forEach((v) => {
v.checked = false
diff --git a/src/views/facilityManage/components/heatingSystem.vue b/src/views/facilityManage/components/heatingSystem.vue
index 7d2c687..9605261 100644
--- a/src/views/facilityManage/components/heatingSystem.vue
+++ b/src/views/facilityManage/components/heatingSystem.vue
@@ -155,7 +155,7 @@
-
+
diff --git a/src/views/facilityManage/components/multipleAir.vue b/src/views/facilityManage/components/multipleAir.vue
index d4fca9e..280fb0f 100644
--- a/src/views/facilityManage/components/multipleAir.vue
+++ b/src/views/facilityManage/components/multipleAir.vue
@@ -114,7 +114,7 @@
-
+
diff --git a/vue.config.js b/vue.config.js
index 100edd8..a3c6b53 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,6 +22,7 @@ module.exports = {
// outputDir: ('1006028-' + pkgInfo.version), //生产包
outputDir: 'dist', //测试环境
lintOnSave: false,
+ parallel: false,
publicPath: '',
chainWebpack: config => {
// config.plugin('webpack-bundle-analyzer').use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin),