Skip to content

Commit

Permalink
fix(axios): repair request parameter return logic
Browse files Browse the repository at this point in the history
  • Loading branch information
dgiot-fe committed Apr 20, 2022
1 parent 78109fa commit 6183d9e
Show file tree
Hide file tree
Showing 7 changed files with 172 additions and 113 deletions.
2 changes: 1 addition & 1 deletion src/config/loca.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
*/
{
path: 'iotapi',
target: 'http://127.0.0.1:5080',
target: 'https://dev.iotn2n.com',
},
/**
* @description 静态资源目录。开发使用
Expand Down
19 changes: 19 additions & 0 deletions src/dgiot/plugins/lajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,25 @@
/**
* 使 Error 对象支持 JSON 序列化
*/
window.console =
window.console ||
(function () {
var c = {}
c.log =
c.warn =
c.debug =
c.info =
c.error =
c.time =
c.dir =
c.profile =
c.clear =
c.exception =
c.trace =
c.assert =
function () {}
return c
})()
if (!('toJSON' in Error.prototype)) {
/* eslint-disable no-extend-native */
Object.defineProperty(Error.prototype, 'toJSON', {
Expand Down
10 changes: 6 additions & 4 deletions src/utils/request/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ const errorcodeVerificationArray = isArray(errorCode)
: [...[errorCode]]

const handleData = ({ config, data, status, statusText }) => {
if (localStorage.getItem('debugaxios'))
console.log({ config, data, status, statusText })
if (loadingInstance) loadingInstance.close()
// 极个别情况,若将错误code设置为0时,防止识别成false影响判断
if (data[statusName] === 0) data[statusName] = '0'
Expand All @@ -49,7 +51,10 @@ const handleData = ({ config, data, status, statusText }) => {
}

switch (code) {
case 200:
case 403:
router.push({ path: '/403' })
break
default:
// 业务层级错误处理,以下是假定restful有一套统一输出格式(指不管成功与否都有相应的数据格式)情况下进行处理
// 例如响应内容:
// 错误内容:{ status: 1, msg: '非法参数' }
Expand All @@ -58,9 +63,6 @@ const handleData = ({ config, data, status, statusText }) => {
// return data.data ? data.data : data.msg
// 或者依然保持完整的格式
return data
case 403:
router.push({ path: '/403' })
break
}
// 异常处理
// 若data.msg存在,覆盖默认提醒消息
Expand Down
53 changes: 36 additions & 17 deletions src/views/CloudSystem/manage/appmarage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
:before-close="handleClose"
:title="$translateTitle('plugins.modulelist')"
:visible.sync="dialogVisible"
width="40%"
>
<div>
<el-table
Expand All @@ -142,27 +141,44 @@
align="center"
:label="$translateTitle('plugins.ischange')"
prop="is_changed"
show-overflow-tooltip
sortable
/>
width="auto"
>
<template #default="{ row }">
<el-tag
:effect="row.is_changed ? 'plain' : 'dark'"
:type="row.is_changed ? '' : 'info'"
>
{{ row.is_changed ? '未修改' : '已修改' }}
</el-tag>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
background
layout="total, sizes, prev, pager, next, jumper"
:page-size="length1"
:page-sizes="[10, 25, 50, 100]"
style="margin-top: 30px"
:total="total1"
@current-change="handleCurrentChange1"
@size-change="handleSizeChange1"
/>
</div>
<el-pagination
background
layout="total, sizes, prev, pager, next, jumper"
:page-size="length1"
:page-sizes="[10, 25, 50, 100]"
:total="total1"
@current-change="handleCurrentChange1"
@size-change="handleSizeChange1"
/>
</div>
<span slot="footer" class="dialog-footer">
<el-button style="float: left" @click="dialogVisible = false">
<span slot="footer" style="padding: 0 0 20px 0; display: block">
<el-button
size="mini"
style="float: left"
@click="dialogVisible = false"
>
{{ $translateTitle('developer.cancel') }}
</el-button>
<el-button style="float: right" type="primary" @click.native="reupload">
<el-button
size="mini"
style="float: right"
type="primary"
@click.native="reupload"
>
{{ $translateTitle('developer.determine') }}
</el-button>
</span>
Expand Down Expand Up @@ -359,6 +375,9 @@
}
})
}
setTimeout(() => {
this.dialogVisible = false
}, 3000)
},
},
}
Expand Down
46 changes: 37 additions & 9 deletions src/views/DeviceCloud/manage/devicelist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,8 @@
append-to-body
:before-close="handleClose"
center
title="设备参数控制"
:visible.sync="commandInfo.dialog"
width="50%"
width="80%"
>
<el-tabs v-model="activeName">
<el-tab-pane
Expand Down Expand Up @@ -196,13 +195,13 @@
:rules="deviceFormRules"
>
<el-form-item label="设备名称:" prop="name">
<el-input v-model="deviceForm.name" autocomplete="off" />
<el-input v-model="deviceForm.name" />
</el-form-item>
<el-form-item label="外壳编号:" prop="detail.assetNum">
<el-input v-model="deviceForm.detail.assetNum" autocomplete="off" />
<el-input v-model="deviceForm.detail.assetNum" />
</el-form-item>
<el-form-item label="主板编号:" prop="devaddr">
<el-input v-model="deviceForm.devaddr" autocomplete="off" />
<el-input v-model="deviceForm.devaddr" />
</el-form-item>
<el-form-item label="到期时间:" prop="detail.expirationTime">
<el-date-picker
Expand Down Expand Up @@ -695,6 +694,38 @@
...mapMutations({
setCurrentDepartment: 'user/setCurrentDepartment',
}),
// 新建设备
/**
* @Author: dgiot-fe
* @Date: 2022-04-20 14:17:24
* @LastEditors:
* @param
* @return {Promise<void>}
* @Description:
*/
async doPostDevice(params) {
try {
const { objectId = '', error = '' } = await postDevice(params)
if (objectId) {
this.fetchData()
this.createDeviceDialog = false
} else {
this.$baseMessage(
this.$translateTitle('alert.Data request error') + `${error}`,
'error',
'vab-hey-message-error'
)
throw new Error(error)
}
} catch (e) {
// this.$baseMessage(
// this.$translateTitle('alert.Data request error') + `${e}`,
// 'error',
// 'vab-hey-message-error'
// )
throw new Error(e)
}
},
async getProduct() {
const { results = [] } = await queryProduct({})
this.Product = results
Expand Down Expand Up @@ -868,10 +899,7 @@
params.detail[this.deviceForm.devaddr] =
this.deviceForm.detail.expirationTime
params.detail.assetNum = this.deviceForm.detail.assetNum
console.error(params)
const res = await postDevice(params)
this.createDeviceDialog = false
this.fetchData()
await this.doPostDevice(params)
} else {
console.log('error submit!!')
return false
Expand Down

0 comments on commit 6183d9e

Please sign in to comment.