Merge remote-tracking branch 'origin/dev' into dev

hyx_2024-11-06_newInspect
guoyuepeng 2024-10-31 16:08:41 +08:00
commit 17b9fdcc9f
8 changed files with 14 additions and 14 deletions

View File

@ -368,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
})

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" />

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
})

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(

View File

@ -118,9 +118,9 @@ export default {
this.jinduData[1] = nowYear + '-12-31'
this.getJindu()
this.getQingdan()
// this.getWorkNumber()
this.getWorkNumber()
this.getRiskNumber()
// this.getHiddenTypeCount()
this.getHiddenTypeCount()
/*
this.getNoticeList()
this.getNoticeCorpList()*/

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
})

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
})

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
})