From 53794600edd624f30869fa16bebd29d683ed5b41 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Fri, 14 Mar 2025 15:30:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod                            | 2 +-
 src/components/martix/Edit/index.vue | 4 ++--
 src/views/debug/index.vue            | 2 +-
 src/views/matrix/index.vue           | 6 +++++-
 src/views/matrixCraft/index.vue      | 2 +-
 vite.config.ts                       | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.env.prod b/.env.prod
index dacdfa5..f38cde4 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,4 +2,4 @@
 
 FT_NODE_ENV=prod
 
-FT_WS_URL=ws://localhost:8090/ws
\ No newline at end of file
+FT_WS_URL=ws://192.168.1.168/ws
\ No newline at end of file
diff --git a/src/components/martix/Edit/index.vue b/src/components/martix/Edit/index.vue
index 0a82fe8..839517f 100644
--- a/src/components/martix/Edit/index.vue
+++ b/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>
diff --git a/src/views/debug/index.vue b/src/views/debug/index.vue
index 0905e2b..e7ecf17 100644
--- a/src/views/debug/index.vue
+++ b/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,
diff --git a/src/views/matrix/index.vue b/src/views/matrix/index.vue
index d97f91b..3c7feb9 100644
--- a/src/views/matrix/index.vue
+++ b/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()
   })
diff --git a/src/views/matrixCraft/index.vue b/src/views/matrixCraft/index.vue
index f208a57..7566e30 100644
--- a/src/views/matrixCraft/index.vue
+++ b/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>
diff --git a/vite.config.ts b/vite.config.ts
index 6cd72a9..3488468 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'),