Merge branch 'camera-lhf' into 'master'

修复相机预览的bug

See merge request tian-group/skyeye-admin-fe!23

src/views/cameras/preview/components/CameraDirectionControl/CameraDirectionControl.vue

@@ -20,7 +20,7 @@
   const { cameraId } = storeToRefs(cameraDetailStore);
   const presetListStore = usePresetListStore();
 
-  const STEP = 0.1;
+  const STEP = 0.05;
 
   const handleMoveTop = () => {
     cameraMoveApi({ cameraId: cameraId.value, zoom: 0, x: 0, y: STEP });
@@ -39,7 +39,7 @@
     presetListStore.currentPresetToken = '';
   };
 </script>
-<style scoped>
+<style scoped lang="scss">
   .cameraDirectionControlWrapper {
     bottom: 100px;
     right: 0px;

src/views/cameras/preview/components/CameraDirectionControl/DirectionItem.vue

@@ -17,7 +17,7 @@
     }, 200);
   };
 </script>
-<style scoped>
+<style scoped lang="scss">
   .sectorWrapper {
     width: 90px;
     height: 90px;
@@ -26,28 +26,28 @@
     cursor: pointer;
     left: 0;
     top: 0;
-    &.top {
-      transform: rotate(45deg);
-    }
+  }
+  .sectorWrapper.top {
+    transform: rotate(45deg);
+  }
 
-    &.right {
-      transform: rotate(135deg);
-    }
+  .sectorWrapper.right {
+    transform: rotate(135deg);
+  }
 
-    &.bottom {
-      transform: rotate(225deg);
-    }
-    &.left {
-      transform: rotate(315deg);
+  .sectorWrapper.bottom {
+    transform: rotate(225deg);
+  }
+  .sectorWrapper.left {
+    transform: rotate(315deg);
+  }
+  .sectorWrapper.active {
+    .sector {
+      background-color: #1890ff;
+      opacity: 0.4;
     }
-    &.active {
-      .sector {
-        background-color: #1890ff;
-        opacity: 0.4;
-      }
-      .triangle {
-        border-bottom-color: #1677ff;
-      }
+    .triangle {
+      border-bottom-color: #1677ff;
     }
   }
   .sector {

src/views/cameras/preview/components/CameraParams/CameraParams.vue

@@ -61,6 +61,11 @@
       cameraId: cameraDetailStore.cameraId,
     }).then(() => {
       ElMessage.success('保存成功');
+      if (!cameraDetailStore.detail) return;
+      cameraDetailStore.detail.nvrPeriod = params.period;
+      cameraDetailStore.detail.resolution = params.resolution;
+      cameraDetailStore.detail.nvrStartAt = params.startAt;
+      cameraDetailStore.detail.nvrEndAt = params.endAt;
     });
   };
 </script>

src/views/cameras/preview/components/CameraTree/CameraTree.vue

@@ -61,8 +61,8 @@
   const handleNodeClick = (e: CameraTree) => {
     console.log('e', e);
     if (e.nodeType === CameraTreeNodeType.camera) {
-      setDetail(e);
       cameraId.value = String(e.id);
+      setDetail(e);
     }
   };
 

src/views/cameras/preview/components/FenceEditor/FenceEditor.vue

@@ -318,7 +318,7 @@
       name: currentTool.name + 'circle',
       x: x,
       y: y,
-      radius: 5 / scale / getDefaultScale(layer?.scaleX()),
+      radius: 8 / scale / getDefaultScale(layer?.scaleX()),
       visible: true, //是否显示
       fill: currentTool.anchorColor,
       stroke: currentTool.anchorColor,
@@ -326,7 +326,7 @@
       strokeWidth: 0.5,
       strokeScaleEnabled: false,
       //增加点击区域
-      hitStrokeWidth: 8 / scale / getDefaultScale(layer?.scaleX()),
+      hitStrokeWidth: 12 / scale / getDefaultScale(layer?.scaleX()),
       //设置拖动区域，不能超过舞台大小
       dragBoundFunc: function (pos) {
         //左上角