diff --git a/src/views/energyEfficiency/clockIn/index.vue b/src/views/energyEfficiency/clockIn/index.vue index d3dc10c..75270cc 100644 --- a/src/views/energyEfficiency/clockIn/index.vue +++ b/src/views/energyEfficiency/clockIn/index.vue @@ -177,12 +177,12 @@ export default { getPosition((data) => { console.log('-------------------------位置信息', data, typeof(data)); if (data) { - console.log(data.longitude, 'lgitude位置信息') if(typeof(data) == 'string'){ let dataArr = data.split(',') that.$set(that.formData, 'lgitude', dataArr[0].match(/\d+\.\d{2}/)[0]) that.$set(that.formData, 'ltitude', dataArr[1].match(/\d+\.\d{2}/)[0]) }else{ + console.log(data.longitude, 'lgitude位置信息') that.$set(that.formData, 'lgitude', (data.longitude+'').match(/\d+\.\d{2}/)[0]) that.$set(that.formData, 'ltitude', (data.latitude+'').match(/\d+\.\d{2}/)[0]) } diff --git a/src/views/enterprise/generalEnergy.vue b/src/views/enterprise/generalEnergy.vue index 812403a..b849895 100644 --- a/src/views/enterprise/generalEnergy.vue +++ b/src/views/enterprise/generalEnergy.vue @@ -8,7 +8,7 @@
-
配电系统基本信息 35kV 及以上
+
配电系统基本信息 10kV 及以上
@@ -21,7 +21,7 @@ 型号 {{ item.systemModel }}
- 额定容量:{{ item.ratedCapacityValue }} kVA额定一次电压:{{ item.ratedVoltageValue }} kV + 单台额定容量:{{ item.ratedCapacityValue }} kVA额定一次电压:{{ item.ratedVoltageValue }} kV
diff --git a/src/views/enterprise/generalEnergyAddEdit.vue b/src/views/enterprise/generalEnergyAddEdit.vue index 60159f0..cbe262b 100644 --- a/src/views/enterprise/generalEnergyAddEdit.vue +++ b/src/views/enterprise/generalEnergyAddEdit.vue @@ -8,7 +8,7 @@ - +