Merge remote-tracking branch 'origin/main'

src/api/FenceManager/record.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import common from '@/utils/common';
 
 //修改围栏进出记录
 function updateRecord(data) {
@@ -30,10 +31,16 @@ function getRecordById(id) {
 
 //查询围栏进出记录列表
 function RecordList(data) {
+    let queryParams = Object.assign({}, data);
+    if (queryParams.Date && queryParams.Date.length) {
+        queryParams.beginTime = common.DateFormat(queryParams.Date[0], 'yyyy-MM-dd');
+        queryParams.endTime = common.DateFormat(queryParams.Date.length > 1 ? queryParams.Date[1] : '', 'yyyy-MM-dd');
+    }
+    delete queryParams['Date'];
     return request({
         url: '/api/equipment/fenceAccessRecord/list',
         method: 'get',
-        params: data
+        params: queryParams
     })
 }
 

src/views/equipmentManagement/devices/Usr.vue

@@ -108,6 +108,13 @@ function initData(item) {
     return;
   }
   deviceid = item.data.deviceId;
+  detailData.value=[];
+  lastData.value.code="";
+  lastData.value.name="";
+  lastData.value.unitName="";
+  lastData.value.position="";
+
+
   request({
     url: '/api/device/getDeviceUser/' + item.data.deviceId,
     method: 'get'
@@ -211,9 +218,9 @@ text-align: left;
   height: 21px;
   letter-spacing: 0px;
   text-align: left;
+  margin-left: -7px;
 }
 
-
 .list .itemRow {
   color: rgba(56, 64, 79, 1);
 
@@ -225,13 +232,17 @@ letter-spacing: 0px;
   text-align: left;
   margin-bottom: 13px;
 }
+
+.list .itemRow:last-child {
+  margin-bottom: 0px;
+}
 .itemChild.marginBottom {
   margin-bottom: 12px;
 }
 .list .childContent {
   width: 100%;
   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;
   padding: 6px 20px;
 }
@@ -241,6 +252,8 @@ margin-bottom: 13px;
   background: rgba(247, 248, 252, 1);
   width: 100%;
   height: auto;
+  box-sizing: border-box;
+  padding: 10px;
 }
 
 .fleft {

src/views/fys-equipment/group/index.vue

@@ -11,10 +11,10 @@
       </div>
 
       <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 }">
 
-            <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>
 
               <div class="iconContent">
@@ -613,6 +613,10 @@ var groupDelDevice = (row) => {
 }
 
 var showDevice = () => {
+  if(!checkNode.val){
+    alert("请先选择分组");
+    return;
+  }
   Status.dialogDeviceVisible = true;
   //获取所有
   let promise1 = api.getNodeDevice({
@@ -936,7 +940,8 @@ onMounted(() => {
 }
 
 .custom-tree-node.active {
-  background: rgba(228, 234, 240, 0.4) !important;
+  background: #80bcf966 !important;
+  color: #FFFFFF;
 }