2022-10-25 fix

1. 修复调整可研电量页面逻辑 及 接口参数

src/api/realtimeDatabaseConfiguration.js

@@ -83,26 +83,6 @@ const deleteWindsubstation =(data)=>{
   })
 }
 
-// 可研电量
-const projectstudy =(data)=>{
-  return request({
-      url:`/projectstudy/listByPage?name=${encodeURIComponent(data.name)}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
-      method:"get"
-  })
-}
-const addProjectstudy =(pairs)=>{
-  return request({
-      url:`/projectstudy/save`,
-      method:"post",
-      data: pairs
-  })
-}
-const deleteProjectstudy =(data)=>{
-  return request({
-      url:`/projectstudy/remove-study/${data.id}`,
-      method:"delete",
-  })
-}
 export default {
 	database,
 	addDatabase,
@@ -116,7 +96,4 @@ export default {
 	deleteManufacturer,
 	deleteModelpower,
 	deleteWindsubstation,
-	addProjectstudy,
-	projectstudy,
-	deleteProjectstudy
 }

src/api/table.js

@@ -45,6 +45,27 @@ const removeIndicators =(data)=>{
       method:"delete",
   })
 }
+
+// 可研电量
+const projectstudy =(data)=>{
+  return request({
+      url:`/projectstudy/List?name=${encodeURIComponent(data.name)}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+      method:"get"
+  })
+}
+const addProjectstudy =(pairs)=>{
+  return request({
+      url:`/projectstudy/add`,
+      method:"post",
+      data: pairs
+  })
+}
+const deleteProjectstudy =(data)=>{
+  return request({
+      url:`/projectstudy/remove-study/${data.id}`,
+      method:"delete",
+  })
+}
 export default {
   projectplan,
   addProjectplan,
@@ -53,4 +74,7 @@ export default {
   indicators,
   addIndicators,
   removeIndicators,
+	addProjectstudy,
+	projectstudy,
+	deleteProjectstudy
 };

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

@@ -1,46 +1,37 @@
 <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="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="generatingcapacity">
-					<el-input class="inputs" v-model="form.generatingcapacity" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="计划停运小时" prop="outagehours">
-					<el-input class="inputs" v-model="form.outagehours" autocomplete="off"></el-input>
-				</el-form-item>
-			</div>
-			<div class="lists">
-				<el-form-item label="年" prop="year">
-					<el-input class="inputs" v-model="form.year" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="月" prop="month">
-					<el-input class="inputs" v-model="form.month" autocomplete="off"></el-input>
-				</el-form-item>
-			</div>
-			<div class="lists">
-				<el-form-item label="场站编号冗余" prop="windpowerid">
-					<el-input class="inputs" v-model="form.windpowerid" autocomplete="off"></el-input>
-				</el-form-item>
-			</div>
+			<el-form-item label="场站" prop="cascaderSel" v-if="idAdd">
+				<el-cascader v-model="form.cascaderSel" :options="options"
+					:props="{ checkStrictly: true, label: 'name', value: 'id' }" clearable>
+				</el-cascader>
+			</el-form-item>
+			<el-form-item label="场站" prop="generatingcapacity" v-if="!idAdd">
+				<el-input class="inputs" v-model="form.windpower" disabled></el-input>
+			</el-form-item>
+			<el-form-item label="期次" prop="generatingcapacity" v-if="!idAdd">
+				<el-input class="inputs" v-model="form.projectid" disabled></el-input>
+			</el-form-item>
+			<el-form-item label="计划发电量" prop="generatingcapacity">
+				<el-input class="inputs" v-model="form.generatingcapacity"></el-input>
+			</el-form-item>
+			<el-form-item label="计划停运小时" prop="outagehours">
+				<el-input class="inputs" v-model="form.outagehours"></el-input>
+			</el-form-item>
+			<el-form-item label="请选择日期" prop="dateValues">
+				<el-date-picker v-model="form.dateValues" type="month" placeholder="选择月" :disabled="!idAdd?true:false">
+				</el-date-picker>
+			</el-form-item>
 		</el-form>
 		<div slot="footer" class="dialog-footer">
 			<el-button @click="close">取 消</el-button>
-			<el-button type="primary" @click="save">确 定</el-button>
+			<el-button type="primary" @click="handleSave()">确 定</el-button>
 		</div>
 	</el-dialog>
 </template>
 
 <script>
-import api from '@/api/realtimeDatabaseConfiguration'
-import dayjs from "dayjs";
+import api from '@/api/table'
 export default {
 	name: 'TableEdit',
 	props: {
@@ -48,31 +39,20 @@ export default {
 			type: Array,
 			default: []
 		},
-		stationList: {
-			type: Array,
-			default: []
-		},
 	},
 	data() {
 		return {
 			form: {
-				id: '',
-				projectid: '',
 				generatingcapacity: '',
 				outagehours: '',
-				year: '',
-				month: '',
-				windpowerid: ''
-
+				cascaderSel: [],
+				dateValues: '',
 			},
 			rules: {
-				id: [{ required: true, trigger: 'blur', message: '请输入' }],
-				projectid: [{ required: true, trigger: 'blur', message: '请输入' }],
-				generatingcapacity: [{ required: true, trigger: 'blur', message: '请输入' }],
-				outagehours: [{ required: true, trigger: 'blur', message: '请输入' }],
-				year: [{ required: true, trigger: 'blur', message: '请输入' }],
-				month: [{ required: true, trigger: 'blur', message: '请输入' }],
-				windpowerid: [{ required: true, trigger: 'blur', message: '请输入' }]
+				generatingcapacity: [{ required: true, trigger: 'blur', message: '请输入发电量' }],
+				outagehours: [{ required: true, trigger: 'blur', message: '请输入停运小时' }],
+				cascaderSel: [{ required: true, trigger: 'blur', message: '请选择场站' }],
+				dateValues: [{ required: true, trigger: 'blur', message: '请选择日期' }],
 			},
 			title: '',
 			dialogFormVisible: false,
@@ -89,6 +69,7 @@ export default {
 				this.title = '编辑'
 				this.idAdd = false
 				this.form = Object.assign({}, row)
+				this.form.dateValues = this.form.year && this.form.month ? new Date(`${this.form.year}-${this.form.month}-01`).getTime() : ''
 			}
 			this.dialogFormVisible = true
 		},
@@ -98,16 +79,25 @@ export default {
 			this.dialogFormVisible = false
 			this.$emit('fetch-data')
 		},
-		save() {
+		handleSave() {
 			this.$refs['form'].validate(async (valid) => {
 				if (valid) {
+					this.form.year = new Date(this.form.dateValues).getFullYear()
+					this.form.month = new Date(this.form.dateValues).getMonth() + 1
+					if (!this.form.projectid) {
+						this.form.projectid = this.form.cascaderSel[2]
+					}
+					if (!this.form.windpower) {
+						this.form.windpower = this.form.cascaderSel[1]
+					}
+
 					api.addProjectstudy(this.form).then(res => {
-						if (res.data) {
+						if (res.code == 200) {
 							this.$message({
 								type: 'success',
 								message: '添加成功!'
 							});
-							this.$emit('save-success');
+							this.$emit('handleSuccess');
 							this.dialogFormVisible = false
 						}
 					})
@@ -116,13 +106,6 @@ export default {
 				}
 			})
 		},
-		handleChange() {
-		},
-		onBlur(val, param) {
-			if (typeof (this.form[param]) !== 'number') {
-				this.form[param] = val.replace(/[^0-9]/ig, "")
-			}
-		},
 	},
 }
 </script>
@@ -130,11 +113,4 @@ export default {
 .inputs {
 	width: 200px;
 }
-
-.lists {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-}
 </style>

src/views/stationConfiguration/projectstudy/index.vue

@@ -1,90 +1,94 @@
 <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="projectid" align="center" sortable></el-table-column>
-				<el-table-column show-overflow-tooltip label="计划发电量" prop="generatingcapacity" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="计划停运小时" prop="outagehours" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="年" prop="year" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="月" prop="month" align="center" sortable>
-				</el-table-column>
-				<el-table-column show-overflow-tooltip label="场站编号冗余" prop="windpowerid" 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-left-panel>
+				<el-form ref="form" :model="queryForm" :inline="true" @submit.native.prevent>
+					<el-form-item>
+						<el-cascader class="cascaders" v-model="cascaderSel" :options="options"
+							:props="{ checkStrictly: true, label: 'name', value: 'id' }" clearable>
+						</el-cascader>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="el-icon-search" type="primary" native-type="submit" @click="handleQuery">
+							查询
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</vab-query-form-left-panel>
+			<vab-query-form-right-panel>
+				<el-button icon="el-icon-plus" type="primary" @click="handleAdd">
+					添加
+				</el-button>
+				<el-button icon="el-icon-delete" type="danger" @click="handleDelete">
+					删除
+				</el-button>
+			</vab-query-form-right-panel>
 		</vab-query-form>
+
+		<el-table ref="tableSort" v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText"
+			:height="height" @selection-change="setSelectRows" @sort-change="tableSortChange" show-summary
+			:summary-method="getSummaries">
+			<el-table-column show-overflow-tooltip type="selection" width="65"></el-table-column>
+			<el-table-column show-overflow-tooltip label="风场编号" prop="windpower" width="200" 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="generatingcapacity" align="center" sortable>
+			</el-table-column>
+			<el-table-column show-overflow-tooltip label="计划停运小时" prop="outagehours" align="center" sortable>
+			</el-table-column>
+			<el-table-column show-overflow-tooltip label="年份" prop="year" align="center" sortable></el-table-column>
+			<el-table-column show-overflow-tooltip label="月份" prop="month" align="center" sortable></el-table-column>
+			<el-table-column show-overflow-tooltip label="操作" width="180px">
+				<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" @handleSuccess="fetchData"></table-edit>
 	</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 api from '@/api/table'
 import TableEdit from './components/TableEdit'
 export default {
+	name: 'ComprehensiveTable',
 	components: {
-		UploadExcel,
-		ExportExcel,
-		TableEdit,
+		TableEdit
+	},
+	filters: {
+		statusFilter(status) {
+			const statusMap = {
+				published: 'success',
+				draft: 'gray',
+				deleted: 'danger',
+			}
+			return statusMap[status]
+		},
 	},
 	data() {
 		return {
-			fuzzyQuery_name: '',
-			listLoading: true,
+			imgShow: true,
 			list: [],
-			options: [],
-			exportExcel: [],
-			templateExcel: [],
-			elementLoadingText: '正在加载...',
-			selectRows: '',
+			cascaderSel: [],
+			imageList: [],
+			listLoading: true,
 			layout: 'total, sizes, prev, pager, next, jumper',
 			total: 0,
 			background: true,
-			exportList: [],
+			selectRows: '',
+			elementLoadingText: '正在加载...',
 			queryForm: {
 				pageNo: 1,
 				pageSize: 20,
+				title: '',
 			},
-			stationList: [],
-			selectValue: ''
-		};
+			options: []
+		}
 	},
 	computed: {
 		height() {
@@ -92,82 +96,28 @@ export default {
 		},
 	},
 	created() {
-		// this.getStation()
+		this.getStation()
 		this.fetchData()
 	},
+	beforeDestroy() { },
+	mounted() { },
 	methods: {
-		getMyExcelData(val) {
-			val.forEach(item => {
-				api.addProjectstudy(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 => {
+			api.wtls().then(res => {
 				if (res.data) {
-					this.listLoading = false
-					this.stationList = res.data.records
+					this.options = res.data
 				}
 			})
 		},
-		fetchData() {
-			api.projectstudy({
-				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: '',
-							projectid: '',
-							generatingcapacity: '',
-							outagehours: '',
-							year: '',
-							month: '',
-							windpowerid: ''
-						}
-					]
-					// 导出
-					let exportExcel = []
-					res.data.records.forEach(item => {
-						exportExcel.push({
-							id: item.id,
-							projectid: item.projectid,
-							generatingcapacity: item.generatingcapacity,
-							outagehours: item.outagehours,
-							year: item.year,
-							month: item.month,
-							windpowerid: item.windpowerid
-						})
-					})
-					this.exportExcel = exportExcel
-				}
+		tableSortChange() {
+			const imageList = []
+			this.$refs.tableSort.tableData.forEach((item, index) => {
+				imageList.push(item.img)
 			})
+			this.imageList = imageList
 		},
-		handleSizeChange(val) {
-			this.queryForm.pageSize = val
-			this.fetchData()
-		},
-		handleCurrentChange(val) {
-			this.queryForm.pageNo = val
-			this.fetchData()
+		setSelectRows(val) {
+			this.selectRows = val
 		},
 		handleAdd() {
 			this.$refs['edit'].showEdit()
@@ -176,51 +126,124 @@ export default {
 			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()
-					}
+			if (row.id) {
+				this.$baseConfirm('你确定要删除当前项吗', null, async () => {
 					api.deleteProjectstudy({
-						id: row.id || ids
+						id: row.id
 					}).then(res => {
-						if (res.data) {
+						if (res.code == 200) {
 							this.$baseMessage('删除成功', 'success')
 							this.fetchData()
 						}
 					})
 				})
 			} else {
-				this.$baseMessage('未选中任何行', 'error')
-				return false
+				if (this.selectRows.length > 0) {
+					const ids = this.selectRows.map((item) => item.id).join()
+					this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+						api.deleteProjectstudy({
+							id: ids
+						}).then(res => {
+							if (res.code == 200) {
+								this.$baseMessage('删除成功', 'success')
+								this.fetchData()
+							}
+						})
+					})
+				} else {
+					this.$baseMessage('未选中任何行', 'error')
+					return false
+				}
 			}
 		},
-		setSelectRows(val) {
-			this.selectRows = val
+		handleSizeChange(val) {
+			this.queryForm.pageSize = val
+			this.fetchData()
+		},
+		handleCurrentChange(val) {
+			this.queryForm.pageNo = val
+			this.fetchData()
 		},
+		handleQuery() {
+			this.queryForm.pageNo = 1
+			this.fetchData()
+		},
+		async fetchData() {
+			this.listLoading = true
+			api.projectstudy({
+				pagenum: this.queryForm.pageNo,
+				pagesize: this.queryForm.pageSize,
+			}).then(res => {
+				if (res.data) {
+					this.total = res.data.total
+					this.list = res.data.records
+					setTimeout(() => {
+						this.listLoading = false
+					}, 500)
+				}
+			})
+
+		},
+		testMessage() {
+			this.$baseMessage('test1', 'success')
+		},
+		testALert() {
+			this.$baseAlert('11')
+			this.$baseAlert('11', '自定义标题', () => {
+				/* 可以写回调; */
+			})
+			this.$baseAlert('11', null, () => {
+				/* 可以写回调; */
+			})
+		},
+		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) => {
+				if (index === 0) {
+					sums[index] = '总计';
+					return;
+				}
+				else if (index === 3) {
+					let totle = 0
+					data.forEach(item => {
+						totle = totle + Number(item.generatingcapacity)
+					})
+					sums[index] = totle;
+				}
+				else if (index === 4) {
+					let totle = 0
+					data.forEach(item => {
+						totle = totle + Number(item.outagehours)
+					})
+					sums[index] = totle;
+				} else {
+					sums[index] = '--';
+				}
+			});
+			return sums;
+		}
 	},
 }
 </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;
-	}
+.cascaders {
+	width: 300px;
 }
-</style>
+</style>