From 9334a78e7a7d06e3fd0fc2feff9aa5d646df27f7 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期六, 19 七月 2025 10:24:57 +0800
Subject: [PATCH] 数据显示,数量
---
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 100 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 93 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 37468d6..23a9e18 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>
@@ -149,11 +150,29 @@
<div class="search_label">鏂囦欢鍚嶇О锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.dbFileName"></el-input>
</div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label">鏁版嵁搴撹处鍙凤細</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.dbUserName"></el-input>
+ </div>
+ <div class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label">鏁版嵁搴撳瘑鐮侊細</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.dbPassword"></el-input>
+ </div>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="dialogVisible4 = false">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm4" :loading="upLoad4">纭� 瀹�</el-button>
</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>
@@ -163,12 +182,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,
@@ -218,7 +242,9 @@
entrustCode: "",
sampleCode: "",
dbFileName: "",
- fiberOpticRibbon: ""
+ fiberOpticRibbon: "",
+ dbUserName: "",
+ dbPassword: ""
},
domains: [
{
@@ -238,6 +264,7 @@
{ label: "mdb", value: ".mdb" },
{ label: "word", value: ".docx" },
{ label: "excel", value: ".xlsx" },
+ { label: "excel", value: ".xls" },
{ label: "txt", value: ".txt" },
{ label: "png", value: ".png" }
],
@@ -286,7 +313,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 +362,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()
@@ -333,7 +415,9 @@
this.$set(this.configForm, "entrustCode", res.data.entrustCode);
this.$set(this.configForm, "sampleCode", res.data.sampleCode);
this.$set(this.configForm, "dbFileName", res.data.dbFileName);
- this.$set(this.configForm, "fiberOpticRibbon", res.data.fiberOpticRibbon)
+ this.$set(this.configForm, "fiberOpticRibbon", res.data.fiberOpticRibbon);
+ this.$set(this.configForm, "dbUserName", res.data.dbUserName);
+ this.$set(this.configForm, "dbPassword", res.data.dbPassword)
})
},
// 鎻愪氦鏂囦欢閰嶇疆
@@ -347,7 +431,9 @@
entrustCode: this.configForm.entrustCode,
sampleCode: this.configForm.sampleCode,
dbFileName: this.configForm.dbFileName,
- fiberOpticRibbon: this.configForm.fiberOpticRibbon
+ fiberOpticRibbon: this.configForm.fiberOpticRibbon,
+ dbUserName: this.configForm.dbUserName,
+ dbPassword: this.configForm.dbPassword
});
this.upLoad4 = true;
saveDeviceFileConfiguration({ deviceId: this.deviceId, ...obj }).then(res => {
@@ -532,7 +618,7 @@
}
.search_thing {
- width: 350px;
+ width: 370px;
display: flex;
align-items: center;
}
--
Gitblit v1.9.3