Explorar el Código

修复编译报错

louhangfei hace 2 años
padre
commit
53a708b6ec

+ 10 - 3
src/views/cameras/preview/components/CameraViewSetting/CameraViewSetting.vue

@@ -16,7 +16,7 @@
       <FenceEditor ref="fenceEditorRef" />
 
       <div class="cameraVideo"><CameraLiveVideo /></div>
-      <div class="presetAddWrapper">
+      <div class="presetAddWrapper" :class="{ hidePresetControlCls: hidePresetControl }">
         <CameraDirectionControl />
         <ElButton
           type="primary"
@@ -69,6 +69,7 @@
   const viewType = ref<ViewType>(ViewType.window1);
 
   const addPresetModalVisible = ref(false);
+  const hidePresetControl = ref(false);
 
   const cameraParamsDetail = ref({});
 
@@ -93,8 +94,11 @@
     isEdit.value = val;
     if (val) {
       fenceEditorRef.value?.setEditMode();
+      // 将预置位的设置按钮隐藏
+      hidePresetControl.value = true;
     } else {
       fenceEditorRef.value?.exitEditMode();
+      hidePresetControl.value = false;
     }
   };
 
@@ -162,11 +166,11 @@
       /** 先清空原有的 */
       fenceEditorRef.value?.clear();
       fenceEditorRef.value?.createLines(rawLinePoints);
-      fenceEditorRef.value?.setEditMode();
+      fenceEditorRef.value?.exitEditMode();
       return;
     }
-    fenceEditorRef.value?.exitEditMode();
     fenceEditorRef.value?.clear();
+    fenceEditorRef.value?.exitEditMode();
   });
 
   const handleAddPreset = () => {
@@ -227,4 +231,7 @@
     flex-basis: 330px;
     flex-shrink: 0;
   }
+  .hidePresetControlCls {
+    display: none;
+  }
 </style>

+ 0 - 44
src/views/result/success-bak.vue

@@ -1,44 +0,0 @@
-<template>
-  <el-card :bordered="false" class="proCard">
-    <div class="result-box">
-      <el-result status="success" title="操作成功11" description="提交结果页用于反馈一系列操作任务的处理结果,如果仅是简单操作,灰色区域可以显示一些补充的信息。">
-        <div class="result-box-extra">
-          <p>已提交申请,等待财务部门审核。</p>
-        </div>
-        <template #footer>
-          <div class="flex justify-center mb-4">
-            <el-space align="center">
-              <el-button type="info" @click="goHome">回到首页</el-button>
-              <el-button>查看详情</el-button>
-              <el-button>打印</el-button>
-            </el-space>
-          </div>
-        </template>
-      </el-result>
-    </div>
-  </el-card>
-</template>
-<script lang="ts" setup>
-import { useRouter } from 'vue-router';
-
-const router = useRouter();
-
-function goHome() {
-  router.push('/');
-}
-</script>
-<style lang="scss" scoped>
-.result-box {
-  width: 72%;
-  margin: 0 auto;
-  text-align: center;
-  padding-top: 5px;
-
-  &-extra {
-    padding: 24px 40px;
-    text-align: left;
-    background: var(--n-border-color);
-    border-radius: 4px;
-  }
-}
-</style>

+ 37 - 59
src/views/result/success.vue

@@ -1,70 +1,48 @@
 <template>
-  <div>
-    <h2> 相机预览 </h2>
-    <div class="cameraMain">
-      <div class="cameraTree">
-        <CameraTree :data="data" v-if="data" />
-      </div>
-      <div class="cameraSettingWrapper">
-        <div class="cameraView">
-          <CameraViewSetting />
+  <el-card :bordered="false" class="proCard">
+    <div class="result-box">
+      <el-result
+        status="success"
+        title="操作成功"
+        description="提交结果页用于反馈一系列操作任务的处理结果,如果仅是简单操作,灰色区域可以显示一些补充的信息。"
+      >
+        <div class="result-box-extra">
+          <p>已提交申请,等待财务部门审核。</p>
         </div>
-        <div class="cameraParamsSettingWrapper">
-          <div class="cameraParamsSetting"> 相机的参数设置 </div>
-          <div class="algorithmsSetting"> <AlgorithmsSetting /> </div>
-        </div>
-      </div>
+        <template #footer>
+          <div class="flex justify-center mb-4">
+            <el-space align="center">
+              <el-button type="info" @click="goHome">回到首页</el-button>
+              <el-button>查看详情</el-button>
+              <el-button>打印</el-button>
+            </el-space>
+          </div>
+        </template>
+      </el-result>
     </div>
-  </div>
+  </el-card>
 </template>
-
 <script lang="ts" setup>
-  import CameraTree from './components/CameraTree/CameraTree.vue';
-  import CameraViewSetting from './components/CameraViewSetting/CameraViewSetting.vue';
-  import AlgorithmsSetting from './components/AlgorithmsSetting/AlgorithmsSetting.vue';
-  import useCameraTree from './hooks/useCameraTree';
-  const { data, loading } = useCameraTree();
-</script>
-<style lang="scss" scoped>
-  .cameraView {
-    width: 800px;
-    // height: 400px;
-    border: 1px solid #ccc;
-  }
+  import { useRouter } from 'vue-router';
 
-  .cameraParamsSetting {
-    width: 350px;
-    min-height: 300px;
-    border: 1px solid #ccc;
-  }
+  const router = useRouter();
 
-  .cameraParamsSetting {
-    width: 350px;
-    min-height: 300px;
-    border: 1px solid #ccc;
-  }
-
-  .algorithmsSetting {
-    flex: 1;
-    border: 1px solid #ccc;
-  }
-  .cameraMain {
-    display: flex;
-    background: #fff;
-  }
-  .cameraTree {
-    width: 250px;
-    height: 800px;
-    border: 1px solid #ccc;
+  function goHome() {
+    router.push('/');
   }
+</script>
+<style lang="scss" scoped>
+  .result-box {
+    width: 72%;
+    margin: 0 auto;
+    text-align: center;
+    padding-top: 5px;
 
-  .cameraParamsSettingWrapper {
-    display: flex;
-    margin-top: 10px;
-  }
-  .algorithmsSetting {
-    flex: 1;
-    min-height: 300px;
-    margin-left: 10px;
+    &-extra {
+      padding: 24px 40px;
+      text-align: left;
+      background: var(--n-border-color);
+      border-radius: 4px;
+    }
   }
 </style>