chenxinlei 2 年 前
コミット
5942e5fc2c

+ 2 - 0
src/views/stationConfiguration/projectstudy/components/TableEdit.vue

@@ -84,6 +84,8 @@ export default {
 				if (valid) {
 					this.form.year = new Date(this.form.dateValues).getFullYear()
 					this.form.month = new Date(this.form.dateValues).getMonth() + 1
+					this.form.cascaderSel = this.form.cascaderSel[this.form.cascaderSel.length-1]
+					
 					if (!this.form.projectid) {
 						this.form.projectid = this.form.cascaderSel[2]
 					}

+ 17 - 32
src/views/stationConfiguration/projectstudy/index.vue

@@ -3,11 +3,18 @@
 		<vab-query-form>
 			<vab-query-form-left-panel>
 				<el-form ref="form" :model="queryForm" :inline="true" @submit.native.prevent>
-					<el-form-item>
-						<el-select v-model="queryForm.stationId" placeholder="请选择" clearable>
+					<el-form-item label="风场编号">
+						<!-- <el-select v-model="queryForm.stationId" placeholder="请选择" clearable>
 							<el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
 							</el-option>
-						</el-select>
+						</el-select> -->
+						<el-cascader 
+							placeholder="请选择"
+							v-model="queryForm.windpower" 
+							:options="options" 
+							style="width: 200px" 
+							:props="{ checkStrictly: true, label: 'name', value: 'id' , children:'children'}"
+							clearable />
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="el-icon-search" type="primary" native-type="submit" @click="handleQuery">
@@ -86,7 +93,7 @@ export default {
 			selectRows: '',
 			elementLoadingText: '正在加载...',
 			queryForm: {
-				stationId: '',
+				windpower: "",
 				pageNo: 1,
 				pageSize: 20,
 				title: '',
@@ -100,23 +107,16 @@ export default {
 		},
 	},
 	created() {
-		this.getStation()
 		this.fetchData()
+		this.getTree()
 	},
 	beforeDestroy() { },
 	mounted() { },
 	methods: {
-		getStation() {
-			stationApi.windpowerstationList({
-				id: '',
-				name: '',
-				companyid: '',
-				pageNum: 1,
-				pageSize: 10000,
-			}).then(res => {
+		getTree() {
+			stationApi.newtreeTreels({tag: 2}).then(res => {
 				if (res.data) {
-					this.queryForm.stationId = ''
-					this.stationList = res.data.records
+				this.options = res.data
 				}
 			})
 		},
@@ -177,12 +177,13 @@ export default {
 		},
 		handleQuery() {
 			this.queryForm.pageNo = 1
+			this.queryForm.windpower = this.queryForm.windpower[this.queryForm.windpower.length - 1]
 			this.fetchData()
 		},
 		async fetchData() {
 			this.listLoading = true
 			api.projectstudy({
-				windpower: this.queryForm.stationId,
+				windpower: this.queryForm.windpower || "",
 				pageNum: this.queryForm.pageNo,
 				pageSize: this.queryForm.pageSize,
 			}).then(res => {
@@ -208,23 +209,7 @@ export default {
 				/* 可以写回调; */
 			})
 		},
-		testConfirm() {
-			this.$baseConfirm(
-				'你确定要执行该操作?',
-				null,
-				() => {
-					/* 可以写回调; */
-				},
-				() => {
-					/* 可以写回调; */
-				}
-			)
-		},
-		testNotify() {
-			this.$baseNotify('测试消息提示', 'test', 'success', 'bottom-right')
-		},
 		getSummaries(param) {
-			console.log(11111);
 			const { columns, data } = param;
 			const sums = [];
 			columns.forEach((column, index) => {