liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

bug修复和体验优化

Browse Source
This commit is contained in:
liub
2025-09-16 15:05:41 +08:00
parent 1c61f32cc8
commit a407fb7f7a
2 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/views/equipmentManagement/devices/Usr.vue
View File

@ -108,6 +108,13 @@ function initData(item) {
return; return;
} }
deviceid = item.data.deviceId; deviceid = item.data.deviceId;
detailData.value=[];
lastData.value.code="";
lastData.value.name="";
lastData.value.unitName="";
lastData.value.position="";
request({ request({
url: '/api/device/getDeviceUser/' + item.data.deviceId, url: '/api/device/getDeviceUser/' + item.data.deviceId,
method: 'get' method: 'get'
@ -163,12 +170,12 @@ watch(
color: rgba(56, 64, 79, 1); color: rgba(56, 64, 79, 1);
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 18px; line-height: 18px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: left; text-align: left;
} }
.row .item .lable { .row .item .lable {
@ -211,19 +218,23 @@ text-align: left;
height: 21px; height: 21px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: left; text-align: left;
margin-left: -7px;
} }
.list .itemRow {
.list .itemRow{
color: rgba(56, 64, 79, 1); color: rgba(56, 64, 79, 1);
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 18px; line-height: 18px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: left; text-align: left;
margin-bottom: 13px; margin-bottom: 13px;
}
.list .itemRow:last-child {
margin-bottom: 0px;
} }
.itemChild.marginBottom { .itemChild.marginBottom {
margin-bottom: 12px; margin-bottom: 12px;
@ -231,7 +242,7 @@ margin-bottom: 13px;
.list .childContent { .list .childContent {
width: 100%; width: 100%;
height: auto; height: auto;
border-left: 1px solid rgba(0, 198, 250, 0.2); border-left: 2px solid rgba(0, 198, 250, 0.2);
box-sizing: border-box; box-sizing: border-box;
padding: 6px 20px; padding: 6px 20px;
} }
@ -241,6 +252,8 @@ margin-bottom: 13px;
background: rgba(247, 248, 252, 1); background: rgba(247, 248, 252, 1);
width: 100%; width: 100%;
height: auto; height: auto;
box-sizing: border-box;
padding: 10px;
} }
.fleft { .fleft {

11
src/views/fys-equipment/group/index.vue
View File

@ -11,10 +11,10 @@
</div> </div>
<div class="treeContent"> <div class="treeContent">
<el-tree :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick"> <el-tree :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick" :highlight-current="true">
<template #default="{ node, data }"> <template #default="{ node, data }">
<div class="custom-tree-node" :class="checkNode.val == data.id ? 'active' : ''"> <div class="custom-tree-node" >
<span :class="data.parentId != null ? '' : 'treeBold'">{{ node.label }}</span> <span :class="data.parentId != null ? '' : 'treeBold'">{{ node.label }}</span>
<div class="iconContent"> <div class="iconContent">
@ -613,6 +613,10 @@ var groupDelDevice = (row) => {
} }
var showDevice = () => { var showDevice = () => {
if(!checkNode.val){
alert("请先选择分组");
return;
}
Status.dialogDeviceVisible = true; Status.dialogDeviceVisible = true;
//获取所有 //获取所有
let promise1 = api.getNodeDevice({ let promise1 = api.getNodeDevice({
@ -936,7 +940,8 @@ onMounted(() => {
} }
.custom-tree-node.active { .custom-tree-node.active {
background: rgba(228, 234, 240, 0.4) !important; background: #80bcf966 !important;
color: #FFFFFF;
} }