From 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/resourceDemand/device/component/management.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 87c9645..e4b42a1 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -50,8 +50,8 @@
display: flex;
align-items: center;
justify-content: center;
- border: 1px solid #EEEEEE;">
- <lims-icon name="el-icon-picture-outline" style="font-size:60px;color:#666666;"></lims-icon>
+ border: 1px solid var(--lims-divider);">
+ <lims-icon name="el-icon-picture-outline" style="font-size:60px;color:var(--lims-text-2);"></lims-icon>
</div></template>
</el-image>
<!-- 琛ㄥ崟 -->
@@ -173,7 +173,7 @@
</el-form-item>
<el-form-item label="鍥剧墖:">
<div
- style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
+ style="border: 1px solid var(--el-border-color);border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
<div v-show="formData.imageName" class="picName">{{ formData.imageName }}</div>
<el-upload :disabled="isUp" :action="action" :on-success="handleSuccessUpImg2" :show-file-list="false"
accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader" :on-change="beforeUpload"
@@ -207,8 +207,8 @@
display: flex;
align-items: center;
justify-content: center;
- border: 1px solid #EEEEEE;">
- <lims-icon name="el-icon-picture-outline" style="font-size:60px;color:#666666;"></lims-icon>
+ border: 1px solid var(--lims-divider);">
+ <lims-icon name="el-icon-picture-outline" style="font-size:60px;color:var(--lims-text-2);"></lims-icon>
</div></template>
</el-image>
<!-- 琛ㄥ崟 -->
@@ -328,7 +328,7 @@
</el-form-item>
<el-form-item label="鍥剧墖:">
<div
- style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;line-height:32px;display:flex;justify-content: space-around;font-size: 13px;">
+ style="border: 1px solid var(--el-border-color);border-radius:4px;height:32px;line-height:32px;display:flex;justify-content: space-around;font-size: 13px;">
<div v-show="formData2.imageName" class="picName">{{ formData2.imageName }}</div>
<el-upload :action="action" :on-success="handleSuccessUpImg2" :show-file-list="false"
accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader" :on-change="beforeUpload"
@@ -550,7 +550,7 @@
page: {
total: 0,
size: 10,
- current: 0,
+ current: 1,
},
tableLoading: false,
}
--
Gitblit v1.9.3