From 6bb2a23358624f72c886fccff39bfb54de868e4f Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 14:59:39 +0800
Subject: [PATCH] jgjl
---
src/components/public/index.vue | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 036a5b3..8048334 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -6,7 +6,7 @@
妫�娴嬬粨鏋� :{{ fList.proResult }}{{ fList.project.proMetering }}
</h3>
- <h2 style="text-align: center;">{{ proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
+ <h2 style="text-align: center">{{ proName || "鏆傛棤椤圭洰鍚嶇О" }}</h2>
<div style="display: flex; width: 100%">
<div style="width: 50%; margin-right: 40px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
@@ -33,9 +33,9 @@
<h3 style="margin-left: 160px">宸查�夐」鐩�</h3>
</el-form-item> -->
</el-form>
- <el-table :data="dataList" ref="multipleTable" v-loading="loading" @selection-change="handleSelectionChange"
+ <el-table :data="dataList" ref="multipleTable" row-key="aid" v-loading="loading" @selection-change="handleSelectionChange"
border height="480px">
- <el-table-column type="selection" width="40" align="center" />
+ <el-table-column type="selection" width="40" align="center" :reserve-selection="true"/>
<el-table-column label="搴忓彿" type="index" align="center" width="50px" />
<!-- <el-table-column label="瑙勫垯" align="center" prop="ruleStr" /> -->
<el-table-column label="妫�鏌ユ墍瑙�" align="center" prop="yxbx" />
@@ -109,7 +109,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
yxbx: "",
- proName: '',
+ proName: "",
// lastDesc: "",
total: 0,
dataList: [],
@@ -122,7 +122,7 @@
queryParams: {
ruleStr: "",
pageNum: 1,
- pageSize: 10,
+ pageSize: 50,
},
list: [],
fList: {},
@@ -132,29 +132,31 @@
},
watch: {
checkStatus(newValue) {
- console.log(565658)
if (newValue === "1") {
this.updateData(this.proResult, this.conclusion);
+ }else{
+
}
},
projectList: {
immediate: true,
deep: true,
handler(newVal) {
- console.log("鏀跺埌鐨勯」鐩暟鎹�:", newVal);
// 浣犲彲浠ュ湪杩欓噷澶勭悊鏁版嵁锛屾瘮濡備繚瀛樺埌 data 鎴栧仛閫昏緫鍒ゆ柇
if (newVal && newVal.length > 0) {
const firstProject = newVal[0]; // 浣犱篃鍙互閬嶅巻鎵�鏈夐」鐩紝鐪嬩綘涓氬姟闇�姹�
this.queryParams.proId = firstProject.proId; // 鍋囪椤圭洰涓彨 id
//this.queryParams.proName = firstProject.proName; // 鍋囪鍙� proName
- this.proName = firstProject.proName
+ this.proName = firstProject.proName;
}
},
},
},
mounted() { },
- created() { },
+ created() {
+
+ },
methods: {
async getList() {
try {
@@ -201,34 +203,46 @@
},
updateData(proResult, conclusion) {
- console.log(proResult, conclusion, 5658)
if (this.checkStatus == 1) {
-
this.form.jcsj = proResult; // 鏇存柊妫�鏌ユ墍瑙�
this.form.desc = conclusion; // 鏇存柊妫�鏌ョ粨璁�
- } else {
- this.form.desc = "";
- this.form.jcsj = "";
}
+
if (this.list.length != 0) {
- let desc = ""
+ let desc = "";
desc += this.list
.map((item) => item.bingzhong || item.ruleStr)
.filter(Boolean)
.join(",");
- let jcsj = ""
+ let jcsj = "";
jcsj += this.list
.map((item) => item.yxbx)
.filter(Boolean)
.join(",");
- this.form.jcsj = this.form.jcsj + jcsj; // 鏇存柊妫�鏌ユ墍瑙�
- this.form.desc = this.form.desc + desc;
+ this.form.jcsj = jcsj; // 鏇存柊妫�鏌ユ墍瑙�
+ this.form.desc = desc;
+ // if (this.queryParams.pageNum == 1) {
+
+ // } else {
+ // this.form.jcsj = this.form.jcsj + jcsj; // 鏇存柊妫�鏌ユ墍瑙�
+ // this.form.desc = this.form.desc + desc;
+ // this.form.jcsj = this.uniqueStrings(this.form.jcsj)
+ // this.form.desc = this.uniqueStrings(this.form.desc)
+ // }
+ }else{
+ this.form.jcsj = ""; // 鏇存柊妫�鏌ユ墍瑙�
+ this.form.desc = "";
}
- },
+ },
+ // uniqueStrings(strings) {
+ // // 浣跨敤Set鏉ュ幓閲�
+ // const uniqueSet = new Set(strings);
+ // return Array.from(uniqueSet).join("")
+ // },
handleSelectionChange(selection) {
- this.list = selection;
+ this.list = selection
this.updateFormContent(selection);
},
@@ -258,12 +272,22 @@
},
handleOk() {
- const jcsjTrim = this.form.jcsj?.trim();
- const descTrim = this.form.desc?.trim();
-
- if (!jcsjTrim || !descTrim) {
- this.$message.warning("妫�鏌ユ墍瑙佸拰妫�鏌ョ粨璁轰笉鑳戒负绌�");
+ if (!this.form.desc && !this.form.jcsj) {
+ this.$message.warning("璇烽�夋嫨鏁版嵁");
return;
+ } else {
+ const desc = this.form.desc?.trim();
+ const jcsj = this.form.jcsj?.trim();
+
+ // 濡傛灉娌℃湁閫変腑琛ㄦ牸椤�
+ if (!this.list || this.list.length === 0) {
+ if (!desc && !jcsj) {
+ this.$message.warning(
+ "璇峰～鍐欐湁鏁堢殑妫�鏌ユ墍瑙佸拰妫�鏌ョ粨璁猴紝鎴栭�夋嫨琛ㄦ牸鏁版嵁"
+ );
+ return;
+ }
+ }
}
try {
@@ -274,6 +298,7 @@
console.error("澶勭悊鏁版嵁澶辫触:", error);
this.$message.error("鎿嶄綔澶辫触");
}
+ this.$refs.multipleTable?.clearSelection();
},
resetForm() {
@@ -286,7 +311,8 @@
},
callcolos() {
this.open = false;
- }
+ this.$refs.multipleTable?.clearSelection();
+ },
},
computed: {
isCheckMode() {
@@ -318,6 +344,6 @@
.jianc {
width: 100%;
height: 600px;
- padding-top: 40px
+ padding-top: 40px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0