linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some bugs

Browse Source
main
chenshuichuan 2 years ago
parent 779898f608
commit 82a42a4210
7 changed files with 281 additions and 211 deletions
Show Stats Download Patch File Download Diff File

4
src/api/mes/energydevice/index.ts
Unescape Escape View File

@ -25,6 +25,10 @@ export const EnergyDeviceApi = {
getEnergyDevice: async (id: number) => { getEnergyDevice: async (id: number) => {
return await request.get({ url: `/mes/energy-device/get?id=` + id }) return await request.get({ url: `/mes/energy-device/get?id=` + id })
}, },
// 查询能源设备列表
getList: async (params: any) => {
return await request.get({ url: `/mes/energy-device/getList`, params })
},
// 新增能源设备 // 新增能源设备
createEnergyDevice: async (data: EnergyDeviceVO) => { createEnergyDevice: async (data: EnergyDeviceVO) => {

2
src/layout/components/Footer/src/Footer.vue
Unescape Escape View File

@ -19,6 +19,6 @@ const title = computed(() => appStore.getTitle)
:class="prefixCls" :class="prefixCls"
class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]" class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
> >
<span class="text-14px">Copyright ©2022-{{ title }}</span> <span class="text-14px">Copyright ©2024-BESURE-{{ title }}</span>
</div> </div>
</template> </template>

2
src/utils/dict.ts
Unescape Escape View File

@ -248,6 +248,8 @@ export enum DICT_TYPE {
MES_STOCK_OUT_TYPE = "mes_stock_out_type", MES_STOCK_OUT_TYPE = "mes_stock_out_type",
MES_PRODUCE_REPORT_TYPE = "mes_produce_report_type", MES_PRODUCE_REPORT_TYPE = "mes_produce_report_type",
MES_ENERGY_DEVICE_TYPE = "mes_energy_device_type", MES_ENERGY_DEVICE_TYPE = "mes_energy_device_type",
MES_MAINTAIN_TYPE = "mes_maintain_type",
MES_MAINTAIN_TIME_UNIT = "mes_maintain_time_unit",
//====iot //====iot
IOT_SIEMENS_TYPE = "iot_siemens_type", IOT_SIEMENS_TYPE = "iot_siemens_type",
IOT_MODBUS_TYPE = "iot_modbus_type", IOT_MODBUS_TYPE = "iot_modbus_type",

113
src/views/mes/energydevicecheck/index.vue
Unescape Escape View File

@ -9,13 +9,21 @@
label-width="68px" label-width="68px"
> >
<el-form-item label="能源设备" prop="deviceId"> <el-form-item label="能源设备" prop="deviceId">
<el-input <el-select
v-model="queryParams.deviceId" v-model="queryParams.deviceId"
placeholder="请输入能源设备" @change="handleQuery"
clearable clearable
@keyup.enter="handleQuery" filterable
class="!w-240px" placeholder="请选择"
/> class="!w-180px"
>
<el-option
v-for="item in deviceList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="抄表时间" prop="checkTime"> <el-form-item label="抄表时间" prop="checkTime">
<el-date-picker <el-date-picker
@ -63,46 +71,53 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="抄表明细" name="first">
<el-table-column label="能源设备" align="center" prop="deviceId" sortable/> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="抄表值" align="center" prop="checkValue" /> <el-table-column label="能源设备" align="center" prop="deviceName" sortable/>
<el-table-column label="差值" align="center" prop="diffValue" /> <el-table-column label="抄表值" align="center" prop="checkValue" />
<el-table-column label="上次抄表值" align="center" prop="lastCheckValue" /> <el-table-column label="差值" align="center" prop="diffValue" />
<el-table-column <el-table-column label="上次抄表值" align="center" prop="lastCheckValue" />
label="抄表时间" <el-table-column
align="center" label="抄表时间"
prop="checkTime" align="center"
:formatter="dateFormatter" prop="checkTime"
width="170px" :formatter="dateFormatter"
sortable width="170px"
/> sortable
<el-table-column />
label="上次抄表时间" <el-table-column
align="center" label="上次抄表时间"
prop="lastCheckTime" align="center"
:formatter="dateFormatter" prop="lastCheckTime"
width="170px" :formatter="dateFormatter"
sortable width="170px"
/> sortable
<el-table-column label="单价" align="center" prop="unitPrice" /> />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="单价" align="center" prop="unitPrice" />
<el-table-column <el-table-column label="备注" align="center" prop="remark" />
label="创建时间" <el-table-column
align="center" label="创建时间"
prop="createTime" align="center"
:formatter="dateFormatter" prop="createTime"
width="170px" :formatter="dateFormatter"
/> width="170px"
/>
</el-table>
<!-- 分页 --> </el-table>
<Pagination <!-- 分页 -->
:total="total" <Pagination
v-model:page="queryParams.pageNo" :total="total"
v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo"
@pagination="getList" v-model:limit="queryParams.pageSize"
/> @pagination="getList"
/>
</el-tab-pane>
<el-tab-pane label="能源报表" name="second" >
能源报表
</el-tab-pane>
</el-tabs>
</ContentWrap> </ContentWrap>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
@ -114,6 +129,7 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { EnergyDeviceCheckRecordApi, EnergyDeviceCheckRecordVO } from '@/api/mes/energydevicecheck' import { EnergyDeviceCheckRecordApi, EnergyDeviceCheckRecordVO } from '@/api/mes/energydevicecheck'
import EnergyDeviceCheckRecordForm from './EnergyDeviceCheckRecordForm.vue' import EnergyDeviceCheckRecordForm from './EnergyDeviceCheckRecordForm.vue'
import {EnergyDeviceVO, EnergyDeviceApi} from "@/api/mes/energydevice";
/** 抄表记录 列表 */ /** 抄表记录 列表 */
defineOptions({ name: 'EnergyDeviceCheckRecord' }) defineOptions({ name: 'EnergyDeviceCheckRecord' })
@ -123,6 +139,8 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中 const loading = ref(true) // 列表的加载中
const list = ref<EnergyDeviceCheckRecordVO[]>([]) // 列表的数据 const list = ref<EnergyDeviceCheckRecordVO[]>([]) // 列表的数据
const deviceList = ref<EnergyDeviceVO[]>([]) // 列表
const total = ref(0) // 列表的总页数 const total = ref(0) // 列表的总页数
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
@ -195,7 +213,8 @@ const handleExport = async () => {
} }
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(async () => {
getList() await getList()
deviceList.value = await EnergyDeviceApi.getTaskList()
}) })
</script> </script>

355
src/views/mes/machine/MachineComponentForm.vue
Unescape Escape View File

@ -7,160 +7,213 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-row> <el-collapse v-model="activeNames" @change="handleChange">
<el-col :span="8"> <el-collapse-item title="基本信息" name="1">
<el-form-item label="父级装备" prop="parentId"> <el-row>
<el-tree-select <el-col :span="8">
v-model="formData.parentId" <el-form-item label="父级装备" prop="parentId">
:data="machineComponentTree" <el-tree-select
:props="defaultProps" v-model="formData.parentId"
check-strictly :data="machineComponentTree"
default-expand-all :props="defaultProps"
placeholder="请选择父级" check-strictly
/> default-expand-all
</el-form-item> placeholder="请选择父级"
</el-col> />
<el-col :span="8"> </el-form-item>
<el-form-item label="组织类型" prop="componentType"> </el-col>
<el-radio-group v-model="formData.componentType"> <el-col :span="8">
<el-radio <el-form-item label="组织类型" prop="componentType">
v-for="dict in getIntDictOptions(DICT_TYPE.MES_MACHINE_TYPE)" <el-radio-group v-model="formData.componentType">
:key="dict.value" <el-radio
:label="dict.value" v-for="dict in getIntDictOptions(DICT_TYPE.MES_MACHINE_TYPE)"
> :key="dict.value"
{{ dict.label }} :label="dict.value"
</el-radio> >
</el-radio-group> {{ dict.label }}
</el-form-item> </el-radio>
</el-col> </el-radio-group>
<el-col :span="8"> </el-form-item>
<el-form-item label="显示顺序" prop="sort"> </el-col>
<el-input v-model="formData.sort" placeholder="请输入显示顺序" /> <el-col :span="8">
</el-form-item> <el-form-item label="显示顺序" prop="sort">
</el-col> <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
</el-row> </el-form-item>
<el-row> </el-col>
<el-col :span="8"> </el-row>
<el-form-item label="编码" prop="code"> <el-row>
<el-input disabled v-model="formData.code" placeholder="保存自动生成" /> <el-col :span="8">
</el-form-item> <el-form-item label="编码" prop="code">
</el-col> <el-input disabled v-model="formData.code" placeholder="保存自动生成" />
<el-col :span="8"> </el-form-item>
<el-form-item label="装备名称" prop="name"> </el-col>
<el-input v-model="formData.name" placeholder="请输入装备名称" /> <el-col :span="8">
</el-form-item> <el-form-item label="装备名称" prop="name">
</el-col> <el-input v-model="formData.name" placeholder="请输入装备名称" />
<el-col :span="8"> </el-form-item>
<el-form-item label="装备SN号" prop="serialCode"> </el-col>
<el-input v-model="formData.serialCode" placeholder="请输入装备SN号" /> <el-col :span="8">
</el-form-item> <el-form-item label="装备SN号" prop="serialCode">
</el-col> <el-input v-model="formData.serialCode" placeholder="请输入装备SN号" />
</el-form-item>
</el-row> </el-col>
</el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="位置" prop="position"> <el-form-item label="位置" prop="position">
<el-input v-model="formData.position" placeholder="请输入位置" /> <el-input v-model="formData.position" placeholder="请输入位置" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="规格" prop="standard"> <el-form-item label="规格" prop="standard">
<el-input v-model="formData.standard" placeholder="请输入规格" /> <el-input v-model="formData.standard" placeholder="请输入规格" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="组织机台" prop="orgId"> <el-form-item v-if="formData.componentType == 1|| formData.componentType == 2" label="机台类型" prop="machineType">
<el-input v-model="formData.orgId" placeholder="请输入组织机台" /> <el-select v-model="formData.machineType" placeholder="请选择机台类型">
</el-form-item> <el-option
</el-col> v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
<el-col :span="8"> :key="dict.value"
<el-form-item label="状态" prop="status"> :label="dict.label"
<el-radio-group v-model="formData.status"> :value="dict.value"
<el-radio />
v-for="dict in getIntDictOptions(DICT_TYPE.MES_MACHINE_STATUS)" </el-select>
:key="dict.value" </el-form-item>
:label="dict.value" </el-col>
> <el-col :span="16">
{{ dict.label }} <el-form-item label="状态" prop="status">
</el-radio> <el-radio-group v-model="formData.status">
</el-radio-group> <el-radio
</el-form-item> v-for="dict in getIntDictOptions(DICT_TYPE.MES_MACHINE_STATUS)"
</el-col> :key="dict.value"
<el-col :span="8"> :label="dict.value"
<el-form-item label="出厂日期" prop="outgoingTime"> >
<el-date-picker {{ dict.label }}
v-model="formData.outgoingTime" </el-radio>
type="date" </el-radio-group>
value-format="x" </el-form-item>
placeholder="选择出厂日期" </el-col>
/> </el-row>
</el-form-item> </el-collapse-item>
</el-col> <el-collapse-item title="模具维保" name="3">
</el-row> <el-row>
<el-col :span="8">
<el-form-item v-if="formData.componentType == 1|| formData.componentType == 2" label="机台类型" prop="machineType"> <el-form-item label="建议维保类型" prop="maintainType">
<el-select v-model="formData.machineType" placeholder="请选择机台类型"> <el-radio-group v-model="formData.status">
<el-option <el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TYPE)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.value"
:value="dict.value" >
/> {{ dict.label }}
</el-select> </el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建议维保时间" prop="maintainTime">
<el-date-picker
v-model="formData.maintainTime"
type="date"
value-format="x"
placeholder="选择建议维保时间"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建议时间单位" prop="maintainTimeUnit">
<el-radio-group v-model="formData.status">
<el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TIME_UNIT)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="实际维保类型" prop="trueMaintainTimeType">
<el-radio-group v-model="formData.trueMaintainTimeType">
<el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TYPE)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际维保时间" prop="trueMaintainTime">
<el-date-picker
v-model="formData.trueMaintainTime"
type="date"
value-format="x"
placeholder="选择实际维保时间"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际时间单位" prop="trueMaintainTimeUnit">
<el-radio-group v-model="formData.trueMaintainTimeUnit">
<el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TIME_UNIT)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="上次维保时间" prop="lastMaitainTime">
<el-date-picker
v-model="formData.lastMaitainTime"
type="date"
value-format="x"
placeholder="选择上次维保时间"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联模具" prop="maintainType">
<el-select v-model="formData.maintainType" placeholder="">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出厂日期" prop="outgoingTime">
<el-date-picker
v-model="formData.outgoingTime"
type="date"
value-format="x"
placeholder="选择出厂日期"
/>
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
<el-form-item label="出厂报告" prop="outgoingReport"> <el-form-item label="出厂报告" prop="outgoingReport">
<Editor v-model="formData.outgoingReport" height="150px" /> <Editor v-model="formData.outgoingReport" height="150px" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="建议维保时间" prop="maintainTime">-->
<!-- <el-date-picker-->
<!-- v-model="formData.maintainTime"-->
<!-- type="date"-->
<!-- value-format="x"-->
<!-- placeholder="选择建议维保时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="建议维保类型(按使用时间，距离上次维保时间)" prop="maintainType">-->
<!-- <el-select v-model="formData.maintainType" placeholder="请选择建议维保类型(按使用时间，距离上次维保时间)">-->
<!-- <el-option label="请选择字典生成" value="" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="建议维保时间单位" prop="maintainTimeUnit">-->
<!-- <el-input v-model="formData.maintainTimeUnit" placeholder="请输入建议维保时间单位" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实际维保时间" prop="trueMaintainTime">-->
<!-- <el-date-picker-->
<!-- v-model="formData.trueMaintainTime"-->
<!-- type="date"-->
<!-- value-format="x"-->
<!-- placeholder="选择实际维保时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实际维保时间单位" prop="trueMaintainTimeUnit">-->
<!-- <el-input v-model="formData.trueMaintainTimeUnit" placeholder="请输入实际维保时间单位" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实际维保类型" prop="trueMaintainTimeType">-->
<!-- <el-select v-model="formData.trueMaintainTimeType" placeholder="请选择实际维保类型">-->
<!-- <el-option label="请选择字典生成" value="" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上次维保时间" prop="lastMaitainTime">-->
<!-- <el-date-picker-->
<!-- v-model="formData.lastMaitainTime"-->
<!-- type="date"-->
<!-- value-format="x"-->
<!-- placeholder="选择上次维保时间"-->
<!-- />-->
<!-- </el-form-item>-->
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>

2
src/views/mes/plan/index.vue
Unescape Escape View File

@ -206,7 +206,7 @@
type="primary" type="primary"
@click="handleStatus(scope.row.code, scope.row.id, 'start',2,'开工')" @click="handleStatus(scope.row.code, scope.row.id, 'start',2,'开工')"
v-hasPermi="['mes:plan:update']" v-hasPermi="['mes:plan:update']"
v-if="scope.row.status === 1" v-if="scope.row.status === 1 || scope.row.status ===4"
> >
开工 开工
</el-button> </el-button>

12
src/views/mes/task/components/TaskDetailList.vue
Unescape Escape View File

@ -18,14 +18,6 @@
<el-table-column label="交货日期" align="center" prop="finishDate" :formatter="dateFormatter2"/> <el-table-column label="交货日期" align="center" prop="finishDate" :formatter="dateFormatter2"/>
<el-table-column label="项目名称" align="center" prop="projectName" /> <el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="技术要求" align="center" prop="techRequirements" /> <el-table-column label="技术要求" align="center" prop="techRequirements" />
<!-- <el-table-column label="备注" align="center" prop="remark" >-->
<!-- <template #default="scope">-->
<!-- <el-link @click="openFormView('detail', scope.row.id)" v-if="scope.row.remark" type="warning">-->
<!-- 查看详情-->
<!-- </el-link>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="订单单号" align="center" prop="saleOrderCode" />-->
<el-table-column label="操作" align="center" width="300px"> <el-table-column label="操作" align="center" width="300px">
<template #default="scope"> <template #default="scope">
@ -46,7 +38,7 @@
link link
type="warning" type="warning"
@click="addPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.number-scope.row.planNumber)" @click="addPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.number-scope.row.planNumber)"
v-hasPermi="['mes:task:plan']" v-hasPermi="['mes:plan:create']"
> >
新增计划 新增计划
</el-button> </el-button>
@ -55,7 +47,7 @@
link link
type="success" type="success"
@click="openTaskPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.productName, scope.row.number, scope.row.planNumber)" @click="openTaskPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.productName, scope.row.number, scope.row.planNumber)"
v-hasPermi="['mes:task:plan']" v-hasPermi="['mes:plan:create']"
> >
排产 排产
</el-button> </el-button>

Write Preview
Loading…
Cancel
Save