diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 0f175f2..444970e 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -93,4 +93,8 @@ .el-dropdown .el-dropdown-link{ color: var(--el-color-primary) !important; +} +// 抽屉中的body内边距 +.el-drawer__body{ + padding: $--el-drawer-padding-primary !important; } \ No newline at end of file diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 3dbfaa7..3fedd5f 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -43,10 +43,13 @@ $--color-danger: #F56C6C; $--color-info: #909399; $base-sidebar-width: 200px; +// 抽屉中的body内边距 +$--el-drawer-padding-primary: var(--el-dialog-padding-primary, 0px); // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { + drawerPaddingprimary:$--el-drawer-padding-primary; menuColor: $base-menu-color; menuLightColor: $base-menu-light-color; menuColorActive: $base-menu-color-active; diff --git a/src/views/big/device/components/Wform.vue b/src/views/big/device/components/Wform.vue new file mode 100644 index 0000000..396ef04 --- /dev/null +++ b/src/views/big/device/components/Wform.vue @@ -0,0 +1,48 @@ + + + + + + diff --git a/src/views/big/device/components/devInfo.vue b/src/views/big/device/components/devInfo.vue new file mode 100644 index 0000000..9bf16fb --- /dev/null +++ b/src/views/big/device/components/devInfo.vue @@ -0,0 +1,128 @@ + + + + + \ No newline at end of file diff --git a/src/views/big/device/index.vue b/src/views/big/device/index.vue index fad8044..f3dd14c 100644 --- a/src/views/big/device/index.vue +++ b/src/views/big/device/index.vue @@ -1,3 +1,12 @@ + @@ -98,6 +112,7 @@ import useDeviceStore from '@/store/modules/device' import add_edit from './components/add_edit.vue' import useUserStore from '@/store/modules/user' import assemblyVue from './components/assembly' +import devInfo from './components/devInfo.vue' const store = useDeviceStore() const userStore = useUserStore() const { proxy } = getCurrentInstance(); @@ -139,6 +154,9 @@ const assemblyTitle = ref("设备装配信息") const assemblyOpen = ref(false) const typeList = ref([]) const assemblyForm = ref({}) +const devinfoopen=ref(false) +const devinfoTitle=ref('设备信息详情') +const devinfoForm=ref({}) /** 查询设备列表 */ function getList() { loading.value = true; @@ -203,6 +221,12 @@ function handleAssembly(row) { assemblyOpen.value = true; assemblyForm.value = row; } +//设备详情 +function handleDevInfo(row) { + devinfoTitle.value= row.name; + devinfoopen.value = true; + devinfoForm.value = row; +} /** 删除按钮操作 */ function handleDelete(row) {