Prechádzať zdrojové kódy

Revert "设备看板右下角设备信息调整维修次数"

This reverts commit f2c3bdc027f533cbd4699671cc828e6ad26cebb7.
shenqilong 1 rok pred
rodič
commit
24a88d5fce

+ 7 - 27
src/views/business/deviceManagement/index.vue

@@ -108,28 +108,16 @@ export default {
                     title: '各部门设备检定/校准完成情况',
                     numData: dataobj.verificationData
                 },
-                // {
-                //     title: '检验科设备停用/报废列表',
-                //     numData: {
-                //         header: ['部门', '设备名称', '设备编号', '状态'],
-                //         headerBGC: 'rgba(0,0,0,0)',
-                //         data: dataobj.scrapData,
-                //         columnWidth: ['120', '250', '180', '110'],
-                //         rowNum: 5,
-                //         hoverPause: true
-                //     }
-                // },
                 {
-                    title: "检验科设备信息",
+                    title: '检验科设备停用/报废列表',
                     numData: {
-                           // header: ["部门", "设备名称", "设备编号", "状态"],
-                        header: ["部门", "设备名称", "设备编号", "状态","维修次数"],
-                        headerBGC: "rgba(0,0,0,0)",
+                        header: ['部门', '设备名称', '设备编号', '状态'],
+                        headerBGC: 'rgba(0,0,0,0)',
                         data: dataobj.scrapData,
-                        columnWidth: ["100", "220", "110","110","120"],
+                        columnWidth: ['120', '250', '180', '110'],
                         rowNum: 5,
                         hoverPause: true
-                        }
+                    }
                 },
                 {
                     title: '设备整体情况',
@@ -184,15 +172,7 @@ export default {
                 const scrapData = data.scrapData.filter((item,i)=>{
                     return item[0].indexOf('综合')===-1
                 })
-                const scrapDataList=JSON.parse(JSON.stringify(scrapData))
-                for (var i = 0; i < scrapData.length; i++) {
-                scrapDataList[i][0] = scrapData[i][4]
-                scrapDataList[i][1] = scrapData[i][5]
-                scrapDataList[i][2] = scrapData[i][3]
-                scrapDataList[i][3] = scrapData[i][7]
-                scrapDataList[i][4] = scrapData[i][1]
-                scrapDataList[i].splice(5, 3)
-                }
+
                 this.mergeData[0].numData = data.distributionDataObj || []
                 this.mergeData[1].numData = numDistributionDataObj
                 this.mergeData[2].numData = lifeTimeData
@@ -206,7 +186,7 @@ export default {
                     })
                 }
                 this.mergeData[5].numData = verificationData
-                this.mergeData[6].numData.data = scrapDataList
+                this.mergeData[6].numData.data = scrapData
                 this.mergeData[7].numData = data.entiretyData || []
                 loading.close()
             })