diff --git a/src/api/device/faultType.js b/src/api/device/faultType.js
new file mode 100644
index 00000000..007c1b7b
--- /dev/null
+++ b/src/api/device/faultType.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询故障类型维护列表
+export function listFaultType(query) {
+	return request({
+		url: '/device/faultType/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询故障类型维护详细
+export function getFaultType(faultId) {
+	return request({
+		url: '/device/faultType/' + faultId,
+		method: 'get'
+		});
+}
+
+// 新增故障类型维护
+export function addFaultType(data) {
+	return request({
+		url: '/device/faultType',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改故障类型维护
+export function updateFaultType(data) {
+	return request({
+		url: '/device/faultType',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除故障类型维护
+export function delFaultType(faultId) {
+	return request({
+		url: '/device/faultType/' + faultId,
+		method: 'delete'
+	});
+}
diff --git a/src/api/device/item.js b/src/api/device/item.js
index 44f1d1bc..9e977fcd 100644
--- a/src/api/device/item.js
+++ b/src/api/device/item.js
@@ -1,5 +1,21 @@
 import request from '@/utils/request'
 
+// 查询检查项维护详细
+export function getEquipmentCodeList(itemCode) {
+  return request({
+    url: '/device/item/getEquipmentCodeList/' + itemCode,
+    method: 'get'
+  });
+}
+
+// 查询检查项维护详细
+export function getEquipmentList() {
+  return request({
+    url: '/device/item/getEquipmentList',
+    method: 'get'
+  });
+}
+
 // 查询检查项维护列表
 export function listItem(query) {
 	return request({
diff --git a/src/views/device/faultType/index.vue b/src/views/device/faultType/index.vue
new file mode 100644
index 00000000..570ab2e1
--- /dev/null
+++ b/src/views/device/faultType/index.vue
@@ -0,0 +1,407 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label-width="100px" label="故障类型编码" prop="faultCode">
+				<el-input
+					v-model="queryParams.faultCode"
+					placeholder="请输入故障类型编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+      <el-form-item label="故障类型" prop="faultType">
+        <el-input
+          v-model="queryParams.faultType"
+          placeholder="请选择故障类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+			<el-form-item label="故障子类" prop="faultSubclass">
+				<el-input
+					v-model="queryParams.faultSubclass"
+					placeholder="请输入故障子类"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="备注" prop="faultRemark">
+				<el-input
+					v-model="queryParams.faultRemark"
+					placeholder="请输入备注"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item  v-if="false" label="工厂编码" prop="factoryCode">
+				<el-input
+					v-model="queryParams.factoryCode"
+					placeholder="请输入工厂编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="备用字段1" prop="attr1">
+				<el-input
+					v-model="queryParams.attr1"
+					placeholder="请输入备用字段1"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="备用字段2" prop="attr2">
+				<el-input
+					v-model="queryParams.attr2"
+					placeholder="请输入备用字段2"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="备用字段3" prop="attr3">
+				<el-input
+					v-model="queryParams.attr3"
+					placeholder="请输入备用字段3"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="删除标志" prop="delFlag">
+				<el-input
+					v-model="queryParams.delFlag"
+					placeholder="请输入删除标志"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="创建人" prop="createBy">
+				<el-input
+					v-model="queryParams.createBy"
+					placeholder="请输入创建人"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="创建时间" prop="createTime">
+				<el-date-picker clearable
+					v-model="queryParams.createTime"
+					type="date"
+					value-format="yyyy-MM-dd"
+					placeholder="请选择创建时间">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item v-if="false" label="更新人" prop="updateBy">
+				<el-input
+					v-model="queryParams.updateBy"
+					placeholder="请输入更新人"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item v-if="false" label="更新时间" prop="updateTime">
+				<el-date-picker clearable
+					v-model="queryParams.updateTime"
+					type="date"
+					value-format="yyyy-MM-dd"
+					placeholder="请选择更新时间">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['device:faultType:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['device:faultType:edit']"
+				>修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['device:faultType:remove']"
+				>删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['device:faultType:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="faultTypeList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+      <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
+			<el-table-column v-if="false" label="主键" align="center" prop="faultId" />
+			<el-table-column label="故障类型编码" align="center" prop="faultCode" />
+			<el-table-column label="故障类型" align="center" prop="faultType" />
+			<el-table-column label="故障子类" align="center" prop="faultSubclass" />
+			<el-table-column label="备注" align="center" prop="faultRemark" />
+			<el-table-column v-if="false" label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column v-if="false" label="备用字段1" align="center" prop="attr1" />
+			<el-table-column v-if="false" label="备用字段2" align="center" prop="attr2" />
+			<el-table-column v-if="false" label="备用字段3" align="center" prop="attr3" />
+			<el-table-column v-if="false" label="删除标志" align="center" prop="delFlag" />
+			<el-table-column label="创建人" align="center" prop="createBy" />
+			<el-table-column label="创建时间" align="center" prop="createTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="更新人" align="center" prop="updateBy" />
+			<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['device:faultType:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['device:faultType:remove']"
+					>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改故障类型维护对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="故障类型编码" prop="faultCode">
+					<el-input v-model="form.faultCode" placeholder="请输入故障类型编码" />
+				</el-form-item>
+				<el-form-item label="故障子类" prop="faultSubclass">
+					<el-input v-model="form.faultSubclass" placeholder="请输入故障子类" />
+				</el-form-item>
+				<el-form-item label="备注" prop="faultRemark">
+					<el-input v-model="form.faultRemark" placeholder="请输入备注" />
+				</el-form-item>
+				<el-form-item label="工厂编码" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+				</el-form-item>
+				<el-form-item label="备用字段1" prop="attr1">
+					<el-input v-model="form.attr1" placeholder="请输入备用字段1" />
+				</el-form-item>
+				<el-form-item label="备用字段2" prop="attr2">
+					<el-input v-model="form.attr2" placeholder="请输入备用字段2" />
+				</el-form-item>
+				<el-form-item label="备用字段3" prop="attr3">
+					<el-input v-model="form.attr3" placeholder="请输入备用字段3" />
+				</el-form-item>
+				<el-form-item label="删除标志" prop="delFlag">
+					<el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listFaultType, getFaultType, delFaultType, addFaultType, updateFaultType } from "@/api/device/faultType";
+
+export default {
+	name: "FaultType",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 故障类型维护表格数据
+			faultTypeList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				faultCode: null,
+				faultType: null,
+				faultSubclass: null,
+				faultRemark: null,
+				factoryCode: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				delFlag: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询故障类型维护列表 */
+		getList() {
+			this.loading = true;
+			listFaultType(this.queryParams).then(response => {
+				this.faultTypeList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				faultId: null,
+				faultCode: null,
+				faultType: null,
+				faultSubclass: null,
+				faultRemark: null,
+				factoryCode: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				delFlag: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.faultId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加故障类型维护";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const faultId = row.faultId || this.ids
+			getFaultType(faultId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改故障类型维护";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.faultId != null) {
+						updateFaultType(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addFaultType(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const faultIds = row.faultId || this.ids;
+			this.$modal.confirm('是否确认删除故障类型维护编号为"' + faultIds + '"的数据项？').then(function() {
+				return delFaultType(faultIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('device/faultType/export', {
+				...this.queryParams
+			}, `faultType_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>
diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index a7ce3363..56316fad 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -178,17 +178,17 @@
         >删除
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['device:item:export']"-->
-<!--        >导出-->
-<!--        </el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['device:item:export']"-->
+      <!--        >导出-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -201,7 +201,7 @@
       <el-table-column width="120" label="方法/工具" align="center" prop="itemMethod"/>
       <el-table-column width="120" label="维护类型编码" align="center" prop="itemType"/>
       <el-table-column width="120" label="维护类型" align="center" prop="itemTypeName"/>
-      <el-table-column width="120" label="备注" align="center" prop="itemRemark"/>
+      <el-table-column width="200" label="备注" align="center" prop="itemRemark"/>
       <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
       <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/>
       <el-table-column v-if="false" label="备用字段2" align="center" prop="attr2"/>
@@ -251,96 +251,116 @@
 
     <!-- 添加或修改检查项维护对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <!-- 第一行 -->
-        <el-row>
-          <!-- 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="检查项">
-              <el-input v-model="form.itemName" placeholder="请输入检查项"></el-input>
+      <el-tabs type="border-card">
+        <el-tab-pane label="检查项配置">
+          <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+            <!-- 第一行 -->
+            <el-row>
+              <!-- 第一列 -->
+              <el-col :span="6">
+                <el-form-item label="检查项">
+                  <el-input v-model="form.itemName" placeholder="请输入检查项"></el-input>
+                </el-form-item>
+              </el-col>
+              <!-- 第二列 -->
+              <el-col :span="6" :offset="1">
+                <el-form-item label="维护类型">
+                  <el-select v-model="form.itemType" placeholder="请选择维护类型" clearable>
+                    <el-option
+                      v-for="dict in dict.type.device_item_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!-- 第三列 -->
+              <el-col :span="7" :offset="1">
+                <el-form-item label-width="100px" label="检查方法/工具">
+                  <el-input v-model="form.itemMethod" placeholder="请输入检查方法/工具"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- 动态表单 -->
+            <div v-for="(item, index) in formStandard" :key="index">
+              <!-- 标准类型 -->
+              <el-row>
+                <el-col :span="7">
+                  <el-form-item label="标准类型">
+                    <el-radio v-model="item.standardType" label="qualitative">定性</el-radio>
+                    <el-radio v-model="item.standardType" label="quantify">定量</el-radio>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!-- 单选-动态表单 -->
+              <el-row v-if="item.standardType === 'qualitative'">
+                <el-col :span="6">
+                  <el-form-item label="标准名称">
+                    <el-input v-model="item.standardName" placeholder="请输入标准名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <!-- 操作 -->
+                <el-col :span="4" class="my-dynamic-btn">
+                  <el-button size="small" v-if="formStandard.length > 1" @click="removeStandard(index)" type="danger">删除
+                  </el-button>
+                  <el-button size="small" v-if="index === formStandard.length - 1" @click="addStandard" type="primary">
+                    添加
+                  </el-button>
+                </el-col>
+              </el-row>
+              <el-row v-else>
+                <el-col :span="6">
+                  <el-form-item label="标准名称">
+                    <el-input v-model="item.standardName" placeholder="请输入标准名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label-width="50px" label="上限">
+                    <el-input v-model="item.detailUpLimit" step="0.01" type="number" maxlength="9" oninput="value=value.replace(/[^\d.]/g, '')" placeholder="请输入上限"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label-width="50px" label="下限">
+                    <el-input v-model="item.detailDownLimit" step="0.01" type="number" maxlength="9" oninput="value=value.replace(/[^\d.]/g, '')" placeholder="请输入下限"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label-width="50px" label="单位">
+                    <el-input v-model="item.detailUnit" placeholder="请输入单位"></el-input>
+                  </el-form-item>
+                </el-col>
+                <!-- 操作 -->
+                <el-col :span="4" class="my-dynamic-btn">
+                  <el-button size="small" v-if="formStandard.length > 1" @click="removeStandard(index)" type="danger">删除
+                  </el-button>
+                  <el-button size="small" v-if="index === formStandard.length - 1" @click="addStandard" type="primary">
+                    添加
+                  </el-button>
+                </el-col>
+              </el-row>
+            </div>
+            <!-- 备注 -->
+            <el-form-item label="备注">
+              <el-input v-model="form.itemRemark" placeholder="请输入备注"></el-input>
             </el-form-item>
-          </el-col>
-          <!-- 第二列 -->
-          <el-col :span="6" :offset="0.9">
-            <el-form-item label="维护类型">
-              <el-select v-model="form.itemType" placeholder="请选择维护类型" clearable>
-                <el-option
-                  v-for="dict in dict.type.device_item_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- 第三列 -->
-          <el-col :span="7" offset="1">
-            <el-form-item label-width="100px" label="检查方法/工具">
-              <el-input v-model="form.itemMethod" placeholder="请输入检查方法/工具"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- 动态表单 -->
-        <div v-for="(item, index) in formStandard" :key="index">
-          <!-- 标准类型 -->
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="关联设备">
           <el-row>
-            <el-col :span="7">
-              <el-form-item label="标准类型">
-                <el-radio v-model="item.standardType" label="qualitative">定性</el-radio>
-                <el-radio v-model="item.standardType" label="quantify">定量</el-radio>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <!-- 单选-动态表单 -->
-          <el-row v-if="item.standardType === 'qualitative'">
-            <el-col :span="6">
-              <el-form-item label="标准名称">
-                <el-input v-model="item.standardName" placeholder="请输入标准名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- 操作 -->
-            <el-col :span="4" class="my-dynamic-btn">
-              <el-button size="small" v-if="formStandard.length > 1" @click="removeStandard(index)" type="danger">删除
-              </el-button>
-              <el-button size="small" v-if="index === formStandard.length - 1" @click="addStandard" type="primary">添加
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-row v-else>
-            <el-col :span="6">
-              <el-form-item label="标准名称">
-                <el-input v-model="item.standardName" placeholder="请输入标准名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label-width="50px" label="上限">
-                <el-input v-model="item.detailUpLimit" placeholder="请输入上限"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label-width="50px" label="下限">
-                <el-input v-model="item.detailDownLimit" placeholder="请输入下限"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label-width="50px" label="单位">
-                <el-input v-model="item.detailUnit" placeholder="请输入单位"></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- 操作 -->
-            <el-col :span="4" class="my-dynamic-btn">
-              <el-button size="small" v-if="formStandard.length > 1" @click="removeStandard(index)" type="danger">删除
-              </el-button>
-              <el-button size="small" v-if="index === formStandard.length - 1" @click="addStandard" type="primary">添加
-              </el-button>
+            <el-col :span="24" :offset="1">
+              <el-transfer
+                :titles="['设备列表','已关联设备']"
+                filterable
+                :filter-method="filterMethod"
+                filter-placeholder="请输入设备名称"
+                v-model="selectEquipmentList"
+                :data="equipmentList">
+              </el-transfer>
             </el-col>
           </el-row>
-        </div>
-        <!-- 备注 -->
-        <el-form-item label="备注">
-          <el-input v-model="form.itemRemark" placeholder="请输入备注"></el-input>
-        </el-form-item>
-      </el-form>
+        </el-tab-pane>
+      </el-tabs>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -350,13 +370,24 @@
 </template>
 
 <script>
-import {listItem, getItem, delItem, addItem, updateItem} from "@/api/device/item";
+import {
+  getEquipmentCodeList,
+  getEquipmentList,
+  listItem,
+  getItem,
+  delItem,
+  addItem,
+  updateItem,
+} from "@/api/device/item";
 
 export default {
   name: "Item",
   dicts: ['device_item_type'],
   data() {
     return {
+      // 设备选择穿梭框
+      equipmentList: [],
+      selectEquipmentList: [],
       // 标准列表
       formStandard: [{
         standardType: 'qualitative',
@@ -440,6 +471,7 @@ export default {
         itemMethod: null,
         itemRemark: null,
         formStandard: [],
+        equipmentCodeList: [],
       },
       // 表单校验
       rules: {}
@@ -449,6 +481,20 @@ export default {
     this.getList();
   },
   methods: {
+    // 获取设备List-置入穿梭框信息
+    setTransfer() {
+      getEquipmentList().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.equipmentList.push({
+            label: response.data[i].equipmentName + '(' + response.data[i].equipmentCode + ')',
+            key: response.data[i].equipmentCode,
+          })
+        }
+      });
+    },
+    filterMethod(query, item) {
+      return item.label.indexOf(query) > -1;
+    },
     // 动态增加表单
     addStandard() {
       this.formStandard.push({
@@ -505,6 +551,8 @@ export default {
         detailDownLimit: null,
         detailUnit: null,
       }];
+      this.selectEquipmentList = [];
+      this.equipmentList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -529,15 +577,24 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.setTransfer();
       this.open = true;
       this.title = "新增检查项";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.setTransfer();
       const itemId = row.itemId || this.ids
       getItem(itemId).then(response => {
         this.form = response.data;
+
+        getEquipmentCodeList(row.itemCode).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.selectEquipmentList.push(response.data[i]);
+          }
+        })
+
         this.formStandard = response.data.formStandard;
         this.open = true;
         this.title = "修改检查项";
@@ -567,6 +624,13 @@ export default {
         })
         return
       }
+      if (this.selectEquipmentList.length == 0) {
+        this.$message({
+          message: "请关联设备！",
+          type: "warning"
+        })
+        return
+      }
       for (let i = 0; i < this.formStandard.length; i++) {
         // 如果为定性
         if (this.formStandard[i].standardType == 'qualitative') {
@@ -615,6 +679,7 @@ export default {
         if (valid) {
           if (this.form.itemId != null) {
             this.form.formStandard = this.formStandard;
+            this.form.equipmentCodeList = this.selectEquipmentList;
             updateItem(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -622,6 +687,7 @@ export default {
             });
           } else {
             this.form.formStandard = this.formStandard;
+            this.form.equipmentCodeList = this.selectEquipmentList;
             addItem(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -634,7 +700,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const itemIds = row.itemId || this.ids;
-      this.$modal.confirm('是否确认删除检查项维护编号为"' + itemIds + '"的数据项？').then(function () {
+
+      var itemCodes = '';
+      // 处理信息
+      for (let i = 0; i < this.itemList.length; i++) {
+        for (let j = 0; j < itemIds.length; j++) {
+          if (itemIds[j] == this.itemList[i].itemId) {
+            itemCodes = itemCodes + this.itemList[i].itemCode + ',';
+          }
+        }
+      }
+
+      if (itemCodes == '') {
+        for (let i = 0; i < this.itemList.length; i++) {
+          if (itemIds == this.itemList[i].itemId) {
+            itemCodes = this.itemList[i].itemCode;
+          }
+        }
+      }
+
+      this.$modal.confirm('是否确认删除检查项维护编号为"' + itemCodes + '"的数据项？').then(function () {
         return delItem(itemIds);
       }).then(() => {
         this.getList();
@@ -655,7 +740,11 @@ export default {
 .my-select-input {
   width: 130px;
 }
-.my-dynamic-btn{
+
+.my-dynamic-btn {
   margin-left: 10px;
 }
+.el-transfer-panel {
+  width: 330px;
+}
 </style>
diff --git a/src/views/technology/proroute/routeprodproduct.vue b/src/views/technology/proroute/routeprodproduct.vue
index ed8886a9..b4dd8a3a 100644
--- a/src/views/technology/proroute/routeprodproduct.vue
+++ b/src/views/technology/proroute/routeprodproduct.vue
@@ -162,7 +162,7 @@ export default {
       //--------------------->
       leftList: [],
       rightList: [],
-      titles: ["未关联产品", "已关联产品"],
+      titles: ["未factoryCode", "已关联产品"],
       // 左侧分页数据
       Ltotal: "",
       LPageNum: "1",