style:模具管理字段调整

liutao_branch
黄伟杰 4 months ago
parent 9ae8012a8b
commit 5def50f85e

@ -1,55 +1,28 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form <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="name"> <el-form-item label="名称" prop="name">
<el-input <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery"
v-model="queryParams.name" class="!w-240px" />
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="能耗类型" prop="deviceType"> <el-form-item label="能耗类型" prop="deviceType">
<el-select <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable class="!w-240px">
v-model="queryParams.deviceType" <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
placeholder="请选择设备类型"
clearable
class="!w-240px"
>
<el-option
v-for="item in typeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery">
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <Icon icon="ep:search" class="mr-5px" /> 搜索
<el-button </el-button>
type="primary" <el-button @click="resetQuery">
plain <Icon icon="ep:refresh" class="mr-5px" /> 重置
@click="openForm('create')" </el-button>
v-hasPermi="['mes:energy-device:create']" <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['mes:energy-device:create']">
>
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-button <el-button type="success" plain @click="handleExport" :loading="exportLoading"
type="success" v-hasPermi="['mes:energy-device:export']">
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:energy-device:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出 <Icon icon="ep:download" class="mr-5px" /> 导出
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -58,38 +31,33 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" highlight-current-row
v-loading="loading" @current-change="handleCurrentChange">
:data="list" <el-table-column label="表编码" align="center" prop="code" />
:stripe="true" <el-table-column label="表名称" align="center" prop="name" />
:show-overflow-tooltip="true"
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="编码" align="center" prop="code" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="能耗类型" align="center" prop="deviceTypeName" /> <el-table-column label="能耗类型" align="center" prop="deviceTypeName" />
<el-table-column label="所属区域" align="center" prop="orgName" /> <el-table-column label="所属区域" align="center" prop="orgName" />
<el-table-column label="计算规则" align="center" prop="rules" /> <el-table-column label="计算规则" align="center" prop="rules" />
<el-table-column label="抄表周期" align="center" prop="checkCron" /> <!-- <el-table-column label="抄表周期" align="center" prop="checkCron" />
<el-table-column label="最后抄表值" align="center" prop="lastCheckValue" /> <el-table-column label="最后抄表值" align="center" prop="lastCheckValue" />
<el-table-column label="单位" align="center" prop="unitName" /> <el-table-column label="单位" align="center" prop="unitName" /> -->
<el-table-column <!-- <el-table-column
label="最后抄表时间" label="最后抄表时间"
align="center" align="center"
prop="lastCheckTime" prop="lastCheckTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> /> -->
<!-- <el-table-column label="设备资料" align="center" prop="info" /> --> <!-- <el-table-column label="设备资料" align="center" prop="info" /> -->
<el-table-column label="是否启用" align="center" prop="isEnable"> <el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="最近更新时间" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="操作" fixed="right" align="center" width="250px"> <el-table-column label="操作" fixed="right" align="center" width="250px">
<template #default="scope"> <template #default="scope">
<el-button <!-- <el-button
link link
type="warning" type="warning"
@click="newRecordForm(scope.row.id,scope.row.name )" @click="newRecordForm(scope.row.id,scope.row.name )"
@ -104,33 +72,20 @@
v-hasPermi="['mes:energy-device:update']" v-hasPermi="['mes:energy-device:update']"
> >
重置 重置
</el-button> </el-button> -->
<el-button <el-button link type="primary" @click="openForm('update', scope.row.id)"
link v-hasPermi="['mes:energy-device:update']">
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:energy-device:update']"
>
编辑 编辑
</el-button> </el-button>
<el-button <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:energy-device:delete']">
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:energy-device:delete']"
>
删除 删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
:total="total" @pagination="getList" />
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap> </ContentWrap>
<!-- 新增设备表单弹窗添加/修改 --> <!-- 新增设备表单弹窗添加/修改 -->
@ -140,14 +95,14 @@
<!-- 抄表弹窗添加/修改 --> <!-- 抄表弹窗添加/修改 -->
<EnergyDeviceCheckRecordForm ref="newRecordFormRef" @success="getList" /> <EnergyDeviceCheckRecordForm ref="newRecordFormRef" @success="getList" />
<!-- 子表的列表 --> <!-- 子表的列表
<ContentWrap> <ContentWrap>
<el-tabs model-value="energyDeviceCheckRecord"> <el-tabs model-value="energyDeviceCheckRecord">
<el-tab-pane :label="'抄表记录: '+currentRow.name" name="energyDeviceCheckRecord"> <el-tab-pane :label="'抄表记录: '+currentRow.name" name="energyDeviceCheckRecord">
<EnergyDeviceCheckRecordList :device-id="currentRow.id" :device-name="currentRow.name" /> <EnergyDeviceCheckRecordList :device-id="currentRow.id" :device-name="currentRow.name" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</ContentWrap> </ContentWrap> -->
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -160,7 +115,7 @@ import ResetForm from './ResetForm.vue'
import EnergyDeviceCheckRecordList from './components/EnergyDeviceCheckRecordList.vue' import EnergyDeviceCheckRecordList from './components/EnergyDeviceCheckRecordList.vue'
import EnergyDeviceCheckRecordForm import EnergyDeviceCheckRecordForm
from "@/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue"; from "@/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue";
import {EnergyTypeApi, EnergyTypeVO} from "@/api/mes/energytype"; import { EnergyTypeApi, EnergyTypeVO } from "@/api/mes/energytype";
/** 能源设备 列表 */ /** 能源设备 列表 */
defineOptions({ name: 'EnergyDevice' }) defineOptions({ name: 'EnergyDevice' })
@ -196,7 +151,7 @@ const getList = async () => {
const data = await EnergyDeviceApi.getEnergyDevicePage(queryParams) const data = await EnergyDeviceApi.getEnergyDevicePage(queryParams)
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
if(list.value.length>0){ if (list.value.length > 0) {
currentRow.value = list.value[0] currentRow.value = list.value[0]
} }
} finally { } finally {
@ -236,7 +191,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// //
await getList() await getList()
} catch {} } catch { }
} }
/** 导出按钮操作 */ /** 导出按钮操作 */

@ -8,7 +8,7 @@
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="能耗类型编码" prop="code"> <el-form-item label="能耗类型编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入能耗类型编码" /> <el-input v-model="formData.code" placeholder="请输入能耗类型编码" :disabled="formType === 'update'" />
</el-form-item> </el-form-item>
<el-form-item label="能耗类型名称" prop="name"> <el-form-item label="能耗类型名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入能耗类型名称" /> <el-input v-model="formData.name" placeholder="请输入能耗类型名称" />

Loading…
Cancel
Save