diff --git a/.env.dev b/.env.dev index 96ac20f..e691d2d 100644 --- a/.env.dev +++ b/.env.dev @@ -2,4 +2,4 @@ FT_NODE_ENV=dev -FT_WS_URL=ws://192.168.1.200:8080/ws \ No newline at end of file +FT_WS_URL=ws://192.168.1.199:8080/ws \ No newline at end of file diff --git a/src/apis/log.ts b/src/apis/log.ts index 6a6444b..5b21943 100644 --- a/src/apis/log.ts +++ b/src/apis/log.ts @@ -7,11 +7,15 @@ export interface logQuery { // 定义返回参数的接口 export interface logResponse { + code: string total: number list: { id: number - message: string - timestamp: string + matrixId: number + matrixInfo: string + status: 0 | 1 + createTime: string + updateTime: string }[] } diff --git a/src/assets/styles/element.scss b/src/assets/styles/element.scss index 23b071c..56da693 100644 --- a/src/assets/styles/element.scss +++ b/src/assets/styles/element.scss @@ -110,7 +110,6 @@ } .el-dialog__title { font-size: 45px; - } .el-dialog__body { max-height: 60vh; @@ -121,6 +120,7 @@ .el-table { width: 100%; + box-shadow: 0 0 12px rgba(0,0,0,0.1); } .el-table th.el-table__cell { diff --git a/src/components/point/Edit/index.vue b/src/components/point/Edit/index.vue index 77db57e..429b4c3 100644 --- a/src/components/point/Edit/index.vue +++ b/src/components/point/Edit/index.vue @@ -21,12 +21,10 @@ onMounted(() => { const form = ref({}) const rules = { - name: [ - { required: true, message: '请输入坐标名称', trigger: 'blur' }, - { required: true, message: '请输入x', trigger: 'blur' }, - { required: true, message: '请输入y', trigger: 'blur' }, - { required: true, message: '请输入z', trigger: 'blur' }, - ], + pointName: [{ required: true, message: '请输入坐标名称', trigger: 'blur' }], + x: [{ required: true, message: '请输入x', trigger: 'blur' }], + y: [{ required: true, message: '请输入y', trigger: 'blur' }], + z: [{ required: true, message: '请输入z', trigger: 'blur' }], } const formRef = ref() @@ -65,13 +63,13 @@ const cancel = () => { - + - + - + diff --git a/src/views/clean/index.vue b/src/views/clean/index.vue index 29722bb..6022c88 100644 --- a/src/views/clean/index.vue +++ b/src/views/clean/index.vue @@ -89,6 +89,7 @@ const nozzlePipelineWash = () => { flex-direction: column; justify-content: center; align-items: center; + color: var(--el-color-primary); .ft-button { margin: 30px; } diff --git a/src/views/log/index.vue b/src/views/log/index.vue index 195f091..7e883d6 100644 --- a/src/views/log/index.vue +++ b/src/views/log/index.vue @@ -3,6 +3,7 @@ import type { logQuery } from 'apis/log' import { list } from 'apis/log' import { list as matrixList } from 'apis/matrix' import { list as matrixCraftList } from 'apis/matrixCraft' +import route3 from 'assets/images/route.png' import route2 from 'assets/images/route_horizontal.png' import route1 from 'assets/images/route_vertical.png' import { onMounted, ref } from 'vue' @@ -73,19 +74,61 @@ const pageChange = (pageNum: number, pageSize: number) => { + + + + + + + + + + + + + + + + + + + + + - - - - - - - diff --git a/src/views/matrixCraft/index.vue b/src/views/matrixCraft/index.vue index 7566e30..39c1cde 100644 --- a/src/views/matrixCraft/index.vue +++ b/src/views/matrixCraft/index.vue @@ -3,6 +3,7 @@ import type { MatrixCraftQuery } from 'apis/matrixCraft' import { list as listMatrix } from 'apis/matrix' import { del, list } from 'apis/matrixCraft' +import route3 from 'assets/images/route.png' import route2 from 'assets/images/route_horizontal.png' import route1 from 'assets/images/route_vertical.png' import FtButton from 'components/common/FTButton/index.vue' @@ -137,19 +138,61 @@ const ok = () => { + + + + + + + + + + + + + + + + + + + + + - - - - - - - diff --git a/vite.config.ts b/vite.config.ts index 3488468..6cd72a9 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -76,8 +76,8 @@ export default defineConfig({ host: '0.0.0.0', proxy: { '/api': { - // target: 'http://192.168.1.199:8080', - target: 'http://192.168.1.200:8080', + target: 'http://192.168.1.199:8080', + // target: 'http://192.168.1.200:8080', // secure: false, changeOrigin: true, // 是否跨域 rewrite: path => path.replace(/^\/api/, 'api'),