From d2d0a1aca5084d29b99dfc0af33c49b7052ddab2 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Sun, 2 Mar 2025 16:34:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=96=B7=E6=B6=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                  |   2 +-
 src/router/index.ts                   |   8 +--
 src/services/matrix/craft.ts          |  12 ++++
 src/services/matrix/manage.ts         |  27 ++++++++
 src/services/matrix/type.ts           |  20 ++++++
 src/views/matrixCraft/index.vue       |  65 +++++++++++++++++++
 src/views/matrixManage/matrixList.vue | 114 ++++++++++++++++++++++++++++++----
 src/views/matrixManage/type.ts        |   6 ++
 src/views/spurtPrint/index.vue        |  50 ---------------
 vite.config.ts                        |   2 +-
 10 files changed, 238 insertions(+), 68 deletions(-)
 create mode 100644 src/services/matrix/craft.ts
 create mode 100644 src/services/matrix/manage.ts
 create mode 100644 src/services/matrix/type.ts
 create mode 100644 src/views/matrixCraft/index.vue
 create mode 100644 src/views/matrixManage/type.ts
 delete mode 100644 src/views/spurtPrint/index.vue

diff --git a/.env b/.env
index 8c01c00..cf3bd09 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-VITE_API_HOST=192.168.1.199
+VITE_API_HOST=192.168.1.130
 VITE_API_PORT=8090
 VITE_WS_PATH=/ws
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 5444b59..489cfec 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -7,7 +7,7 @@ import PreSpray from "@/views/PreSpray.vue";
 import SprayView from "../views/SprayView.vue";
 import PrintView from "../views/PrintView.vue";
 import Debug from '../views/debug/index.vue'
-import SpurtPrint from '../views/spurtPrint/index.vue'
+import MatrixCraft from '../views/matrixCraft/index.vue'
 import MatrixManage from '../views/matrixManage/matrixList.vue'
 
 
@@ -48,9 +48,9 @@ const router = createRouter({
 					name: "debug",
 					component: Debug,
 				},{
-					path: "/spurtPrint",
-					name: "spurtPrint",
-					component: SpurtPrint
+					path: "/matrixCraft",
+					name: "matrixCraft",
+					component: MatrixCraft
 				},{
 					path: "/matrixManage",
 					name: "matrixManage",
diff --git a/src/services/matrix/craft.ts b/src/services/matrix/craft.ts
new file mode 100644
index 0000000..8104e31
--- /dev/null
+++ b/src/services/matrix/craft.ts
@@ -0,0 +1,12 @@
+import httpRequest, { type BaseResponse } from "../httpRequest";
+type ResponseParams = {
+  pageNum: number;
+  pageSize: number;
+}
+export function getList(params:ResponseParams){
+  return httpRequest<BaseResponse<string>>({
+      url: "/api/matrixCraft/list",
+      params: { ...params },
+      method: "GET",
+    });
+}
diff --git a/src/services/matrix/manage.ts b/src/services/matrix/manage.ts
new file mode 100644
index 0000000..a618412
--- /dev/null
+++ b/src/services/matrix/manage.ts
@@ -0,0 +1,27 @@
+import httpRequest, { type BaseResponse } from "../httpRequest";
+import type { MatrixItem }  from './type';
+
+
+export function getList(params: { pageNum: number; pageSize: number }){
+  return httpRequest<BaseResponse<{ list: MatrixItem[]; total: number }>>({
+      url: "/api/matrix/list",
+      params: { ...params },
+      method: "GET",
+    });
+}
+
+export function add(params:{name: string}){
+  return httpRequest<BaseResponse>({
+      url: "/api/matrix/add",
+      params: { ...params },
+      method: "POST",
+    });
+}
+
+export function updateMatrix(params:{name: string, id: number}){
+  return httpRequest<BaseResponse>({
+      url: "/api/matrix",
+      params: { ...params },
+      method: "PUT",
+    });
+}
\ No newline at end of file
diff --git a/src/services/matrix/type.ts b/src/services/matrix/type.ts
new file mode 100644
index 0000000..d9f1de5
--- /dev/null
+++ b/src/services/matrix/type.ts
@@ -0,0 +1,20 @@
+export type ResponseParams = {
+  pageNum: number;
+  pageSize: number;
+}
+
+export const defaultParams = {
+  pageNum: 1,
+  pageSize: 10
+}
+
+export type MatrixItem = {
+  id: number;
+  name: string;
+  isSelected?: boolean;
+};
+
+export type MatrixItemList = {
+  list:MatrixItem,
+  total:number
+}
diff --git a/src/views/matrixCraft/index.vue b/src/views/matrixCraft/index.vue
new file mode 100644
index 0000000..38c2a91
--- /dev/null
+++ b/src/views/matrixCraft/index.vue
@@ -0,0 +1,65 @@
+<template>
+  <main class="spurt_print">
+    <div class="spurt_print_btn ml-[3rem]">
+      <el-button type="primary">新增工艺</el-button>
+      <el-button type="default">编辑</el-button>
+      <el-button>删除</el-button>
+    </div>
+    <div class="w-[90vw] ml-[3rem] mt-[2rem] h-[70vh]">
+      <el-table :data="tableData" stripe style="width: 100%">
+        <el-table-column prop="name" label="基质名称" width="180" />
+        <el-table-column prop="craftName" label="工艺名称" width="180" />
+        <el-table-column prop="line" label="喷涂路线" />
+      </el-table>
+    </div>
+  </main>
+  <footer class="footer">
+    <el-pagination class="pagination" layout="prev, pager, next" :total="50" />
+  </footer>
+</template>
+<script lang="ts" setup>
+  import { ref, onMounted } from 'vue'
+  import { getList } from '@/services/matrix/craft'
+  onMounted(()=>{
+    getCraftList()
+  })
+  const tableData = [
+    {
+      craftName: '1',
+      name: '1',
+      line: '1',
+    }
+  ]
+
+  const getCraftList = () => {
+    const params = {
+      pageNum:1,
+      pageSize:10,
+    }
+    getList(params).then(res=>{
+      console.log('res====', res)
+    })
+  }
+</script>
+<style lang="scss" scoped>
+  .el-button--primary{
+    background: linear-gradient(90deg, #0657c0 24%, #096ae0 101%);;
+  }
+  .spurt_print{
+    .spurt_print_btn{
+      margin-top: 2rem;
+    }
+  }
+
+  .footer{
+    display: flex;
+    justify-content: end;
+    position: relative;
+
+    .pagination{
+      position: absolute;
+      bottom: 0;
+      right: 3rem;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/matrixManage/matrixList.vue b/src/views/matrixManage/matrixList.vue
index 0a514e8..eb25fb2 100644
--- a/src/views/matrixManage/matrixList.vue
+++ b/src/views/matrixManage/matrixList.vue
@@ -2,20 +2,22 @@
   <main>
     <div class="opt_btn p-[3rem]">
       <el-button type="primary" @click="onAdd">新增基质</el-button>
-      <el-button>编辑</el-button>
+      <el-button @click="onEdit">编辑</el-button>
       <el-button>删除</el-button>
     </div>
-    <div class="matrix_list">
-
+    <div class="matrix_list pl-[3rem]">
+      <div v-for="(item, index) in matrixList" class="w-[8rem] h-[3rem] matrix_module" @click="toggleSelection(index)" :style="{ backgroundColor: item.isSelected ? '#65a8ff' : '#ffffff' }">
+        {{ item.name }}
+      </div>
     </div>
-    <el-dialog v-model="addVisible" width="20rem" align-center>
+    <el-dialog v-if="addVisible" v-model="addVisible" width="25rem" align-center :close-on-click-modal="false" destroy-on-close>
       <template #header><h2>新增基质</h2></template>
-      <el-form ref="ruleFormRef" :model="addForm" label-width="auto" style="max-width: 600px;" :rules="rules">
+      <el-form ref="addFormRef" :model="addForm" label-width="auto" style="max-width: 600px;" :rules="rules">
         <el-form-item label="基质名称" prop="name">
           <el-input v-model="addForm.name" />
         </el-form-item>
       </el-form>
-      <div class="flex justify-center">
+      <div class="flex justify-center h-[5rem] pt-[2rem]">
         <el-button type="primary" @click="onSave">保存</el-button>
         <el-button @click="onCancel">取消</el-button>
       </div>
@@ -23,34 +25,122 @@
   </main>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue'
+  import { ref, reactive, onMounted } from 'vue'
+  import type { MatrixItem } from './type'
+  import { ElMessage } from "element-plus";
+  import {getList, add, updateMatrix} from '@/services/matrix/manage'
   const addVisible = ref(false)
-  const addForm = ref<Record<string,string>>({})
+  let addForm = reactive<Record<string,string>>({})
+  const addFormRef:any =  ref<any>()
   const rules = ref({
     name: [{
       required: true,
       message: '请输入名称',
-      trigger: 'change',
+      trigger: 'blur',
     }]
   })
-  const matrixList = ref([])
+  const matrixList = ref<Array<MatrixItem>>([])
 
+  onMounted(()=>{
+    getMatrixList()
+  })
+
+  const getMatrixList = () => {
+    const params = {
+      pageNum:1,
+      pageSize:20,
+    }
+    getList(params).then(res => {
+      if(res.success){
+        const { list } = res.data;
+        matrixList.value = list;
+      }
+    })
+  }
+  const toggleSelection = (index:number) => {
+    matrixList.value[index].isSelected = !matrixList.value[index].isSelected;
+  }
+  let saveType = 'add'
   const onAdd = () => {
     addVisible.value = true;
+    saveType = 'add'
   }
 
+  let editItem = <MatrixItem>{}
+  const onEdit = () => {
+    let list = matrixList.value.filter((item:MatrixItem) => !!item.isSelected)
+    if(list.length !== 1){
+      ElMessage.error("只能编辑一条数据")
+      return;
+    }
+    saveType = 'edit'
+    editItem = list[0]
+    addForm.name = editItem.name
+    addVisible.value = true;
+  }
   const onSave = () => {
-    console.log('form----', addForm.value)
+    addFormRef.value.validate((vali:boolean) => {
+      if(vali){
+        if(saveType === 'add'){
+          doSave()
+        }else if(saveType === 'edit'){
+          doEdit()
+        }
+        
+      }
+    })
+  }
+
+  const doEdit = () => {
+    const params = {
+      name:addForm.name,
+      id:editItem.id
+    }
+    updateMatrix(params).then(res => {
+      console.log('编辑基质-------', res)
+      if(res.success){
+        ElMessage.success('编辑成功')
+        getMatrixList()
+        onCancel()
+      }
+    })
+  }
+
+
+  const doSave = ()=>{
+    const params = {
+      name:addForm.name
+    }
+    add(params).then(res => {
+      console.log('新增基质-------', res)
+      if(res.success){
+        ElMessage.success('新增成功')
+        getMatrixList()
+        onCancel()
+      }
+    })
   }
 
   const onCancel = () => {
-    addForm.value = {}
+    addForm = {}
     addVisible.value = false;
   }
 
+
 </script>
 <style lang="scss" scoped>
   .el-button--primary{
     background: linear-gradient(90deg, #0657c0 24%, #096ae0 101%);;
   }
+
+  .matrix_list{
+    display: grid;
+    grid-template-columns:repeat(6, 1fr);
+  }
+  .matrix_module{
+    background: #ffffff;
+    border-radius: 10px;
+    line-height: 3rem;
+    text-align: center;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/matrixManage/type.ts b/src/views/matrixManage/type.ts
new file mode 100644
index 0000000..f2908b8
--- /dev/null
+++ b/src/views/matrixManage/type.ts
@@ -0,0 +1,6 @@
+export type MatrixItem = {
+  id: number;
+  name: string;
+  isSelected?: boolean;
+};
+
diff --git a/src/views/spurtPrint/index.vue b/src/views/spurtPrint/index.vue
deleted file mode 100644
index eebbbd1..0000000
--- a/src/views/spurtPrint/index.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <main class="spurt_print">
-    <div class="spurt_print_btn ml-[3rem]">
-      <el-button type="primary">新增工艺</el-button>
-      <el-button type="default">编辑</el-button>
-      <el-button>删除</el-button>
-    </div>
-    <div class="w-[90vw] ml-[3rem] mt-[2rem] h-[70vh]">
-      <el-table :data="tableData" stripe style="width: 100%">
-        <el-table-column prop="name" label="基质名称" width="180" />
-        <el-table-column prop="craftName" label="工艺名称" width="180" />
-        <el-table-column prop="line" label="喷涂路线" />
-      </el-table>
-    </div>
-  </main>
-  <footer class="footer">
-    <el-pagination class="pagination" layout="prev, pager, next" :total="50" />
-  </footer>
-</template>
-<script lang="ts" setup>
-  const tableData = [
-    {
-      craftName: '1',
-      name: '1',
-      line: '1',
-    }
-  ]
-</script>
-<style lang="scss" scoped>
-  .el-button--primary{
-    background: linear-gradient(90deg, #0657c0 24%, #096ae0 101%);;
-  }
-  .spurt_print{
-    .spurt_print_btn{
-      margin-top: 2rem;
-    }
-  }
-
-  .footer{
-    display: flex;
-    justify-content: end;
-    position: relative;
-
-    .pagination{
-      position: absolute;
-      bottom: 0;
-      right: 3rem;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index 4be5bf4..37a32c2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,7 +18,7 @@ export default defineConfig({
 		port: 5175,
 		proxy: {
 			"/api": {
-				target: "http://192.168.1.199:8090",
+				target: "http://192.168.1.130:8090",
 				// target: "http://localhost:8080",
 				changeOrigin: true,
 				// rewrite: (path) => path.replace(/^\/api/, ''),