From 512d5d7e79e0a64b36e24cbe5d7c5f8d0adc0b94 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 26 九月 2024 17:46:48 +0800
Subject: [PATCH] 1.升级了element-plus版本 2.对外支持模块新设备匹配工地功能完成 3.新增设备匹配模块单挑匹配记录编辑功能（未完成）
---
src/views/fysp/evaluation/EvalutationRecord.vue | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/views/fysp/evaluation/EvalutationRecord.vue b/src/views/fysp/evaluation/EvalutationRecord.vue
index b3dc2c3..190fc16 100644
--- a/src/views/fysp/evaluation/EvalutationRecord.vue
+++ b/src/views/fysp/evaluation/EvalutationRecord.vue
@@ -1,6 +1,4 @@
<template>
- <!-- <CompPreCheck @pre-check="autoEvaluate"></CompPreCheck> -->
-
<FYTable @search="onSearch" :pagination="false" ref="tableRef">
<template #options>
<!-- 鍖哄幙 -->
@@ -19,6 +17,16 @@
<!-- 鏃堕棿 -->
<FYOptionTime :initValue="false" type="month" v-model:value="formSearch.time"></FYOptionTime>
</template>
+ <template #buttons>
+ <!-- <el-button icon="Download" size="default" type="success" @click="download"
+ >瑙勮寖鎬ц瘎浼颁笌鍒嗘瀽鎶ュ憡</el-button
+ > -->
+ <CompReport
+ :locations="formSearch.locations"
+ :scenetype="formSearch.scenetype"
+ :time="formSearch.time"
+ ></CompReport>
+ </template>
<template #options-expand>
<el-form :inline="true">
@@ -27,17 +35,9 @@
</template>
<template #table-column>
- <el-table-column type="index" fixed="left" prop="sceneName" label="鍚嶇О" width="300">
- <template #default="{ row }">
- <el-tooltip
- effect="dark"
- :content="row.sceneName"
- placement="top-start"
- :show-after="500"
- >
- {{ row.sceneName }}
- </el-tooltip>
- </template>
+ <el-table-column fixed="left" sortable prop="sceneIndex" label="缂栧彿" width="80">
+ </el-table-column>
+ <el-table-column prop="sceneName" :show-overflow-tooltip="true" label="鍚嶇О" width="300">
</el-table-column>
<el-table-column
prop="subTaskTime"
@@ -71,11 +71,11 @@
<!-- <el-table-column prop="biArea" label="闆嗕腑鍖�" width="110" />
<el-table-column prop="biManagementCompany" label="鐗╀笟" min-width="110"/> -->
<el-table-column fixed="right" align="right" label="鎿嶄綔" width="160">
- <template #header>
- <el-button icon="Download" size="default" type="success" @click="download"
- >涓嬭浇缁撴灉</el-button
+ <!-- <template #header>
+ <el-button icon="Download" size="default" type="success" @click="exportExcel"
+ >瀵煎嚭缁撴灉</el-button
>
- </template>
+ </template> -->
<template #default="{ row }">
<el-button type="primary" size="small" @click="editRow(row)">鏌ョ湅</el-button>
</template>
@@ -88,11 +88,11 @@
import dayjs from 'dayjs';
import evaluateApi from '@/api/fysp/evaluateApi';
import { envCreditCode } from '@/constants/index';
-import CompQuickSet from './components/CompQuickSet.vue';
+import CompReport from './components/CompReport.vue';
export default {
name: 'ResultManage',
- components: { CompQuickSet },
+ components: { CompReport },
data() {
return {
formSearch: {
@@ -117,6 +117,9 @@
scensetypeid: scenetype.value
};
},
+ editRow(row) {
+ this.$router.push(`evalutationEdit/${row.subTaskId}`);
+ },
setOptions(param) {
this.formSearch.locations = param.locations;
this.formSearch.scenetype = param.scenetype;
@@ -134,6 +137,7 @@
}
});
},
+ // 瑙勮寖鎬ц瘎浼颁笌鍒嗘瀽鎶ュ憡鍚庡彴鐢熸垚浠诲姟
download() {
const area = this._getParam();
evaluateApi.downloadAutoEvaluation(area).then((res) => {
@@ -143,6 +147,8 @@
}
});
},
+ // 瀵煎嚭琛ㄦ牸涓篹xcel鏍煎紡
+ exportExcel() {},
getFilters(data) {
const townList = [];
data.forEach((e) => {
--
Gitblit v1.9.3