禅道bug修复
This commit is contained in:
parent
6eb212ae28
commit
e197795cae
|
|
@ -12,21 +12,21 @@ export function reqStationAndCamera(query) {
|
|||
return request({
|
||||
url: '/project/camera/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
export function reqGetRealtimeVideo(query) {
|
||||
return request({
|
||||
url: '/project/camera/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
export function reqCloseVideo1(query) {
|
||||
return request({
|
||||
url: '/project/camera/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -105,6 +105,8 @@ export default {
|
|||
|
||||
async getQxToken() {
|
||||
const res = await getQxToken()
|
||||
|
||||
console.log('res播放视频的token', res)
|
||||
this.qxToken = res.msg
|
||||
},
|
||||
async selectVideoLoginInfo() {
|
||||
|
|
|
|||
|
|
@ -137,7 +137,13 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="start" align="top" :gutter="gutterValue" v-if="items.data.postName == '1'">
|
||||
<el-row
|
||||
type="flex"
|
||||
justify="start"
|
||||
align="top"
|
||||
:gutter="gutterValue"
|
||||
v-if="items.data.postName == '1' || items.data.postName == '特殊工种'"
|
||||
>
|
||||
<el-col :span="11">
|
||||
<el-form-item label-width="120px" label="特殊工种种类" prop="specialJobType">
|
||||
<el-input
|
||||
|
|
@ -207,7 +213,13 @@
|
|||
></bns-file-list-tabs>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="start" align="top" :gutter="gutterValue" v-if="items.data.postName == '1'">
|
||||
<el-row
|
||||
type="flex"
|
||||
justify="start"
|
||||
align="top"
|
||||
:gutter="gutterValue"
|
||||
v-if="items.data.postName == '1' || items.data.postName == '特殊工种'"
|
||||
>
|
||||
<el-col :span="24">
|
||||
<el-form-item label-width="120px" label="特殊工种文件"></el-form-item>
|
||||
<img
|
||||
|
|
|
|||
|
|
@ -263,7 +263,9 @@
|
|||
</el-row>
|
||||
|
||||
<el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
|
||||
<span style="margin-left: 15px; font-weight: 800; font-size: 16px" v-preventReClick="3000">确定退出本次练习吗?</span>
|
||||
<span style="margin-left: 15px; font-weight: 800; font-size: 16px" v-preventReClick="3000">
|
||||
确定退出本次练习吗?
|
||||
</span>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="openDialog2" v-preventReClick="5000">确 定</el-button>
|
||||
|
|
@ -552,9 +554,10 @@ export default {
|
|||
handleClose() {
|
||||
this.dialogVisible2 = false
|
||||
// 关闭页面
|
||||
this.$tab.closePage().then(() => {
|
||||
this.$router.push({ path: '/educTrainLearn/libertyLearn/index' })
|
||||
})
|
||||
this.$tab.closePage()
|
||||
// this.$tab.closePage().then(() => {
|
||||
// this.$router.push({ path: '/educTrainLearn/libertyLearn/index' })
|
||||
// })
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -84,6 +84,8 @@ export default {
|
|||
}
|
||||
getSubPersonnelDetails(params).then(response => {
|
||||
this.formData.data = response.data
|
||||
|
||||
console.log('response.data详情数据', response.data)
|
||||
this.formData.data.phone = hideSensitiveInfo(response.data.phone)
|
||||
this.formData.data.idCard = hideSensitiveInfo(response.data.idCard)
|
||||
this.formData.finalCheck = this.paramsData.finalCheck
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ module.exports = {
|
|||
// target: `http://localhost:18080`,
|
||||
// target: 'http://192.168.0.176:18080',
|
||||
// target: 'http://192.168.0.58:19090', // 杰
|
||||
target: 'http://192.168.0.14:18080', // 测试环境
|
||||
// target: 'http://192.168.0.14:18080', // 测试环境
|
||||
// target: 'http://218.21.27.6:1999/prod-api', // 生产环境
|
||||
// target: 'http://192.168.0.38:18080', // 郝志权
|
||||
// target: 'http://192.168.2.122:18080', // 梁超
|
||||
target: 'http://192.168.2.125:18080', // 梁超
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
['^' + process.env.VUE_APP_BASE_API]: '',
|
||||
|
|
|
|||
Loading…
Reference in New Issue