冲突修改

src/api/station.js

@@ -142,8 +142,6 @@ const deleteEquipmentmodel =(data)=>{
       method:"delete",
   })
 }
-<<<<<<< HEAD
-=======
 const meterpoint =(data)=>{
   return request({
       url:`/meterpoint/listByPage?name=${encodeURIComponent(data.name)}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
@@ -163,7 +161,6 @@ const deleteMeterpoint =(data)=>{
       method:"delete",
   })
 }
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 export default {
   companys,
   addCompanys,
@@ -186,12 +183,8 @@ export default {
   newtreeTreels,
 	equipmentmodel,
 	addEquipmentmodel,
-<<<<<<< HEAD
-	deleteEquipmentmodel
-=======
 	deleteEquipmentmodel,
 	meterpoint,
 	addMeterpoint,
 	deleteMeterpoint
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 };

src/views/stationConfiguration/equipmentmodel/components/TableEdit.vue

@@ -18,19 +18,11 @@
 				</el-form-item>
 			</div>
 			<div class="lists">
-<<<<<<< HEAD
-				<el-form-item label="容量" prop="powerProduction">
-					<el-input class="inputs" v-model.trim="form.powerProduction" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="厂商编号" prop="windTurbineManufactureId">
-					<el-input class="inputs" v-model.trim="form.windTurbineManufactureId" autocomplete="off"></el-input>
-=======
 				<el-form-item label="容量" prop="powerproduction">
 					<el-input class="inputs" v-model.trim="form.powerproduction" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="厂商编号" prop="windturbinemanufacturerid">
 					<el-input class="inputs" v-model.trim="form.windturbinemanufacturerid" autocomplete="off"></el-input>
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 				</el-form-item>
 			</div>
 			<div class="lists">
@@ -43,27 +35,6 @@
 				</el-form-item>
 			</div>
 			<div class="lists">
-<<<<<<< HEAD
-				<el-form-item label="切入风速" prop="cutinWindSpeed">
-					<el-input class="inputs" v-model="form.cutinWindSpeed" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="额定风速" prop="ratedWindSpeed">
-					<el-input class="inputs" v-model.trim="form.ratedWindSpeed" autocomplete="off"></el-input>
-				</el-form-item>
-			</div>
-			<div class="lists">
-				<el-form-item label="切出风速" prop="cutoutWindSpeed">
-					<el-input class="inputs" v-model="form.cutoutWindSpeed" autocomplete="off">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="叶片切入面积" prop="sweptArea">
-					<el-input class="inputs" v-model.trim="form.sweptArea" autocomplete="off"></el-input>
-				</el-form-item>
-			</div>
-			<div class="lists">
-				<el-form-item label="设备类别" prop="equipmentCategory">
-					<el-input class="inputs" v-model="form.equipmentCategory" autocomplete="off">
-=======
 				<el-form-item label="切入风速" prop="cutinwindspeed">
 					<el-input class="inputs" v-model="form.cutinwindspeed" autocomplete="off"></el-input>
 				</el-form-item>
@@ -83,7 +54,6 @@
 			<div class="lists">
 				<el-form-item label="设备类别" prop="equipmentcategory">
 					<el-input class="inputs" v-model="form.equipmentcategory" autocomplete="off">
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 					</el-input>
 				</el-form-item>
 			</div>
@@ -117,17 +87,6 @@ export default {
 				code: '',
 				name: '',
 				description: '',
-<<<<<<< HEAD
-				powerProduction: '',
-				windTurbineManufactureId: '',
-				photo: '',
-				unit: '',
-				cutinWindSpeed: '',
-				ratedWindSpeed: '',
-				cutoutWindSpeed: '',
-				sweptArea: '',
-				equipmentCategory: '',
-=======
 				powerproduction: '',
 				windturbinemanufacturerid: '',
 				photo: '',
@@ -137,24 +96,12 @@ export default {
 				cutoutwindspeed: '',
 				sweptarea: '',
 				equipmentcategory: '',
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 			},
 			rules: {
 				id: [{ required: true, trigger: 'blur', message: '请输入' }],
 				code: [{ required: true, trigger: 'blur', message: '请输入' }],
 				name: [{ required: true, trigger: 'blur', message: '请输入' }],
 				description: [{ required: true, trigger: 'blur', message: '请输入' }],
-<<<<<<< HEAD
-				powerProduction: [{ required: true, trigger: 'blur', message: '请输入' }],
-				windTurbineManufactureId: [{ required: true, trigger: 'blur', message: '请输入' }],
-				photo: [{ required: true, trigger: 'blur', message: '请输入' }],
-				unit: [{ required: true, trigger: 'blur', message: '请输入' }],
-				cutinWindSpeed: [{ required: true, trigger: 'blur', message: '请输入' }],
-				ratedWindSpeed: [{ required: true, trigger: 'blur', message: '请输入' }],
-				cutoutWindSpeed: [{ required: true, trigger: 'blur', message: '请输入' }],
-				sweptArea: [{ required: true, trigger: 'blur', message: '请输入' }],
-				equipmentCategory: [{ required: true, trigger: 'blur', message: '请输入' }],
-=======
 				powerproduction: [{ required: true, trigger: 'blur', message: '请输入' }],
 				windturbinemanufacturerid: [{ required: true, trigger: 'blur', message: '请输入' }],
 				photo: [{ required: true, trigger: 'blur', message: '请输入' }],
@@ -164,7 +111,6 @@ export default {
 				cutoutwindspeed: [{ required: true, trigger: 'blur', message: '请输入' }],
 				sweptarea: [{ required: true, trigger: 'blur', message: '请输入' }],
 				equipmentcategory: [{ required: true, trigger: 'blur', message: '请输入' }],
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 			},
 			title: '',
 			dialogFormVisible: false,

src/views/stationConfiguration/equipmentmodel/index.vue

@@ -30,31 +30,13 @@
 				<el-table-column show-overflow-tooltip label="编码" prop="code" align="center" sortable></el-table-column>
 				<el-table-column show-overflow-tooltip label="名称" prop="name" align="center" sortable></el-table-column>
 				<el-table-column show-overflow-tooltip label="描述" prop="description" align="center" sortable></el-table-column>
-
-<<<<<<< HEAD
-				<el-table-column show-overflow-tooltip label="容量" prop="powerProduction" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="厂商编号" prop="windTurbineManufactureId" align="center" sortable>
-=======
 				<el-table-column show-overflow-tooltip label="容量" prop="powerproduction" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="厂商编号" prop="windturbinemanufacturerid" align="center" sortable>
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="图片" prop="photo" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="传输总发电量单位" prop="unit" align="center" sortable></el-table-column>
-<<<<<<< HEAD
-				<el-table-column show-overflow-tooltip label="切入风速" prop="cutinWindSpeed" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="额定风速" prop="ratedWindSpeed" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="切出风速" prop="cutoutWindSpeed" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="叶片切入面积" prop="sweptArea" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="设备类别" prop="equipmentCategory" align="center" sortable>
-=======
 				<el-table-column show-overflow-tooltip label="切入风速" prop="cutinwindspeed" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="额定风速" prop="ratedwindspeed" align="center" sortable>
@@ -64,7 +46,6 @@
 				<el-table-column show-overflow-tooltip label="叶片切入面积" prop="sweptarea" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="设备类别" prop="equipmentcategory" align="center" sortable>
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">
 					<template #default="{ row }">
@@ -166,17 +147,6 @@ export default {
 							code: '',
 							name: '',
 							description: '',
-<<<<<<< HEAD
-							powerProduction: '',
-							windTurbineManufactureId: '',
-							photo: '',
-							unit: '',
-							cutinWindSpeed: '',
-							ratedWindSpeed: '',
-							cutoutWindSpeed: '',
-							sweptArea: '',
-							equipmentCategory: '',
-=======
 							powerproduction: '',
 							windturbinemanufacturerid: '',
 							photo: '',
@@ -186,7 +156,6 @@ export default {
 							cutoutwindspeed: '',
 							sweptarea: '',
 							equipmentcategory: '',
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 						}
 					]
 					// 导出
@@ -197,17 +166,6 @@ export default {
 							code: item.code,
 							name: item.name,
 							description: item.description,
-<<<<<<< HEAD
-							powerProduction: item.powerProduction,
-							windTurbineManufactureId: item.windTurbineManufactureId,
-							photo: item.photo,
-							unit: item.unit,
-							cutinWindSpeed: item.cutinWindSpeed,
-							ratedWindSpeed: item.ratedWindSpeed,
-							cutoutWindSpeed: item.cutoutWindSpeed,
-							sweptArea: item.sweptArea,
-							equipmentCategory: item.equipmentCategory,
-=======
 							powerproduction: item.powerproduction,
 							windturbinemanufacturerid: item.windturbinemanufacturerid,
 							photo: item.photo,
@@ -217,7 +175,6 @@ export default {
 							cutoutwindspeed: item.cutoutwindspeed,
 							sweptarea: item.sweptarea,
 							equipmentcategory: item.equipmentcategory,
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 						})
 					})
 					this.exportExcel = exportExcel