From f5332aaac7ebccce9258c8a5fc8b3d3fad2d6ca7 Mon Sep 17 00:00:00 2001 From: donghao Date: Tue, 24 Sep 2024 10:25:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- .env.development | 2 +- src/components/CustomTree/src/collapseTree.tsx | 9 ++++++++- src/views/deviceSetting/hooks/useDeviceObject.ts | 8 ++++---- vite.config.ts | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.env b/.env index c88b550..93d0c41 100644 --- a/.env +++ b/.env @@ -4,4 +4,4 @@ VITE_PORT = 8848 # 是否隐藏首页 隐藏 true 不隐藏 false （勿删除，VITE_HIDE_HOME只需在.env文件配置） VITE_HIDE_HOME = false # 开发环境后端地址 -VITE_APP_BASE_URL = 'http://192.168.10.21:8000' +VITE_APP_BASE_URL = 'http://192.168.10.70:8080' diff --git a/.env.development b/.env.development index 22c009d..e770a7e 100644 --- a/.env.development +++ b/.env.development @@ -7,4 +7,4 @@ VITE_PUBLIC_PATH = ./ # 开发环境路由历史模式（Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数"） VITE_ROUTER_HISTORY = "hash" # 开发环境后端地址 -VITE_APP_BASE_URL = 'http://192.168.10.21:8000' +VITE_APP_BASE_URL = 'http://192.168.10.70:8080' diff --git a/src/components/CustomTree/src/collapseTree.tsx b/src/components/CustomTree/src/collapseTree.tsx index 7c3409a..555fe8c 100644 --- a/src/components/CustomTree/src/collapseTree.tsx +++ b/src/components/CustomTree/src/collapseTree.tsx @@ -1,3 +1,11 @@ +/* + * @Author: donghao donghao@supervision.ltd + * @Date: 2024-02-22 13:38:04 + * @LastEditors: donghao donghao@supervision.ltd + * @LastEditTime: 2024-09-24 09:38:20 + * @FilePath: \general-work-web\General-AI-Platform-Web-Client\src\components\CustomTree\src\collapseTree.tsx + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ import { defineComponent, Transition } from "vue"; import CollapseTreeItem from "./collapseTreeItem"; import "./collapseTreeStyle.scss"; @@ -16,7 +24,6 @@ export default defineComponent({ // const count = ref(1); // const treeData = ref(props.value); // console.log(treeData.value); - return () => { return (
diff --git a/src/views/deviceSetting/hooks/useDeviceObject.ts b/src/views/deviceSetting/hooks/useDeviceObject.ts index bff402a..5f200c1 100644 --- a/src/views/deviceSetting/hooks/useDeviceObject.ts +++ b/src/views/deviceSetting/hooks/useDeviceObject.ts @@ -193,10 +193,10 @@ export const useDeviceObject = () => { return false; } - function isInView() { - // TODO 用三角函数判断 - return; - } + // function isInView() { + // // TODO 用三角函数判断 + // return; + // } // 设备对象是否移动 function isMoveDevice(activeObject, viewObj) { diff --git a/vite.config.ts b/vite.config.ts index 053c024..8e29e0c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -57,7 +57,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => { // 本地跨域代理 https://cn.vitejs.dev/config/server-options.html#server-proxy proxy: { "/api/": { - target: "http://192.168.10.21:8000/", + target: "http://192.168.10.70:8080/", changeOrigin: true, secure: false // rewrite: path => path.replace(/^\/api/, "")