From fcb432744dd7a718de11a24baa58a8abc3943a33 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 09 九月 2024 10:56:32 +0800
Subject: [PATCH] 设备分类 使用字典
---
src/views/ecg/devmanage/DevModel.vue | 159 +++++++++++++++++++++------------------
src/views/ecg/devmanage/DevModelForm.vue | 26 +++--
src/utils/dict.ts | 1
3 files changed, 103 insertions(+), 83 deletions(-)
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index a3cbfa0..eef69ba 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -148,6 +148,7 @@
ECG_BOOK_SRC = 'ecg_book_src',
ECG_QUEUE_STATUS = 'ecg_queue_status',
ECG_DEV_BRAND = 'ecg_dev_brand',
+ ECG_DEV_CATEGORY = 'ecg_dev_category',
// ========== BPM 妯″潡 ==========
BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
diff --git a/src/views/ecg/devmanage/DevModel.vue b/src/views/ecg/devmanage/DevModel.vue
index c200aa4..a2fbd2c 100644
--- a/src/views/ecg/devmanage/DevModel.vue
+++ b/src/views/ecg/devmanage/DevModel.vue
@@ -2,68 +2,79 @@
<ContentWrap>
<!-- 鎼滅储宸ヤ綔鏍� -->
<el-form
- class="-mb-15px"
- :model="queryParams"
- ref="queryFormRef"
- :inline="true"
- label-width="68px"
+ class="-mb-15px"
+ :model="queryParams"
+ ref="queryFormRef"
+ :inline="true"
+ label-width="68px"
>
- <el-form-item label="鍒嗙被鍚�" prop="category">
- <el-input
- v-model="queryParams.category"
- placeholder="璇疯緭鍏ュ垎绫诲悕"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="鍝佺墝" prop="brand">
- <el-input
- v-model="queryParams.brand"
- placeholder="璇疯緭鍏ュ搧鐗�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
-
- <el-form-item label="鍨嬪彿" prop="model">
- <el-input
- v-model="queryParams.model"
- placeholder="璇疯緭鍏ュ瀷鍙�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
<el-date-picker
- v-model="queryParams.createTime"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
- class="!w-220px"
+ v-model="queryParams.createTime"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="daterange"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+ class="!w-220px"
+ />
+ </el-form-item>
+ <el-form-item label="鍒嗙被鍚�" prop="category">
+ <el-select
+ v-model="queryParams.category"
+ placeholder="璇烽�夋嫨鍒嗙被鍚�"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.ECG_DEV_CATEGORY)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍝佺墝" prop="brand">
+ <el-select
+ v-model="queryParams.brand"
+ placeholder="璇烽�夋嫨鍝佺墝"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.ECG_DEV_BRAND)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍨嬪彿" prop="model">
+ <el-input
+ v-model="queryParams.model"
+ placeholder="璇疯緭鍏ュ瀷鍙�"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
<el-button
- type="primary"
- plain
- @click="openForm('create')"
- v-hasPermi="['ecg:dev-model:create']"
+ type="primary"
+ plain
+ @click="openForm('create')"
+ v-hasPermi="['ecg:dev-model:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 鏂板
</el-button>
<el-button
- type="success"
- plain
- @click="handleExport"
- :loading="exportLoading"
- v-hasPermi="['ecg:dev-model:export']"
+ type="success"
+ plain
+ @click="handleExport"
+ :loading="exportLoading"
+ v-hasPermi="['ecg:dev-model:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
</el-button>
@@ -75,35 +86,39 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
- <el-table-column label="鍒嗙被鍚�" align="center" prop="category" />
+ <el-table-column
+ label="鍒涘缓鏃堕棿"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <el-table-column label="鍒嗙被鍚�" align="center" prop="category">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ECG_DEV_CATEGORY" :value="scope.row.category" />
+ </template>
+ </el-table-column>
<el-table-column label="鍝佺墝" align="center" prop="brand">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_DEV_BRAND" :value="scope.row.brand" />
</template>
</el-table-column>
<el-table-column label="鍨嬪彿" align="center" prop="model" />
- <el-table-column
- label="鍒涘缓鏃堕棿"
- align="center"
- prop="createTime"
- :formatter="dateFormatter"
- width="180px"
- />
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
<el-button
- link
- type="primary"
- @click="openForm('update', scope.row.id)"
- v-hasPermi="['ecg:dev-model:update']"
+ link
+ type="primary"
+ @click="openForm('update', scope.row.id)"
+ v-hasPermi="['ecg:dev-model:update']"
>
缂栬緫
</el-button>
<el-button
- link
- type="danger"
- @click="handleDelete(scope.row.id)"
- v-hasPermi="['ecg:dev-model:delete']"
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ v-hasPermi="['ecg:dev-model:delete']"
>
鍒犻櫎
</el-button>
@@ -112,10 +127,10 @@
</el-table>
<!-- 鍒嗛〉 -->
<Pagination
- :total="total"
- v-model:page="queryParams.pageNo"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
+ :total="total"
+ v-model:page="queryParams.pageNo"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
/>
</ContentWrap>
@@ -124,11 +139,11 @@
</template>
<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { DevModelApi, DevModelVO } from '@/api/ecg/devmanage'
import DevModelForm from './DevModelForm.vue'
-import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
/** 璁惧鍨嬪彿 鍒楄〃 */
defineOptions({ name: 'DevModel' })
@@ -142,10 +157,10 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
+ createTime: [],
category: undefined,
brand: undefined,
- model: undefined,
- createTime: []
+ model: undefined
})
const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
diff --git a/src/views/ecg/devmanage/DevModelForm.vue b/src/views/ecg/devmanage/DevModelForm.vue
index 5b236bd..bbf8f66 100644
--- a/src/views/ecg/devmanage/DevModelForm.vue
+++ b/src/views/ecg/devmanage/DevModelForm.vue
@@ -1,17 +1,24 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
- ref="formRef"
- :model="formData"
- :rules="formRules"
- label-width="100px"
- v-loading="formLoading"
+ ref="formRef"
+ :model="formData"
+ :rules="formRules"
+ label-width="100px"
+ v-loading="formLoading"
>
<el-form-item label="鍒嗙被鍚�" prop="category">
- <el-input v-model="formData.category" placeholder="璇疯緭鍏ュ垎绫诲悕" />
+ <el-select v-model="formData.category" placeholder="璇烽�夋嫨鍒嗙被鍚�">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.ECG_DEV_CATEGORY)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鍝佺墝" prop="brand">
- <el-select v-model="formData.brand" placeholder="璇疯緭鍏ュ搧鐗�">
+ <el-select v-model="formData.brand" placeholder="璇烽�夋嫨鍝佺墝">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.ECG_DEV_BRAND)"
:key="dict.value"
@@ -31,8 +38,8 @@
</Dialog>
</template>
<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { DevModelApi, DevModelVO } from '@/api/ecg/devmanage'
-import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
/** 璁惧鍨嬪彿 琛ㄥ崟 */
defineOptions({ name: 'DevModelForm' })
@@ -50,9 +57,6 @@
model: undefined
})
const formRules = reactive({
- category: [{ required: true, message: '鍒嗙被鍚嶄笉鑳戒负绌�', trigger: 'blur' }],
- brand: [{ required: true, message: '鍝佺墝涓嶈兘涓虹┖', trigger: 'blur' }],
- model: [{ required: true, message: '鍨嬪彿涓嶈兘涓虹┖', trigger: 'blur' }]
})
const formRef = ref() // 琛ㄥ崟 Ref
--
Gitblit v1.9.3