update axios response的解析

src/views/modules/monitoring/equipmenFile.vue

@@ -187,8 +187,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmenGroup.vue

@@ -169,8 +169,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmenattr.vue

@@ -163,8 +163,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipment.vue

@@ -11,35 +11,39 @@
 			</el-form-item>
 		</el-form>
 		<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="设备名称"> </el-table-column>
-			<el-table-column prop="enName" header-align="center" align="center" label="英文名称"> </el-table-column>
-			<el-table-column prop="abbr" header-align="center" align="center" label="缩写"> </el-table-column>
-			<el-table-column prop="enterTime" header-align="center" align="center" label="进厂日期"> </el-table-column>
-			<el-table-column prop="productionTime" header-align="center" align="center" label="生产日期"> </el-table-column>
-			<el-table-column prop="equipmentTypeId" header-align="center" align="center" label="设备类型，关联设备类型表"> </el-table-column>
-			<el-table-column prop="groupId" header-align="center" align="center" label="分组id （关联 T_EQUIPMENT_GROUP）"> </el-table-column>
-			<el-table-column prop="dataType" header-align="center" align="center" label="0:无类别，1:上片数据设备，2:下片数据设备"> </el-table-column>
-			<el-table-column prop="tvalue" header-align="center" align="center" label="每小时生产数量"> </el-table-column>
-			<el-table-column prop="processingTime" header-align="center" align="center" label="单件加工时间 s/件"> </el-table-column>
-			<el-table-column prop="manufacturer" header-align="center" align="center" label="制造商"> </el-table-column>
-			<el-table-column prop="spec" header-align="center" align="center" label="规格"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="功能描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统代码"> </el-table-column>
-			<el-table-column prop="externalCodeStatis" header-align="center" align="center" label="统一用的外部代码，代表用哪个设备的数据代替该设备，目前用于生产数量统计">
-			</el-table-column>
+			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+			<el-table-column prop="id" header-align="center" align="center" label="id"></el-table-column>
+			<el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column>
+			<el-table-column prop="name" header-align="center" align="center" label="设备名称"></el-table-column>
+			<el-table-column prop="enName" header-align="center" align="center" label="英文名称"></el-table-column>
+			<el-table-column prop="abbr" header-align="center" align="center" label="缩写"></el-table-column>
+			<el-table-column prop="enterTime" header-align="center" align="center" label="进厂日期"></el-table-column>
+			<el-table-column prop="productionTime" header-align="center" align="center" label="生产日期"></el-table-column>
+			<el-table-column prop="equipmentTypeId" header-align="center" align="center" label="设备类型，关联设备类型表"></el-table-column>
+			<el-table-column prop="groupId" header-align="center" align="center" label="分组id （关联 T_EQUIPMENT_GROUP）"></el-table-column>
+			<el-table-column prop="dataType" header-align="center" align="center" label="0:无类别，1:上片数据设备，2:下片数据设备"></el-table-column>
+			<el-table-column prop="tvalue" header-align="center" align="center" label="每小时生产数量"></el-table-column>
+			<el-table-column prop="processingTime" header-align="center" align="center" label="单件加工时间 s/件"></el-table-column>
+			<el-table-column prop="manufacturer" header-align="center" align="center" label="制造商"></el-table-column>
+			<el-table-column prop="spec" header-align="center" align="center" label="规格"></el-table-column>
+			<el-table-column prop="description" header-align="center" align="center" label="功能描述"></el-table-column>
+			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"></el-table-column>
+			<el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
+			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"></el-table-column>
+			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"></el-table-column>
+			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"></el-table-column>
+			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"></el-table-column>
+			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"></el-table-column>
+			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"></el-table-column>
+			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"></el-table-column>
+			<el-table-column prop="version" header-align="center" align="center" label="版本号"></el-table-column>
+			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统代码"></el-table-column>
+			<el-table-column
+				prop="externalCodeStatis"
+				header-align="center"
+				align="center"
+				label="统一用的外部代码，代表用哪个设备的数据代替该设备，目前用于生产数量统计"
+			></el-table-column>
 			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
 				<template slot-scope="scope">
 					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
@@ -55,8 +59,7 @@
 			:page-size="pageSize"
 			:total="totalPage"
 			layout="total, sizes, prev, pager, next, jumper"
-		>
-		</el-pagination>
+		></el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
 		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
 	</div>
@@ -99,9 +102,10 @@ export default {
 					key: this.dataForm.key
 				})
 			}).then(({ data }) => {
+				console.log('===', data)
 				if (data && data.code === 0) {
-					this.dataList = data.list
-					this.totalPage = data.total
+					this.dataList = data.data.list
+					this.totalPage = data.data.total
 				} else {
 					this.dataList = []
 					this.totalPage = 0

src/views/modules/monitoring/equipmentAlarmLog.vue

@@ -169,8 +169,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -199,8 +199,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentPlc.vue

@@ -217,8 +217,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -163,8 +163,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentPlcParam.vue

@@ -247,8 +247,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentQuantity.vue

@@ -193,8 +193,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentStatusLog.vue

@@ -187,8 +187,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentType.vue

@@ -181,8 +181,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/equipmentTypeFile.vue

@@ -187,8 +187,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/factory.vue

@@ -181,8 +181,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.totalCount
+            this.dataList = data.data.list
+            this.totalPage = data.data.totalCount
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/producArrt.vue

@@ -187,8 +187,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/product.vue

@@ -205,8 +205,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/productionLine.vue

@@ -193,8 +193,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/productionLineRecSch.vue

@@ -133,8 +133,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/qualityInspectionDet.vue

@@ -163,8 +163,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -193,8 +193,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/qualityInspectionType.vue

@@ -157,8 +157,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/reportSheet.vue

@@ -193,8 +193,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/reportSheetCategory.vue

@@ -175,8 +175,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/sysfile.vue

@@ -169,8 +169,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/sysfileType.vue

@@ -157,8 +157,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/workShopSection.vue

@@ -187,8 +187,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/modules/monitoring/workShopSectionEquipment.vue

@@ -163,8 +163,8 @@
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.list
-            this.totalPage = data.total
+            this.dataList = data.data.list
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0