From a52ac50ffc5f3b369eb689dd734bfb8a4bb988a4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:41:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/resourceDemand/device/component/deviceOverview.vue | 51 ++++++++++++++++-----------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue b/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue
index 60e79e3..c7b4d4e 100644
--- a/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue
+++ b/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue
@@ -4,7 +4,7 @@
<div style="display: flex;justify-content: space-between;margin-top: 10px;">
<div style="display: flex;">
<div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
- <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">鐘舵��</span>
+ <span style="width: 48px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">鐘舵��</span>
<el-select v-model="entity.deviceStatus" placeholder="鍏ㄩ儴"
@change="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()"
size="small" clearable>
@@ -13,7 +13,7 @@
</el-select>
</div>
<div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
- <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">璁惧鍚嶇О</span>
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">璁惧鍚嶇О</span>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.deviceName"
@keyup.enter="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()"></el-input>
</div>
@@ -36,8 +36,8 @@
display: flex;
align-items: center;
justify-content: center;
- border: 1px solid #EEEEEE;">
- <lims-icon name="el-icon-picture-outline" style="font-size:20px;color:#666666;"></lims-icon>
+ border: 1px solid var(--lims-divider);">
+ <lims-icon name="el-icon-picture-outline" style="font-size:20px;color:var(--lims-text-2);"></lims-icon>
</div></template>
</el-image>
<div class="list-left">
@@ -52,13 +52,13 @@
</div>
<div class="list-left-info">
<span class="label">瑙勬牸鍨嬪彿锛�</span>
- <span style="color:#333333;font-size: 16px;">{{ m.specificationModel ? m.specificationModel : '鏃�'
+ <span style="color:var(--lims-text);font-size: 16px;">{{ m.specificationModel ? m.specificationModel : '鏃�'
}}</span>
</div>
<div class="list-left-info">
<span class="label">鐘舵�侊細</span>
<el-tag :type="m.type" v-if="m.deviceStatusName">{{ m.deviceStatusName }}</el-tag>
- <span v-else style="color:#333333;font-size: 16px;">鏃�</span>
+ <span v-else style="color:var(--lims-text);font-size: 16px;">鏃�</span>
</div>
</div>
<div class="circles" :class="m.type">
@@ -70,7 +70,7 @@
</li>
</ul>
</scroll-pagination>
- <div v-if="list.length < 1 && !loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px">
+ <div v-if="list.length < 1 && !loading" style="color:var(--lims-text-3);font-size:14px;text-align: center;margin-top:200px">
鏆傛棤鏁版嵁
</div>
</div>
@@ -116,6 +116,7 @@
entity: {
deviceStatus: null,
deviceName: null,
+ largeCategory: null,
},
options: [],
list: [],
@@ -125,7 +126,6 @@
loading: true, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
keyMap: {},
- laboratoryNameIsNull: false,
importVisible: false,
importing: false,
importFiles: [],
@@ -206,7 +206,6 @@
this.finishLoding = false;
}
selectDeviceParameter({
- laboratoryNameIsNull: this.laboratoryNameIsNull,
current: this.currentPage,
size: this.pageSize,
...this.entity
@@ -263,6 +262,7 @@
this.entity = {
deviceStatus: null,
deviceName: null,
+ largeCategory: null,
};
this.refreshTable()
},
@@ -275,33 +275,14 @@
},
// 鐐瑰嚮渚ц竟鏍忓埛鏂�
clickSidebar(clickNodeVal) {
- this.laboratoryNameIsNull = false
- // 鏄惁瀛樺湪value锛屽瓨鍦╲alue浠ｈ〃涓轰笁绾�
+ // 瀛樺湪value浠ｈ〃閫変腑浜嗚澶囷紝鐢辫澶囪鎯呭睍绀哄鐞�
if (!clickNodeVal.value) {
this.finishLoding = false;
this.keyMap = {};
this.currentPage = 1;
this.list = [];
- this.entity.laboratoryName = null
- this.entity.storagePoint = null
- // 绛変簬1浠ｈ〃涓烘爲鐨勪竴绾э紝label涓洪儴闂�
- if (clickNodeVal.label == '鍏朵粬') {
- this.laboratoryNameIsNull = true
- this.refreshTable();
- return
- }
- if (clickNodeVal.level == 1) {
- this.entity.laboratoryName = clickNodeVal.label
- // 绛変簬浜岀骇銆俵abel涓哄瓨鍌ㄥ湴鐐�
- } else if (clickNodeVal.level == 2) {
- // 鍏朵粬琛ㄧず娌℃湁閰嶇疆瀹為獙瀹わ紝鍙厤缃簡鍦扮偣
- if (clickNodeVal.parent.label == '鍏朵粬') {
- this.laboratoryNameIsNull = true
- } else {
- this.entity.laboratoryName = clickNodeVal.parent.label
- }
- this.entity.storagePoint = clickNodeVal.label
- }
+ // 鏍戠殑涓�绾т负鍒嗙被锛氬叏閮�/璁惧/璁￠噺鍣ㄥ叿
+ this.entity.largeCategory = clickNodeVal.label === '鍏ㄩ儴' ? null : clickNodeVal.label;
this.refreshTable();
}
}
@@ -336,14 +317,14 @@
width: 330px;
height: 165px;
border-radius: 8px 8px 8px 8px;
- border: 1px solid #EEEEEE;
+ border: 1px solid var(--lims-divider);
margin: 0 !important;
display: flex;
align-items: center;
box-sizing: border-box;
padding: 16px;
font-size: 14px;
- color: #666666;
+ color: var(--lims-text-2);
position: relative;
overflow: hidden;
}
@@ -415,7 +396,7 @@
}
.success .circle {
- background: #34BD66;
+ background: var(--el-color-success);
}
.danger .circle {
@@ -427,7 +408,7 @@
}
.info .circle {
- background: #909399;
+ background: var(--lims-text-3);
}
.el-form-item {
--
Gitblit v1.9.3