diff --git a/src/api/device/types.ts b/src/api/device/types.ts index cf441b3..3e6bb5c 100644 --- a/src/api/device/types.ts +++ b/src/api/device/types.ts @@ -42,7 +42,7 @@ export interface headerVo { ctrlpro: any; } export interface deetsVo { - centerDeviceCode: string; + centerDeviceCode: string | number; deviceName: string; } export interface partitionVo { diff --git a/src/styles/index.scss b/src/styles/index.scss index dcce559..5828a57 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -4,7 +4,6 @@ @import './dark.scss'; @import './style.scss'; - .app-container { padding: 20px; @@ -16,7 +15,6 @@ box-shadow: var(--el-box-shadow-light); background-color: var(--el-bg-color-overlay); } - } .n-drawer-container { @@ -114,7 +112,7 @@ padding: 80px; .waringTable { - --el-table-border-color:none; + --el-table-border-color: none; background-color: transparent; border: 1px solid #053872; @@ -125,7 +123,7 @@ .headerRowClass { .headerCellClass { color: #fff; - background-color: #001D40; + background-color: #001d40; border-bottom: none; } } @@ -134,9 +132,9 @@ background-color: transparent; .cellClass { - color: #B1E3FF; + color: #b1e3ff; border-bottom: none; - background-color: #01153A; + background-color: #01153a; .confirm { background-color: #022a5a !important; @@ -147,7 +145,7 @@ .rowClass.el-table__row--striped { .cellClass { - background-color: #001D40; + background-color: #001d40; } } } @@ -155,21 +153,39 @@ .warClose { width: 50px; cursor: pointer; - color: #B1E3FF; + color: #b1e3ff; margin: 100px auto 0 auto; } } } } -.el-overlay{ +.n-modal-container { + .modalClass { + .n-card-header { + padding: 1.5rem; + } + .n-card__content { + padding: 0 1.5rem; + } + .n-card__footer { + text-align: right; + padding: 1.5rem; + button { + margin-left: 2rem; + } + } + } +} + +.el-overlay { z-index: 99999 !important; } -.el-notification{ +.el-notification { border: none !important; background-color: #0f2856 !important; - .el-notification__content{ + .el-notification__content { color: #eee !important; } -} \ No newline at end of file +} diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 67e581d..5742656 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -2,6 +2,7 @@ export {} declare global { const EffectScope: typeof import('vue')['EffectScope'] + const ElForm: typeof import('element-plus/es')['ElForm'] const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const ElNotification: typeof import('element-plus/es')['ElNotification'] @@ -272,6 +273,7 @@ import { UnwrapRef } from 'vue' declare module 'vue' { interface ComponentCustomProperties { readonly EffectScope: UnwrapRef + readonly ElForm: UnwrapRef readonly ElMessage: UnwrapRef readonly ElMessageBox: UnwrapRef readonly ElNotification: UnwrapRef diff --git a/src/types/components.d.ts b/src/types/components.d.ts index bbb3b0d..d8efe23 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -12,6 +12,7 @@ declare module '@vue/runtime-core' { ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] @@ -47,8 +48,6 @@ declare module '@vue/runtime-core' { NDrawerContent: typeof import('naive-ui')['NDrawerContent'] NIcon: typeof import('naive-ui')['NIcon'] NInput: typeof import('naive-ui')['NInput'] - NInputGroup: typeof import('naive-ui')['NInputGroup'] - NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel'] NInputNumber: typeof import('naive-ui')['NInputNumber'] NMenu: typeof import('naive-ui')['NMenu'] NModal: typeof import('naive-ui')['NModal'] diff --git a/src/views/details/index.scss b/src/views/details/index.scss index ffdea77..8489125 100644 --- a/src/views/details/index.scss +++ b/src/views/details/index.scss @@ -23,13 +23,16 @@ .item { margin-bottom: 20px; } + .formBtn { + padding: 0 20px; + } } } .echart { .comparisonInfo { .stackedLine { width: 100%; - height: 82vh; + height: 74vh; font-size: 1.4rem; text-align: center; color: #606266; diff --git a/src/views/details/index.vue b/src/views/details/index.vue index 9e8a01a..bf3d5ac 100644 --- a/src/views/details/index.vue +++ b/src/views/details/index.vue @@ -19,7 +19,7 @@ - + - + - + - + - 搜索 - 重置 + +
+ + 搜索 + 重置 + +
@@ -99,6 +104,7 @@
暂无数据
+ + + diff --git a/src/views/monitoring/devicemanage/components/main.vue b/src/views/monitoring/devicemanage/components/main.vue index e4b3ea7..e397fc4 100644 --- a/src/views/monitoring/devicemanage/components/main.vue +++ b/src/views/monitoring/devicemanage/components/main.vue @@ -141,35 +141,44 @@ size="small" v-model:value="res.value" style="--n-rail-color-active: #409eff; --n-rail-color: #ff4949" - @update:value="handleBlur(res)" + @update:value="submitBlur(res)" v-if="res.ctrlpro.valueType === 'bool'" > - + + @@ -200,28 +209,21 @@ size="small" v-model:value="res.value" style="--n-rail-color-active: #409eff; --n-rail-color: #ff4949" - @update:value="handleBlur(res)" + @update:value="submitBlur(res)" v-if="res.ctrlpro.valueType === 'bool'" > - - - 确定 - + @@ -256,6 +258,15 @@ -->
暂无设备信息!
+ + + + + +