代码提交

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

@ -64,13 +64,13 @@ service.interceptors.request.use(
repeatSubmit = false, repeatSubmit = false,
skipReplayProtection = false skipReplayProtection = false
} = headers } = headers
// 读取全局安全开关(动态)并与请求头开关进行“与”组合 // 读取全局安全开关(动态)并与请求头开关进行“与”组合
const flags = getSecurityFlags() const flags = getSecurityFlags()
const useEncryptRequest = flags.encryptRequest && encryptRequest const useEncryptRequest = flags.encryptRequest && encryptRequest
const useCheckIntegrity = flags.checkIntegrity && checkIntegrity const useCheckIntegrity = flags.checkIntegrity && checkIntegrity
const useEncryptResponse = flags.encryptResponse && encryptResponse const useEncryptResponse = flags.encryptResponse && encryptResponse
// 设置请求头 // 设置请求头
config.headers['encryptRequest'] = useEncryptRequest ? 'true' : 'false' config.headers['encryptRequest'] = useEncryptRequest ? 'true' : 'false'
config.headers['checkIntegrity'] = useCheckIntegrity ? 'true' : 'false' config.headers['checkIntegrity'] = useCheckIntegrity ? 'true' : 'false'
@ -119,7 +119,7 @@ service.interceptors.request.use(
requestUrl += '?' + paramsString requestUrl += '?' + paramsString
} }
} }
const signature = generateRequestSignature(userId, timestamp, method, requestUrl, userSecret) const signature = generateRequestSignature(userId, timestamp, method, requestUrl, userSecret)
console.log(signature); console.log(signature);
console.log(requestUrl); console.log(requestUrl);
@ -269,7 +269,7 @@ service.interceptors.response.use(
) { ) {
return res.data return res.data
} }
// 账号在其他设备登录的安全提示(基于后端返回信息关键词识别) // 账号在其他设备登录的安全提示(基于后端返回信息关键词识别)
const otherDeviceLogin = /multipleDeviceLogin/.test(String(msg || '')) const otherDeviceLogin = /multipleDeviceLogin/.test(String(msg || ''))
if (otherDeviceLogin) { if (otherDeviceLogin) {
@ -329,11 +329,10 @@ service.interceptors.response.use(
} else if (code === 500) { } else if (code === 500) {
Message({ message: msg, type: 'error' }) Message({ message: msg, type: 'error' })
if(res.data.data){ 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{ }else{
return Promise.reject(new Error(msg)); return Promise.reject(msg);
} }
} else if (code === 601) { } else if (code === 601) {
Message({ message: msg, type: 'warning' }) Message({ message: msg, type: 'warning' })
return Promise.reject('error') return Promise.reject('error')
@ -358,7 +357,7 @@ service.interceptors.response.use(
}else{ }else{
message = '系统接口' + message.substr(message.length - 3) + '异常' message = '系统接口' + message.substr(message.length - 3) + '异常'
} }
} }
Message({ message: message, type: 'error', duration: 5 * 1000 }) Message({ message: message, type: 'error', duration: 5 * 1000 })
return Promise.reject(error) return Promise.reject(error)
@ -407,4 +406,4 @@ export function download(url, params, filename, config) {
}) })
} }
export default service export default service

View File

@ -104,7 +104,7 @@ export default {
{ required: true, message: '档案名称不能为空', trigger: 'blur' } { required: true, message: '档案名称不能为空', trigger: 'blur' }
], ],
fileList: [ fileList: [
{ validator: (rule, value, callback) => { {required: true, validator: (rule, value, callback) => {
if (!Array.isArray(this.fileList) || this.fileList.length === 0) { if (!Array.isArray(this.fileList) || this.fileList.length === 0) {
callback(new Error('请上传附件文件')) callback(new Error('请上传附件文件'))
} else { } else {
@ -184,10 +184,10 @@ export default {
this.belongName = this.rowData.belongName; this.belongName = this.rowData.belongName;
this.detailStatus = this.rowData.detailStatus; this.detailStatus = this.rowData.detailStatus;
if ((this.isAdd === 'edit' || this.isAdd === 'detail') && this.rowData) { if ((this.isAdd === 'edit' || this.isAdd === 'detail') && this.rowData) {
const res2 = await getFileManageByIdApi({id:this.rowData.id,proId:this.projectId}); const res2 = await getFileManageByIdApi({id:this.rowData.id,proId:this.projectId});
const obj =res2.data; const obj =res2.data;
// //
this.form = { this.form = {
id: obj.id, id: obj.id,
@ -269,7 +269,7 @@ export default {
} }
const isValidType = this.checkFileType(file) const isValidType = this.checkFileType(file)
const isValidSize = this.checkFileSize(file) const isValidSize = this.checkFileSize(file)
if (!isValidType) { if (!isValidType) {
this.$message.error('只能上传PDF和图片文件') this.$message.error('只能上传PDF和图片文件')
return false return false
@ -278,13 +278,13 @@ export default {
this.$message.error('文件大小不能超过`${this.maxFileTips}`') this.$message.error('文件大小不能超过`${this.maxFileTips}`')
return false return false
} }
// //
if (this.fileList.length >= 1) { if (this.fileList.length >= 1) {
this.$message.warning('只能上传一个文件,请先删除现有文件!') this.$message.warning('只能上传一个文件,请先删除现有文件!')
return false return false
} }
return true return true
}, },
// //
@ -292,7 +292,7 @@ export default {
const allowedTypes = [ const allowedTypes = [
'application/pdf', 'application/pdf',
'image/jpeg', 'image/jpeg',
'image/jpg', 'image/jpg',
'image/png', 'image/png',
] ]
return allowedTypes.includes(file.type) return allowedTypes.includes(file.type)
@ -331,7 +331,7 @@ export default {
} }
// console.log(':', fileList.length, '') // console.log(':', fileList.length, '')
}, },
/**验证 */ /**验证 */
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
@ -360,7 +360,7 @@ export default {
this.fileList.map(file => { this.fileList.map(file => {
if(file.raw instanceof File){ if(file.raw instanceof File){
formData.append('file', file.raw); formData.append('file', file.raw);
} }
}) })
} }
if (this.isAdd === 'add') { if (this.isAdd === 'add') {
@ -402,7 +402,7 @@ export default {
}else{ }else{
return errorMessage; return errorMessage;
} }
} }
} }
}; };
@ -441,4 +441,4 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
</style> </style>

View File

@ -3,7 +3,7 @@ export const formLabel = [
isShow: false, // 是否展示label isShow: false, // 是否展示label
f_type: 'ipt', f_type: 'ipt',
f_label: '单项工程名称', f_label: '单项工程名称',
f_model: 'proName', f_model: 'singleProName',
f_max: 32, f_max: 32,
}, },
{ {
@ -30,4 +30,4 @@ export const columnsList = [
{ t_props: 'createUserName', t_label: '申请人' }, { t_props: 'createUserName', t_label: '申请人' },
{ t_props: 'createTime', t_label: '申请时间' }, { t_props: 'createTime', t_label: '申请时间' },
{ t_slot: 'auditStatus', t_label: '审批状态' }, { t_slot: 'auditStatus', t_label: '审批状态' },
] ]

View File

@ -3,7 +3,7 @@ export const formLabel = [
isShow: false, // 是否展示label isShow: false, // 是否展示label
f_type: 'ipt', f_type: 'ipt',
f_label: '单项工程名称', f_label: '单项工程名称',
f_model: 'proName', f_model: 'singleProName',
f_max: 32, f_max: 32,
}, },
{ {
@ -30,4 +30,4 @@ export const columnsList = [
{ t_props: 'createUserName', t_label: '申请人' }, { t_props: 'createUserName', t_label: '申请人' },
{ t_props: 'createTime', t_label: '申请时间' }, { t_props: 'createTime', t_label: '申请时间' },
{ t_slot: 'auditStatus', t_label: '审批状态' }, { t_slot: 'auditStatus', t_label: '审批状态' },
] ]

View File

@ -32,7 +32,7 @@
<el-button type="primary" class="search-btn" :disabled="disabled" <el-button type="primary" class="search-btn" :disabled="disabled"
@click="submitForm('ruleForm')" v-if="!isRead">确认</el-button> @click="submitForm('ruleForm')" v-if="!isRead">确认</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
@ -83,7 +83,7 @@ export default {
errorObj: { errorObj: {
transferIssue: '移交问题', transferIssue: '移交问题',
}, },
}; };
}, },
created() { created() {
@ -254,7 +254,7 @@ export default {
}else{ }else{
return errorMessage; return errorMessage;
} }
} }
} }
}; };
@ -293,4 +293,4 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
</style> </style>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -58,7 +58,7 @@
v-hasPermi="['system:role:edit']">修改</el-button> v-hasPermi="['system:role:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']">删除</el-button> v-hasPermi="['system:role:remove']">删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:role:edit']"> v-hasPermi="['system:role:edit']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
@ -248,7 +248,7 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
console.log(this.queryParams); console.log(this.queryParams);
listRole(this.queryParams).then(response => { listRole(this.queryParams).then(response => {
this.roleList = response.rows this.roleList = response.rows
this.total = response.total this.total = response.total
@ -488,7 +488,8 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.roleId || this.ids 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) return delRole(roleIds)
}).then(() => { }).then(() => {
this.getList() this.getList()
@ -503,4 +504,4 @@ export default {
} }
} }
} }
</script> </script>