xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change(dms): 修改DMS 模块的 API调用和界面展示

Browse Source 
- 更新 API 调用方式，统一使用 xxxList 方法替代 xxxIn 方法
- 优化界面展示，包括停机时间格式化、设备类型下拉框等
-调整表格列显示、统计信息展示等内容
master
zangchenhao 3 weeks ago
parent c8f7196572
commit 4bc6a063dd
12 changed files with 180 additions and 154 deletions
Show Stats Download Patch File Download Diff File

2
src/api/dms/dmsBaseMachineInfo/index.ts
Unescape Escape View File

@ -8,7 +8,7 @@ import { ProdBaseMachineInfoVO, ProdBaseMachineInfoForm, ProdBaseMachineInfoQuer
* @returns {*} * @returns {*}
*/ */
export const listDmsBaseMachineInfoIn = (query?: ProdBaseMachineInfoQuery): AxiosPromise<ProdBaseMachineInfoVO[]> => { export const listDmsBaseMachineInfo = (query?: ProdBaseMachineInfoQuery): AxiosPromise<ProdBaseMachineInfoVO[]> => {
return request({ return request({
url: '/dms/dmsBaseMachineInfo/list', url: '/dms/dmsBaseMachineInfo/list',
method: 'get', method: 'get',

8
src/views/dms/alarmType/index.vue
Unescape Escape View File

@ -129,8 +129,8 @@
<script setup name='AlarmType' lang='ts'> <script setup name='AlarmType' lang='ts'>
import { listAlarmType, getAlarmType, delAlarmType, addAlarmType, updateAlarmType } from '@/api/dms/alarmType'; import { listAlarmType, getAlarmType, delAlarmType, addAlarmType, updateAlarmType } from '@/api/dms/alarmType';
import { AlarmTypeVO, AlarmTypeQuery, AlarmTypeForm } from '@/api/dms/alarmType/types'; import { AlarmTypeVO, AlarmTypeQuery, AlarmTypeForm } from '@/api/dms/alarmType/types';
import { getBaseDeviceCategoryListInDMS } from '@/api/dms/baseDeviceCategory'; import { getBaseDeviceCategoryList } from '@/api/dms/baseDeviceCategory';
import { getBaseDeviceTypeListInDMS } from '@/api/dms/baseDeviceType'; import { getBaseDeviceTypeList } from '@/api/dms/baseDeviceType';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { dms_level_status } = toRefs<any>(proxy?.useDict('dms_level_status')); const { dms_level_status } = toRefs<any>(proxy?.useDict('dms_level_status'));
@ -155,14 +155,14 @@ const dialog = reactive<DialogOption>({
/** 获取设备大类下拉框 */ /** 获取设备大类下拉框 */
const deviceCategoryList = ref([]); const deviceCategoryList = ref([]);
const getBaseDeviceCategoryListSelect = async () => { const getBaseDeviceCategoryListSelect = async () => {
let res = await getBaseDeviceCategoryListInDMS(null); let res = await getBaseDeviceCategoryList(null);
deviceCategoryList.value = res.data; deviceCategoryList.value = res.data;
}; };
/** 获取设备类型下拉框 */ /** 获取设备类型下拉框 */
const deviceTypeList = ref([]); const deviceTypeList = ref([]);
const getBaseDeviceTypeListSelect = async () => { const getBaseDeviceTypeListSelect = async () => {
let res = await getBaseDeviceTypeListInDMS(null); let res = await getBaseDeviceTypeList(null);
deviceTypeList.value = res.data; deviceTypeList.value = res.data;
}; };

4
src/views/dms/dmsBaseInspectRoute/index.vue
Unescape Escape View File

@ -134,7 +134,7 @@
<script setup name="DmsBaseInspectRoute" lang="ts"> <script setup name="DmsBaseInspectRoute" lang="ts">
import { listDmsBaseInspectRoute, getDmsBaseInspectRoute, delDmsBaseInspectRoute, addDmsBaseInspectRoute, updateDmsBaseInspectRoute } from '@/api/dms/dmsBaseInspectRoute'; import { listDmsBaseInspectRoute, getDmsBaseInspectRoute, delDmsBaseInspectRoute, addDmsBaseInspectRoute, updateDmsBaseInspectRoute } from '@/api/dms/dmsBaseInspectRoute';
import { DmsBaseInspectRouteVO, DmsBaseInspectRouteQuery, DmsBaseInspectRouteForm } from '@/api/dms/dmsBaseInspectRoute/types'; import { DmsBaseInspectRouteVO, DmsBaseInspectRouteQuery, DmsBaseInspectRouteForm } from '@/api/dms/dmsBaseInspectRoute/types';
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { inspect_type } = toRefs<any>(proxy?.useDict('inspect_type')); const { inspect_type } = toRefs<any>(proxy?.useDict('inspect_type'));
@ -304,7 +304,7 @@ const handleExport = () => {
let deviceTypeOptions = ref([]) let deviceTypeOptions = ref([])
const getDeviceTypeOptions = async () => { const getDeviceTypeOptions = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
deviceTypeOptions.value = res.data; deviceTypeOptions.value = res.data;
} }

4
src/views/dms/dmsBaseLubeStandard/index.vue
Unescape Escape View File

@ -126,7 +126,7 @@
<script setup name="DmsBaseLubeStandard" lang="ts"> <script setup name="DmsBaseLubeStandard" lang="ts">
import { listDmsBaseLubeStandard, getDmsBaseLubeStandard, delDmsBaseLubeStandard, addDmsBaseLubeStandard, updateDmsBaseLubeStandard } from '@/api/dms/dmsBaseLubeStandard'; import { listDmsBaseLubeStandard, getDmsBaseLubeStandard, delDmsBaseLubeStandard, addDmsBaseLubeStandard, updateDmsBaseLubeStandard } from '@/api/dms/dmsBaseLubeStandard';
import { DmsBaseLubeStandardVO, DmsBaseLubeStandardQuery, DmsBaseLubeStandardForm } from '@/api/dms/dmsBaseLubeStandard/types'; import { DmsBaseLubeStandardVO, DmsBaseLubeStandardQuery, DmsBaseLubeStandardForm } from '@/api/dms/dmsBaseLubeStandard/types';
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@ -301,7 +301,7 @@ const handleExport = () => {
// 获取设备类型下拉框 // 获取设备类型下拉框
let deviceTypeOptions = ref([]); let deviceTypeOptions = ref([]);
const getBaseDeviceTypeOption = async () => { const getBaseDeviceTypeOption = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
deviceTypeOptions.value = res.data; deviceTypeOptions.value = res.data;
} }

4
src/views/dms/dmsBaseLubeStation/index.vue
Unescape Escape View File

@ -136,7 +136,7 @@
import { listDmsBaseLubeStation, getDmsBaseLubeStation, delDmsBaseLubeStation, addDmsBaseLubeStation, updateDmsBaseLubeStation } from '@/api/dms/dmsBaseLubeStation'; import { listDmsBaseLubeStation, getDmsBaseLubeStation, delDmsBaseLubeStation, addDmsBaseLubeStation, updateDmsBaseLubeStation } from '@/api/dms/dmsBaseLubeStation';
import { DmsBaseLubeStationVO, DmsBaseLubeStationQuery, DmsBaseLubeStationForm } from '@/api/dms/dmsBaseLubeStation/types'; import { DmsBaseLubeStationVO, DmsBaseLubeStationQuery, DmsBaseLubeStationForm } from '@/api/dms/dmsBaseLubeStation/types';
import {getDmsBaseLubeStandardList} from "@/api/dms/dmsBaseLubeStandard"; import {getDmsBaseLubeStandardList} from "@/api/dms/dmsBaseLubeStandard";
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@ -310,7 +310,7 @@ const handleExport = () => {
// 获取设备类型下拉框 // 获取设备类型下拉框
let deviceTypeOptions = ref([]); let deviceTypeOptions = ref([]);
const getBaseDeviceTypeOption = async () => { const getBaseDeviceTypeOption = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
deviceTypeOptions.value = res.data; deviceTypeOptions.value = res.data;
} }

4
src/views/dms/dmsBaseMaintStandard/index.vue
Unescape Escape View File

@ -129,7 +129,7 @@
<script setup name="DmsBaseMaintStandard" lang="ts"> <script setup name="DmsBaseMaintStandard" lang="ts">
import { listDmsBaseMaintStandard, getDmsBaseMaintStandard, delDmsBaseMaintStandard, addDmsBaseMaintStandard, updateDmsBaseMaintStandard } from '@/api/dms/dmsBaseMaintStandard'; import { listDmsBaseMaintStandard, getDmsBaseMaintStandard, delDmsBaseMaintStandard, addDmsBaseMaintStandard, updateDmsBaseMaintStandard } from '@/api/dms/dmsBaseMaintStandard';
import { DmsBaseMaintStandardVO, DmsBaseMaintStandardQuery, DmsBaseMaintStandardForm } from '@/api/dms/dmsBaseMaintStandard/types'; import { DmsBaseMaintStandardVO, DmsBaseMaintStandardQuery, DmsBaseMaintStandardForm } from '@/api/dms/dmsBaseMaintStandard/types';
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@ -298,7 +298,7 @@ const handleExport = () => {
// 设备类型 // 设备类型
let dviceTypeOptions = ref([]); let dviceTypeOptions = ref([]);
const getDviceTypeOption = async () => { const getDviceTypeOption = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
dviceTypeOptions.value = res.data; dviceTypeOptions.value = res.data;
} }

4
src/views/dms/dmsBaseMaintStation/index.vue
Unescape Escape View File

@ -149,7 +149,7 @@
import { listDmsBaseMaintStation, getDmsBaseMaintStation, delDmsBaseMaintStation, addDmsBaseMaintStation, updateDmsBaseMaintStation } from '@/api/dms/dmsBaseMaintStation'; import { listDmsBaseMaintStation, getDmsBaseMaintStation, delDmsBaseMaintStation, addDmsBaseMaintStation, updateDmsBaseMaintStation } from '@/api/dms/dmsBaseMaintStation';
import { DmsBaseMaintStationVO, DmsBaseMaintStationQuery, DmsBaseMaintStationForm } from '@/api/dms/dmsBaseMaintStation/types'; import { DmsBaseMaintStationVO, DmsBaseMaintStationQuery, DmsBaseMaintStationForm } from '@/api/dms/dmsBaseMaintStation/types';
import {getDmsBaseMaintStandardList} from "@/api/dms/dmsBaseMaintStandard"; import {getDmsBaseMaintStandardList} from "@/api/dms/dmsBaseMaintStandard";
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
import { getDmsBaseMaintProjectList } from '@/api/dms/dmsBaseMaintProject'; import { getDmsBaseMaintProjectList } from '@/api/dms/dmsBaseMaintProject';
@ -332,7 +332,7 @@ const getMaintStandardOtions = async () => {
// 设备类型 // 设备类型
let dviceTypeOptions = ref([]); let dviceTypeOptions = ref([]);
const getDviceTypeOption = async () => { const getDviceTypeOption = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
dviceTypeOptions.value = res.data; dviceTypeOptions.value = res.data;
} }

4
src/views/dms/dmsKnowledgeLube/index.vue
Unescape Escape View File

@ -142,7 +142,7 @@
<script setup name="DmsKnowledgeLube" lang="ts"> <script setup name="DmsKnowledgeLube" lang="ts">
import { listDmsKnowledgeLube, getDmsKnowledgeLube, delDmsKnowledgeLube, addDmsKnowledgeLube, updateDmsKnowledgeLube } from '@/api/dms/dmsKnowledgeLube'; import { listDmsKnowledgeLube, getDmsKnowledgeLube, delDmsKnowledgeLube, addDmsKnowledgeLube, updateDmsKnowledgeLube } from '@/api/dms/dmsKnowledgeLube';
import { DmsKnowledgeLubeVO, DmsKnowledgeLubeQuery, DmsKnowledgeLubeForm } from '@/api/dms/dmsKnowledgeLube/types'; import { DmsKnowledgeLubeVO, DmsKnowledgeLubeQuery, DmsKnowledgeLubeForm } from '@/api/dms/dmsKnowledgeLube/types';
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
import {getDmsBaseLubeStationList} from "@/api/dms/dmsBaseLubeStation"; import {getDmsBaseLubeStationList} from "@/api/dms/dmsBaseLubeStation";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -320,7 +320,7 @@ const handleExport = () => {
// 获取设备类型下拉框 // 获取设备类型下拉框
let deviceTypeOptions = ref([]); let deviceTypeOptions = ref([]);
const getBaseDeviceTypeOption = async () => { const getBaseDeviceTypeOption = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
deviceTypeOptions.value = res.data; deviceTypeOptions.value = res.data;
} }

4
src/views/dms/dmsKnowledgeMaint/index.vue
Unescape Escape View File

@ -142,7 +142,7 @@
<script setup name="DmsKnowledgeMaint" lang="ts"> <script setup name="DmsKnowledgeMaint" lang="ts">
import { listDmsKnowledgeMaint, getDmsKnowledgeMaint, delDmsKnowledgeMaint, addDmsKnowledgeMaint, updateDmsKnowledgeMaint } from '@/api/dms/dmsKnowledgeMaint'; import { listDmsKnowledgeMaint, getDmsKnowledgeMaint, delDmsKnowledgeMaint, addDmsKnowledgeMaint, updateDmsKnowledgeMaint } from '@/api/dms/dmsKnowledgeMaint';
import { DmsKnowledgeMaintVO, DmsKnowledgeMaintQuery, DmsKnowledgeMaintForm } from '@/api/dms/dmsKnowledgeMaint/types'; import { DmsKnowledgeMaintVO, DmsKnowledgeMaintQuery, DmsKnowledgeMaintForm } from '@/api/dms/dmsKnowledgeMaint/types';
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
import {getDmsBaseMaintStationList} from "@/api/dms/dmsBaseMaintStation"; import {getDmsBaseMaintStationList} from "@/api/dms/dmsBaseMaintStation";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -320,7 +320,7 @@ const handleExport = () => {
// 获取设备类型下拉框 // 获取设备类型下拉框
let deviceTypeOptions = ref([]); let deviceTypeOptions = ref([]);
const getBaseDeviceTypeOption = async () => { const getBaseDeviceTypeOption = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
deviceTypeOptions.value = res.data; deviceTypeOptions.value = res.data;
} }

4
src/views/dms/dmsKnowledgeRepair/index.vue
Unescape Escape View File

@ -133,7 +133,7 @@
<script setup name="DmsKnowledgeRepair" lang="ts"> <script setup name="DmsKnowledgeRepair" lang="ts">
import { listDmsKnowledgeRepair, getDmsKnowledgeRepair, delDmsKnowledgeRepair, addDmsKnowledgeRepair, updateDmsKnowledgeRepair } from '@/api/dms/dmsKnowledgeRepair'; import { listDmsKnowledgeRepair, getDmsKnowledgeRepair, delDmsKnowledgeRepair, addDmsKnowledgeRepair, updateDmsKnowledgeRepair } from '@/api/dms/dmsKnowledgeRepair';
import { DmsKnowledgeRepairVO, DmsKnowledgeRepairQuery, DmsKnowledgeRepairForm } from '@/api/dms/dmsKnowledgeRepair/types'; import { DmsKnowledgeRepairVO, DmsKnowledgeRepairQuery, DmsKnowledgeRepairForm } from '@/api/dms/dmsKnowledgeRepair/types';
import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType"; import {getBaseDeviceTypeList} from "@/api/dms/baseDeviceType";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@ -306,7 +306,7 @@ const handleExport = () => {
// 获取设备类型下拉框 // 获取设备类型下拉框
let deviceTypeOptions = ref([]); let deviceTypeOptions = ref([]);
const getBaseDeviceTypeOption = async () => { const getBaseDeviceTypeOption = async () => {
const res = await getBaseDeviceTypeListInDMS(null); const res = await getBaseDeviceTypeList(null);
deviceTypeOptions.value = res.data; deviceTypeOptions.value = res.data;
} }

52
src/views/dms/dmsRecordShutDown/index.vue
Unescape Escape View File

@ -58,12 +58,12 @@
<el-card shadow="never"> <el-card shadow="never">
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsRecordShutDown:add']">新增</el-button> <!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsRecordShutDown:add']">新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsRecordShutDown:edit']">修改</el-button> <!-- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsRecordShutDown:edit']">修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsRecordShutDown:remove']">删除</el-button> <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsRecordShutDown:remove']">删除</el-button>
</el-col> </el-col>
@ -78,8 +78,8 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="recordShutDownId" v-if="columns[0].visible"/> <el-table-column label="主键标识" align="center" prop="recordShutDownId" v-if="columns[0].visible"/>
<el-table-column label="设备" align="center" prop="machineName" v-if="columns[2].visible"/> <el-table-column label="设备" align="center" prop="machineName" v-if="columns[2].visible"/>
<el-table-column label="停机类型" align="center" prop="shutTypeId" v-if="columns[3].visible"/> <el-table-column label="停机类型" align="center" prop="shutTypeName" v-if="columns[3].visible"/>
<el-table-column label="停机原因" align="center" prop="shutReasonId" v-if="columns[4].visible"/> <el-table-column label="停机原因" align="center" prop="shutReasonName" v-if="columns[4].visible"/>
<el-table-column label="停机开始时间" align="center" prop="shutBeginTime" width="180" v-if="columns[5].visible"> <el-table-column label="停机开始时间" align="center" prop="shutBeginTime" width="180" v-if="columns[5].visible">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.shutBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.shutBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -90,8 +90,17 @@
<span>{{ parseTime(scope.row.shutEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.shutEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="停机时长(毫秒)" align="center" prop="shutTime" v-if="columns[7].visible"/> <!-- <el-table-column label="停机时长(毫秒)" align="center" prop="shutTime" v-if="columns[7].visible"/>-->
<el-table-column label="停机标识" align="center" prop="downtimeFlag" v-if="columns[8].visible"/> <el-table-column label="停机时长" align="center" prop="shutTime" v-if="columns[7].visible">
<template #default="scope">
<span>{{ formatDuration(scope.row.shutTime) }}</span>
</template>
</el-table-column>
<el-table-column label="停机标识" align="center" prop="downtimeFlag" v-if="columns[8].visible">
<template #default="scope">
<dict-tag :options="downtime_flag" :value="scope.row.downtimeFlag"/>
</template>
</el-table-column>
<el-table-column label="停机原因" align="center" prop="shutReason" v-if="columns[9].visible"/> <el-table-column label="停机原因" align="center" prop="shutReason" v-if="columns[9].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[10].visible"> <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[10].visible">
<template #default="scope"> <template #default="scope">
@ -173,7 +182,14 @@
<el-input v-model="form.shutTime" placeholder="请输入停机时长(毫秒)" /> <el-input v-model="form.shutTime" placeholder="请输入停机时长(毫秒)" />
</el-form-item> </el-form-item>
<el-form-item label="停机标识" prop="downtimeFlag"> <el-form-item label="停机标识" prop="downtimeFlag">
<el-input v-model="form.downtimeFlag" placeholder="请输入停机标识" /> <!-- <el-input v-model="form.downtimeFlag" placeholder="请输入停机标识" />-->
<el-radio-group v-model="form.downtimeFlag">
<el-radio
v-for="dict in downtime_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="激活标识" prop="activeFlag"> <el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag"> <el-radio-group v-model="form.activeFlag">
@ -206,7 +222,7 @@ import {getDmsBaseShutTypeList} from "@/api/dms/dmsBaseShutType";
import {getDmsBaseShutReasonList} from "@/api/dms/dmsBaseShutReason"; import {getDmsBaseShutReasonList} from "@/api/dms/dmsBaseShutReason";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); const { active_flag, downtime_flag } = toRefs<any>(proxy?.useDict('active_flag', 'downtime_flag'));
const dmsRecordShutDownList = ref<DmsRecordShutDownVO[]>([]); const dmsRecordShutDownList = ref<DmsRecordShutDownVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
@ -231,7 +247,7 @@ const columns = ref<FieldOption[]>([
{ key: 1, label: `租户编号`, visible: false }, { key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `设备`, visible: true }, { key: 2, label: `设备`, visible: true },
{ key: 3, label: `停机类型`, visible: true }, { key: 3, label: `停机类型`, visible: true },
{ key: 4, label: `停机原因id`, visible: false }, { key: 4, label: `停机原因`, visible: true },
{ key: 5, label: `停机开始时间`, visible: true }, { key: 5, label: `停机开始时间`, visible: true },
{ key: 6, label: `停机结束时间`, visible: true }, { key: 6, label: `停机结束时间`, visible: true },
{ key: 7, label: `停机时长(毫秒)`, visible: true }, { key: 7, label: `停机时长(毫秒)`, visible: true },
@ -260,6 +276,7 @@ const initFormData: DmsRecordShutDownForm = {
remark: undefined, remark: undefined,
machineName: undefined, machineName: undefined,
shutTypeName: undefined, shutTypeName: undefined,
shutReasonNameName: undefined,
} }
const data = reactive<PageData<DmsRecordShutDownForm, DmsRecordShutDownQuery>>({ const data = reactive<PageData<DmsRecordShutDownForm, DmsRecordShutDownQuery>>({
@ -279,6 +296,7 @@ const data = reactive<PageData<DmsRecordShutDownForm, DmsRecordShutDownQuery>>({
activeFlag: undefined, activeFlag: undefined,
machineName: undefined, machineName: undefined,
shutTypeName: undefined, shutTypeName: undefined,
shutReasonNameName: undefined,
params: { params: {
} }
}, },
@ -413,6 +431,14 @@ const handleShutReasonChange = (shutReasonId: number) => {
form.value.shutTypeId = selectedReason?.shutTypeId || ''; // 获取停机类型 form.value.shutTypeId = selectedReason?.shutTypeId || ''; // 获取停机类型
}; };
const formatDuration = (millis: number): string => {
if (!millis || millis <= 0) return '0秒'
const hours = Math.floor(millis / 3600000)
const minutes = Math.floor((millis % 3600000) / 60000)
const seconds = Math.floor((millis % 60000) / 1000)
return `${hours ? hours + '小时' : ''}${minutes ? minutes + '分' : ''}${seconds}秒`
}
onMounted(() => { onMounted(() => {
getMachineOtions(); getMachineOtions();
getShutTypeOtions(); getShutTypeOtions();

68
src/views/dms/prodBaseMachineInfo/index.vue
Unescape Escape View File

@ -91,12 +91,12 @@
</el-button> </el-button>
</el-button-group> </el-button-group>
</div> </div>
<div class="toolbar-right"> <!-- <div class="toolbar-right">-->
<el-button type="primary" @click="exportData"> <!-- <el-button type="primary" @click="exportData">-->
<el-icon><Download /></el-icon> <!-- <el-icon><Download /></el-icon>-->
导出数据 <!-- 导出数据-->
</el-button> <!-- </el-button>-->
</div> <!-- </div>-->
</div> </div>
<!-- 查询过滤器 --> <!-- 查询过滤器 -->
@ -385,15 +385,15 @@
<el-col :span="6"> <el-col :span="6">
<el-statistic title="计划保养次数" :value="maintenanceStats.planned" /> <el-statistic title="计划保养次数" :value="maintenanceStats.planned" />
</el-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-statistic title="临时保养次数" :value="maintenanceStats.temporary" /> <!-- <el-statistic title="临时保养次数" :value="maintenanceStats.temporary" />-->
</el-col> <!-- </el-col>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-statistic title="平均保养间隔" :value="maintenanceStats.avgInterval" suffix="天" /> <!-- <el-statistic title="平均保养间隔" :value="maintenanceStats.avgInterval" suffix="天" />-->
</el-col> <!-- </el-col>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-statistic title="下次保养时间" :value="maintenanceStats.nextDate || '未计划'" /> <!-- <el-statistic title="下次保养时间" :value="maintenanceStats.nextDate || '未计划'" />-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
</el-card> </el-card>
</el-col> </el-col>
@ -408,13 +408,13 @@
<el-table-column prop="maintDate" label="保养日期" /> <el-table-column prop="maintDate" label="保养日期" />
<el-table-column prop="maintPerson" label="保养人员" /> <el-table-column prop="maintPerson" label="保养人员" />
<el-table-column prop="maintContent" label="保养内容" show-overflow-tooltip /> <el-table-column prop="maintContent" label="保养内容" show-overflow-tooltip />
<el-table-column prop="maintResult" label="保养结果"> <!-- <el-table-column prop="maintResult" label="保养结果">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-tag :type="scope.row.maintResult === '合格' ? 'success' : 'warning'"> <!-- <el-tag :type="scope.row.maintResult === '合格' ? 'success' : 'warning'">-->
{{ scope.row.maintResult }} <!-- {{ scope.row.maintResult }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
@ -426,10 +426,10 @@
</div> </div>
</template> </template>
<script setup name="ProdBaseMachineInfo"> <script setup name="ProdBaseMachineInfo" lang="ts">
import { ref, reactive, toRefs, getCurrentInstance, onMounted, onUnmounted, shallowRef, markRaw, watch } from 'vue'; import { ref, reactive, toRefs, getCurrentInstance, onMounted, onUnmounted, shallowRef, markRaw, watch } from 'vue';
import { listDmsBaseMachineInfoIn, getDmsBaseMachineInfoList, getDmsBaseMachineInfo } from '@/api/dms/dmsBaseMachineInfo'; import { listDmsBaseMachineInfo, getDmsBaseMachineInfoList, getDmsBaseMachineInfo } from '@/api/dms/dmsBaseMachineInfo';
import { listBaseDeviceTypeInDMS, getBaseDeviceTypeListInDMS } from '@/api/dms/baseDeviceType'; import { listBaseDeviceType, getBaseDeviceTypeList } from '@/api/dms/baseDeviceType';
import { listDmsBaseDevicePurchase, getDmsBaseDevicePurchaseList } from '@/api/dms/dmsBaseDevicePurchase'; import { listDmsBaseDevicePurchase, getDmsBaseDevicePurchaseList } from '@/api/dms/dmsBaseDevicePurchase';
import { listDmsBaseDeviceInstall, getDmsBaseDeviceInstallList } from '@/api/dms/dmsBaseDeviceInstall'; import { listDmsBaseDeviceInstall, getDmsBaseDeviceInstallList } from '@/api/dms/dmsBaseDeviceInstall';
import { listDmsBaseDeviceDebugging, getDmsBaseDeviceDebuggingList } from '@/api/dms/dmsBaseDeviceDebugging'; import { listDmsBaseDeviceDebugging, getDmsBaseDeviceDebuggingList } from '@/api/dms/dmsBaseDeviceDebugging';
@ -459,8 +459,8 @@ import {
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
// TODO: 需要引入完整的字典数据 // TODO: 需要引入完整的字典数据
const { machine_status, debug_status, fault_status, maint_level, maint_status } = toRefs(proxy.useDict( const { machine_status, debug_status, fault_status, maint_level, maint_status, handle_status, bills_status, active_flag } = toRefs(proxy.useDict(
'machine_status', 'debug_status', 'fault_status', 'maint_level', 'maint_status' 'machine_status', 'debug_status', 'fault_status', 'maint_level', 'maint_status', 'handle_status', 'bills_status', 'active_flag'
)); ));
// TODO: 需要补充以下字典 // TODO: 需要补充以下字典
// const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); // const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@ -489,7 +489,7 @@ const deviceTypes = ref([]);
// 查询参数 // 查询参数
const queryParams = ref({ const queryParams = ref({
pageNum: 1, pageNum: 1,
pageSize: 12, pageSize: 10,
machineCode: undefined, machineCode: undefined,
machineName: undefined, machineName: undefined,
machineLocation: undefined, machineLocation: undefined,
@ -618,7 +618,7 @@ const updateCurrentTime = () => {
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
try { try {
const res = await listDmsBaseMachineInfoIn(queryParams.value); const res = await listDmsBaseMachineInfo(queryParams.value);
machineList.value = res.rows || []; machineList.value = res.rows || [];
total.value = res.total || 0; total.value = res.total || 0;
@ -635,7 +635,7 @@ const getList = async () => {
// 获取设备类型列表 // 获取设备类型列表
const getDeviceTypes = async () => { const getDeviceTypes = async () => {
try { try {
const res = await getBaseDeviceTypeListInDMS({ pageNum: 1, pageSize: 100 }); const res = await getBaseDeviceTypeList({ pageNum: 1, pageSize: 100 });
deviceTypes.value = res.data; deviceTypes.value = res.data;
} catch (error) { } catch (error) {
console.error('获取设备类型失败:', error); console.error('获取设备类型失败:', error);
@ -1109,10 +1109,10 @@ const viewDetails = async (machine) => {
]); ]);
}; };
// 导出数据 // // 导出数据
const exportData = () => { // const exportData = () => {
proxy.$modal.msgInfo('导出功能开发中...'); // proxy.$modal.msgInfo('导出功能开发中...');
}; // };
// 定时更新 // 定时更新
let timer = null; let timer = null;

Write Preview
Loading…
Cancel
Save