diff --git a/src/views/device/faultInformation/index.vue b/src/views/device/faultInformation/index.vue
index 542cc8a3..0201c4d9 100644
--- a/src/views/device/faultInformation/index.vue
+++ b/src/views/device/faultInformation/index.vue
@@ -1,20 +1,18 @@
-
-
+
-
+
-
+
-
+
-
diff --git a/src/views/device/faultInformation/itemFaultDescription.vue b/src/views/device/faultInformation/itemFaultDescription.vue
index 515ecdda..25091d32 100644
--- a/src/views/device/faultInformation/itemFaultDescription.vue
+++ b/src/views/device/faultInformation/itemFaultDescription.vue
@@ -1,16 +1,27 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+
+ :picker-options="pickerOptions"
+ >
@@ -68,121 +80,211 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
- :picker-options="pickerOptions">
+ :picker-options="pickerOptions"
+ >
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
-
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
-
-
- 修改
- 删除
-
-
-
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}
+
+
+
+
+ 修改
+ 删除
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/faultInformation/itemFaultMeasures.vue b/src/views/device/faultInformation/itemFaultMeasures.vue
index 75bd3eaf..5430e8a8 100644
--- a/src/views/device/faultInformation/itemFaultMeasures.vue
+++ b/src/views/device/faultInformation/itemFaultMeasures.vue
@@ -1,16 +1,27 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+
+ :picker-options="pickerOptions"
+ >
@@ -59,121 +71,211 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
- :picker-options="pickerOptions">
+ :picker-options="pickerOptions"
+ >
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
-
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
-
-
- 修改
- 删除
-
-
-
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}
+
+
+
+
+ 修改
+ 删除
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/faultInformation/itemFaultReason.vue b/src/views/device/faultInformation/itemFaultReason.vue
index f092fc0f..4f5a7f1a 100644
--- a/src/views/device/faultInformation/itemFaultReason.vue
+++ b/src/views/device/faultInformation/itemFaultReason.vue
@@ -1,17 +1,29 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+ :picker-options="pickerOptions"
+ >
@@ -72,122 +85,217 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
- :picker-options="pickerOptions">
+ :picker-options="pickerOptions"
+ >
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
-
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
-
-
- 修改
- 删除
-
-
-
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}
+
+
+
+
+ 修改
+ 删除
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/faultInformation/itemFaultType.vue b/src/views/device/faultInformation/itemFaultType.vue
index b32ee213..defb74a3 100644
--- a/src/views/device/faultInformation/itemFaultType.vue
+++ b/src/views/device/faultInformation/itemFaultType.vue
@@ -1,17 +1,29 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ :picker-options="pickerOptions"
+ >
@@ -120,126 +133,242 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
- :picker-options="pickerOptions">
+ :picker-options="pickerOptions"
+ >
-
- 搜索
- 重置
-
-
+
+ 搜索
+ 重置
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}
+
+
+
-
+ 修改
+ 删除
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
-
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
-
-
- 修改
- 删除
-
-
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/faultInformation/selectSingleEquipment.vue b/src/views/device/faultInformation/selectSingleEquipment.vue
index bf9dee99..7a44f7ac 100644
--- a/src/views/device/faultInformation/selectSingleEquipment.vue
+++ b/src/views/device/faultInformation/selectSingleEquipment.vue
@@ -64,13 +64,13 @@
placeholder="请选择组线"
style="width: 160px"
>
-
-
+
+
@@ -155,7 +155,7 @@ import {
getGroupLineList,
} from "@/api/device/faultReport";
-import {getEquList} from "@/api/device/plan";
+import { getEquList } from "@/api/device/plan";
import { treeselect } from "@/api/wms/equipment";
import { Message } from "element-ui";
@@ -215,7 +215,7 @@ export default {
itemId: null,
itemCode: null,
itemType: null,
- groupLine :null,
+ groupLine: null,
};
this.resetForm("form");
},
@@ -257,7 +257,6 @@ export default {
});
},
-
/** 查询分类下拉树结构 */
getEquipmentType() {
getEquipmentTypeList().then((response) => {
@@ -291,7 +290,7 @@ export default {
this.queryParams.equipmentTypeCode = null;
this.resetForm("queryForm");
this.queryParams.pageNum = 1;
- this.getList()
+ this.getList();
},
// 多选框选中数据
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 6f7d0222..e73eb46a 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -207,6 +207,7 @@
align="center"
prop="orderDesc"
width="200"
+ :show-overflow-tooltip="true"
/>
{{ parseTime(scope.row.orderBreakdownTime) }}
-
+
-
+
-
+
-
+
@@ -705,7 +723,12 @@
-
+
@@ -967,23 +990,23 @@
-
-
-
-
+
+
+
+
@@ -1045,16 +1068,23 @@
:contentStyle="CS"
:label-style="LSP"
>
-
+
+
+
+
-
+
@@ -1160,7 +1190,7 @@ export default {
pageSize: 1000,
},
//故障描述
- orderDescOption : [],
+ orderDescOption: [],
teamOption: [],
//图片存储
fileList: [],
@@ -1330,8 +1360,6 @@ export default {
second
);
}
- console.log(time);
- console.log(nowDate(time));
this.form.workPlanTime = nowDate(time);
},
/** 查询维修措施列表 */
@@ -1531,7 +1559,6 @@ export default {
});
this.checkList = standards;
- console.log(this.checkList);
}
this.openView = true;
@@ -1543,7 +1570,6 @@ export default {
this.reset();
const orderId = row.orderId || this.ids;
getMaintenanceTeamList(this.queryParams).then((response) => {
- console.log(response.rows);
this.teamOption = response.rows;
});
getFaultReport(orderId).then((response) => {
@@ -1609,7 +1635,6 @@ export default {
});
this.checkList = standards;
- console.log(this.checkList);
}
if (
@@ -1655,7 +1680,6 @@ export default {
if (Array.isArray(this.form.fileList)) {
this.form.fileList = this.listToString(this.form.fileList);
}
-
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.orderId != null) {
@@ -1757,7 +1781,6 @@ export default {
}
}
},
-
},
};
@@ -1767,4 +1790,9 @@ export default {
height: 400px;
overflow-y: auto;
}
+
+.view_picture_body {
+ height: 300px;
+ overflow-y: auto;
+}