From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Tue, 09 Aug 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/facilityManagement/keyEquipment/index.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/facilityManagement/keyEquipment/index.vue b/src/views/facilityManagement/keyEquipment/index.vue
index 7e987d6..3627137 100644
--- a/src/views/facilityManagement/keyEquipment/index.vue
+++ b/src/views/facilityManagement/keyEquipment/index.vue
@@ -87,7 +87,12 @@
<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>
+ <template #default="scope">
+ <span v-if="scope.row.type == 1">关键装置</span>
+ <span v-if="scope.row.type == 2">重点部位</span>
+ </template>
+ </el-table-column>
<el-table-column label="操作" align="center" width="250">
<template #default="scope">
<el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row.id)">查看</el-button>
@@ -136,13 +141,14 @@
pageSize: 10,
pageIndex: 1,
searchParams: {
- equipmentTypeId: '', ////类型/类别外键
+ // equipmentTypeId: '', ////类型/类别外键
qName: '', ////装置/部位名称
// departmentId: '',////所属部门
// position: '', ////具体位置
// leadingPersonName: '', ////负责人姓名
// connectPersonId: '',////装置部位分类
- infoTpe: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ // infoTpe: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ typeId:''
},
});
// 重置
@@ -217,7 +223,7 @@
};
const handleNodeClick = (data: Tree) => {
console.log(data)
- ruleForm.searchParams.qName = data.typeName;
+ ruleForm.searchParams.typeId = data.id;
listApi();
};
--
Gitblit v1.9.2