bill 1 年之前
父節點
當前提交
0362ed88ff

+ 4 - 0
src/assets/style/public.scss

@@ -564,4 +564,8 @@ html .el-input-group__append button.el-button {
 
 .el-cascader__dropdown {
   max-width: 100%;
+}
+
+.el-color-predefine__color-selector {
+  border: 1px solid #e5e5e5;
 }

+ 10 - 6
src/store/scene.ts

@@ -146,9 +146,12 @@ 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>;
 };
 
@@ -179,11 +182,12 @@ export type DownloadQuoteSceneLog = {
 };
 export const getDownloadQuoteScene = async (
   params: Omit<QueryDownloadQuoteSceneParams, "createTime"> & {
-    startCreateTime: string;
-    endCreateTime: string;
+    startCreateTime: string | null;
+    endCreateTime: string | null;
   }
 ) =>
-  (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;

+ 1 - 0
src/view/case/draw/edit-shape/preset.ts

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

+ 3 - 3
src/view/case/draw/selectFuseImage.vue

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

+ 21 - 3
src/view/vrmodel/downloadLog.vue

@@ -16,6 +16,7 @@
           format="YYYY-MM-DD HH:mm:ss"
           v-model="createTime"
           placeholder="请选择"
+          :defaultTime="defaultTime"
           style="width: 100%"
         />
       </el-form-item>
@@ -77,7 +78,13 @@ import { getDownloadQuoteScene } from "@/store/scene";
 import { ref, watchEffect } from "vue";
 import { dateFormat } from "@/util";
 
-const { state, queryReset, refresh, changPageCurrent, changPageSize } = usePagging({
+const {
+  state,
+  queryReset: queryResetRaw,
+  refresh,
+  changPageCurrent,
+  changPageSize,
+} = usePagging({
   get: getDownloadQuoteScene,
   paramsTemlate: {
     nickName: "",
@@ -91,13 +98,24 @@ const { state, queryReset, refresh, changPageCurrent, changPageSize } = usePaggi
   },
 });
 
-const createTime = ref<Date[]>([]);
+const defaultTime: [Date, Date] = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+];
+const createTime = ref<Date[] | null>(null);
 watchEffect(() => {
-  if (createTime.value.length === 2) {
+  if (createTime.value && 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");
+  } else {
+    state.query.startCreateTime = null as any;
+    state.query.endCreateTime = null as any;
   }
 });
+const queryReset = () => {
+  queryResetRaw();
+  createTime.value = null;
+};
 </script>
 
 <style scoped lang="scss"></style>