fix: 1

src/app/fire/routeConfig.ts

@@ -12,10 +12,10 @@ export const menuRouteNames = [
   FireRouteName.camera,
   FireRouteName.dispatch,
   FireRouteName.teaching,
+  FireRouteName.statistics,
   FireRouteName.organization,
   FireRouteName.role,
   FireRouteName.user,
-  FireRouteName.statistics,
   FireRouteName.downloadLog,
 ];
 

src/store/scene.ts

@@ -146,12 +146,9 @@ type ScenePaggingParams = PaggingReq<
 >;
 export const getScenePagging = async (params: ScenePaggingParams) => {
   return (
-    await axios.get(
-      params.type === SceneType.SWMX ? getModelSceneList : getSceneList,
-      {
-        params,
-      }
-    )
+    await axios.get(params.type === SceneType.SWMX ? getModelSceneList : getSceneList, {
+      params,
+    })
   ).data as PaggingRes<Scene>;
 };
 
@@ -181,10 +178,12 @@ export type DownloadQuoteSceneLog = {
   createTime: string;
 };
 export const getDownloadQuoteScene = async (
-  params: QueryDownloadQuoteSceneParams
+  params: Omit<QueryDownloadQuoteSceneParams, "createTime"> & {
+    startCreateTime: string;
+    endCreateTime: string;
+  }
 ) =>
-  (await axios.post(downloadSceneList, params))
-    .data as PaggingRes<DownloadQuoteSceneLog>;
+  (await axios.post(downloadSceneList, params)).data as PaggingRes<DownloadQuoteSceneLog>;
 
 export const genMeshScene = async (scene: QuoteScene) => {
   const res = (await axios.post(checkGenMeshScene, { id: scene.id })).data;

src/view/case/draw/board/index.js

@@ -87,7 +87,7 @@ export const create = async (store, canvas) => {
       const shapes = [];
 
       if (floor) {
-        const bgImage = floor.image.src || floor.image.url;
+        const bgImage = floor.bgImage?.url;
         if (bgImage && bgImage.includes("blob:")) {
           const url = await fetch(bgImage)
             .then((res) => res.blob())
@@ -95,7 +95,7 @@ export const create = async (store, canvas) => {
               uploadFile(new File([blob], (store.id || "image") + ".png"))
             );
 
-          floor.image.src = url;
+          floor.bgImage.url = url;
           console.log(url);
         }
         shapes.push({ type: title, text: floor.title.value });

src/view/case/draw/edit-shape/preset.ts

@@ -4,5 +4,5 @@ export const predefineColors = [
   "#1a9bff",
   "#1aad19",
   "#000000",
-  "#ffffff",
+  "#666666",
 ];

src/view/case/draw/selectFuseImage.vue

@@ -90,8 +90,9 @@ const refreshBlob = async () => {
   if (!iframeRef.value) {
     return;
   }
-  const width = 500;
-  const height = 390;
+  const scale = 3;
+  const width = 500 * scale;
+  const height = 390 * scale;
   const fuseImage = await getFuseImage(iframeRef.value, width, height);
   if (fuseImage?.blob) {
     imageBlob.value =

src/view/case/help.ts

@@ -189,11 +189,13 @@ export const getFuseImage = async (
 
   switch (typeMap?.type) {
     case FuseImageType.FUSE:
+      console.error(width, height);
       const dataURL = await typeMap.sdk.screenshot(width, height, 0);
       const res = await fetch(dataURL);
       blob = await res.blob();
       break;
     case FuseImageType.KANKAN:
+      console.error("截图尺寸", width, height);
       const result = await typeMap.sdk.Camera.screenshot(
         [{ width: width, height: height, name: "2k", bgOpacity: 0 }],
         false
@@ -221,7 +223,7 @@ export const fuseImageJoinHot = async (
   width = 500,
   height = 390
 ) => {
-  console.log(width, showTags)
+  console.log(width, showTags);
   // fuse场景需要特别处理
   const img = new Image();
   img.src = URL.createObjectURL(rawBlob);

src/view/vrmodel/downloadLog.vue

@@ -12,8 +12,9 @@
       </el-form-item>
       <el-form-item label="下载时间：">
         <el-date-picker
-          type="datetime"
-          v-model="state.query.createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss"
+          v-model="createTime"
           placeholder="请选择"
           style="width: 100%"
         />
@@ -73,6 +74,8 @@ import comHead from "@/components/head/index.vue";
 import comCompany from "@/components/company-select/index.vue";
 import comPagination from "@/components/pagination/index.vue";
 import { getDownloadQuoteScene } from "@/store/scene";
+import { ref, watchEffect } from "vue";
+import { dateFormat } from "@/util";
 
 const { state, queryReset, refresh, changPageCurrent, changPageSize } = usePagging({
   get: getDownloadQuoteScene,
@@ -80,12 +83,21 @@ const { state, queryReset, refresh, changPageCurrent, changPageSize } = usePaggi
     nickName: "",
     deptId: "",
     userName: "",
-    createTime: "",
+    startCreateTime: "",
+    endCreateTime: "",
     sceneTitle: "",
     sceneNum: "",
     snCode: "",
   },
 });
+
+const createTime = ref<Date[]>([]);
+watchEffect(() => {
+  if (createTime.value.length === 2) {
+    state.query.startCreateTime = dateFormat(createTime.value[0], "yyyy-MM-dd hh:mm:ss");
+    state.query.endCreateTime = dateFormat(createTime.value[1], "yyyy-MM-dd hh:mm:ss");
+  }
+});
 </script>
 
 <style scoped lang="scss"></style>