update axios response的解析

.prettierrc

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

src/App.vue

@@ -5,9 +5,9 @@
 </template>
 
 <style>
-  .el-table th.gutter{
-    display: table-cell!important;
-  }
+.el-table th.gutter {
+	display: table-cell !important;
+}
 </style>
 <script>
 import Cookies from 'js-cookie'
@@ -16,11 +16,11 @@ export default {
 	watch: {
 		'$i18n.locale': 'i18nHandle'
 	},
-  created () {
+	created() {
 		this.i18nHandle(this.$i18n.locale)
 	},
 	methods: {
-    i18nHandle (val, oldVal) {
+		i18nHandle(val, oldVal) {
 			Cookies.set('language', val)
 			document.querySelector('html').setAttribute('lang', val)
 			document.title = messages[val].brand.lg

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>
@@ -40,28 +41,27 @@
 <script>
 import { isURL } from '@/utils/validate'
 export default {
-  data () {
-    return {
-    }
+	data() {
+		return {}
 	},
 	methods: {
 		// tabs, 是否通过iframe展示
-    tabIsIframe (url) {
+		tabIsIframe(url) {
 			return isURL(url)
 		},
 		// tabs, 选中tab
-    tabSelectedHandle (tab) {
+		tabSelectedHandle(tab) {
 			tab = this.$store.state.contentTabs.filter(item => item.name === tab.name)[0]
 			if (tab) {
 				this.$router.push({
-          'name': tab.name,
-          'params': { ...tab.params },
-          'query': { ...tab.query }
+					name: tab.name,
+					params: { ...tab.params },
+					query: { ...tab.query }
 				})
 			}
 		},
 		// tabs, 删除tab
-    tabRemoveHandle (tabName) {
+		tabRemoveHandle(tabName) {
 			if (tabName === 'home') {
 				return false
 			}
@@ -81,13 +81,13 @@ export default {
 			}
 		},
 		// tabs, 关闭其它
-    tabsCloseOtherHandle () {
+		tabsCloseOtherHandle() {
 			this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => {
 				return item.name === 'home' || item.name === this.$store.state.contentTabsActiveName
 			})
 		},
 		// tabs, 关闭全部
-    tabsCloseAllHandle () {
+		tabsCloseAllHandle() {
 			this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
 			this.$router.push({ name: 'home' })
 		}

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>
@@ -16,14 +17,13 @@
 <script>
 import SubMenu from './main-sidebar-sub-menu'
 export default {
-  data () {
-    return {
-    }
+	data() {
+		return {}
 	},
 	components: {
 		SubMenu
 	},
-  created () {
+	created() {
 		this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
 	}
 }

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

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>
@@ -57,57 +60,60 @@ import Cookies from 'js-cookie'
 import debounce from 'lodash/debounce'
 // import { getUUID } from '@/utils'
 export default {
-  data () {
+	data() {
 		return {
 			captchaPath: '',
 			dataForm: {
 				username: 'admin',
 				password: 'admin',
-        uuid: '',
+				uuid: ''
 				// captcha: ''
 			}
 		}
 	},
 	computed: {
-    dataRule () {
+		dataRule() {
 			return {
-        username: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+				username: [{ 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' }
 				// ]
 			}
 		}
 	},
-  created () {
+	created() {
 		// this.getCaptcha()
 	},
 	methods: {
 		// 获取验证码
-    getCaptcha () {
+		getCaptcha() {
 			this.dataForm.uuid = getUUID()
 			this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
 		},
 		// 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+		dataFormSubmitHandle: debounce(
+			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>