update

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,9 +161,6 @@ const deleteMeterpoint =(data)=>{
       method:"delete",
   })
 }
-<<<<<<< HEAD
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
-=======
 
 const getStationPersis =(data)=>{
   return request({
@@ -179,7 +174,6 @@ const getAdmList =(data)=>{
 		method:"get"
   })
 }
->>>>>>> 6c7b043eaee33b02a500d8aec5db233f9c3220a9
 export default {
   companys,
   addCompanys,
@@ -202,18 +196,10 @@ export default {
   newtreeTreels,
 	equipmentmodel,
 	addEquipmentmodel,
-<<<<<<< HEAD
-	deleteEquipmentmodel
-=======
 	deleteEquipmentmodel,
 	meterpoint,
 	addMeterpoint,
-<<<<<<< HEAD
-	deleteMeterpoint
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
-=======
 	deleteMeterpoint,
 	getStationPersis,
-	getAdmList
->>>>>>> 6c7b043eaee33b02a500d8aec5db233f9c3220a9
+	getAdmList,
 };

src/api/table.js

@@ -45,14 +45,12 @@ const removeIndicators =(data)=>{
       method:"delete",
   })
 }
-<<<<<<< HEAD
 const newtreeTreels=(data)=>{
   return request({ 
       url:`/newtree/treels?tag=${data.tag}`,
       method:"get"
   })
 }
-=======
 
 // 可研电量
 const projectstudy =(data)=>{
@@ -74,7 +72,6 @@ const deleteProjectstudy =(data)=>{
       method:"delete",
   })
 }
->>>>>>> 6c7b043eaee33b02a500d8aec5db233f9c3220a9
 export default {
   projectplan,
   addProjectplan,
@@ -83,11 +80,8 @@ export default {
   indicators,
   addIndicators,
   removeIndicators,
-<<<<<<< HEAD
-  newtreeTreels
-=======
+  newtreeTreels,
 	addProjectstudy,
 	projectstudy,
 	deleteProjectstudy
->>>>>>> 6c7b043eaee33b02a500d8aec5db233f9c3220a9
 };

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

@@ -1,232 +1,178 @@
 <template>
-	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-		<el-form ref="form" :model="form" :rules="rules">
-			<div class="lists">
-				<el-form-item label="id" prop="id">
-					<el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
-				</el-form-item>
-				<el-form-item label="编码" prop="code">
-					<el-input class="inputs" v-model.trim="form.code" autocomplete="off"></el-input>
-				</el-form-item>
-			</div>
-			<div class="lists">
-				<el-form-item label="名称" prop="name">
-					<el-input class="inputs" v-model="form.name" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="描述" prop="description">
-					<el-input class="inputs" v-model="form.description" autocomplete="off"></el-input>
-				</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">
-				<el-form-item label="图片" prop="photo">
-					<el-input class="inputs" v-model="form.photo" autocomplete="off">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="传输总发电量单位" prop="unit">
-					<el-input class="inputs" v-model.trim="form.unit" autocomplete="off"></el-input>
-				</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>
-				<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">
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
-					</el-input>
-				</el-form-item>
-			</div>
-		</el-form>
-		<div slot="footer" class="dialog-footer">
-			<el-button @click="close">取 消</el-button>
-			<el-button type="primary" @click="save">确 定</el-button>
-		</div>
-	</el-dialog>
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
+    <el-form ref="form" :model="form" :rules="rules">
+      <div class="lists">
+        <el-form-item label="id" prop="id">
+          <el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd ? true : false"></el-input>
+        </el-form-item>
+        <el-form-item label="编码" prop="code">
+          <el-input class="inputs" v-model.trim="form.code" autocomplete="off"></el-input>
+        </el-form-item>
+      </div>
+      <div class="lists">
+        <el-form-item label="名称" prop="name">
+          <el-input class="inputs" v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="描述" prop="description">
+          <el-input class="inputs" v-model="form.description" autocomplete="off"></el-input>
+        </el-form-item>
+      </div>
+      <div class="lists">
+        <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>
+        </el-form-item>
+      </div>
+      <div class="lists">
+        <el-form-item label="图片" prop="photo">
+          <el-input class="inputs" v-model="form.photo" autocomplete="off">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="传输总发电量单位" prop="unit">
+          <el-input class="inputs" v-model.trim="form.unit" autocomplete="off"></el-input>
+        </el-form-item>
+      </div>
+      <div class="lists">
+        <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-input>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
 import api from '@/api/station'
 import dayjs from "dayjs";
 export default {
-	name: 'TableEdit',
-	props: {
-		options: {
-			type: Array,
-			default: []
-		},
-		stationList: {
-			type: Array,
-			default: []
-		},
-	},
-	data() {
-		return {
-			form: {
-				id: '',
-				code: '',
-				name: '',
-				description: '',
-<<<<<<< HEAD
-				powerProduction: '',
-				windTurbineManufactureId: '',
-				photo: '',
-				unit: '',
-				cutinWindSpeed: '',
-				ratedWindSpeed: '',
-				cutoutWindSpeed: '',
-				sweptArea: '',
-				equipmentCategory: '',
-=======
-				powerproduction: '',
-				windturbinemanufacturerid: '',
-				photo: '',
-				unit: '',
-				cutinwindspeed: '',
-				ratedwindspeed: '',
-				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: '请输入' }],
-				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: '请输入' }],
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
-			},
-			title: '',
-			dialogFormVisible: false,
-			idAdd: true,
-		}
-	},
-	created() { },
-	methods: {
-		showEdit(row) {
-			if (!row) {
-				this.title = '添加'
-				this.idAdd = true
-			} else {
-				this.title = '编辑'
-				this.idAdd = false
-				this.form = Object.assign({}, row)
-			}
-			this.dialogFormVisible = true
-		},
-		close() {
-			this.$refs['form'].resetFields()
-			this.form = this.$options.data().form
-			this.dialogFormVisible = false
-			this.$emit('fetch-data')
-		},
-		save() {
-			this.$refs['form'].validate(async (valid) => {
-				if (valid) {
-					api.addEquipmentmodel(this.form).then(res => {
-						if (res.data) {
-							this.$message({
-								type: 'success',
-								message: '添加成功!'
-							});
-							this.$emit('save-success');
-							this.dialogFormVisible = false
-						}
-					})
-				} else {
-					return false
-				}
-			})
-		},
-		handleChange() {
-		},
-		onBlur(val, param) {
-			if (typeof (this.form[param]) !== 'number') {
-				this.form[param] = val.replace(/[^0-9]/ig, "")
-			}
-		},
-	},
+  name: 'TableEdit',
+  props: {
+    options: {
+      type: Array,
+      default: []
+    },
+    stationList: {
+      type: Array,
+      default: []
+    },
+  },
+  data() {
+    return {
+      form: {
+        id: '',
+        code: '',
+        name: '',
+        description: '',
+        powerproduction: '',
+        windturbinemanufacturerid: '',
+        photo: '',
+        unit: '',
+        cutinwindspeed: '',
+        ratedwindspeed: '',
+        cutoutwindspeed: '',
+        sweptarea: '',
+        equipmentcategory: '',
+      },
+      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: '请输入' }],
+        powerproduction: [{ required: true, trigger: 'blur', message: '请输入' }],
+        windturbinemanufacturerid: [{ 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: '请输入' }],
+      },
+      title: '',
+      dialogFormVisible: false,
+      idAdd: true,
+    }
+  },
+  created() { },
+  methods: {
+    showEdit(row) {
+      if (!row) {
+        this.title = '添加'
+        this.idAdd = true
+      } else {
+        this.title = '编辑'
+        this.idAdd = false
+        this.form = Object.assign({}, row)
+      }
+      this.dialogFormVisible = true
+    },
+    close() {
+      this.$refs['form'].resetFields()
+      this.form = this.$options.data().form
+      this.dialogFormVisible = false
+      this.$emit('fetch-data')
+    },
+    save() {
+      this.$refs['form'].validate(async (valid) => {
+        if (valid) {
+          api.addEquipmentmodel(this.form).then(res => {
+            if (res.data) {
+              this.$message({
+                type: 'success',
+                message: '添加成功!'
+              });
+              this.$emit('save-success');
+              this.dialogFormVisible = false
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleChange() {
+    },
+    onBlur(val, param) {
+      if (typeof (this.form[param]) !== 'number') {
+        this.form[param] = val.replace(/[^0-9]/ig, "")
+      }
+    },
+  },
 }
 </script>
 <style lang="less" scoped>
 .inputs {
-	width: 200px;
+  width: 200px;
 }
 
 .lists {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
 }
-</style>
+</style>

src/views/stationConfiguration/equipmentmodel/index.vue

@@ -1,84 +1,66 @@
 <template>
-	<div class="table-container">
-		<vab-query-form>
-			<div class="title">
-				<div class="left">
-					<div class="left-item">
-						<div style="width: 70px;">名称：</div>
-						<el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
-					</div>
-					<el-button icon="el-icon-search" type="primary" native-type="submit" @click="fetchData">
-						查询
-					</el-button>
-				</div>
-				<div class="right">
-					<el-button icon="el-icon-plus" type="primary" @click="handleAdd">
-						添加
-					</el-button>
-					<el-button icon="el-icon-delete" type="danger" @click="handleDelete">
-						删除
-					</el-button>
-					<UploadExcel style="margin-left: 10px;" @getResult="getMyExcelData"></UploadExcel>
-					<ExportExcel :exportList="exportExcel" :useType="'export'" partsName="设备型号"></ExportExcel>
-					<ExportExcel :exportList="templateExcel" :useType="'template'" partsName="设备型号模板"></ExportExcel>
-				</div>
-			</div>
-			<el-table ref="tableSort" v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText"
-				:height="height" @selection-change="setSelectRows">
-				<el-table-column show-overflow-tooltip type="selection" width="40"></el-table-column>
-				<el-table-column show-overflow-tooltip label="id" prop="id" align="center" sortable></el-table-column>
-				<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>
+  <div class="table-container">
+    <vab-query-form>
+      <div class="title">
+        <div class="left">
+          <div class="left-item">
+            <div style="width: 70px;">名称：</div>
+            <el-input v-model="fuzzyQuery_name" placeholder="请输入" clearable />
+          </div>
+          <el-button icon="el-icon-search" type="primary" native-type="submit" @click="fetchData">
+            查询
+          </el-button>
+        </div>
+        <div class="right">
+          <el-button icon="el-icon-plus" type="primary" @click="handleAdd">
+            添加
+          </el-button>
+          <el-button icon="el-icon-delete" type="danger" @click="handleDelete">
+            删除
+          </el-button>
+          <UploadExcel style="margin-left: 10px;" @getResult="getMyExcelData"></UploadExcel>
+          <ExportExcel :exportList="exportExcel" :useType="'export'" partsName="设备型号"></ExportExcel>
+          <ExportExcel :exportList="templateExcel" :useType="'template'" partsName="设备型号模板"></ExportExcel>
+        </div>
+      </div>
+      <el-table ref="tableSort" v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText"
+        :height="height" @selection-change="setSelectRows">
+        <el-table-column show-overflow-tooltip type="selection" width="40"></el-table-column>
+        <el-table-column show-overflow-tooltip label="id" prop="id" align="center" sortable></el-table-column>
+        <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>
-				</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>
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">
-					<template #default="{ row }">
-						<el-button type="text" @click="handleEdit(row)">编辑</el-button>
-						<el-button type="text" @click="handleDelete(row)">删除</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination :background="background" :current-page="queryForm.pageNo" :layout="layout"
-				:page-size="queryForm.pageSize" :total="total" @current-change="handleCurrentChange"
-				@size-change="handleSizeChange"></el-pagination>
-			<table-edit ref="edit" :options="options" :stationList="stationList" @save-success="fetchData"></table-edit>
-		</vab-query-form>
-	</div>
+        <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>
+        </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>
+        <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>
+        <el-table-column show-overflow-tooltip label="操作" width="100px" fixed="right">
+          <template #default="{ row }">
+            <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+            <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :background="background" :current-page="queryForm.pageNo" :layout="layout"
+        :page-size="queryForm.pageSize" :total="total" @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"></el-pagination>
+      <table-edit ref="edit" :options="options" :stationList="stationList" @save-success="fetchData"></table-edit>
+    </vab-query-form>
+  </div>
 </template>
 <script>
 import UploadExcel from '@/components/UploadExcel/index'
@@ -86,204 +68,180 @@ import ExportExcel from '@/components/ExportExcel/index'
 import api from '@/api/station'
 import TableEdit from './components/TableEdit'
 export default {
-	components: {
-		UploadExcel,
-		ExportExcel,
-		TableEdit,
-	},
-	data() {
-		return {
-			fuzzyQuery_name: '',
-			listLoading: true,
-			list: [],
-			options: [],
-			exportExcel: [],
-			templateExcel: [],
-			elementLoadingText: '正在加载...',
-			selectRows: '',
-			layout: 'total, sizes, prev, pager, next, jumper',
-			total: 0,
-			background: true,
-			exportList: [],
-			queryForm: {
-				pageNo: 1,
-				pageSize: 20,
-			},
-			stationList: [],
-			selectValue: ''
-		};
-	},
-	computed: {
-		height() {
-			return this.$baseTableHeight() + 50
-		},
-	},
-	created() {
-		// this.getStation()
-		this.fetchData()
-	},
-	methods: {
-		getMyExcelData(val) {
-			val.forEach(item => {
-				api.addEquipmentmodel(item).then(res => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: '添加成功!'
-						});
-						this.fetchData()
-					}
-				})
-			})
-		},
-		getStation() {
-			api.windpowerstationList({
-				id: '',
-				name: '',
-				companyid: '',
-				pageNum: 1,
-				pageSize: 1000,
-			}).then(res => {
-				if (res.data) {
-					this.listLoading = false
-					this.stationList = res.data.records
-				}
-			})
-		},
-		fetchData() {
-			api.equipmentmodel({
-				name: this.fuzzyQuery_name,
-				pageNum: this.queryForm.pageNo,
-				pageSize: this.queryForm.pageSize,
-			}).then(res => {
-				if (res.data) {
-					this.listLoading = false
-					this.total = res.data.total
-					this.list = res.data.records
-					this.templateExcel = [
-						{
-							id: '',
-							code: '',
-							name: '',
-							description: '',
-<<<<<<< HEAD
-							powerProduction: '',
-							windTurbineManufactureId: '',
-							photo: '',
-							unit: '',
-							cutinWindSpeed: '',
-							ratedWindSpeed: '',
-							cutoutWindSpeed: '',
-							sweptArea: '',
-							equipmentCategory: '',
-=======
-							powerproduction: '',
-							windturbinemanufacturerid: '',
-							photo: '',
-							unit: '',
-							cutinwindspeed: '',
-							ratedwindspeed: '',
-							cutoutwindspeed: '',
-							sweptarea: '',
-							equipmentcategory: '',
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
-						}
-					]
-					// 导出
-					let exportExcel = []
-					res.data.records.forEach(item => {
-						exportExcel.push({
-							id: item.id,
-							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,
-							unit: item.unit,
-							cutinwindspeed: item.cutinwindspeed,
-							ratedwindspeed: item.ratedwindspeed,
-							cutoutwindspeed: item.cutoutwindspeed,
-							sweptarea: item.sweptarea,
-							equipmentcategory: item.equipmentcategory,
->>>>>>> 143692c9b11945a0b3169f618acc848858072d41
-						})
-					})
-					this.exportExcel = exportExcel
-				}
-			})
-		},
-		handleSizeChange(val) {
-			this.queryForm.pageSize = val
-			this.fetchData()
-		},
-		handleCurrentChange(val) {
-			this.queryForm.pageNo = val
-			this.fetchData()
-		},
-		handleAdd() {
-			this.$refs['edit'].showEdit()
-		},
-		handleEdit(row) {
-			this.$refs['edit'].showEdit(row)
-		},
-		handleDelete(row) {
-			if (row.id || this.selectRows.length > 0) {
-				this.$baseConfirm('你确定要删除吗', null, async () => {
-					let ids = ''
-					if (this.selectRows.length > 0) {
-						ids = this.selectRows.map((item) => item.id).join()
-					}
-					api.deleteEquipmentmodel({
-						id: row.id || ids
-					}).then(res => {
-						if (res.data) {
-							this.$baseMessage('删除成功', 'success')
-							this.fetchData()
-						}
-					})
-				})
-			} else {
-				this.$baseMessage('未选中任何行', 'error')
-				return false
-			}
-		},
-		setSelectRows(val) {
-			this.selectRows = val
-		},
-	},
+  components: {
+    UploadExcel,
+    ExportExcel,
+    TableEdit,
+  },
+  data() {
+    return {
+      fuzzyQuery_name: '',
+      listLoading: true,
+      list: [],
+      options: [],
+      exportExcel: [],
+      templateExcel: [],
+      elementLoadingText: '正在加载...',
+      selectRows: '',
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      background: true,
+      exportList: [],
+      queryForm: {
+        pageNo: 1,
+        pageSize: 20,
+      },
+      stationList: [],
+      selectValue: ''
+    };
+  },
+  computed: {
+    height() {
+      return this.$baseTableHeight() + 50
+    },
+  },
+  created() {
+    // this.getStation()
+    this.fetchData()
+  },
+  methods: {
+    getMyExcelData(val) {
+      val.forEach(item => {
+        api.addEquipmentmodel(item).then(res => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '添加成功!'
+            });
+            this.fetchData()
+          }
+        })
+      })
+    },
+    getStation() {
+      api.windpowerstationList({
+        id: '',
+        name: '',
+        companyid: '',
+        pageNum: 1,
+        pageSize: 1000,
+      }).then(res => {
+        if (res.data) {
+          this.listLoading = false
+          this.stationList = res.data.records
+        }
+      })
+    },
+    fetchData() {
+      api.equipmentmodel({
+        name: this.fuzzyQuery_name,
+        pageNum: this.queryForm.pageNo,
+        pageSize: this.queryForm.pageSize,
+      }).then(res => {
+        if (res.data) {
+          this.listLoading = false
+          this.total = res.data.total
+          this.list = res.data.records
+          this.templateExcel = [
+            {
+              id: '',
+              code: '',
+              name: '',
+              description: '',
+              powerproduction: '',
+              windturbinemanufacturerid: '',
+              photo: '',
+              unit: '',
+              cutinwindspeed: '',
+              ratedwindspeed: '',
+              cutoutwindspeed: '',
+              sweptarea: '',
+              equipmentcategory: '',
+            }
+          ]
+          // 导出
+          let exportExcel = []
+          res.data.records.forEach(item => {
+            exportExcel.push({
+              id: item.id,
+              code: item.code,
+              name: item.name,
+              description: item.description,
+              powerproduction: item.powerproduction,
+              windturbinemanufacturerid: item.windturbinemanufacturerid,
+              photo: item.photo,
+              unit: item.unit,
+              cutinwindspeed: item.cutinwindspeed,
+              ratedwindspeed: item.ratedwindspeed,
+              cutoutwindspeed: item.cutoutwindspeed,
+              sweptarea: item.sweptarea,
+              equipmentcategory: item.equipmentcategory,
+            })
+          })
+          this.exportExcel = exportExcel
+        }
+      })
+    },
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val
+      this.fetchData()
+    },
+    handleCurrentChange(val) {
+      this.queryForm.pageNo = val
+      this.fetchData()
+    },
+    handleAdd() {
+      this.$refs['edit'].showEdit()
+    },
+    handleEdit(row) {
+      this.$refs['edit'].showEdit(row)
+    },
+    handleDelete(row) {
+      if (row.id || this.selectRows.length > 0) {
+        this.$baseConfirm('你确定要删除吗', null, async () => {
+          let ids = ''
+          if (this.selectRows.length > 0) {
+            ids = this.selectRows.map((item) => item.id).join()
+          }
+          api.deleteEquipmentmodel({
+            id: row.id || ids
+          }).then(res => {
+            if (res.data) {
+              this.$baseMessage('删除成功', 'success')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$baseMessage('未选中任何行', 'error')
+        return false
+      }
+    },
+    setSelectRows(val) {
+      this.selectRows = val
+    },
+  },
 }
 </script>
 <style lang="less" scoped>
 .title {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	margin-bottom: 20px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
 }
 
 .left {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
 
-	.left-item {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		margin-right: 10px;
-	}
+  .left-item {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-right: 10px;
+  }
 }
 </style>