Skip to content

Z
zhxf_vue
Commit d051e13e authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

页面调整

parent d69b5a4b
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 131 deletions
public/config.js
View file @ d051e13e
......@@ -5,12 +5,12 @@ CONFIG.TITLE = '产业园区智慧消防系统'
// 网络请求公用地址
CONFIG.requestPath = 'http://localhost:8046'
// CONFIG.requestPath = 'http://localhost:8046'
// CONFIG.requestPath = 'http://59.110.43.122/:8046'
CONFIG.requestPath = 'http://10.20.72.44:8046'
// 文件上传
CONFIG.urlPath = 'http://59.110.43.122/'
CONFIG.urlPath = 'http://10.20.72.44/'
// BIM
CONFIG.bimPath = 'http://10.20.2.98:8066/'
src/App.vue
View file @ d051e13e
......@@ -141,7 +141,7 @@ export default {
let webpath = ''
//wsuri.substring(0, wsuri.indexOf(':'))
if (wsuri != null && wsuri.indexOf(':') <= -1) {
webpath = 'ws://api.crsh.cn:8091/websocket/1001'
webpath = 'ws://10.20.72.44:8091/websocket/1001'
} else {
webpath =
'ws:' +
......@@ -274,7 +274,7 @@ export default {
let webpath = ''
//wsuri.substring(0, wsuri.indexOf(':'))
if (wsuri != null && wsuri.indexOf(':') <= -1) {
webpath = 'ws://api.crsh.cn:8091/websocket/1002'
webpath = 'ws://10.20.72.44:8091/websocket/1002'
} else {
webpath =
'ws:' +
......
src/pages/ol/demo/index.vue
View file @ d051e13e
......@@ -416,10 +416,11 @@ export default {
}),
text: new Text({
text: name, // 添加文字描述
font: '14px font-size', // 设置字体大小
font: 'bold 14px font-size', // 设置字体大小
stroke: new Stroke({ color: 'white', width: 5 }), //设置文字背景
fill: new Fill({
// 设置字体颜色
color: 'black'
color: 'blue'
}),
offsetY: 30 // 设置文字偏移量
})
......
src/pages/ol/demo/no-query-detail.vue
View file @ d051e13e
......@@ -477,67 +477,66 @@ export default {
},
clickPTZControl(ptz, dwStop, img) {
// console.log(this.camera)
if (
!this.camera ||
(this.cameraCur.type !== 'ece0b8b2db27411886254e81134988a3' &&
(ptz < 11 || ptz > 16))
) {
return
}
if (!isAuth('ol:demo:corona')) {
this.$message({
type: 'warning',
message: '没有操作权限，请联系管理员',
duration: 1000
})
return
}
if (img && img != 'right') {
this.imgUrl = img
}
if (dwStop) {
this.imgUrl = ''
}
if (img && img == 'right') {
this['imgRightUrl' + ptz] = true
}
if (dwStop && img == 'right') {
this['imgRightUrl' + ptz] = false
}
this.$http({
url: this.$http.adornUrlEq('/camera/ptzControl'),
method: 'post',
data: {
resourceId: this.cameraCur.id,
stationId: this.cameraCur.stationId,
userId: localStorage.getItem('userId'),
levelType: 1,
controlType: 3,
ip: this.cameraCur.addressCode, //ip地址
port: this.cameraCur.port, //端口
username: this.cameraCur.username, //账号
password: this.cameraCur.password, //密码
channel: this.cameraCur.byx1, //通道
stream: 'main', //主码流
dwPtzCommand: ptz, //云台控制命令
dwStop: dwStop //云台控制0开始和1结束
}
}).then((data) => {
if (data && data.code === 0) {
if (dwStop == 0) {
//云台控制0开始和1结束
this.saveLog(1, ptz) // 执行结果 成功 1 失败 2
this.$message.success(data.msg)
}
} else {
if (dwStop == 0) {
//云台控制0开始和1结束
this.saveLog(2, ptz) // 执行结果 成功 1 失败 2
this.$message.error(data.msg)
}
}
})
// if (
// !this.camera ||
// (this.cameraCur.type !== 'ece0b8b2db27411886254e81134988a3' &&
// (ptz < 11 || ptz > 16))
// ) {
// return
// }
// if (!isAuth('ol:demo:corona')) {
// this.$message({
// type: 'warning',
// message: '没有操作权限，请联系管理员',
// duration: 1000
// })
// return
// }
// if (img && img != 'right') {
// this.imgUrl = img
// }
// if (dwStop) {
// this.imgUrl = ''
// }
// if (img && img == 'right') {
// this['imgRightUrl' + ptz] = true
// }
// if (dwStop && img == 'right') {
// this['imgRightUrl' + ptz] = false
// }
// this.$http({
// url: this.$http.adornUrlEq('/camera/ptzControl'),
// method: 'post',
// data: {
// resourceId: this.cameraCur.id,
// stationId: this.cameraCur.stationId,
// userId: localStorage.getItem('userId'),
// levelType: 1,
// controlType: 3,
// ip: this.cameraCur.addressCode, //ip地址
// port: this.cameraCur.port, //端口
// username: this.cameraCur.username, //账号
// password: this.cameraCur.password, //密码
// channel: this.cameraCur.byx1, //通道
// stream: 'main', //主码流
// dwPtzCommand: ptz, //云台控制命令
// dwStop: dwStop //云台控制0开始和1结束
// }
// }).then((data) => {
// if (data && data.code === 0) {
// if (dwStop == 0) {
// //云台控制0开始和1结束
// this.saveLog(1, ptz) // 执行结果 成功 1 失败 2
// this.$message.success(data.msg)
// }
// } else {
// if (dwStop == 0) {
// //云台控制0开始和1结束
// this.saveLog(2, ptz) // 执行结果 成功 1 失败 2
// this.$message.error(data.msg)
// }
// }
// })
},
//调用日志保存记录操作指令
saveLog(result, ptz) {
......
src/pages/ol/demo/query-detail.vue
View file @ d051e13e
......@@ -257,67 +257,67 @@ export default {
this.$emit('closeQ')
},
clickPTZControl(ptz, dwStop, img) {
if (
this.dataForm.type !== 'ece0b8b2db27411886254e81134988a3' &&
(ptz < 11 || ptz > 16)
) {
return
}
if (!isAuth('ol:demo:corona')) {
this.$message({
type: 'warning',
message: '没有操作权限，请联系管理员',
duration: 1000
})
return
}
if (img && img != 'right') {
this.imgUrl = img
}
if (dwStop) {
this.imgUrl = ''
}
if (img && img == 'right') {
this['imgRightUrl' + ptz] = true
}
if (dwStop && img == 'right') {
this['imgRightUrl' + ptz] = false
}
this.$http({
url: this.$http.adornUrlEq('/camera/ptzControl'),
method: 'post',
data: {
resourceId: this.dataForm.id,
stationId: this.dataForm.stationId,
userId: localStorage.getItem('userId'),
levelType: 1,
controlType: 3,
ip: this.dataForm.addressCode, //ip地址
port: this.dataForm.port, //端口
username: this.dataForm.username, //账号
password: this.dataForm.password, //密码
channel: this.dataForm.byx1, //通道
stream: 'main', //主码流
dwPtzCommand: ptz, //云台控制命令
dwStop: dwStop //云台控制0开始和1结束
}
}).then((data) => {
// console.log(11)
// console.log(data)
if (data && data.code === 0) {
if (dwStop == 0) {
//云台控制0开始和1结束
this.saveLog(1, ptz) // 执行结果 成功 1 失败 2
this.$message.success(data.msg)
}
} else {
if (dwStop == 0) {
//云台控制0开始和1结束
this.saveLog(2, ptz) // 执行结果 成功 1 失败 2
this.$message.error(data.msg)
}
}
})
// if (
// this.dataForm.type !== 'ece0b8b2db27411886254e81134988a3' &&
// (ptz < 11 || ptz > 16)
// ) {
// return
// }
// if (!isAuth('ol:demo:corona')) {
// this.$message({
// type: 'warning',
// message: '没有操作权限，请联系管理员',
// duration: 1000
// })
// return
// }
// if (img && img != 'right') {
// this.imgUrl = img
// }
// if (dwStop) {
// this.imgUrl = ''
// }
// if (img && img == 'right') {
// this['imgRightUrl' + ptz] = true
// }
// if (dwStop && img == 'right') {
// this['imgRightUrl' + ptz] = false
// }
// this.$http({
// url: this.$http.adornUrlEq('/camera/ptzControl'),
// method: 'post',
// data: {
// resourceId: this.dataForm.id,
// stationId: this.dataForm.stationId,
// userId: localStorage.getItem('userId'),
// levelType: 1,
// controlType: 3,
// ip: this.dataForm.addressCode, //ip地址
// port: this.dataForm.port, //端口
// username: this.dataForm.username, //账号
// password: this.dataForm.password, //密码
// channel: this.dataForm.byx1, //通道
// stream: 'main', //主码流
// dwPtzCommand: ptz, //云台控制命令
// dwStop: dwStop //云台控制0开始和1结束
// }
// }).then((data) => {
// // console.log(11)
// // console.log(data)
// if (data && data.code === 0) {
// if (dwStop == 0) {
// //云台控制0开始和1结束
// this.saveLog(1, ptz) // 执行结果 成功 1 失败 2
// this.$message.success(data.msg)
// }
// } else {
// if (dwStop == 0) {
// //云台控制0开始和1结束
// this.saveLog(2, ptz) // 执行结果 成功 1 失败 2
// this.$message.error(data.msg)
// }
// }
// })
},
//调用日志保存记录操作指令
saveLog(result, ptz) {
......
src/pages/sys/point/index.vue
View file @ d051e13e
......@@ -527,10 +527,11 @@ export default {
}),
text: new Text({
text: name, // 添加文字描述
font: '14px font-size', // 设置字体大小
font: 'bold 14px font-size', // 设置字体大小
stroke: new Stroke({ color: 'white', width: 5 }), //设置文字背景
fill: new Fill({
// 设置字体颜色
color: 'black'
color: 'blue'
}),
offsetY: 30 // 设置文字偏移量
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment