瀏覽代碼

fix:变电所接口联调

chenxinlei 2 年之前
父節點
當前提交
b45fae3ec4

+ 12 - 12
src/views/stationConfiguration/windsubstation/components/TableEdit.vue

@@ -5,8 +5,8 @@
 				<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 label="编码" prop="nemCode">
+					<el-input class="inputs" v-model.trim="form.nemCode" autocomplete="off"></el-input>
 				</el-form-item>
 			</div>
 			<div class="lists">
@@ -18,14 +18,14 @@
 				</el-form-item>
 			</div>
 			<div class="lists">
-				<el-form-item label="风场编号" prop="windpowerstationid">
-					<el-select v-model="form.windpowerstationid" placeholder="请选择" clearable>
+				<el-form-item label="风场编号" prop="windpowerstationId">
+					<el-select v-model="form.windpowerstationId" placeholder="请选择" clearable style="width: 200px;">
 						<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="ordernum">
-					<el-input class="inputs" v-model="form.ordernum" autocomplete="off"></el-input>
+				<el-form-item label="顺序" prop="orderNum">
+					<el-input class="inputs" v-model="form.orderNum" autocomplete="off"></el-input>
 				</el-form-item>
 			</div>
 		</el-form>
@@ -55,20 +55,20 @@ export default {
 		return {
 			form: {
 				id: '',
-				code: '',
+				nemCode: '',
 				name: '',
 				aname: '',
-				windpowerstationid: '',
-				ordernum: ''
+				windpowerstationId: '',
+				orderNum: ''
 
 			},
 			rules: {
 				id: [{ required: true, trigger: 'blur', message: '请输入' }],
-				code: [{ required: true, trigger: 'blur', message: '请输入' }],
+				nemCode: [{ required: true, trigger: 'blur', message: '请输入' }],
 				name: [{ required: true, trigger: 'blur', message: '请输入' }],
 				aname: [{ required: true, trigger: 'blur', message: '请输入' }],
-				windpowerstationid: [{ required: true, trigger: 'blur', message: '请输入' }],
-				ordernum: [{ required: true, trigger: 'blur', message: '请输入' }]
+				windpowerstationId: [{ required: true, trigger: 'blur', message: '请输入' }],
+				orderNum: [{ required: true, trigger: 'blur', message: '请输入' }]
 			},
 			title: '',
 			dialogFormVisible: false,

+ 11 - 4
src/views/stationConfiguration/windsubstation/index.vue

@@ -27,13 +27,13 @@
 				:element-loading-text="elementLoadingText" :height="height" @selection-change="setSelectRows">
 				<el-table-column show-overflow-tooltip type="selection" align="center" 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="nemCode" 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="aname" align="center" sortable>
 				</el-table-column>
-				<el-table-column show-overflow-tooltip label="风场编号" prop="windpowerstationid" align="center" sortable>
+				<el-table-column show-overflow-tooltip label="风场编号" prop="windpowerstationId" align="center" sortable>
 				</el-table-column>
-				<el-table-column show-overflow-tooltip label="顺序" prop="ordernum" align="center" sortable></el-table-column>
+				<el-table-column show-overflow-tooltip label="顺序" prop="orderNum" 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>
@@ -106,10 +106,17 @@ export default {
 			})
 		},
 		getStation() {
+      // id
+      // name
+      // companyId
+      // groupId
+      // pageNum
+      // pageSize
 			stationApi.windpowerstationList({
 				id: '',
 				name: '',
-				companyid: '',
+				companyId: '',
+				groupId: '',
 				pageNum: 1,
 				pageSize: 1000,
 			}).then(res => {