update axios response的解析

.prettierrc

@@ -2,6 +2,7 @@
 	"singleQuote": true,
 	"tabWidth": 2,
 	"bracketSameLine": true,
+	"htmlWhitespaceSensitivity": "ignore",
 	"embeddedLanguageFormatting": "auto",
 	"printWidth": 180,
 	"quoteProps": "consistent",

src/views/main-content.vue

@@ -17,7 +17,8 @@
 					:name="item.name"
 					:label="item.title"
 					:closable="item.name !== 'home'"
-          :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }">
+					:class="{ 'is-iframe': tabIsIframe(item.iframeURL) }"
+				>
 					<template v-if="item.name === 'home'">
 						<svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true"><use xlink:href="#icon-home"></use></svg>
 					</template>
@@ -41,8 +42,7 @@
 import { isURL } from '@/utils/validate'
 export default {
 	data() {
-    return {
+		return {}
-    }
 	},
 	methods: {
 		// tabs, 是否通过iframe展示
@@ -54,9 +54,9 @@ export default {
 			tab = this.$store.state.contentTabs.filter(item => item.name === tab.name)[0]
 			if (tab) {
 				this.$router.push({
-          'name': tab.name,
+					name: tab.name,
-          'params': { ...tab.params },
+					params: { ...tab.params },
-          'query': { ...tab.query }
+					query: { ...tab.query }
 				})
 			}
 		},

src/views/main-sidebar.vue

@@ -6,7 +6,8 @@
 				:collapse="$store.state.sidebarFold"
 				:unique-opened="true"
 				:collapseTransition="false"
-        class="aui-sidebar__menu">
+				class="aui-sidebar__menu"
+			>
 				<sub-menu v-for="menu in $store.state.sidebarMenuList" :key="menu.id" :menu="menu" />
 			</el-menu>
 		</div>
@@ -17,8 +18,7 @@
 import SubMenu from './main-sidebar-sub-menu'
 export default {
 	data() {
-    return {
+		return {}
-    }
 	},
 	components: {
 		SubMenu

src/views/modules/monitoring/equipmenFile.vue

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

src/views/modules/monitoring/equipment.vue

@@ -38,8 +38,12 @@
 			<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>
+				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.dataList = data.data.list
-					this.totalPage = data.total
+					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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.totalCount
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            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.dataList = data.data.list
-            this.totalPage = data.total
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0

src/views/pages/login.vue

@@ -45,7 +45,10 @@
 					<p>
 						<a href="http://demo.open.renren.io/renren-security" target="_blank">{{ $t('login.demo') }}</a>
 					</p>
-          <p><a href="https://www.renren.io/" target="_blank">{{ $t('login.copyright') }}</a>2022 © renren.io</p>
+					<p>
+						<a href="https://www.renren.io/" target="_blank">{{ $t('login.copyright') }}</a>
+						2022 © renren.io
+					</p>
 				</div>
 			</main>
 		</div>
@@ -63,7 +66,7 @@ export default {
 			dataForm: {
 				username: 'admin',
 				password: 'admin',
-        uuid: '',
+				uuid: ''
 				// captcha: ''
 			}
 		}
@@ -71,12 +74,8 @@ export default {
 	computed: {
 		dataRule() {
 			return {
-        username: [
+				username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+				password: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
-        ],
-        password: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
 				// captcha: [
 				//   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
 				// ]
@@ -93,21 +92,28 @@ export default {
 			this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
 		},
 		// 表单提交
-    dataFormSubmitHandle: debounce(function () {
+		dataFormSubmitHandle: debounce(
-      this.$refs['dataForm'].validate((valid) => {
+			function() {
+				this.$refs['dataForm'].validate(valid => {
 					if (!valid) {
 						return false
 					}
-        this.$http.post(this.$http.adornUrl('/login'), this.dataForm).then(({ data: res }) => {
+					this.$http
+						.post(this.$http.adornUrl('/login'), this.dataForm)
+						.then(({ data: res }) => {
 							if (res.code !== 200) {
 								// this.getCaptcha()
 								return this.$message.error(res.msg)
 							}
 							Cookies.set('token', res.data.token)
 							this.$router.replace({ name: 'home' })
-        }).catch(() => {})
 						})
-    }, 1000, { 'leading': true, 'trailing': false })
+						.catch(() => {})
+				})
+			},
+			1000,
+			{ leading: true, trailing: false }
+		)
 	}
 }
 </script>