From c60ce7e35c2c4e2f4c8b2aa24aab839a931f3a62 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 11 八月 2022 15:11:14 +0800
Subject: [PATCH] 对接
---
src/views/facilityManagement/InstrumentationInformation/index.vue | 92 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/src/views/facilityManagement/InstrumentationInformation/index.vue b/src/views/facilityManagement/InstrumentationInformation/index.vue
index 3a8d289..ee2b75e 100644
--- a/src/views/facilityManagement/InstrumentationInformation/index.vue
+++ b/src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -17,9 +17,8 @@
</el-form>
<el-row>
<el-col :span="4">
- <el-input v-model="filterText" style="height: 30px" placeholder="请输入关键字" />
+ <el-input v-model="filterText" style="height: 30px" placeholder="请输入关键字" />
<div class="tree">
-
<!-- <el-tree ref="treeRef" class="filter-tree" :data="data" :props="props" :filter-node-method="filterNode" /> -->
<el-tree ref="treeRef" :data="data" :props="props" @node-click="handleNodeClick" :filter-node-method="filterNode" />
</div>
@@ -27,8 +26,8 @@
<el-col :span="20">
<div class="btns">
<div>
- <el-button size="default" type="primary" :icon="Plus" @click="openD">新建</el-button>
- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
+ <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
+ <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
<el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
</div>
<div>
@@ -38,46 +37,56 @@
</div>
</div>
<div style="padding-left: 10px">
- <el-table ref="multipleTableRef" :data="tableData" style="width: 100%">
+ <el-table ref="multipleTableRef" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
<template #default="scope">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClicks" style="margin: 0 5%">
<el-tab-pane label="设备保养" name="first">
<el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="保养情况" sortable />
- <el-table-column property="name" align="center" label="保养负责人" sortable />
- <el-table-column property="takecareDate" align="center" label="保养日期" sortable />
- <el-table-column property="name" align="center" label="保养负责人单位" sortable />
+ <el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
+ <el-table-column property="leadingPersonName" align="center" label="保养负责人" sortable />
+ <el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
+ <el-table-column property="leadingPersonDepartmentName" align="center" label="保养负责人单位" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检查" name="second"
><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
- <el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
- <el-table-column property="createTime" align="center" label="检查日期" sortable />
+ <el-table-column property="leadingPersonName" align="center" label="检查人" sortable />
+ <el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
<el-table-column property="name" align="center" label="检查人部门" sortable />
<el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
<el-table-column property="name" align="center" label="检查状态" sortable /> </el-table
></el-tab-pane>
<el-tab-pane label="设备检测" name="third">
<el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="检测人" sortable />
- <el-table-column property="name" align="center" label="检测日期" sortable />
- <el-table-column property="name" align="center" label="检测人单位" sortable />
- <el-table-column property="name" align="center" label="检测内容" sortable />
- <el-table-column property="name" align="center" label="检测结果" sortable />
- <el-table-column property="name" align="center" label="检测状态" sortable />
+ <el-table-column property="testPersonName" align="center" label="检测人" sortable />
+ <el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
+ <el-table-column property="testPersonDepartmentName" align="center" label="检测人单位" sortable />
+ <el-table-column property="testMemo" align="center" label="检测内容" sortable />
+ <el-table-column align="center" label="检测结果">
+ <template #default="scope">
+ <span v-if="scope.row.testResult == 1">成功</span>
+ <span v-if="scope.row.testResult == 2">失败</span>
+ </template>
+ </el-table-column>
+ <el-table-column property="testStatus" align="center" label="检测状态" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备维修" name="fourth">
<el-table ref="multipleTableRef" :data="scope.row.repaireDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="设施异常项" sortable />
- <el-table-column property="name" align="center" label="维修状态" sortable />
- <el-table-column property="name" align="center" label="维修情况" sortable />
- <el-table-column property="name" align="center" label="维修负责人" sortable />
- <el-table-column property="name" align="center" label="维修负责人单位" sortable />
- <el-table-column property="name" align="center" label="维修开始日期" sortable />
- <el-table-column property="name" align="center" label="维修结束日期" sortable />
+ <el-table-column property="exceptionInfo" align="center" label="设施异常项" sortable />
+ <el-table-column align="center" label="维修状态">
+ <template #default="scope">
+ <span v-if="scope.row.repairStatus == 1">维修中</span>
+ <span v-if="scope.row.repairStatus == 2">已修好</span>
+ </template>
+ </el-table-column>
+ <el-table-column property="repairMemo" align="center" label="维修情况" sortable />
+ <el-table-column property="repairPersonName" align="center" label="维修负责人" sortable />
+ <el-table-column property="repairPersonDepartmentName" align="center" label="维修负责人单位" sortable />
+ <el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
+ <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
</el-table>
</el-tab-pane>
</el-tabs>
@@ -112,11 +121,12 @@
</el-col>
</el-row>
<!-- <updata ref="Show"></updata> -->
- <Dailog ref="openAdd"></Dailog>
+ <Dailog ref="openAdd" @navAddorUpdata="onAddorUpdata"></Dailog>
</div>
</template>
<script lang="ts">
import { defineComponent, ref, reactive, watch, onMounted } from 'vue';
+import { timeDate } from '/@/assets/index.ts';
import updata from '/@/components/updata/updata.vue';
import Dailog from '/@/components/equipmentDailog/Dailog.vue';
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
@@ -136,12 +146,14 @@
searchParams: {
qName: '', ////名称
positionNum: '', ////位号
+ equipmentTypeId: '',
infoType: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
},
});
// 重置
const resetForm = () => {
ruleForm.searchParams.qName = '';
+ ruleForm.searchParams.positionNum = '';
listApi();
};
const listApi = () => {
@@ -183,10 +195,12 @@
// 弹窗
const openAdd = ref();
const openD = (title: String, id: number) => {
- openAdd.value.openDailog(title, id);
+ openAdd.value.openDailog(title, false, id, 0);
};
// 删除
const onDelete = (id: number) => {
+ let arr = [];
+ arr.push(id);
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -194,7 +208,7 @@
})
.then(() => {
facilityManagementApi()
- .getequipmentInfoDelete(id)
+ .getequipmentInfoDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -224,15 +238,15 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr;
if (val.length == 1) {
- // warning.value = false;
+ warning.value = false;
danger.value = false;
} else if (val.length == 0) {
- // warning.value = true;
+ warning.value = true;
danger.value = true;
} else {
- // warning.value = true;
+ warning.value = true;
danger.value = false;
}
};
@@ -272,7 +286,7 @@
.getequipmentTypeMngTreeData()
.then((res) => {
if (res.data.code == 200) {
- data.value= res.data.data;
+ data.value = res.data.data;
} else {
ElMessage({
showClose: true,
@@ -286,7 +300,7 @@
label: 'typeName',
children: 'childList',
value: 'id',
- }
+ };
watch(filterText, (val) => {
treeRef.value!.filter(val);
});
@@ -295,18 +309,19 @@
if (!value) return true;
return data.typeName.includes(value);
};
- const handleNodeClick=(data: Tree)=>{
- ruleForm.searchParams.positionNum=data.id
+ const handleNodeClick = (data: Tree) => {
+ ruleForm.searchParams.positionNum = data.sortNum;
+ ruleForm.searchParams.equipmentTypeId = data.id;
listApi();
- }
- const data=ref([])
+ };
+ const data = ref([]);
onMounted(() => {
listApiTree();
});
const handleClicks = (tab: TabsPaneContext, event: Event) => {
console.log(tab, event);
};
-
+
const activeName = ref('first');
// const Show=ref()
// const openUp=()=>{
@@ -315,6 +330,7 @@
return {
handleNodeClick,
ruleForm,
+ timeDate,
resetForm,
listApi,
onAddorUpdata,
--
Gitblit v1.9.2