From 3cd37d6952d98b42ea728c3aeb345e1f7f9b5a90 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 12 二月 2025 16:56:08 +0800
Subject: [PATCH] 1
---
src/components/jianceResult/index.vue | 43 ++++++++++++++++++++++++++++++++++++-------
src/views/sampling/sampling/index.vue | 2 +-
2 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/components/jianceResult/index.vue b/src/components/jianceResult/index.vue
index 0ee3f4a..55118a0 100644
--- a/src/components/jianceResult/index.vue
+++ b/src/components/jianceResult/index.vue
@@ -7,15 +7,25 @@
<el-input v-model="queryParams.xmgz" placeholder="璇疯緭鍏ュ唴瀹�" clearable @keyup.enter.native="handleQuery"
style="width: 130px;" />
</el-form-item>
- <el-form-item>
+ <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
</el-form-item>
+ <el-form-item label="妫�娴嬬粨鏋�" prop="xmg">
+ <el-input
+ type="textarea"
+ :autosize="{ minRows: 2, maxRows: 4 }"
+ v-model="selectedContent"
+ placeholder=""
+ style="width: 400px;"
+ clearable
+ />
+ </el-form-item>
</el-form>
- <el-table :data="dataList" ref="elTable" v-loading="loading" border @selection-change="handleSelectionChange">
+ <el-table :data="dataList" ref="elTable" v-loading="loading" border @selection-change="handleSelectionChange" style="max-height: 360px; overflow-y: auto;">
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="鏍囧彿" prop="aid" align="center" />
<el-table-column label="缁撹鍊�" prop="ruleStr" align="center" />
- <el-table-column label="鍙傝�冭寖鍥�" prop="reference" align="center" />
+ <el-table-column label="鍙傝�冭寖鍥�" prop="reference" align="center" />
<el-table-column label="绠�鐮�" prop="jm" align="center" />
</el-table>
<span slot="footer" class="dialog-footer">
@@ -55,21 +65,26 @@
mounted() {
},
methods: {
+ handleOk() {
+ this.open = false
+ this.$emit('add', this.list);
+ this.list = []; // 娓呯┖宸查�夊垪琛�
+ this.queryParams.xmgz = ''; // 娓呯┖鏌ヨ鍙傛暟
+ },
quxiao(){
this.open = false
this.queryParams = {
xmgz: ''
}
- },
- handleOk() {
- this.open = false
- this.$emit('add', this.list);
+ this.list = []; // 娓呯┖宸查�夊垪琛�
},
handleQuery() {
this.getList();
},
handleSelectionChange(selection) {
this.list = selection
+ console.log(this.list);
+
},
getList() {
this.loading = true;
@@ -88,6 +103,20 @@
});
},
},
+ computed: {
+ selectedContent: {
+ get() {
+ return this.list.map(item => item.ruleStr).join(',');
+ },
+ set(value) {
+ // 鎵嬪姩缂栬緫鏃跺悓姝ュ洖list锛堥渶瑕佹牴鎹疄闄呮暟鎹粨鏋勮皟鏁达級
+ this.list = value.split(',').map(str => ({
+ ...this.dataList.find(item => item.ruleStr === str.trim()),
+ ruleStr: str.trim()
+ })).filter(Boolean);
+ }
+ }
+ },
};
</script>
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 1ec984b..4091737 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -249,7 +249,7 @@
piliangList: [],
msg: "",
getNumbr: null,
- valueUrl: "ws://192.168.1.138:6789/websocket",
+ valueUrl: "ws://127.0.0.1:6789/websocket",
webSocket: null,
list: [],
selectList: [],
--
Gitblit v1.8.0