Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检查项显示优化

Browse Source
yangwl
wws 1 year ago
parent 9ae9944d9c
commit eed43a5b34
6 changed files with 94 additions and 40 deletions
Show Stats Download Patch File Download Diff File

23
src/views/device/deviceOrder/index.vue
Unescape Escape View File

@ -502,7 +502,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工单信息修改"> <el-tab-pane v-if="false" label="工单信息修改">
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="巡检时间"> <el-form-item label="巡检时间">
@ -541,7 +541,7 @@
<el-dialog <el-dialog
title="巡检详情" title="巡检详情"
:visible.sync="workDetail" :visible.sync="workDetail"
width="900px" width="1000px"
> >
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="巡检信息"> <el-tab-pane label="巡检信息">
@ -572,12 +572,15 @@
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息"> <el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table <el-table
:data="detail.standardList" :data="standardListVo"
border border
style="width: 100%"> style="width: 100%">
<el-table-column
prop="itemName"
label="检查项"
width="180">
</el-table-column>
<el-table-column <el-table-column
prop="standardName" prop="standardName"
label="标准名称" label="标准名称"
@ -586,7 +589,7 @@
<el-table-column <el-table-column
prop="standardTypeName" prop="standardTypeName"
label="标准类型" label="标准类型"
width="180"> width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailReach" prop="detailReach"
@ -629,7 +632,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -656,6 +658,7 @@ export default {
dicts: ['device_order_status', 'device_loop_type','device_reach_standard'], dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
data() { data() {
return { return {
standardListVo:[],
// 初始化VO // 初始化VO
workVO: { workVO: {
order: { order: {
@ -787,6 +790,12 @@ export default {
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => { getInspectionWork(orderId).then(response => {
this.workVO = response.data; this.workVO = response.data;
for (let i = 0; i < this.workVO.detailList.length; i++) {
for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
}
}
this.workDetail = true; this.workDetail = true;
}); });

23
src/views/device/inspectionWork/index.vue
Unescape Escape View File

@ -417,7 +417,7 @@
<el-dialog <el-dialog
title="巡检详情" title="巡检详情"
:visible.sync="workDetail" :visible.sync="workDetail"
width="900px" width="1000px"
> >
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="巡检信息"> <el-tab-pane label="巡检信息">
@ -448,12 +448,15 @@
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息"> <el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table <el-table
:data="detail.standardList" :data="standardListVo"
border border
style="width: 100%"> style="width: 100%">
<el-table-column
prop="itemName"
label="检查项"
width="180">
</el-table-column>
<el-table-column <el-table-column
prop="standardName" prop="standardName"
label="标准名称" label="标准名称"
@ -462,7 +465,7 @@
<el-table-column <el-table-column
prop="standardTypeName" prop="standardTypeName"
label="标准类型" label="标准类型"
width="180"> width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailReach" prop="detailReach"
@ -505,7 +508,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -540,6 +542,7 @@ export default {
dicts: ['device_order_status', 'device_loop_type'], dicts: ['device_order_status', 'device_loop_type'],
data() { data() {
return { return {
standardListVo:[],
workCenterList: [], workCenterList: [],
test: false, test: false,
// 日期范围选择快捷 // 日期范围选择快捷
@ -667,12 +670,18 @@ export default {
this.workCenterList = response.data; this.workCenterList = response.data;
}) })
}, },
// 测试 // 展示
showWork(row) { showWork(row) {
this.reset(); this.reset();
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => { getInspectionWork(orderId).then(response => {
this.workVO = response.data; this.workVO = response.data;
for (let i = 0; i < this.workVO.detailList.length; i++) {
for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
}
}
this.workDetail = true; this.workDetail = true;
}); });

23
src/views/device/maintenanceWork/index.vue
Unescape Escape View File

@ -450,7 +450,7 @@
<el-dialog <el-dialog
title="保养详情" title="保养详情"
:visible.sync="workDetail" :visible.sync="workDetail"
width="900px" width="1000px"
> >
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="保养信息"> <el-tab-pane label="保养信息">
@ -527,12 +527,15 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息"> <el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table <el-table
:data="detail.standardList" :data="standardListVo"
border border
style="width: 100%"> style="width: 100%">
<el-table-column
prop="itemName"
label="检查项"
width="180">
</el-table-column>
<el-table-column <el-table-column
prop="standardName" prop="standardName"
label="标准名称" label="标准名称"
@ -541,7 +544,7 @@
<el-table-column <el-table-column
prop="standardTypeName" prop="standardTypeName"
label="标准类型" label="标准类型"
width="180"> width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailReach" prop="detailReach"
@ -584,7 +587,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -614,6 +616,7 @@ export default {
dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'], dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'],
data() { data() {
return { return {
standardListVo:[],
workCenterList:[], workCenterList:[],
// 日期范围选择快捷 // 日期范围选择快捷
pickerOptions: { pickerOptions: {
@ -760,6 +763,12 @@ export default {
}else { }else {
this.workVO.order.shutDown = '停机保养'; this.workVO.order.shutDown = '停机保养';
} }
for (let i = 0; i < this.workVO.detailList.length; i++) {
for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
}
}
this.workDetail = true; this.workDetail = true;
}); });
@ -896,7 +905,7 @@ export default {
margin-top: 10px; margin-top: 10px;
} }
.demo-image__lazy{ .demo-image__lazy{
height: 400px; height: 350px;
overflow-y: auto; overflow-y: auto;
} }
</style> </style>

23
src/views/device/spotInspectionOrder/index.vue
Unescape Escape View File

@ -493,7 +493,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工单信息修改"> <el-tab-pane v-if="false" label="工单信息修改">
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="点检时间"> <el-form-item label="点检时间">
@ -532,7 +532,7 @@
<el-dialog <el-dialog
title="点检详情" title="点检详情"
:visible.sync="workDetail" :visible.sync="workDetail"
width="900px" width="1000px"
> >
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="点检信息"> <el-tab-pane label="点检信息">
@ -563,12 +563,15 @@
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息"> <el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table <el-table
:data="detail.standardList" :data="standardListVo"
border border
style="width: 100%"> style="width: 100%">
<el-table-column
prop="itemName"
label="检查项"
width="180">
</el-table-column>
<el-table-column <el-table-column
prop="standardName" prop="standardName"
label="标准名称" label="标准名称"
@ -577,7 +580,7 @@
<el-table-column <el-table-column
prop="standardTypeName" prop="standardTypeName"
label="标准类型" label="标准类型"
width="180"> width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailReach" prop="detailReach"
@ -620,7 +623,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -643,6 +645,7 @@ export default {
dicts: ['device_order_status', 'device_loop_type','device_reach_standard'], dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
data() { data() {
return { return {
standardListVo: [],
workDetail:false, workDetail:false,
// 初始化VO // 初始化VO
workVO: { workVO: {
@ -785,6 +788,12 @@ export default {
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => { getInspectionWork(orderId).then(response => {
this.workVO = response.data; this.workVO = response.data;
for (let i = 0; i < this.workVO.detailList.length; i++) {
for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
}
}
this.workDetail = true; this.workDetail = true;
}); });

19
src/views/device/spotInspectionWork/index.vue
Unescape Escape View File

@ -406,7 +406,7 @@
<el-dialog <el-dialog
title="点检详情" title="点检详情"
:visible.sync="workDetail" :visible.sync="workDetail"
width="900px" width="1000px"
> >
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="点检信息"> <el-tab-pane label="点检信息">
@ -437,12 +437,15 @@
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息"> <el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table <el-table
:data="detail.standardList" :data="standardListVo"
border border
style="width: 100%"> style="width: 100%">
<el-table-column
prop="itemName"
label="检查项"
width="180">
</el-table-column>
<el-table-column <el-table-column
prop="standardName" prop="standardName"
label="标准名称" label="标准名称"
@ -494,7 +497,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -523,6 +525,7 @@ export default {
dicts: ['device_order_status', 'device_loop_type'], dicts: ['device_order_status', 'device_loop_type'],
data() { data() {
return { return {
standardListVo:[],
// 日期范围选择快捷 // 日期范围选择快捷
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
@ -656,6 +659,12 @@ export default {
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => { getInspectionWork(orderId).then(response => {
this.workVO = response.data; this.workVO = response.data;
for (let i = 0; i < this.workVO.detailList.length; i++) {
for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
}
}
this.workDetail = true; this.workDetail = true;
}); });

23
src/views/device/upkeepOrder/index.vue
Unescape Escape View File

@ -1027,7 +1027,7 @@
<el-dialog <el-dialog
title="保养详情" title="保养详情"
:visible.sync="workDetail" :visible.sync="workDetail"
width="900px" width="1000px"
> >
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="保养信息"> <el-tab-pane label="保养信息">
@ -1104,12 +1104,15 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息"> <el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table <el-table
:data="detail.standardList" :data="standardListVo"
border border
style="width: 100%"> style="width: 100%">
<el-table-column
prop="itemName"
label="检查项"
width="180">
</el-table-column>
<el-table-column <el-table-column
prop="standardName" prop="standardName"
label="标准名称" label="标准名称"
@ -1118,7 +1121,7 @@
<el-table-column <el-table-column
prop="standardTypeName" prop="standardTypeName"
label="标准类型" label="标准类型"
width="180"> width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailReach" prop="detailReach"
@ -1161,7 +1164,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -1190,6 +1192,7 @@ export default {
dicts: ['device_order_status', 'device_loop_type','device_reach_standard','device_upkeep_type','device_inspect_status'], dicts: ['device_order_status', 'device_loop_type','device_reach_standard','device_upkeep_type','device_inspect_status'],
data() { data() {
return { return {
standardListVo:[],
workDetail:false, workDetail:false,
// 初始化VO // 初始化VO
workVO: { workVO: {
@ -1424,6 +1427,12 @@ export default {
}else { }else {
this.workVO.order.shutDown = '停机保养'; this.workVO.order.shutDown = '停机保养';
} }
for (let i = 0; i < this.workVO.detailList.length; i++) {
for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
}
}
this.workDetail = true; this.workDetail = true;
}); });
@ -1842,7 +1851,7 @@ export default {
width: 250px; width: 250px;
} }
.demo-image__lazy{ .demo-image__lazy{
height: 400px; height: 350px;
overflow-y: auto; overflow-y: auto;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save