ln 2 anni fa
parent
commit
ffb6875fde
54 ha cambiato i file con 1050 aggiunte e 74 eliminazioni
  1. 2 2
      manage/index.html
  2. BIN
      manage/kb_icon.png
  3. 1 1
      manage/static/css/app.c66a46be.css
  4. 2 2
      manage/static/css/chunk-1fa9bf9e.6a604bc8.css
  5. 1 1
      manage/static/css/chunk-0e7276a4.97f549c4.css
  6. 1 1
      manage/static/css/chunk-18dda7de.f0703bf9.css
  7. 1 1
      manage/static/css/chunk-34cc96a6.44804637.css
  8. 1 1
      manage/static/css/chunk-4ac88b52.40b3f944.css
  9. 1 1
      manage/static/css/chunk-53f1eafc.6112a018.css
  10. 1 1
      manage/static/css/chunk-5529d741.1f831f23.css
  11. 1 1
      manage/static/css/chunk-5a3493ef.601fad95.css
  12. 1 1
      manage/static/css/chunk-5b685476.6edec273.css
  13. 1 1
      manage/static/css/chunk-6b208424.3f1439af.css
  14. 7 0
      manage/static/css/chunk-7bd40fc5.8693ffeb.css
  15. 1 1
      manage/static/css/chunk-7cbc41e5.8ba8f05b.css
  16. 0 7
      manage/static/css/chunk-a81e4b78.2457d9c0.css
  17. 1 1
      manage/static/css/chunk-c0c44a18.c40df83f.css
  18. 1 1
      manage/static/css/chunk-cbad8fa8.e5b84919.css
  19. 1 1
      manage/static/css/chunk-cfbf8292.12c21748.css
  20. 1 1
      manage/static/css/element-ui.0e3a750b.css
  21. 1 1
      manage/static/css/vab-layouts.12c46285.css
  22. 3 3
      manage/static/js/app.e76e5126.js
  23. 7 0
      manage/static/js/chunk-0e6424f6.60eb1d21.js
  24. 1 1
      manage/static/js/chunk-0e7276a4.870b8345.js
  25. 2 2
      manage/static/js/chunk-18dda7de.4adb079a.js
  26. 0 7
      manage/static/js/chunk-1fa9bf9e.75905254.js
  27. 2 2
      manage/static/js/chunk-34cc96a6.8dd6e52b.js
  28. 2 2
      manage/static/js/chunk-4ac88b52.41492cb7.js
  29. 0 7
      manage/static/js/chunk-53f1eafc.0e3bf569.js
  30. 7 0
      manage/static/js/chunk-53f1eafc.579b58d0.js
  31. 2 2
      manage/static/js/chunk-5529d741.223baefb.js
  32. 1 1
      manage/static/js/chunk-5a3493ef.c788e996.js
  33. 1 1
      manage/static/js/chunk-5b685476.b75a5e67.js
  34. 1 1
      manage/static/js/chunk-6b208424.c7ef6191.js
  35. 7 0
      manage/static/js/chunk-7bd40fc5.6a796662.js
  36. 1 1
      manage/static/js/chunk-7cbc41e5.8bdb006c.js
  37. 0 7
      manage/static/js/chunk-a81e4b78.e158bd78.js
  38. 1 1
      manage/static/js/chunk-c0c44a18.e564b99d.js
  39. 2 2
      manage/static/js/chunk-cbad8fa8.6316797f.js
  40. 2 2
      manage/static/js/chunk-cfbf8292.f2c1a6cc.js
  41. 1 1
      manage/static/js/element-ui.cfb27695.js
  42. 1 1
      manage/static/js/vab-chunk-024ddcda.9ff5c737.js
  43. 1 1
      manage/static/js/vab-chunk-47eec42d.2ad3f2d5.js
  44. 1 1
      manage/static/js/vab-chunk-d939e436.afa00d83.js
  45. 1 1
      manage/static/js/vab-layouts.7b155346.js
  46. 26 0
      src/api/realtimeDatabaseConfiguration.js
  47. 29 0
      src/api/station.js
  48. 34 0
      src/router/index.js
  49. 142 0
      src/views/meterpoint/components/TableEdit.vue
  50. 223 0
      src/views/meterpoint/index.vue
  51. 178 0
      src/views/realDatabaseConfig/components/TableEdit.vue
  52. 248 0
      src/views/realDatabaseConfig/index.vue
  53. 54 0
      src/views/stationConfiguration/equipmentmodel/components/TableEdit.vue
  54. 42 0
      src/views/stationConfiguration/equipmentmodel/index.vue

File diff suppressed because it is too large
+ 2 - 2
manage/index.html


BIN
manage/kb_icon.png


File diff suppressed because it is too large
+ 1 - 1
manage/static/css/app.c66a46be.css


+ 2 - 2
manage/static/css/chunk-1fa9bf9e.6a604bc8.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
- */.inputs[data-v-237db4f4]{width:200px}.cascaders[data-v-7aa9cfb2]{width:300px}
+ *  time: 2022-10-20 20:43:25
+ */.inputs[data-v-5234f0ff]{width:200px}.cascaders[data-v-718610fe]{width:300px}

File diff suppressed because it is too large
+ 1 - 1
manage/static/css/chunk-0e7276a4.97f549c4.css


+ 1 - 1
manage/static/css/chunk-18dda7de.f0703bf9.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.input-file{display:none}.inputs[data-v-04e79e68]{width:200px}.title[data-v-18d8f6fb]{justify-content:space-between;margin-bottom:20px}.left .left-item[data-v-18d8f6fb],.left[data-v-18d8f6fb],.title[data-v-18d8f6fb]{display:flex;flex-direction:row;align-items:center}.left .left-item[data-v-18d8f6fb]{margin-right:10px}

+ 1 - 1
manage/static/css/chunk-34cc96a6.44804637.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.inputs[data-v-15869e09]{width:200px}.title[data-v-002f0084]{justify-content:space-between}.left .left-item[data-v-002f0084],.left[data-v-002f0084],.title[data-v-002f0084]{display:flex;flex-direction:row;align-items:center}.left .left-item[data-v-002f0084]{margin-right:10px}.cascaders[data-v-002f0084]{width:300px}

+ 1 - 1
manage/static/css/chunk-4ac88b52.40b3f944.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.input-file{display:none}.inputs[data-v-af6b4c98]{width:200px}.lists[data-v-af6b4c98],.title[data-v-36ae840d]{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.title[data-v-36ae840d]{margin-bottom:20px}.left .left-item[data-v-36ae840d],.left[data-v-36ae840d]{display:flex;flex-direction:row;align-items:center}.left .left-item[data-v-36ae840d]{margin-right:10px}

+ 1 - 1
manage/static/css/chunk-53f1eafc.6112a018.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.input-file{display:none}.inputs[data-v-713ca668]{width:200px}.lists[data-v-713ca668],.title[data-v-26051ab5]{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.title[data-v-26051ab5]{margin-bottom:20px}.left .left-item[data-v-26051ab5],.left[data-v-26051ab5]{display:flex;flex-direction:row;align-items:center}.left .left-item[data-v-26051ab5]{margin-right:10px}

+ 1 - 1
manage/static/css/chunk-5529d741.1f831f23.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.input-file{display:none}.inputs[data-v-34841345]{width:200px}.lists[data-v-34841345],.title[data-v-0c763eed]{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.title[data-v-0c763eed]{margin-bottom:20px}.left .left-item[data-v-0c763eed],.left[data-v-0c763eed]{display:flex;flex-direction:row;align-items:center}.left .left-item[data-v-0c763eed]{margin-right:10px}

File diff suppressed because it is too large
+ 1 - 1
manage/static/css/chunk-5a3493ef.601fad95.css


File diff suppressed because it is too large
+ 1 - 1
manage/static/css/chunk-5b685476.6edec273.css


File diff suppressed because it is too large
+ 1 - 1
manage/static/css/chunk-6b208424.3f1439af.css


File diff suppressed because it is too large
+ 7 - 0
manage/static/css/chunk-7bd40fc5.8693ffeb.css


File diff suppressed because it is too large
+ 1 - 1
manage/static/css/chunk-7cbc41e5.8ba8f05b.css


File diff suppressed because it is too large
+ 0 - 7
manage/static/css/chunk-a81e4b78.2457d9c0.css


+ 1 - 1
manage/static/css/chunk-c0c44a18.c40df83f.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.inputs[data-v-da767c7a]{width:200px}a[data-v-e5534eb0]{float:right}.inputs[data-v-70320506]{width:200px}a[data-v-88bd6df4]{float:right}.inputs[data-v-3ba6a510]{width:200px}a[data-v-7a371e0c]{float:right}

+ 1 - 1
manage/static/css/chunk-cbad8fa8.e5b84919.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.input-file{display:none}.inputs[data-v-3567b4aa]{width:200px}

+ 1 - 1
manage/static/css/chunk-cfbf8292.12c21748.css

@@ -2,5 +2,5 @@
  *  build: vue-admin-better 
  *  vue-admin-beautiful.com 
  *  https://gitee.com/chu1204505056/vue-admin-better 
- *  time: 2022-10-19 09:38:35
+ *  time: 2022-10-20 20:43:25
  */.input-file{display:none}.inputs[data-v-5ed22276]{width:200px}.lists[data-v-5ed22276],.title[data-v-11f44cf3]{display:flex;flex-direction:row;align-items:center;justify-content:space-between}.title[data-v-11f44cf3]{margin-bottom:20px}.left .left-item[data-v-11f44cf3],.left[data-v-11f44cf3]{display:flex;flex-direction:row;align-items:center}.left .left-item[data-v-11f44cf3]{margin-right:10px}

File diff suppressed because it is too large
+ 1 - 1
manage/static/css/element-ui.0e3a750b.css


File diff suppressed because it is too large
+ 1 - 1
manage/static/css/vab-layouts.12c46285.css


File diff suppressed because it is too large
+ 3 - 3
manage/static/js/app.e76e5126.js


File diff suppressed because it is too large
+ 7 - 0
manage/static/js/chunk-0e6424f6.60eb1d21.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/chunk-0e7276a4.870b8345.js


File diff suppressed because it is too large
+ 2 - 2
manage/static/js/chunk-18dda7de.4adb079a.js


File diff suppressed because it is too large
+ 0 - 7
manage/static/js/chunk-1fa9bf9e.75905254.js


File diff suppressed because it is too large
+ 2 - 2
manage/static/js/chunk-34cc96a6.8dd6e52b.js


File diff suppressed because it is too large
+ 2 - 2
manage/static/js/chunk-4ac88b52.41492cb7.js


File diff suppressed because it is too large
+ 0 - 7
manage/static/js/chunk-53f1eafc.0e3bf569.js


File diff suppressed because it is too large
+ 7 - 0
manage/static/js/chunk-53f1eafc.579b58d0.js


File diff suppressed because it is too large
+ 2 - 2
manage/static/js/chunk-5529d741.223baefb.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/chunk-5a3493ef.c788e996.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/chunk-5b685476.b75a5e67.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/chunk-6b208424.c7ef6191.js


File diff suppressed because it is too large
+ 7 - 0
manage/static/js/chunk-7bd40fc5.6a796662.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/chunk-7cbc41e5.8bdb006c.js


File diff suppressed because it is too large
+ 0 - 7
manage/static/js/chunk-a81e4b78.e158bd78.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/chunk-c0c44a18.e564b99d.js


File diff suppressed because it is too large
+ 2 - 2
manage/static/js/chunk-cbad8fa8.6316797f.js


File diff suppressed because it is too large
+ 2 - 2
manage/static/js/chunk-cfbf8292.f2c1a6cc.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/element-ui.cfb27695.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/vab-chunk-024ddcda.9ff5c737.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/vab-chunk-47eec42d.2ad3f2d5.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/vab-chunk-d939e436.afa00d83.js


File diff suppressed because it is too large
+ 1 - 1
manage/static/js/vab-layouts.7b155346.js


+ 26 - 0
src/api/realtimeDatabaseConfiguration.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+const database =(data)=>{
+  return request({
+      url:`/realtimeDatabaseConfiguration/listByPage?name=${encodeURIComponent(data.name)}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+      method:"get"
+  })
+}
+const addDatabase =(pairs)=>{
+  return request({
+      url:`/realtimeDatabaseConfiguration/save`,
+      method:"post",
+      data: pairs
+  })
+}
+const deleteDatabase =(data)=>{
+  return request({
+      url:`/realtimeDatabaseConfiguration/remove-modelpower/${data.id}`,
+      method:"delete",
+  })
+}
+export default {
+	database,
+	addDatabase,
+	deleteDatabase
+}

+ 29 - 0
src/api/station.js

@@ -142,6 +142,28 @@ const deleteEquipmentmodel =(data)=>{
       method:"delete",
   })
 }
+<<<<<<< HEAD
+=======
+const meterpoint =(data)=>{
+  return request({
+      url:`/meterpoint/listByPage?name=${encodeURIComponent(data.name)}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+      method:"get"
+  })
+}
+const addMeterpoint =(pairs)=>{
+  return request({
+      url:`/meterpoint/save`,
+      method:"post",
+      data: pairs
+  })
+}
+const deleteMeterpoint =(data)=>{
+  return request({
+      url:`/meterpoint/remove-meterpoint/${data.id}`,
+      method:"delete",
+  })
+}
+>>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 export default {
   companys,
   addCompanys,
@@ -164,5 +186,12 @@ export default {
   newtreeTreels,
 	equipmentmodel,
 	addEquipmentmodel,
+<<<<<<< HEAD
 	deleteEquipmentmodel
+=======
+	deleteEquipmentmodel,
+	meterpoint,
+	addMeterpoint,
+	deleteMeterpoint
+>>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 };

+ 34 - 0
src/router/index.js

@@ -141,6 +141,40 @@ export const asyncRoutes = [
       },
     ],
   },
+	{
+    path: "/meterpoint",
+    component: Layout,
+    redirect: "noRedirect",
+    children: [
+      {
+        path: "meterpoint",
+        name: "meterpoint",
+        component: () => import("@/views/meterpoint/index"),
+        meta: {
+          title: "电计量配置",
+          icon: "allergies",
+          permissions: ["admin"],
+        },
+      },
+    ],
+  },
+	{
+    path: "/realDatabaseConfig",
+    component: Layout,
+    redirect: "noRedirect",
+    children: [
+      {
+        path: "realDatabaseConfig",
+        name: "realDatabaseConfig",
+        component: () => import("@/views/realDatabaseConfig/index"),
+        meta: {
+          title: "实时数据库配置",
+          icon: "allergies",
+          permissions: ["admin"],
+        },
+      },
+    ],
+  },
 
   // {
   //   path: "/square",

+ 142 - 0
src/views/meterpoint/components/TableEdit.vue

@@ -0,0 +1,142 @@
+<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">
+				<el-form-item label="风场编号" prop="windpowerstationid">
+					<el-select v-model="form.windpowerstationid" placeholder="请选择" clearable>
+						<el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="工程编号" prop="projectid">
+					<el-input class="inputs" v-model.trim="form.projectid" autocomplete="off"></el-input>
+				</el-form-item>
+			</div>
+			<div class="lists">
+				<el-form-item label="线路编号" prop="lineid">
+					<el-input class="inputs" v-model.trim="form.lineid" 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: '',
+				windpowerstationid: '',
+				projectId: '',
+				lineId: ''
+			},
+			rules: {
+				id: [{ required: true, trigger: 'blur', message: '请输入' }],
+				name: [{ required: true, trigger: 'blur', message: '请输入' }],
+				code: [{ required: true, trigger: 'blur', message: '请输入' }],
+				description: [{ required: true, trigger: 'blur', message: '请输入' }],
+				windpowerstationid: [{ required: true, trigger: 'blur', message: '请输入' }],
+				projectid: [{ required: true, trigger: 'blur', message: '请输入' }],
+				lineid: [{ 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.addMeterpoint(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;
+}
+
+.lists {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>

+ 223 - 0
src/views/meterpoint/index.vue

@@ -0,0 +1,223 @@
+<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>
+				<el-table-column show-overflow-tooltip label="风场编号" prop="windpowerstationid" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="工程编号" prop="projectid" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="线路编号" prop="lineid" 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'
+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.addMeterpoint(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.meterpoint({
+				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: '',
+							windpowerstationid: '',
+							projectId: '',
+							lineId: ''
+						}
+					]
+					// 导出
+					let exportExcel = []
+					res.data.records.forEach(item => {
+						exportExcel.push({
+							id: item.id,
+							code: item.code,
+							name: item.name,
+							description: item.description,
+							windpowerstationid: item.windpowerstationid,
+							projectid: item.projectid,
+							lineid: item.lineid,
+						})
+					})
+					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.deleteMeterpoint({
+						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;
+}
+
+.left {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+
+	.left-item {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-right: 10px;
+	}
+}
+</style>

+ 178 - 0
src/views/realDatabaseConfig/components/TableEdit.vue

@@ -0,0 +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="surname">
+					<el-input class="inputs" v-model.trim="form.surname" autocomplete="off"></el-input>
+				</el-form-item>
+			</div>
+			<div class="lists">
+				<el-form-item label="服务名历史" prop="namehist">
+					<el-input class="inputs" v-model="form.namehist" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="服务名配置" prop="namecmcfg">
+					<el-input class="inputs" v-model="form.namecmcfg" autocomplete="off"></el-input>
+				</el-form-item>
+			</div>
+			<div class="lists">
+				<el-form-item label="服务名实时" prop="namerts">
+					<el-input class="inputs" v-model="form.namerts" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="点标签" prop="label">
+					<el-input class="inputs" v-model="form.label" autocomplete="off"></el-input>
+				</el-form-item>
+			</div>
+			<div class="lists">
+				<el-form-item label="风场编号" prop="windpowerstationid">
+					<el-select v-model="form.windpowerstationid" placeholder="请选择" clearable>
+						<el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="端口历史" prop="porthist">
+					<el-input class="inputs" v-model.trim="form.porthist" autocomplete="off"></el-input>
+				</el-form-item>
+			</div>
+			<div class="lists">
+				<el-form-item label="端口配置" prop="portcmcfg">
+					<el-input class="inputs" v-model.trim="form.portcmcfg" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="端口实时" prop="portrts">
+					<el-input class="inputs" v-model.trim="form.portrts" autocomplete="off"></el-input>
+				</el-form-item>
+			</div>
+			<div class="lists">
+				<el-form-item label="地址历史" prop="iphist">
+					<el-input class="inputs" v-model.trim="form.iphist" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="地址配置" prop="ipcmcfg">
+					<el-input class="inputs" v-model.trim="form.ipcmcfg" autocomplete="off"></el-input>
+				</el-form-item>
+			</div>
+			<div class="lists">
+				<el-form-item label="地址实时" prop="iprts">
+					<el-input class="inputs" v-model.trim="form.iprts" 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/realtimeDatabaseConfiguration'
+import dayjs from "dayjs";
+export default {
+	name: 'TableEdit',
+	props: {
+		options: {
+			type: Array,
+			default: []
+		},
+		stationList: {
+			type: Array,
+			default: []
+		},
+	},
+	data() {
+		return {
+			form: {
+				id: '',
+				surname: '',
+				namehist: '',
+				namecmcfg: '',
+				namerts: '',
+				label: '',
+				windpowerstationid: '',
+				porthist: '',
+				portcmcfg: '',
+				portrts: '',
+				iphist: '',
+				ipcmcfg: '',
+				iprts: '',
+			},
+			rules: {
+				id: [{ required: true, trigger: 'blur', message: '请输入' }],
+				surname: [{ required: true, trigger: 'blur', message: '请输入' }],
+				namehist: [{ required: true, trigger: 'blur', message: '请输入' }],
+				namecmcfg: [{ required: true, trigger: 'blur', message: '请输入' }],
+				namerts: [{ required: true, trigger: 'blur', message: '请输入' }],
+				label: [{ required: true, trigger: 'blur', message: '请输入' }],
+				windpowerstationid: [{ required: true, trigger: 'blur', message: '请输入' }],
+				porthist: [{ required: true, trigger: 'blur', message: '请输入' }],
+				portcmcfg: [{ required: true, trigger: 'blur', message: '请输入' }],
+				portrts: [{ required: true, trigger: 'blur', message: '请输入' }],
+				iphist: [{ required: true, trigger: 'blur', message: '请输入' }],
+				ipcmcfg: [{ required: true, trigger: 'blur', message: '请输入' }],
+				iprts: [{ 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.addDatabase(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;
+}
+
+.lists {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>

+ 248 - 0
src/views/realDatabaseConfig/index.vue

@@ -0,0 +1,248 @@
+<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="surname" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="服务名历史" prop="namehist" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="服务名配置" prop="namecmcfg" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="服务名实时" prop="namerts" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="点标签" prop="label" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="风场编号" prop="windpowerstationid" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="端口历史" prop="porthist" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="端口配置" prop="portcmcfg" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="端口实时" prop="portrts" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="地址历史" prop="iphist" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="地址配置" prop="ipcmcfg" align="center" sortable>
+				</el-table-column>
+				<el-table-column show-overflow-tooltip label="地址实时" prop="iprts" 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'
+import ExportExcel from '@/components/ExportExcel/index'
+import api from '@/api/realtimeDatabaseConfiguration'
+import stationApi 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.addDatabase(item).then(res => {
+					if (res.code == 200) {
+						this.$message({
+							type: 'success',
+							message: '添加成功!'
+						});
+						this.fetchData()
+					}
+				})
+			})
+		},
+		getStation() {
+			stationApi.windpowerstationList({
+				id: '',
+				name: '',
+				companyid: '',
+				pageNum: 1,
+				pageSize: 1000,
+			}).then(res => {
+				if (res.data) {
+					this.listLoading = false
+					this.stationList = res.data.records
+				}
+			})
+		},
+		fetchData() {
+			api.database({
+				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: '',
+							surname: '',
+							namehist: '',
+							namecmcfg: '',
+							namerts: '',
+							label: '',
+							windpowerstationid: '',
+							porthist: '',
+							portcmcfg: '',
+							portrts: '',
+							iphist: '',
+							ipcmcfg: '',
+							iprts: '',
+						}
+					]
+					// 导出
+					let exportExcel = []
+					res.data.records.forEach(item => {
+						exportExcel.push({
+							id: item.id,
+							surname: item.surname,
+							namehist: item.namehist,
+							namecmcfg: item.namecmcfg,
+							namerts: item.namerts,
+							label: item.label,
+							windpowerstationid: item.windpowerstationid,
+							porthist: item.porthist,
+							portcmcfg: item.portcmcfg,
+							portrts: item.portrts,
+							iphist: item.iphist,
+							ipcmcfg: item.ipcmcfg,
+							iprts: item.iprts,
+						})
+					})
+					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.deleteDatabase({
+						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;
+}
+
+.left {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+
+	.left-item {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-right: 10px;
+	}
+}
+</style>

+ 54 - 0
src/views/stationConfiguration/equipmentmodel/components/TableEdit.vue

@@ -18,11 +18,19 @@
 				</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">
@@ -35,6 +43,7 @@
 				</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>
@@ -54,6 +63,27 @@
 			<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>
@@ -87,6 +117,7 @@ export default {
 				code: '',
 				name: '',
 				description: '',
+<<<<<<< HEAD
 				powerProduction: '',
 				windTurbineManufactureId: '',
 				photo: '',
@@ -96,12 +127,24 @@ export default {
 				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: '请输入' }],
@@ -111,6 +154,17 @@ export default {
 				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,

+ 42 - 0
src/views/stationConfiguration/equipmentmodel/index.vue

@@ -31,13 +31,20 @@
 				<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>
@@ -47,6 +54,17 @@
 				<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 }">
@@ -148,6 +166,7 @@ export default {
 							code: '',
 							name: '',
 							description: '',
+<<<<<<< HEAD
 							powerProduction: '',
 							windTurbineManufactureId: '',
 							photo: '',
@@ -157,6 +176,17 @@ export default {
 							cutoutWindSpeed: '',
 							sweptArea: '',
 							equipmentCategory: '',
+=======
+							powerproduction: '',
+							windturbinemanufacturerid: '',
+							photo: '',
+							unit: '',
+							cutinwindspeed: '',
+							ratedwindspeed: '',
+							cutoutwindspeed: '',
+							sweptarea: '',
+							equipmentcategory: '',
+>>>>>>> 143692c9b11945a0b3169f618acc848858072d41
 						}
 					]
 					// 导出
@@ -167,6 +197,7 @@ export default {
 							code: item.code,
 							name: item.name,
 							description: item.description,
+<<<<<<< HEAD
 							powerProduction: item.powerProduction,
 							windTurbineManufactureId: item.windTurbineManufactureId,
 							photo: item.photo,
@@ -176,6 +207,17 @@ export default {
 							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