From a32ba2c6b9e91e98a2d261b7bef81c35d124d74c Mon Sep 17 00:00:00 2001
From: fuhao <fuhao@ciqihuo.net>
Date: Tue, 3 Sep 2024 20:15:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=83=85=E6=8A=A5=E6=9D=BF=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AE=9A=E4=B9=89=E5=89=8D=E7=AB=AF=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/board/boardtype.js          |  20 +--
 ruoyi-ui/src/views/board/boardType/index.vue | 123 +++++++++++--------
 2 files changed, 79 insertions(+), 64 deletions(-)

diff --git a/ruoyi-ui/src/api/board/boardtype.js b/ruoyi-ui/src/api/board/boardtype.js
index fd6504b6..959654b0 100644
--- a/ruoyi-ui/src/api/board/boardtype.js
+++ b/ruoyi-ui/src/api/board/boardtype.js
@@ -1,44 +1,44 @@
 import request from '@/utils/request'
 
 // 查询情报板类型列表
-export function listType(query) {
+export function listBoardType(query) {
   return request({
-    url: '/boardType/type/list',
+    url: '/board/boardType/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询情报板类型详细
-export function getType(id) {
+export function getBoardType(id) {
   return request({
-    url: '/boardType/type/' + id,
+    url: '/board/boardType/' + id,
     method: 'get'
   })
 }
 
 // 新增情报板类型
-export function addType(data) {
+export function addBoardType(data) {
   return request({
-    url: '/boardType/type',
+    url: '/board/boardType',
     method: 'post',
     data: data
   })
 }
 
 // 修改情报板类型
-export function updateType(data) {
+export function updateBoardType(data) {
   return request({
-    url: '/boardType/type',
+    url: '/board/boardType',
     method: 'put',
     data: data
   })
 }
 
 // 删除情报板类型
-export function delType(id) {
+export function delBoardType(id) {
   return request({
-    url: '/boardType/type/' + id,
+    url: '/board/boardType/' + id,
     method: 'delete'
   })
 }
diff --git a/ruoyi-ui/src/views/board/boardType/index.vue b/ruoyi-ui/src/views/board/boardType/index.vue
index 65fbb2ab..8194a213 100644
--- a/ruoyi-ui/src/views/board/boardType/index.vue
+++ b/ruoyi-ui/src/views/board/boardType/index.vue
@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="尺寸" prop="size">
-        <el-input
-          v-model="queryParams.size"
-          placeholder="请输入尺寸"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -31,8 +23,9 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['boardType:type:add']"
-        >新增</el-button>
+          v-hasPermi="['board:boardType:add']"
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -42,8 +35,9 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['boardType:type:edit']"
-        >修改</el-button>
+          v-hasPermi="['board:boardType:edit']"
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,28 +47,19 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['boardType:type:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['boardType:type:export']"
-        >导出</el-button>
+          v-hasPermi="['board:boardType:remove']"
+        >删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="尺寸" align="center" prop="size" />
+    <el-table v-loading="loading" :data="boardTypeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="唯一编号" align="center" prop="id"/>
+      <el-table-column label="名称" align="center" prop="name"/>
+      <el-table-column label="类型" align="center" prop="type"/>
+      <el-table-column label="尺寸" align="center" prop="size"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -82,15 +67,17 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['boardType:type:edit']"
-          >修改</el-button>
+            v-hasPermi="['board:boardType:edit']"
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['boardType:type:remove']"
-          >删除</el-button>
+            v-hasPermi="['board:boardType:remove']"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -105,12 +92,25 @@
 
     <!-- 添加或修改情报板类型对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
+          <el-input v-model="form.name" placeholder="请输入名称"/>
         </el-form-item>
-        <el-form-item label="尺寸" prop="size">
-          <el-input v-model="form.size" placeholder="请输入尺寸" />
+        <el-form-item label="类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入类型"/>
+        </el-form-item>
+        <el-form-item label="尺寸(高*长)" prop="size">
+          <el-row align="middle">
+            <el-col :span="8">
+                <el-input-number :controls="false" v-model="form.height" placeholder="请输入尺寸" size="small"/>
+            </el-col>
+            <el-col :span="4" align="middle">
+              <div>*</div>
+            </el-col>
+            <el-col :span="8">
+                <el-input-number :controls="false" v-model="form.width" placeholder="请输入尺寸" size="small"/>
+            </el-col>
+          </el-row>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -122,7 +122,7 @@
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType } from "@/api/board/boardtype";
+import {listBoardType, getBoardType, delBoardType, addBoardType, updateBoardType} from "@/api/board/boardtype";
 
 export default {
   name: "BoardType",
@@ -141,7 +141,7 @@ export default {
       // 总条数
       total: 0,
       // 情报板类型表格数据
-      typeList: [],
+      boardTypeList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -159,13 +159,23 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
+          {required: true, message: "名称不能为空", trigger: "change"}
         ],
         type: [
-          { required: true, message: "类型不能为空", trigger: "change" }
+          {required: true, message: "类型不能为空", trigger: "change"}
         ],
         size: [
-          { required: true, message: "尺寸不能为空", trigger: "blur" }
+          {
+            validator: (rule, value, callback) => {
+              if (!this.form.height || !this.form.width) {
+                callback(new Error('尺寸(高和长)不能为空'));
+              } else {
+                callback();
+              }
+            },
+            required: true,
+            trigger: 'change'
+          }
         ]
       }
     };
@@ -177,8 +187,8 @@ export default {
     /** 查询情报板类型列表 */
     getList() {
       this.loading = true;
-      listType(this.queryParams).then(response => {
-        this.typeList = response.rows;
+      listBoardType(this.queryParams).then(response => {
+        this.boardTypeList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -194,6 +204,8 @@ export default {
         id: null,
         name: null,
         type: null,
+        height: null,
+        width: null,
         size: null
       };
       this.resetForm("form");
@@ -211,7 +223,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -224,8 +236,9 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getType(id).then(response => {
+      getBoardType(id).then(response => {
         this.form = response.data;
+        [this.form.height, this.form.width] = response.data.size.split("*").map(Number);
         this.open = true;
         this.title = "修改情报板类型";
       });
@@ -234,14 +247,15 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.size = this.form.height + '*' + this.form.width;
           if (this.form.id != null) {
-            updateType(this.form).then(response => {
+            updateBoardType(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addType(this.form).then(response => {
+            addBoardType(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -253,18 +267,19 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除情报板类型编号为"' + ids + '"的数据项？').then(function() {
-        return delType(ids);
+      this.$modal.confirm('是否确认删除情报板类型编号为"' + ids + '"的数据项？').then(function () {
+        return delBoardType(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('boardType/type/export', {
+      this.download('board/boardType/export', {
         ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+      }, `boardType_${new Date().getTime()}.xlsx`)
     }
   }
 };