代码提交

This commit is contained in:
liang.chao 2025-10-22 11:12:44 +08:00
parent 652eaa7200
commit 9c94734322
12 changed files with 82 additions and 60 deletions

View File

@ -329,11 +329,10 @@ service.interceptors.response.use(
} else if (code === 500) {
Message({ message: msg, type: 'error' })
if(res.data.data){
return Promise.reject(new Error(`${msg}${JSON.stringify(res.data.data)}`));
return Promise.reject(`${msg}${JSON.stringify(res.data.data)}`);
}else{
return Promise.reject(new Error(msg));
return Promise.reject(msg);
}
} else if (code === 601) {
Message({ message: msg, type: 'warning' })
return Promise.reject('error')

View File

@ -104,7 +104,7 @@ export default {
{ required: true, message: '档案名称不能为空', trigger: 'blur' }
],
fileList: [
{ validator: (rule, value, callback) => {
{required: true, validator: (rule, value, callback) => {
if (!Array.isArray(this.fileList) || this.fileList.length === 0) {
callback(new Error('请上传附件文件'))
} else {

View File

@ -3,7 +3,7 @@ export const formLabel = [
isShow: false, // 是否展示label
f_type: 'ipt',
f_label: '单项工程名称',
f_model: 'proName',
f_model: 'singleProName',
f_max: 32,
},
{

View File

@ -3,7 +3,7 @@ export const formLabel = [
isShow: false, // 是否展示label
f_type: 'ipt',
f_label: '单项工程名称',
f_model: 'proName',
f_model: 'singleProName',
f_max: 32,
},
{

View File

@ -38,12 +38,11 @@
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -85,7 +84,7 @@
v-hasPermi="['monitor:logininfor:unlock']"
>解锁</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -94,7 +93,7 @@
@click="handleExport"
v-hasPermi="['monitor:logininfor:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -174,12 +173,23 @@ export default {
/** 查询登录日志列表 */
getList() {
this.loading = true
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
//
const params = {
...this.queryParams
}
// 使 beginTime endTime
if (this.dateRange && this.dateRange.length === 2) {
params.beginTime = this.dateRange[0]
params.endTime = this.dateRange[1]
}
list(params).then(response => {
this.list = response.rows
this.total = response.total
this.loading = false
}
)
})
},
/** 搜索按钮操作 */
handleQuery() {

View File

@ -62,12 +62,11 @@
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -98,7 +97,7 @@
v-hasPermi="['monitor:operlog:remove']"
>清空</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -107,7 +106,7 @@
@click="handleExport"
v-hasPermi="['monitor:operlog:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -253,12 +252,23 @@ export default {
/** 查询登录日志 */
getList() {
this.loading = true
list(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
//
const params = {
...this.queryParams
}
// 使 beginTime endTime
if (this.dateRange && this.dateRange.length === 2) {
params.beginTime = this.dateRange[0]
params.endTime = this.dateRange[1]
}
list(params).then(response => {
this.list = response.rows
this.total = response.total
this.loading = false
}
)
})
},
//
typeFormat(row, column) {

View File

@ -95,7 +95,7 @@
>
重置
</el-button>
<el-button
<!-- <el-button
@click="handleBackups"
class="filter-item"
style="margin-left: 20px"
@ -103,7 +103,7 @@
v-hasPermi="['error:log:download']"
>
备份
</el-button>
</el-button>-->
</div>
<el-table

View File

@ -103,7 +103,7 @@
>
重置
</el-button>
<el-button
<!-- <el-button
@click="handleBackups"
class="filter-item"
style="margin-left: 20px"
@ -111,7 +111,7 @@
v-hasPermi="['business:log:download']"
>
备份
</el-button>
</el-button>-->
</div>
<el-table

View File

@ -115,9 +115,11 @@
//
resetFilter() {
this.listQuery={
rangeDate:[],
startTime:'',
endTime:'',
type:'1',
},
};
this.rangeDate = [];
this.handleFilter()
},
getInitData() {

View File

@ -93,7 +93,7 @@
>
重置
</el-button>
<el-button
<!-- <el-button
@click="handleBackups"
class="filter-item"
style="margin-left: 20px"
@ -101,7 +101,7 @@
v-hasPermi="['system:log:download']"
>
备份
</el-button>
</el-button>-->
</div>
<el-table

View File

@ -488,7 +488,8 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const roleIds = row.roleId || this.ids
this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function () {
const roleName = row.roleName
this.$modal.confirm('是否确认删除角色"' + roleName + '"的数据项?').then(function () {
return delRole(roleIds)
}).then(() => {
this.getList()