admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yanyan_dev' into shenzhen-dev

Browse Source
This commit is contained in:
yjl 2022-12-17 09:24:37 +08:00
commit eab68abe7f
4 changed files with 233 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue
View File

@ -49,8 +49,8 @@
<el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose"> <el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
<el-form ref="form" :model="form" label-width="150px"> <el-form ref="form" :model="form" label-width="150px">
<el-form-item label="设备名称："> <el-form-item label="设备名称：">
<el-select v-model="equipmentName" placeholder="请选择" style="width:350px" @change="changeEquipmentType($event)"> <el-select v-model="equipmentId" placeholder="请选择" style="width:350px">
<el-option v-for="item in EquipmentList" :key="item.id" :label="item.name" :value="item.name"> </el-option> <el-option v-for="item in EquipmentList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="加油量："> <el-form-item label="加油量：">
@ -58,15 +58,15 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleAdd = false">取 消</el-button> <el-button @click="noAdd">取 消</el-button>
<el-button type="primary" @click="okAdd">确 定</el-button> <el-button type="primary" @click="okAdd">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose"> <el-dialog title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose">
<el-form ref="form" :model="form" label-width="150px"> <el-form ref="form" :model="form" label-width="150px">
<el-form-item label="设备名称："> <el-form-item label="设备名称：">
<el-select v-model="equipmentName" placeholder="请选择" style="width:350px" @change="changeEquipmentType($event)"> <el-select v-model="equipmentId" placeholder="请选择" style="width:350px">
<el-option v-for="item in EquipmentList" :key="item.id" :label="item.name" :value="item.name"> </el-option> <el-option v-for="item in EquipmentList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="加油量："> <el-form-item label="加油量：">
@ -82,7 +82,13 @@
</div> </div>
</template> </template>
<script> <script>
import { getRefuelingRecordList,addRefuelingRecord,editRefuelingRecord,deleteRefuelingRecord,getAllRefuelingRecordList } from '@/assets/js/api/gantryCrane' import {
getRefuelingRecordList,
addRefuelingRecord,
editRefuelingRecord,
deleteRefuelingRecord,
getAllRefuelingRecordList
} from '@/assets/js/api/gantryCrane'
export default { export default {
components: { components: {
@ -111,20 +117,20 @@ export default {
dialogVisibleEdit: false, dialogVisibleEdit: false,
form: { form: {
name: '', name: '',
plateNumber: '', plateNumber: ''
}, },
editForm: { editForm: {
name: '', name: '',
plateNumber: '', plateNumber: ''
}, },
valueFuel: '', valueFuel: '',
valueEquipment: '', valueEquipment: '',
fuelTypeId:'', equipmentId: '',
equipmentId:'', editId: '',
editId:'', EquipmentList: [],
EquipmentList:[], devId: '',
equipmentName:'', fuel: ''
fuel:''
} }
}, },
created() { created() {
@ -132,35 +138,23 @@ export default {
this.getListData() this.getListData()
}, },
methods: { methods: {
openAdd(){ openAdd() {
this.dialogVisibleAdd = true this.dialogVisibleAdd = true
this.getEquipmentList() this.getEquipmentList()
}, },
getEquipmentList(){ getEquipmentList() {
getAllRefuelingRecordList().then((res) => { getAllRefuelingRecordList({ projectSn: this.projectSn }).then(res => {
this.EquipmentList = res.result this.EquipmentList = res.result
}) })
}, },
changeFuelType(val){ noAdd(){
this.fuelType.forEach((item,index,array) => { this.dialogVisibleAdd = false
if (item.typeName == val) { this.equipmentId = ''
this.fuelTypeId = item.id this.fuel = ''
}
})
},
changeEquipmentType(val){
console.log(val);
console.log(this.EquipmentList);
this.EquipmentList.forEach((item,index,array) => {
if (item.name == val) {
this.equipmentId = item.id
}
})
}, },
okAdd() { okAdd() {
let data = { let data = {
devId: Number(this.equipmentId), devId: this.equipmentId,
fuelType: this.fuelTypeId,
fuelCharge: Number(this.fuel), fuelCharge: Number(this.fuel),
projectSn: this.projectSn projectSn: this.projectSn
} }
@ -169,6 +163,8 @@ export default {
this.$message.success('新增成功！') this.$message.success('新增成功！')
this.getListData() this.getListData()
this.dialogVisibleAdd = false this.dialogVisibleAdd = false
this.equipmentId = ''
this.fuel = ''
} else { } else {
this.$message.success('新增失败！') this.$message.success('新增失败！')
} }
@ -176,12 +172,12 @@ export default {
}, },
okEdit() { okEdit() {
this.dialogVisibleEdit = false this.dialogVisibleEdit = false
this.EquipmentList
let data = { let data = {
devId: Number(this.equipmentId), devId: this.equipmentId,
fuelType: this.fuelTypeId, fuelCharge: this.fuel,
fuelCharge: Number(this.fuel),
projectSn: this.projectSn, projectSn: this.projectSn,
id:this.editId id: this.editId
} }
editRefuelingRecord(data).then(res => { editRefuelingRecord(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
@ -205,6 +201,7 @@ export default {
pageSize: this.pageSize pageSize: this.pageSize
} }
getRefuelingRecordList(data).then(res => { getRefuelingRecordList(data).then(res => {
console.log('加油记录', res)
this.tableList = res.result.records this.tableList = res.result.records
this.total = res.result.total this.total = res.result.total
}) })
@ -225,16 +222,22 @@ export default {
}, },
//编辑按钮 //编辑按钮
editBtn(val) { editBtn(val) {
console.log(val); console.log(val)
this.editForm = { ...val } this.editForm = { ...val }
this.dialogVisibleEdit = true
this.editId = val.id this.editId = val.id
this.equipmentName = val.devName
this.fuel = val.fuelCharge
this.getEquipmentList() this.getEquipmentList()
this.dialogVisibleEdit = true
this.equipmentId = val.devId
this.fuel = val.fuelCharge
}, },
//删除按钮 //删除按钮
deleteBtn(val) { deleteBtn(val) {
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
let data = { let data = {
id: val.id id: val.id
} }
@ -246,6 +249,13 @@ export default {
this.$message.success('删除失败！') this.$message.success('删除失败！')
} }
}) })
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {

54
src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue
View File

@ -75,7 +75,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleAdd = false">取 消</el-button> <el-button @click="noAdd">取 消</el-button>
<el-button type="primary" @click="okAdd">确 定</el-button> <el-button type="primary" @click="okAdd">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -136,11 +136,11 @@ export default {
dialogVisibleEdit: false, dialogVisibleEdit: false,
form: { form: {
name: '', name: '',
plateNumber: '', plateNumber: ''
}, },
editForm: { editForm: {
name: '', name: '',
plateNumber: '', plateNumber: ''
}, },
fuelType: [ fuelType: [
{ id: 1, typeName: '柴油' }, { id: 1, typeName: '柴油' },
@ -152,9 +152,9 @@ export default {
], ],
valueFuel: '', valueFuel: '',
valueEquipment: '', valueEquipment: '',
fuelTypeId:'', fuelTypeId: '',
equipmentTypeId:'', equipmentTypeId: '',
editId:'' editId: ''
} }
}, },
created() { created() {
@ -162,20 +162,29 @@ export default {
this.getListData() this.getListData()
}, },
methods: { methods: {
changeFuelType(val){ changeFuelType(val) {
this.fuelType.forEach((item,index,array) => { this.fuelType.forEach((item, index, array) => {
if (item.typeName == val) { if (item.typeName == val) {
this.fuelTypeId = item.id this.fuelTypeId = item.id
} }
}) })
}, },
changeEquipmentType(val){ changeEquipmentType(val) {
this.equipmentType.forEach((item,index,array) => { this.equipmentType.forEach((item, index, array) => {
if (item.typeName == val) { if (item.typeName == val) {
this.equipmentTypeId = item.id this.equipmentTypeId = item.id
} }
}) })
}, },
noAdd() {
this.dialogVisibleAdd = false
this.form = {
name: '',
plateNumber: ''
}
this.valueFuel = ''
this.valueEquipment = ''
},
okAdd() { okAdd() {
this.dialogVisibleAdd = false this.dialogVisibleAdd = false
let data = { let data = {
@ -189,6 +198,12 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.$message.success('新增成功！') this.$message.success('新增成功！')
this.getListData() this.getListData()
this.form = {
name: '',
plateNumber: ''
}
this.valueFuel = ''
this.valueEquipment = ''
} else { } else {
this.$message.success('新增失败！') this.$message.success('新增失败！')
} }
@ -198,11 +213,11 @@ export default {
this.dialogVisibleEdit = false this.dialogVisibleEdit = false
let data = { let data = {
name: this.editForm.name, name: this.editForm.name,
fuelType:this.fuelTypeId, fuelType: this.fuelTypeId,
plateNumber: this.editForm.plateNumber, plateNumber: this.editForm.plateNumber,
type: this.equipmentTypeId, type: this.equipmentTypeId,
projectSn: this.projectSn, projectSn: this.projectSn,
id:this.editId id: this.editId
} }
editBicarbon(data).then(res => { editBicarbon(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
@ -246,7 +261,7 @@ export default {
}, },
//编辑按钮 //编辑按钮
editBtn(val) { editBtn(val) {
console.log(val); console.log(val)
this.editForm = { ...val } this.editForm = { ...val }
this.dialogVisibleEdit = true this.dialogVisibleEdit = true
this.editId = val.id this.editId = val.id
@ -255,6 +270,12 @@ export default {
}, },
//删除按钮 //删除按钮
deleteBtn(val) { deleteBtn(val) {
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
let data = { let data = {
id: val.id id: val.id
} }
@ -266,6 +287,13 @@ export default {
this.$message.success('删除失败！') this.$message.success('删除失败！')
} }
}) })
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {

24
src/views/projectLevel/photovoltaic/photovoltaic.vue
View File

@ -117,7 +117,7 @@ export default {
}, },
options: [], options: [],
value: '', value: '',
editId:'' editId: ''
} }
}, },
created() { created() {
@ -128,12 +128,12 @@ export default {
changeName(val) { changeName(val) {
this.options.forEach((item, index, array) => { this.options.forEach((item, index, array) => {
if (item.name == val) { if (item.name == val) {
console.log(item); console.log(item)
this.form.devId = item.id this.form.devId = item.id
this.editForm.devId = item.id this.editForm.devId = item.id
} }
}) })
console.log(this.editForm.devId); console.log(this.editForm.devId)
}, },
openAdd() { openAdd() {
this.dialogVisibleAdd = true this.dialogVisibleAdd = true
@ -143,6 +143,7 @@ export default {
}, },
noAdd() { noAdd() {
this.dialogVisibleAdd = false this.dialogVisibleAdd = false
this.value = ''
this.form = { this.form = {
devId: '', devId: '',
generatingCapacity: '' generatingCapacity: ''
@ -172,7 +173,7 @@ export default {
okEdit() { okEdit() {
this.dialogVisibleEdit = false this.dialogVisibleEdit = false
let data = { let data = {
id:this.editId, id: this.editId,
devId: this.editForm.devId, devId: this.editForm.devId,
generatingCapacity: this.editForm.generatingCapacity, generatingCapacity: this.editForm.generatingCapacity,
projectSn: this.projectSn projectSn: this.projectSn
@ -219,7 +220,7 @@ export default {
}, },
//编辑按钮 //编辑按钮
editBtn(val) { editBtn(val) {
console.log(val); console.log(val)
this.editForm = { ...val } this.editForm = { ...val }
this.value = val.devName this.value = val.devName
this.dialogVisibleEdit = true this.dialogVisibleEdit = true
@ -230,6 +231,12 @@ export default {
}, },
//删除按钮 //删除按钮
deleteBtn(val) { deleteBtn(val) {
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
let data = { let data = {
id: val.id id: val.id
} }
@ -241,6 +248,13 @@ export default {
this.$message.success('删除失败！') this.$message.success('删除失败！')
} }
}) })
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {

110
src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue
View File

@ -92,7 +92,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleAdd = false">取 消</el-button> <el-button @click="noAdd">取 消</el-button>
<el-button type="primary" @click="okAdd">确 定</el-button> <el-button type="primary" @click="okAdd">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -164,27 +164,27 @@ export default {
attenuationRate: '', attenuationRate: '',
name: '', name: '',
hourGeneratingCapacity: '', hourGeneratingCapacity: '',
isc:'', isc: '',
modelNumber:'', modelNumber: '',
ocv:'', ocv: '',
size:'', size: '',
specification:'', specification: '',
standardOperatingCurrent:'', standardOperatingCurrent: '',
standardOperatingVoltage:'', standardOperatingVoltage: '',
standardPower:'', standardPower: ''
}, },
editForm: { editForm: {
attenuationRate: '', attenuationRate: '',
name: '', name: '',
hourGeneratingCapacity: '', hourGeneratingCapacity: '',
isc:'', isc: '',
modelNumber:'', modelNumber: '',
ocv:'', ocv: '',
size:'', size: '',
specification:'', specification: '',
standardOperatingCurrent:'', standardOperatingCurrent: '',
standardOperatingVoltage:'', standardOperatingVoltage: '',
standardPower:'', standardPower: ''
} }
} }
}, },
@ -193,6 +193,22 @@ export default {
this.getListData() this.getListData()
}, },
methods: { methods: {
noAdd(){
this.dialogVisibleAdd = false
this.form = {
attenuationRate: '',
name: '',
hourGeneratingCapacity: '',
isc: '',
modelNumber: '',
ocv: '',
size: '',
specification: '',
standardOperatingCurrent: '',
standardOperatingVoltage: '',
standardPower: ''
}
},
okAdd() { okAdd() {
this.dialogVisibleAdd = false this.dialogVisibleAdd = false
let data = { let data = {
@ -201,19 +217,32 @@ export default {
attenuationRate: this.form.attenuationRate, attenuationRate: this.form.attenuationRate,
hourGeneratingCapacity: this.form.hourGeneratingCapacity, hourGeneratingCapacity: this.form.hourGeneratingCapacity,
id: this.form.id, id: this.form.id,
isc:this.form.isc, isc: this.form.isc,
modelNumber:this.form.modelNumber, modelNumber: this.form.modelNumber,
ocv:this.form.ocv, ocv: this.form.ocv,
size:this.form.size, size: this.form.size,
specification:this.form.specification, specification: this.form.specification,
standardOperatingCurrent:this.form.standardOperatingCurrent, standardOperatingCurrent: this.form.standardOperatingCurrent,
standardOperatingVoltage:this.form.standardOperatingVoltage, standardOperatingVoltage: this.form.standardOperatingVoltage,
standardPower:this.form.standardPower, standardPower: this.form.standardPower
} }
addPhotovoltaoc(data).then(res => { addPhotovoltaoc(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success('新增成功！') this.$message.success('新增成功！')
this.getListData() this.getListData()
this.form = {
attenuationRate: '',
name: '',
hourGeneratingCapacity: '',
isc: '',
modelNumber: '',
ocv: '',
size: '',
specification: '',
standardOperatingCurrent: '',
standardOperatingVoltage: '',
standardPower: ''
}
} else { } else {
this.$message.success('新增失败！') this.$message.success('新增失败！')
} }
@ -227,14 +256,14 @@ export default {
attenuationRate: this.editForm.attenuationRate, attenuationRate: this.editForm.attenuationRate,
hourGeneratingCapacity: this.editForm.hourGeneratingCapacity, hourGeneratingCapacity: this.editForm.hourGeneratingCapacity,
id: this.editForm.id, id: this.editForm.id,
isc:this.editForm.isc, isc: this.editForm.isc,
modelNumber:this.editForm.modelNumber, modelNumber: this.editForm.modelNumber,
ocv:this.editForm.ocv, ocv: this.editForm.ocv,
size:this.editForm.size, size: this.editForm.size,
specification:this.editForm.specification, specification: this.editForm.specification,
standardOperatingCurrent:this.editForm.standardOperatingCurrent, standardOperatingCurrent: this.editForm.standardOperatingCurrent,
standardOperatingVoltage:this.editForm.standardOperatingVoltage, standardOperatingVoltage: this.editForm.standardOperatingVoltage,
standardPower:this.editForm.standardPower, standardPower: this.editForm.standardPower
} }
editPhotovoltaoc(data).then(res => { editPhotovoltaoc(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
@ -255,7 +284,7 @@ export default {
name: this.formInline.buildName, name: this.formInline.buildName,
projectSn: this.projectSn, projectSn: this.projectSn,
current: this.current, current: this.current,
pageSize: this.pageSize, pageSize: this.pageSize
} }
getPhotovoltaocList(data).then(res => { getPhotovoltaocList(data).then(res => {
this.tableList = res.result.records this.tableList = res.result.records
@ -284,6 +313,12 @@ export default {
}, },
//删除按钮 //删除按钮
deleteBtn(val) { deleteBtn(val) {
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
let data = { let data = {
id: val.id id: val.id
} }
@ -295,6 +330,13 @@ export default {
this.$message.success('删除失败！') this.$message.success('删除失败！')
} }
}) })
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {