From 1f772a6c7834eef35ff4c9f2c8ed734a4c2be76a Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: Tue, 02 Aug 2022 11:09:16 +0800
Subject: [PATCH] 数据对接
---
src/views/facilityManagement/keyEquipment/index.vue | 503 +++++++++++++++++++++++++------------------------------
1 files changed, 232 insertions(+), 271 deletions(-)
diff --git a/src/views/facilityManagement/keyEquipment/index.vue b/src/views/facilityManagement/keyEquipment/index.vue
index f1d3218..f8fae6e 100644
--- a/src/views/facilityManagement/keyEquipment/index.vue
+++ b/src/views/facilityManagement/keyEquipment/index.vue
@@ -4,7 +4,7 @@
<el-row>
<el-col :span="4">
<el-form-item size="default">
- <el-input v-model="ruleForm.searchParams.equipmentTypeId" placeholder="装置/部位名称" />
+ <el-input v-model="ruleForm.searchParams.qName" placeholder="装置/部位名称" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -17,9 +17,10 @@
</el-form>
<el-row>
<el-col :span="4">
+ <el-input v-model="filterText" style="height: 30px" placeholder="请输入关键字" />
<div class="tree">
-<!-- <el-input v-model="filterText" style="height: 30px" placeholder="Filter keyword" />-->
- <el-tree ref="treeRef" :data="data" :props="defaultProps" :filter-node-method="filterNode" />
+ <!-- <el-input v-model="filterText" style="height: 30px" placeholder="Filter keyword" />-->
+ <el-tree ref="treeRef" :data="data" :props="props" @node-click="handleNodeClick" :filter-node-method="filterNode" />
</div>
</el-col>
<el-col :span="20">
@@ -36,64 +37,61 @@
</div>
</div>
<div style="padding-left: 10px">
- <el-table ref="multipleTableRef" :data="tableData" style="width: 100%">
+ <el-table ref="multipleTableRef" :data="tableData" @selection-change="handleSelectionChange" style="width: 100%">
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
- <template #default>
+ <template #default="scope">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" 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="name" 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="leadingPersonId" align="center" label="保养负责人" sortable />
+ <el-table-column property="takecareDate" align="center" label="保养日期" sortable />
+ <el-table-column property="leadingPersonDepartmentId" 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="name" align="center" label="检查人" sortable />
- <el-table-column property="name" align="center" label="检查日期" sortable />
+ <el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
+ <el-table-column property="createTime" 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="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 ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
+ <el-table-column property="testPersonId" align="center" label="检测人" sortable />
+ <el-table-column property="testDate" align="center" label="检测日期" sortable />
+ <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
+ <el-table-column property="testMemo" align="center" label="检测内容" sortable />
+ <el-table-column property="testResult" align="center" label="检测结果" sortable />
+ <el-table-column property="testStatus" align="center" label="检测状态" sortable />
</el-table>
- </el-tab-pane>
+ </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="departmentId" 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 property="repairStatus" align="center" label="维修状态" sortable />
+ <el-table-column property="repairMemo" align="center" label="维修情况" sortable />
+ <el-table-column property="repairPersonId" align="center" label="维修负责人" sortable />
+ <el-table-column property="repairPersonDepartmentId" align="center" label="维修负责人单位" sortable />
+ <el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
+ <el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
</el-table>
</el-tab-pane>
</el-tabs>
</template>
</el-table-column>
- <el-table-column label="id" align="center" sortable>
- <template #default="scope">{{ scope.row.date }}</template>
- </el-table-column>
<el-table-column property="equipmentTypeId" align="center" label="类型/类别外键" sortable />
- <el-table-column property="name" align="center" label="装置/部位名称" sortable />
+ <el-table-column property="qName" align="center" label="装置/部位名称" sortable />
<el-table-column property="departmentId" label="所属部门" align="center" sortable show-overflow-tooltip />
<el-table-column property="position" label="具体位置" align="center" sortable show-overflow-tooltip />
<el-table-column property="leadingPersonName" label="负责人姓名" align="center" sortable show-overflow-tooltip />
- <el-table-column property="connectPersonId" label="装置部位分类" align="center" sortable show-overflow-tooltip />
+ <el-table-column property="connectPersonId" label="装置部位分类" align="center" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" width="250">
<template #default="scope">
- <el-button link type="primary" size="default" :icon="View" @click="openEdit('查看', scope.row.id)">查看</el-button>
- <el-button link type="primary" size="default" :icon="EditPen" @click="openEdit('修改', scope.row.id)">修改</el-button>
+ <el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row.id)">查看</el-button>
+ <el-button link type="primary" size="default" :icon="EditPen" @click="openD('修改', scope.row.id)">修改</el-button>
<el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除</el-button>
</template>
</el-table-column>
@@ -112,288 +110,251 @@
</div>
</el-col>
</el-row>
- <updata ref="Show"></updata>
- <DailogS ref="ShowD" @myAdd="onMyAdd"></DailogS>
+ <!-- <updata ref="Show"></updata>-->
+ <DailogS ref="ShowD" @navAddorUpdata="onAddorUpdata"></DailogS>
</div>
</template>
<script lang="ts">
import { defineComponent, ref, reactive, watch, onMounted } from 'vue';
-import updata from '/@/components/updata/updata.vue'
-import DailogS from '/@/components/equipmentDailog/DailogS.vue'
-import { ElTree, TabsPaneContext ,ElMessage, ElMessageBox} from 'element-plus';
-import { EditPen, Plus, Delete, Download, Refresh, Upload ,View} from '@element-plus/icons-vue';
-import {facilityManagementApi} from "/@/api/facilityManagement";
+// import updata from '/@/components/updata/updata.vue'
+import DailogS from '/@/components/equipmentDailog/DailogS.vue';
+import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
+import { EditPen, Plus, Delete, Download, Refresh, Upload, View } from '@element-plus/icons-vue';
+import { facilityManagementApi } from '/@/api/facilityManagement';
interface Tree {
- id: number;
label: string;
children?: Tree[];
}
export default defineComponent({
- components:{updata,DailogS},
+ components: {
+ // updata,
+ DailogS,
+ },
setup() {
const ruleForm = reactive({
- pageSize: 10,
- pageIndex: 1,
- searchParams: {
- equipmentTypeId: '', ////类型/类别外键
- name: '', ////装置/部位名称
- departmentId: '',////所属部门
- position: '', ////具体位置
- leadingPersonName: '', ////负责人姓名
- connectPersonId: '',////装置部位分类
- },
+ pageSize: 10,
+ pageIndex: 1,
+ searchParams: {
+ equipmentTypeId: '', ////类型/类别外键
+ qName: '', ////装置/部位名称
+ // departmentId: '',////所属部门
+ // position: '', ////具体位置
+ // leadingPersonName: '', ////负责人姓名
+ // connectPersonId: '',////装置部位分类
+ infoTpe: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ },
});
- // 重置
- const resetForm = () => {
- ruleForm.searchParams.equipmentTypeId = '';
- listApi();
- };
- const listApi = () => {
- facilityManagementApi()
- .getkeypointEquipmentInfoAddOrList(ruleForm)
- .then((res) => {
- if (res.data.code == 200) {
- tableData.value = res.data.data;
- currentPage4.value = res.data.pageIndex;
- pageSize4.value = res.data.pageSize;
- total.value = res.data.total;
- } else {
- ElMessage.error(res.data.msg);
- }
- });
- };
- onMounted(() => {
- listApi();
- });
- const onAddorUpdata = () => {
- listApi();
- };
- const tableData = ref();
- const currentPage4 = ref();
- const pageSize4 = ref();
- const total = ref();
- const handleSizeChange = (val: number) => {
- // console.log(`${val} items per page`);
- ruleForm.pageSize = val;
- listApi();
- };
- const handleCurrentChange = (val: number) => {
- // console.log(`current page: ${val}`);
- ruleForm.pageIndex = val;
- listApi();
- };
+ // 重置
+ const resetForm = () => {
+ ruleForm.searchParams.qName = '';
+ listApi();
+ };
+ const listApi = () => {
+ facilityManagementApi()
+ .getkeypointEquipmentInfoAddOrList(ruleForm)
+ .then((res) => {
+ if (res.data.code == 200) {
+ tableData.value = res.data.data;
+ currentPage4.value = res.data.pageIndex;
+ pageSize4.value = res.data.pageSize;
+ total.value = res.data.total;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ };
+ onMounted(() => {
+ listApi();
+ });
+ const onAddorUpdata = () => {
+ listApi();
+ };
+ const tableData = ref();
+ const currentPage4 = ref();
+ const pageSize4 = ref();
+ const total = ref();
+ const handleSizeChange = (val: number) => {
+ // console.log(`${val} items per page`);
+ ruleForm.pageSize = val;
+ listApi();
+ };
+ const handleCurrentChange = (val: number) => {
+ // console.log(`current page: ${val}`);
+ ruleForm.pageIndex = val;
+ listApi();
+ };
const filterText = ref('');
const treeRef = ref<InstanceType<typeof ElTree>>();
-
- const defaultProps = {
- children: 'children',
- label: 'typeName',
- value: 'id',
+ // 树形
+ const listApiTree = () => {
+ facilityManagementApi()
+ .getequipmentTypeMngTreeData()
+ .then((res) => {
+ if (res.data.code == 200) {
+ console.log(res.data.data);
+ data.value = res.data.data;
+ } else {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'error',
+ });
+ }
+ });
};
-
+ const props = {
+ label: 'typeName',
+ children: 'childList',
+ value: 'id',
+ }
watch(filterText, (val) => {
treeRef.value!.filter(val);
});
-
const filterNode = (value: string, data: Tree) => {
if (!value) return true;
return data.typeName.includes(value);
};
+ const handleNodeClick = (data: Tree) => {
+ console.log(data)
+ ruleForm.searchParams.qName = data.typeName;
- // 删除
- const onDelete = (id: number) => {
- ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(() => {
- facilityManagementApi()
- .getkeypointEquipmentInfoDetele(id)
- .then((res) => {
- if (res.data.code == 200) {
- ElMessage({
- message: res.data.msg,
- type: 'success',
- });
- listApi();
- } else {
- ElMessage.error(res.data.msg);
- }
- });
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: 'Delete canceled',
- });
- });
- };
- // 批量删除
- const warning = ref(true);
- const danger = ref(true);
- const deletAll = ref();
- const handleSelectionChange = (val: any) => {
- let valId = JSON.parse(JSON.stringify(val));
- let arr = [];
- for (let i = 0; i < valId.length; i++) {
- arr.push(valId[i].id);
- }
- deletAll.value = arr.toString();
- if (val.length == 1) {
- // warning.value = false;
- danger.value = false;
- } else if (val.length == 0) {
- // warning.value = true;
- danger.value = true;
- } else {
- // warning.value = true;
- danger.value = false;
- }
- };
- const onDeleteAll = () => {
- ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(() => {
- facilityManagementApi()
- .getkeypointEquipmentInfoDetele(deletAll.value)
- .then((res) => {
- if (res.data.code == 200) {
- ElMessage({
- message: res.data.msg,
- type: 'success',
- });
- listApi();
- } else {
- ElMessage.error(res.data.msg);
- }
- });
- })
- .catch(() => {
- // ElMessage({
- // type: 'info',
- // message: 'Delete canceled',
- // });
- });
- };
- const data: Tree[] = [
- {
- id: 1,
- label: 'Level one 1',
- children: [
- {
- id: 4,
- label: 'Level two 1-1',
- children: [
- {
- id: 9,
- label: 'Level three 1-1-1',
- },
- {
- id: 10,
- label: 'Level three 1-1-2',
- },
- ],
- },
- ],
- },
- {
- id: 2,
- label: 'Level one 2',
- children: [
- {
- id: 5,
- label: 'Level two 2-1',
- },
- {
- id: 6,
- label: 'Level two 2-2',
- },
- ],
- },
- {
- id: 3,
- label: 'Level one 3',
- children: [
- {
- id: 7,
- label: 'Level two 3-1',
- },
- {
- id: 8,
- label: 'Level two 3-2',
- },
- ],
- },
- ];
+ listApi();
+ };
+ const data = ref([]);
+ onMounted(() => {
+ listApiTree();
+ });
+ // 删除
+ const onDelete = (id: number) => {
+ ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ facilityManagementApi()
+ .getkeypointEquipmentInfoDetele(id)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ listApi();
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: 'Delete canceled',
+ });
+ });
+ };
+ // 批量删除
+ const warning = ref(true);
+ const danger = ref(true);
+ const deletAll = ref();
+ const handleSelectionChange = (val: any) => {
+ let valId = JSON.parse(JSON.stringify(val));
+ let arr = [];
+ for (let i = 0; i < valId.length; i++) {
+ arr.push(valId[i].id);
+ }
+ deletAll.value = arr.toString();
+ if (val.length == 1) {
+ warning.value = false;
+ danger.value = false;
+ } else if (val.length == 0) {
+ warning.value = true;
+ danger.value = true;
+ } else {
+ warning.value = true;
+ danger.value = false;
+ }
+ };
+ const onDeleteAll = () => {
+ ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ facilityManagementApi()
+ .getkeypointEquipmentInfoDetele(deletAll.value)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ listApi();
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ })
+ .catch(() => {
+ // ElMessage({
+ // type: 'info',
+ // message: 'Delete canceled',
+ // });
+ });
+ };
+
const activeName = ref('first');
const handleClick = (tab: TabsPaneContext, event: Event) => {
console.log(tab, event);
};
- const Show=ref()
- const openUp=()=>{
- Show.value.openDialog()
- }
- // 新增弹窗
- const ShowD=ref()
- const openD=()=>{
- ShowD.value.openDailog('新建仪器仪表',false)
- }
- // 新增后刷新
- const onMyAdd = (e: boolean) => {
- if (e) {
- listApi();
- } else {
- listApi();
- }
- };
- // 打开修改用户弹窗
- const openEdit = (val: string, row: object) => {
- if (val == '查看') {
- ShowD.value.openDailog('查看仪器仪表',row,true);
- } else {
- ShowD.value.openDailog('修改仪器仪表',row,false);
- }
- };
+ // const Show=ref()
+ // const openUp=()=>{
+ // Show.value.openDialog()
+ // }
+ // 新增弹窗
+ const ShowD = ref();
+ const openD = (title: String, id: number) => {
+ ShowD.value.openDailog(title, false, id, 2);
+ };
return {
activeName,
handleClick,
ruleForm,
filterText,
treeRef,
- defaultProps,
+ props,
filterNode,
data,
tableData,
- Show,
- openUp,
+ // Show,
+ // openUp,
ShowD,
+ danger,
openD,
- openEdit,
+ // openEdit,
Plus,
EditPen,
+ listApiTree,
Delete,
- View,
+ View,
Download,
Refresh,
Upload,
- resetForm,
- listApi,
- onMyAdd,
- handleCurrentChange,
- handleSizeChange,
- onAddorUpdata,
- total,
- currentPage4,
- pageSize4,
- onDelete,
- warning,
- handleSelectionChange,
- onDeleteAll,
+ resetForm,
+ listApi,
+ handleCurrentChange,
+ handleSizeChange,
+ onAddorUpdata,
+ total,
+ currentPage4,
+ pageSize4,
+ onDelete,
+ warning,
+ handleSelectionChange,
+ onDeleteAll,
+ handleNodeClick,
};
},
});
--
Gitblit v1.9.2