From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 37468d6..1bbe52c 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -5,6 +5,7 @@
<el-col :span="6" style="padding-left: 20px;text-align: left;">鏁伴噰閰嶇疆</el-col>
<el-col :span="18" style="text-align: right;">
<el-button size="small" type="primary" @click="fileConfiguration">鏂囦欢閰嶇疆</el-button>
+ <el-button size="small" type="primary" @click="addItem">妫�楠岄」鏂板</el-button>
<el-button size="small" @click="$parent.closeDataVue()">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
@@ -156,6 +157,16 @@
</el-row>
</span>
</el-dialog>
+ <el-dialog title="娣诲姞妫�楠岄」" :visible.sync="dialogVisible5" width="1000px">
+ <lims-table :tableData="tableData5" :column="column5"
+ :isSelection="true" :handleSelectionChange="selectMethod"
+ height="540" :page="page5" :tableLoading="tableLoading5"
+ @pagination="pagination5"></lims-table>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible5 = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm5" :loading="loading5">淇� 瀛�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -163,12 +174,17 @@
import {
queryDataAcquisitionConfiguration,
saveDataAcquisitionConfiguration,
- deleteDataAcquisitionConfiguration, getDeviceById, saveDeviceFileConfiguration, queryProductConfiguration,
+ deleteDataAcquisitionConfiguration,
+ getDeviceById,
+ saveDeviceFileConfiguration,
+ queryProductConfiguration,
+ getNoConfigProduct,
} from '@/api/cnas/resourceDemand/device.js'
+import limsTable from "@/components/Table/lims-table.vue";
export default {
name: "dataAcquisitionConfig",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {},
+ components: {limsTable},
props: {
deviceId: {
type: Number,
@@ -286,7 +302,23 @@
]
}
},
- deleteList: []
+ deleteList: [],
+ tableData5: [],
+ column5: [
+ {label: '鏍峰搧鍚嶇О', prop: 'sample'},
+ {label: '妫�楠岄」鍒嗙被', prop: 'inspectionItemClass'},
+ {label: '妫�楠岄」', prop: 'inspectionItem'},
+ {label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass'},
+ ],
+ page5: {
+ total:0,
+ size:20,
+ current:1
+ },
+ tableLoading5: false,
+ dialogVisible5: false,
+ loading5: false,
+ multipleSelection: []
};
},
mounted() {
@@ -319,6 +351,45 @@
const letterIndex = index % 26;
return alphabet.charAt(letterIndex) + (index + 1);
},
+ // 鎵撳紑鏂板妫�楠岄」寮规
+ addItem () {
+ this.dialogVisible5 = true;
+ this.getList5()
+ },
+ getList5() {
+ this.tableLoading5 = true;
+ getNoConfigProduct({deviceId: this.deviceId, ...this.page5 }).then(res => {
+ this.tableLoading5 = false;
+ this.tableData5 = res.data.records
+ this.page5.total = res.data.total
+ }).catch(err => {
+ this.tableLoading5 = false;
+ })
+ },
+ pagination5 (page) {
+ this.page5.size = page.limit
+ this.getList5()
+ },
+ // 琛ㄦ牸閫夋嫨鏂规硶
+ selectMethod(val) {
+ this.multipleSelection = val
+ },
+ // 鎻愪氦鏂板妫�楠岄」
+ submitForm5 () {
+ this.loading5 = true;
+ saveDataAcquisitionConfiguration({
+ deviceId: this.deviceId,
+ dataConfigList: this.multipleSelection,
+ }).then(res => {
+ this.loading5 = false;
+ this.dialogVisible5 = false;
+ this.init();
+ this.$message.success("娣诲姞鎴愬姛");
+ }).catch(err => {
+ this.loading5 = false;
+ })
+ },
+ // 鎵撳紑鏂囦欢閰嶇疆寮规
fileConfiguration() {
this.dialogVisible4 = true;
this.getInfo()
--
Gitblit v1.9.3