Browse Source

fix: bug修复

master
guoapeng 5 months ago
parent
commit
53794600ed
  1. 2
      .env.prod
  2. 4
      src/components/martix/Edit/index.vue
  3. 2
      src/views/debug/index.vue
  4. 6
      src/views/matrix/index.vue
  5. 2
      src/views/matrixCraft/index.vue
  6. 4
      vite.config.ts

2
.env.prod

@ -2,4 +2,4 @@
FT_NODE_ENV=prod
FT_WS_URL=ws://localhost:8090/ws
FT_WS_URL=ws://192.168.1.168/ws

4
src/components/martix/Edit/index.vue

@ -56,9 +56,9 @@ const cancel = () => {
</script>
<template>
<FtDialog visible :title="form.id ? '编辑工艺' : '新增工艺'" width="40%" @ok="okHandle" @cancel="cancel">
<FtDialog visible :title="form.id ? '编辑基质' : '新增基质'" width="40%" @ok="okHandle" @cancel="cancel">
<el-form ref="formRef" label-width="120" :model="form" :rules="rules">
<el-form-item label="工艺名称">
<el-form-item label="基质名称">
<el-input v-model="form.name" placeholder="" />
</el-form-item>
</el-form>

2
src/views/debug/index.vue

@ -139,7 +139,7 @@ const dehumidifierValveClose = () => {
const syringePumpInjectionVolumeSet = () => {
const params = {
cmdName: 'syringe_pump__start',
cmdName: 'syringe_pump_start',
cmdId: '',
param: {
direction: form.direction,

6
src/views/matrix/index.vue

@ -77,7 +77,11 @@ const delHandle = async () => {
closeOnPressEscape: false,
closeOnHashChange: false,
}).then(async () => {
await del(ids.join(','))
const res = await del(ids.join(','))
if (res.matrixName?.length) {
FtMessage.error(`基质: ${res.matrixName.join(',')}已绑定工艺, 无法删除`)
return
}
FtMessage.success('删除成功')
await getList()
})

2
src/views/matrixCraft/index.vue

@ -154,7 +154,7 @@ const ok = () => {
</div>
<div class="table-footer">
<el-pagination size="large" background layout="prev, pager, next" :total @change="pageChange" />
<el-pagination size="large" :total background layout="prev, pager, next,total" @change="pageChange" />
</div>
<Edit v-if="addVisible" :matrix-list :form-data @ok="ok" @cancel="addVisible = false" />
</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