caoyan/energy_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
jiangyinzhi
2024-08-05 19:21:29 +08:00
parent ec2f27d196
commit ee500763de
11 changed files with 263 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/enterprise/acquisition.vue
+9
View File
@@ -317,6 +317,15 @@ export default {
}
},
saveAllInfo() {
let item = JSON.parse(sessionStorage.getItem('tidCid')).item
if(!item.isPosition){
this.$notify({
message: '必须先在app打卡以后才能提交',
duration: 1000,
type: 'warning'
})
return
}
taskList({ consName: this.info.customerName }).then((res) => {
this.records = res.data.list[0]
src/views/enterprise/bengjiSystem.vue
+2 -1
View File
@@ -7,7 +7,8 @@
<!-- <div class="title" style="margin-top: 20px;margin-left: 5px;">通用能源系统</div> -->
<div class="partTwo-box">
<div class="partTwo-content">
<div class="title">泵机系统基本信息<span style="font-size: 14px; color: #bbbbbb;"> 单台电机额定功率≥20kW</span>
<!-- 单台电机额定功率≥20kW 电网让改大于5 -->
<div class="title">泵机系统基本信息<span style="font-size: 14px; color: #bbbbbb;"> 单台电机额定功率≥5kW</span>
</div>
<van-swipe-cell :right-width="65" v-for="(item, index) in list" :key="index">
<div class="msg-card" @click="bengjisystemaddedit(item.id)">
src/views/enterprise/bengjiSystemAddEdit.vue
+2 -2
View File
@@ -116,8 +116,8 @@ export default {
}
},
handelChange () {
if(Number(this.form.ratedPowerValue) < 20) {
Notify({ type: "danger", message: '单台额定功率≥20 ' });
if(Number(this.form.ratedPowerValue) < 5) {
Notify({ type: "danger", message: '单台额定功率≥5 ' });
this.form.ratedPowerValue = ''
}
},
src/views/enterprise/energyManagement.vue
+13 -17
View File
@@ -440,20 +440,20 @@ export default {
},
methods: {
// 获取当前位置
getLocation() {
if (process.env.NODE_ENV === 'development') {
this.address = '江苏省南京市江宁区'
}
// // 获取当前位置
// getLocation() {
// if (process.env.NODE_ENV === 'development') {
// this.address = '江苏省南京市江宁区'
// }
getLocationMessage(data=> {
if(data) {
this.address = data
} else {
Notify({ type: 'warning', message: '未获取到定位信息' });
}
})
},
// getLocationMessage(data=> {
// if(data) {
// this.address = data
// } else {
// Notify({ type: 'warning', message: '未获取到定位信息' });
// }
// })
// },
base64ToFile(data, fileName) {
const dataArr = data.split(",");
const byteString = window.atob(dataArr[1]);
@@ -797,10 +797,6 @@ export default {
this.$toast('请上传企业外观照片')
return
}
if (!this.address&&this.$store.getters.cityIsNx) {
this.$toast('请获取位置信息')
return
}
if (this.isfaly1 == false) {
let id = this.gzList.map(v => {
return v.id
src/views/enterprise/kongyajiSystem.vue
+2 -1
View File
@@ -7,7 +7,8 @@
<!-- <div class="title" style="margin-top: 20px;margin-left: 5px;">通用能源系统</div> -->
<div class="partTwo-box">
<div class="partTwo-content">
<div class="title">空压机系统基本信息 <span style="font-size: 14px; color: #bbbbbb;">单机额定功率≥50kW</span></div>
<!-- 单机额定功率≥50kW 电网让改 ≥5kW -->
<div class="title">空压机系统基本信息 <span style="font-size: 14px; color: #bbbbbb;">单机额定功率≥5kW</span></div>
<van-swipe-cell :right-width="65" v-for="(item, index) in list" :key="index">
<div class="msg-card" @click="kongyajisystemaddedit(item.id)">
<div>
src/views/enterprise/kongyajiSystemAddEdit.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<van-field v-model="form.systemModel" required :rules="[{ required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="空压机型号" placeholder="请输入空压机型号" maxlength="20" />
<van-field v-model="form.motorModel" required :rules="[{ required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="电机型号" placeholder="请输入电机型号" maxlength="20" />
<van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{ required: true }]" label="台数（台）" placeholder="请输入台数" />
<van-field v-input.floatNo0 v-model="form.ratedPowerValue" required :rules="[{ required: true }]" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',50,'单台额定功率')"/>
<van-field v-input.floatNo0 v-model="form.ratedPowerValue" required :rules="[{ required: true }]" type="number" label="单台额定功率（kW）" placeholder="请输入" @blur="handelChange('ratedPowerValue',5,'单台额定功率')"/>
<van-field v-input.float v-model="form.frequencyPerValue" required :rules="[{ required: true }]" type="number" label="变频占比（%）" placeholder="请输入" @input="handelChangeNumber('frequencyPerValue','变频占比')" />
<van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
<van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰空压机数量" placeholder="请输入" />
src/views/enterprise/yearEnergyAddEdit.vue
+2 -2
View File
@@ -514,7 +514,7 @@ export default {
return time
},
readOnly(){
return this.yearForm.energyUnutilizedVO.notUsedResidueEnergyType!='01'
return this.yearForm.energyUnutilizedVO&&this.yearForm.energyUnutilizedVO.notUsedResidueEnergyType!='01'
}
},
mounted() {
@@ -749,6 +749,7 @@ export default {
if(this.notHeatDemandOtherName) {
this.yearForm.energyUnutilizedVO.notHeatDemandOther = this.notHeatDemandOtherName
}
this.yearForm.energyUnutilizedVO = Object.assign( this.yearForm.energyUnutilizedVO ,this.customerInfo)
}
if(this.tabName == 'a'&&this.tips1){
return
@@ -756,7 +757,6 @@ export default {
if(this.tabName == 'c'&&this.tips0){
return
}
this.yearForm.energyUnutilizedVO = Object.assign( this.yearForm.energyUnutilizedVO ,this.customerInfo)
let params = Object.assign(this.customerInfo, this.yearForm)
params.taskId = this.tidCid.taskId
if(this.$route.query.id) {