guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'hyx_2024-10-30_new' into pet

hyx_2024-11-12_newInspect
huangyuxuan 2024-10-31 15:23:37 +08:00
parent 4bfda5d7fc 504fdc7746
commit 9e8fbe60a2
8 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/accesscontrol/accesscontroldata/components/list.vue
View File

@ -59,9 +59,7 @@
<div class="page-btn-group">
<div>
<el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">申请</el-button>
<!--
<el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
-->
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
@ -370,7 +368,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.location.href = config.httpurl + 'riskunit/excelModel'
window.location.href = config.httpurl + '/riskunit/excelModel'
}).catch(() => {
this.listLoading = false
})

6
src/views/corpInfo/information/qualifications/components/list.vue
View File

@ -76,14 +76,14 @@
</el-table-column>
<el-table-column label="操作" align="left" width="200">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.QUALIFICATIONS_ID)">修改</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.QUALIFICATIONS_ID)">删除</el-button>
<el-button v-if="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.QUALIFICATIONS_ID)">修改</el-button>
<el-button v-if="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.QUALIFICATIONS_ID)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="page-btn-group">
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button v-if="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<!-- <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>-->
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />

2
src/views/firefighting/device/components/info.vue
View File

@ -163,7 +163,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.location.href = config.httpurl + 'riskpoint/excelModel'
window.location.href = config.httpurl + '/riskpoint/excelModel'
}).catch(() => {
this.listLoading = false
})

3
src/views/firefighting/points/components/list.vue
View File

@ -173,6 +173,9 @@ export default {
KEYWORDS: '',
FIRE_POINT_NAME: '',
FIRE_POINT_CODE: '',
selectForm: {
DEPARTMENT_ID: ''
},
// 树形菜单
filterText: '',
varList: [],

2
src/views/hiddenApi/publicMethod/list.vue
View File

@ -644,7 +644,7 @@ export default {
data += '&ENDTIME=' + _this.condform.creatTime[1]
data += '&sessionID=' + ssionID
data += '&tm=' + new Date().getTime()
window.location.href = config.httpurl + 'hiddenExcel/excel2' + data
window.location.href = config.httpurl + '/hiddenExcel/excel2' + data
var timingTask = setInterval(function() {
requestFN(

4
src/views/risk/identificationparts/components/list.vue
View File

@ -468,7 +468,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.location.href = config.httpurl + 'identificationparts/excel'
window.location.href = config.httpurl + '/identificationparts/excel'
}).catch(() => {
this.listLoading = false
})
@ -505,7 +505,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.location.href = config.httpurl + 'identificationparts/excelModel'
window.location.href = config.httpurl + '/identificationparts/excelModel'
}).catch(() => {
this.listLoading = false
})

6
src/views/risk/riskpoint/components/list.vue
View File

@ -493,7 +493,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.location.href = config.httpurl + 'riskpoint/excel'
window.location.href = config.httpurl + '/riskpoint/excel'
}).catch(() => {
this.listLoading = false
})
@ -517,7 +517,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.open(this.config.httpurl + 'riskpoint/excelAll?ids=' + ids)
window.open(this.config.httpurl + '/riskpoint/excelAll?ids=' + ids)
}).catch(() => {
this.listLoading = false
})
@ -530,7 +530,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.location.href = config.httpurl + 'riskpoint/excelModel'
window.location.href = config.httpurl + '/riskpoint/excelModel'
}).catch(() => {
this.listLoading = false
})

2
src/views/risk/riskunit/components/list.vue
View File

@ -379,7 +379,7 @@ export default {
type: 'warning'
}).then(() => {
this.listLoading = false
window.location.href = config.httpurl + 'riskunit/excelModel'
window.location.href = config.httpurl + '/riskunit/excelModel'
}).catch(() => {
this.listLoading = false
})