XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统一axios写法

Browse Source
This commit is contained in:
panlinlin
2021-04-12 16:04:04 +08:00
parent 27df8bd84c
commit 4010ed6c23
28 changed files with 243 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web_src/src/components/DeviceList.vue
View File

@@ -136,20 +136,20 @@
getDeviceList: function() {
let that = this;
this.getDeviceListLoading = true;
this.$axios.get(`/api/device/query/devices`,{
this.$axios({
method: 'get',
url:`/api/device/query/devices`,
params: {
page: that.currentPage,
count: that.count
}
} )
.then(function (res) {
}).then(function (res) {
console.log(res);
console.log(res.data.list);
that.total = res.data.total;
that.deviceList = res.data.list;
that.getDeviceListLoading = false;
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
that.getDeviceListLoading = false;
});

12
web_src/src/components/Login.vue
View File

@@ -61,10 +61,11 @@ export default {
//设置在登录状态
this.isLoging = true;
this.$axios.get("/api/user/login",{
params: loginParam
} )
.then(function (res) {
this.$axios({
method: 'get',
url:"/api/user/login",
params: loginParam
}).then(function (res) {
console.log(JSON.stringify(res));
if (res.data == "success") {
that.$cookies.set("session", {"username": that.username}) ;
@@ -79,8 +80,7 @@ export default {
type: 'error'
});
}
})
.catch(function (error) {
}).catch(function (error) {
that.$message.error(error.response.statusText);
that.isLoging = false;
});

46
web_src/src/components/ParentPlatformList.vue
View File

@@ -121,20 +121,21 @@ export default {
},
deletePlatformCommit: function(platform) {
var that = this;
that.$axios.delete(`/api/platform/delete/${platform.serverGBId}`)
.then(function (res) {
if (res.data == "success") {
that.$message({
showClose: true,
message: '删除成功',
type: 'success'
});
that.initData()
}
})
.catch(function (error) {
console.log(error);
});
that.$axios({
method: 'delete',
url:`/api/platform/delete/${platform.serverGBId}`
}).then(function (res) {
if (res.data == "success") {
that.$message({
showClose: true,
message: '删除成功',
type: 'success'
});
that.initData()
}
}).catch(function (error) {
console.log(error);
});
},
chooseChannel: function(platform) {
this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, ()=>{
@@ -155,14 +156,15 @@ export default {
getPlatformList: function() {
let that = this;
this.$axios.get(`/api/platform/query/${that.count}/${that.currentPage}`)
.then(function (res) {
that.total = res.data.total;
that.platformList = res.data.list;
})
.catch(function (error) {
console.log(error);
});
this.$axios({
method: 'get',
url:`/api/platform/query/${that.count}/${that.currentPage}`
}).then(function (res) {
that.total = res.data.total;
that.platformList = res.data.list;
}).catch(function (error) {
console.log(error);
});
}

38
web_src/src/components/PushVideoList.vue
View File

@@ -107,20 +107,20 @@
getPushList: function() {
let that = this;
this.getDeviceListLoading = true;
this.$axios.get(`/api/push/list`,{
this.$axios({
method: 'get',
url:`/api/push/list`,
params: {
page: that.currentPage,
count: that.count
}
} )
.then(function (res) {
}).then(function (res) {
console.log(res);
console.log(res.data.list);
that.total = res.data.total;
that.pushList = res.data.list;
that.getDeviceListLoading = false;
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
that.getDeviceListLoading = false;
});
@@ -129,20 +129,20 @@
playPuhsh: function(row){
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/media/getStreamInfoByAppAndStream`,{
this.$axios({
method: 'get',
url:`/api/media/stream_info_by_app_and_stream`,
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
}).then(function (res) {
that.getListLoading = false;
that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
streamInfo: res.data,
hasAudio: true
});
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
});
@@ -155,17 +155,17 @@
},
removeFromGB: function(row){
var that = this;
that.$axios.post(`/api/push/remove_form_gb`, row)
.then(function (res) {
console.log(res);
console.log(res.data == "success");
if (res.data == "success") {
that.$axios({
method:"delete",
url:"/api/push/remove_form_gb",
data:row
}).then((res)=>{
if (res.data == "success") {
that.initData()
}
})
.catch(function (error) {
console.log(error);
});
}).catch(function (error) {
console.log(error);
});
},
dateFormat: function(/** timestamp=0 **/) {
var ts = arguments[0] || 0;

66
web_src/src/components/StreamProxyList.vue
View File

@@ -62,7 +62,7 @@
<el-button-group>
<el-button size="mini" icon="el-icon-video-play" v-if="scope.row.enable" @click="play(scope.row)">播放</el-button>
<el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">停用</el-button>
<el-button size="mini" icon="el-icon-check" type="primary" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
<el-button size="mini" icon="el-icon-check" type="primary" :loading="startBtnLaoding" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
<el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">删除</el-button>
</el-button-group>
</template>
@@ -105,7 +105,8 @@
currentPage:1,
count:15,
total:0,
getListLoading: false
getListLoading: false,
startBtnLaoding: false
};
},
computed: {
@@ -133,20 +134,20 @@
getStreamProxyList: function() {
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/list`,{
this.$axios({
method: 'get',
url:`/api/proxy/list`,
params: {
page: that.currentPage,
count: that.count
}
} )
.then(function (res) {
}).then(function (res) {
console.log(res);
console.log(res.data.list);
that.total = res.data.total;
that.streamProxyList = res.data.list;
that.getListLoading = false;
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
});
@@ -159,20 +160,20 @@
play: function(row){
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/media/getStreamInfoByAppAndStream`,{
this.$axios({
method: 'get',
url:`/api/media/stream_info_by_app_and_stream`,
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
}).then(function (res) {
that.getListLoading = false;
that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
streamInfo: res.data,
hasAudio: true
});
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
});
@@ -182,53 +183,56 @@
console.log(1111)
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/del`,{
params: {
that.$axios({
method:"delete",
url:"/api/proxy/del",
params:{
app: row.app,
stream: row.stream
}
})
.then(function (res) {
that.getListLoading = false;
}).then((res)=>{
that.getListLoading = false;
that.initData()
})
.catch(function (error) {
console.log(error);
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
});
});
},
start: function(row){
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/start`,{
this.startBtnLaoding = true;
this.$axios({
method: 'get',
url:`/api/proxy/start`,
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
}).then(function (res) {
that.getListLoading = false;
that.startBtnLaoding = false;
that.initData()
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
that.startBtnLaoding = false;
});
},
stop: function(row){
let that = this;
this.getListLoading = true;
this.$axios.get(`/api/proxy/stop`,{
this.$axios({
method: 'get',
url:`/api/proxy/stop`,
params: {
app: row.app,
stream: row.stream
}
})
.then(function (res) {
}).then(function (res) {
that.getListLoading = false;
that.initData()
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
that.getListLoading = false;
});

62
web_src/src/components/channelList.vue
View File

@@ -153,17 +153,17 @@ export default {
},
getDeviceChannelList: function () {
let that = this;
this.$axios.get(`/api/device/query/devices/${this.$route.params.deviceId}/channels`, {
params: {
page: that.currentPage,
this.$axios({
method: 'get',
url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
params:{
page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
channelType: that.channelType
}
})
.then(function (res) {
}
}).then(function (res) {
console.log(res);
that.total = res.data.total;
that.deviceChannelList = res.data.list;
@@ -171,10 +171,10 @@ export default {
that.$nextTick(() => {
that.$refs.channelListTable.doLayout();
})
})
.catch(function (error) {
console.log(error);
});
}).catch(function (error) {
console.log(error);
});
},
@@ -215,7 +215,7 @@ export default {
console.log(itemData)
var that = this;
this.$axios({
method: 'post',
method: 'get',
url: '/api/play/stop/' + itemData.streamId
}).then(function (res) {
console.log(JSON.stringify(res));
@@ -251,26 +251,26 @@ export default {
showSubchannels: function (channelId) {
let that = this;
this.$axios.get(`/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`, {
params: {
page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
channelType: that.channelType
}
this.$axios({
method: 'get',
url:`/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
params: {
page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
channelType: that.channelType
}
}).then(function (res) {
that.total = res.data.total;
that.deviceChannelList = res.data.list;
// 防止出现表格错位
that.$nextTick(() => {
that.$refs.channelListTable.doLayout();
})
.then(function (res) {
that.total = res.data.total;
that.deviceChannelList = res.data.list;
// 防止出现表格错位
that.$nextTick(() => {
that.$refs.channelListTable.doLayout();
})
})
.catch(function (error) {
console.log(error);
});
}).catch(function (error) {
console.log(error);
});
},
search: function () {
console.log(this.searchSrt)

49
web_src/src/components/devicePosition.vue
View File

@@ -171,13 +171,14 @@ export default {
this.endTime = null;
}
let self = this;
this.$axios.get(`/api/position/history/${this.deviceId}`, {
this.$axios({
method: 'get',
url:`/api/position/history/${this.deviceId}`,
params: {
start: self.startTime,
end: self.endTime,
},
})
.then(function (res) {
}).then(function (res) {
self.total = res.data.length;
self.mobilePositionList = res.data;
console.log(self.mobilePositionList);
@@ -192,8 +193,7 @@ export default {
self.showMarkPoints(self);
});
}
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
});
},
@@ -202,8 +202,10 @@ export default {
this.mapPointList = [];
this.mobilePositionList = [];
let self = this;
this.$axios.get(`/api/position/latest/${this.deviceId}`)
.then(function (res) {
this.$axios({
method: 'get',
url:`/api/position/latest/${this.deviceId}`
}).then(function (res) {
console.log(res.data);
self.total = res.data.length;
self.mobilePositionList.push(res.data);
@@ -219,20 +221,20 @@ export default {
self.showMarkPoints(self);
});
}
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
});
},
subscribeMobilePosition: function() {
let self = this;
this.$axios.get(`/api/position/subscribe/${this.deviceId}`, {
params: {
expires: self.expired,
interval: self.interval,
},
})
.then(function (res) {
this.$axios({
method: 'get',
url:`/api/position/subscribe/${this.deviceId}`,
params: {
expires: self.expired,
interval: self.interval,
},
}).then(function (res) {
console.log(res.data);
})
.catch(function (error) {
@@ -241,16 +243,17 @@ export default {
},
unSubscribeMobilePosition: function() {
let self = this;
this.$axios.get(`/api/position/subscribe/${this.deviceId}`, {
params: {
expires: 0,
interval: self.interval,
},
this.$axios({
method: 'get',
url:`/api/position/subscribe/${this.deviceId}`,
params: {
expires: 0,
interval: self.interval,
},
})
.then(function (res) {
console.log(res.data);
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
});
},

27
web_src/src/components/dialog/StreamProxyEdit.vue
View File

@@ -146,9 +146,11 @@ export default {
onSubmit: function () {
console.log("onSubmit");
var that = this;
that.$axios
.post(`/api/proxy/save`, that.proxyParam)
.then(function (res) {
that.$axios({
method: 'post',
url:`/api/proxy/save`,
data: that.proxyParam
}).then(function (res) {
console.log(res);
console.log(res.data == "success");
if (res.data == "success") {
@@ -162,8 +164,7 @@ export default {
that.listChangeCallback();
}
}
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
});
},
@@ -175,14 +176,14 @@ export default {
deviceGBIdExit: async function (deviceGbId) {
var result = false;
var that = this;
await that.$axios
.post(`/api/platform/exit/${deviceGbId}`)
.then(function (res) {
result = res.data;
})
.catch(function (error) {
console.log(error);
});
await that.$axios({
method: 'post',
url:`/api/platform/exit/${deviceGbId}`
}).then(function (res) {
result = res.data;
}).catch(function (error) {
console.log(error);
});
return result;
},
checkExpires: function() {

31
web_src/src/components/dialog/addStreamTOGB.vue
View File

@@ -89,11 +89,11 @@ export default {
onSubmit: function () {
console.log("onSubmit");
var that = this;
that.$axios
.post(`/api/push/save_to_gb`, that.proxyParam)
.then(function (res) {
console.log(res);
console.log(res.data == "success");
that.$axios({
method:"post",
url:`/api/push/save_to_gb`,
data: that.proxyParam
}).then(function (res) {
if (res.data == "success") {
that.$message({
showClose: true,
@@ -105,10 +105,9 @@ export default {
that.listChangeCallback();
}
}
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
});
});
},
close: function () {
console.log("关闭加入GB");
@@ -118,14 +117,14 @@ export default {
deviceGBIdExit: async function (deviceGbId) {
var result = false;
var that = this;
await that.$axios
.post(`/api/platform/exit/${deviceGbId}`)
.then(function (res) {
result = res.data;
})
.catch(function (error) {
console.log(error);
});
await that.$axios({
method:"post",
url:`/api/platform/exit/${deviceGbId}`
}).then(function (res) {
result = res.data;
}).catch(function (error) {
console.log(error);
});
return result;
},
checkExpires: function() {

4
web_src/src/components/dialog/chooseChannelForGb.vue
View File

@@ -182,7 +182,9 @@ export default {
getChannelList: function () {
let that = this;
this.$axios.get(`/api/platform/channel_list`, {
this.$axios({
method:"get",
url:`/api/platform/channel_list`,
params: {
page: that.currentPage,
count: that.count,

22
web_src/src/components/dialog/chooseChannelForStream.vue
View File

@@ -162,16 +162,18 @@ export default {
getChannelList: function () {
let that = this;
this.$axios.get(`/api/gbStream/list`, {
params: {
page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
choosed: that.choosed,
platformId: that.platformId,
channelType: that.channelType
}
this.$axios({
method: 'get',
url:`/api/gbStream/list`,
params: {
page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
choosed: that.choosed,
platformId: that.platformId,
channelType: that.channelType
}
})
.then(function (res) {
that.total = res.data.total;

28
web_src/src/components/dialog/platformEdit.vue
View File

@@ -163,17 +163,17 @@ export default {
methods: {
openDialog: function (platform, callback) {
var that = this;
this.$axios
.get(`/api/platform/server_config`)
.then(function (res) {
this.$axios({
method: 'get',
url:`/api/platform/server_config`
}).then(function (res) {
console.log(res);
that.platform.deviceGBId = res.data.username;
that.platform.deviceIp = res.data.deviceIp;
that.platform.devicePort = res.data.devicePort;
that.platform.username = res.data.username;
that.platform.password = res.data.password;
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
});
this.showDialog = true;
@@ -188,11 +188,11 @@ export default {
onSubmit: function () {
console.log("onSubmit");
var that = this;
that.$axios
.post(`/api/platform/save`, that.platform)
.then(function (res) {
console.log(res);
console.log(res.data == "success");
that.$axios({
method: 'post',
url:`/api/platform/save`,
data: that.platform
}).then(function (res) {
if (res.data == "success") {
that.$message({
showClose: true,
@@ -204,8 +204,7 @@ export default {
that.listChangeCallback();
}
}
})
.catch(function (error) {
}).catch(function (error) {
console.log(error);
});
},
@@ -218,8 +217,9 @@ export default {
deviceGBIdExit: async function (deviceGbId) {
var result = false;
var that = this;
await that.$axios
.post(`/api/platform/exit/${deviceGbId}`)
await that.$axios({
method: 'post',
url:`/api/platform/exit/${deviceGbId}`})
.then(function (res) {
result = res.data;
})

8
web_src/src/components/dialog/rtcPlayer.vue
View File

@@ -11,7 +11,8 @@ export default {
name: 'rtcPlayer',
data() {
return {
webrtcPlayer: null
webrtcPlayer: null,
timer: null
};
},
props: ['videoUrl', 'error', 'hasaudio'],
@@ -55,7 +56,7 @@ export default {
this.eventcallbacK("OFFER ANSWER ERROR ", "offer anwser 交换失败")
if (e.code ==-400 && e.msg=="流不存在"){
console.log("111111")
setTimeout(()=>{
this.timer = setTimeout(()=>{
this.webrtcPlayer.close();
this.play(url)
}, 100)
@@ -83,6 +84,9 @@ export default {
console.log(message)
}
},
destroyed() {
clearTimeout(this.timer);
},
}
</script>