Browse Source

fix:bug修复2

master
guoapeng 5 months ago
parent
commit
ccb129970f
  1. 2
      .env.dev
  2. 8
      src/apis/log.ts
  3. 2
      src/assets/styles/element.scss
  4. 16
      src/components/point/Edit/index.vue
  5. 1
      src/views/clean/index.vue
  6. 63
      src/views/log/index.vue
  7. 63
      src/views/matrixCraft/index.vue
  8. 4
      vite.config.ts

2
.env.dev

@ -2,4 +2,4 @@
FT_NODE_ENV=dev
FT_WS_URL=ws://192.168.1.200:8080/ws
FT_WS_URL=ws://192.168.1.199:8080/ws

8
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
}[]
}

2
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 {

16
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 = () => {
<el-input v-model="form.pointName" placeholder="" />
</el-form-item>
<el-form-item label="x" prop="x">
<el-input v-model="form.x" placeholder="" />
<el-input v-model="form.x" type="number" placeholder="" />
</el-form-item>
<el-form-item label="y" prop="y">
<el-input v-model="form.y" placeholder="" />
<el-input v-model="form.y" type="number" placeholder="" />
</el-form-item>
<el-form-item label="z" prop="z">
<el-input v-model="form.z" placeholder="" />
<el-input v-model="form.z" type="number" placeholder="" />
</el-form-item>
</el-form>
</FtDialog>

1
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;
}

63
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) => {
<el-table-column prop="matrixPathType" label="喷涂路线">
<template #default="scope">
<div class="scope-box">
<img v-show="scope.row.routeType === 'horizontal'" :src="route1" width="20px" height="20px" alt="icon">
<img v-show="scope.row.routeType === 'vertical'" :src="route2" width="20px" height="20px" alt="icon">
<img v-show="scope.row.routeType === 'grid'" :src="route2" width="20px" height="20px" alt="icon">
<img v-show="scope.row.matrixPathType === 'horizontal'" :src="route1" width="20px" height="20px" alt="icon">
<img v-show="scope.row.matrixPathType === 'vertical'" :src="route2" width="20px" height="20px" alt="icon">
<img v-show="scope.row.matrixPathType === 'grid'" :src="route3" width="20px" height="20px" alt="icon">
</div>
</template>
</el-table-column>
<el-table-column prop="motorZHeight" label="喷涂高度">
<template #default="scope">
<div class="scope-box">
{{ scope.row.motorZHeight }}mm
</div>
</template>
</el-table-column>
<el-table-column prop="gasPressure" label="氮气气压">
<template #default="scope">
<div class="scope-box">
{{ scope.row.gasPressure }}Mpa
</div>
</template>
</el-table-column>
<el-table-column prop="volume" label="基质流速">
<template #default="scope">
<div class="scope-box">
{{ scope.row.volume }}uL/min
</div>
</template>
</el-table-column>
<el-table-column prop="highVoltageValue" label="电压">
<template #default="scope">
<div class="scope-box">
{{ scope.row.highVoltageValue }}V
</div>
</template>
</el-table-column>
<el-table-column prop="movingSpeed" label="移速">
<template #default="scope">
<div class="scope-box">
{{ scope.row.movingSpeed }}mm/s
</div>
</template>
</el-table-column>
<el-table-column prop="spacing" label="行间距">
<template #default="scope">
<div class="scope-box">
{{ scope.row.spacing }}mm
</div>
</template>
</el-table-column>
<el-table-column prop="times" label="喷涂次数">
<template #default="scope">
<div class="scope-box">
{{ scope.row.times }}
</div>
</template>
</el-table-column>
<el-table-column prop="motorZHeight" label="喷涂高度" />
<el-table-column prop="gasPressure" label="氮气气压" />
<el-table-column prop="volume" label="基质流速" />
<el-table-column prop="highVoltageValue" label="电压" />
<el-table-column prop="movingSpeed" label="移速" />
<el-table-column prop="spacing" label="行间距" />
<el-table-column prop="times" label="喷涂遍数" />
</el-table>
</div>

63
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 = () => {
<el-table-column prop="matrixPathType" label="喷涂路线">
<template #default="scope">
<div class="scope-box">
<img v-show="scope.row.routeType === 'horizontal'" :src="route1" width="20px" height="20px" alt="icon">
<img v-show="scope.row.routeType === 'vertical'" :src="route2" width="20px" height="20px" alt="icon">
<img v-show="scope.row.routeType === 'grid'" :src="route2" width="20px" height="20px" alt="icon">
<img v-show="scope.row.matrixPathType === 'horizontal'" :src="route1" width="20px" height="20px" alt="icon">
<img v-show="scope.row.matrixPathType === 'vertical'" :src="route2" width="20px" height="20px" alt="icon">
<img v-show="scope.row.matrixPathType === 'grid'" :src="route3" width="20px" height="20px" alt="icon">
</div>
</template>
</el-table-column>
<el-table-column prop="motorZHeight" label="喷涂高度">
<template #default="scope">
<div class="scope-box">
{{ scope.row.motorZHeight }}mm
</div>
</template>
</el-table-column>
<el-table-column prop="gasPressure" label="氮气气压">
<template #default="scope">
<div class="scope-box">
{{ scope.row.gasPressure }}Mpa
</div>
</template>
</el-table-column>
<el-table-column prop="volume" label="基质流速">
<template #default="scope">
<div class="scope-box">
{{ scope.row.volume }}uL/min
</div>
</template>
</el-table-column>
<el-table-column prop="highVoltageValue" label="电压">
<template #default="scope">
<div class="scope-box">
{{ scope.row.highVoltageValue }}V
</div>
</template>
</el-table-column>
<el-table-column prop="movingSpeed" label="移速">
<template #default="scope">
<div class="scope-box">
{{ scope.row.movingSpeed }}mm/s
</div>
</template>
</el-table-column>
<el-table-column prop="spacing" label="行间距">
<template #default="scope">
<div class="scope-box">
{{ scope.row.spacing }}mm
</div>
</template>
</el-table-column>
<el-table-column prop="times" label="喷涂次数">
<template #default="scope">
<div class="scope-box">
{{ scope.row.times }}
</div>
</template>
</el-table-column>
<el-table-column prop="motorZHeight" label="喷涂高度" />
<el-table-column prop="gasPressure" label="氮气气压" />
<el-table-column prop="volume" label="基质流速" />
<el-table-column prop="highVoltageValue" label="电压" />
<el-table-column prop="movingSpeed" label="移速" />
<el-table-column prop="spacing" label="行间距" />
<el-table-column prop="times" label="喷涂遍数" />
</el-table>
</div>

4
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'),

Loading…
Cancel
Save