Browse Source

代码提交

master
si@aidatagov.com 3 days ago
parent
commit
d15ed64f90
  1. 1
      vue-fastapi-backend/module_admin/dao/metadata_config_dao.py
  2. 8
      vue-fastapi-backend/module_admin/entity/vo/metadata_config_vo.py
  3. 6
      vue-fastapi-frontend/src/api/metadataConfig/metadataConfig.js
  4. 8
      vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue
  5. 8
      vue-fastapi-frontend/src/views/datastd/stddict/index.vue
  6. 2
      vue-fastapi-frontend/src/views/metadataConfig/bizPermiConfig/index.vue

1
vue-fastapi-backend/module_admin/dao/metadata_config_dao.py

@ -213,6 +213,7 @@ class MetadataConfigDao:
.join(MetadataSec, SecuBizConfig.risk_lvl == MetadataSec.onum, isouter=True) .join(MetadataSec, SecuBizConfig.risk_lvl == MetadataSec.onum, isouter=True)
.where( .where(
SecuBizPermiConfig.obj_value.like(f"%{query_object.obj_value}%") if query_object.obj_value else true(), SecuBizPermiConfig.obj_value.like(f"%{query_object.obj_value}%") if query_object.obj_value else true(),
SecuBizPermiConfig.obj_name.like(f"%{query_object.obj_name}%") if query_object.obj_name else true(),
SecuBizPermiConfig.obj_type == query_object.obj_type if query_object.obj_type else true(), SecuBizPermiConfig.obj_type == query_object.obj_type if query_object.obj_type else true(),
SecuBizPermiConfig.isStop == query_object.isStop if query_object.isStop is not None else true(), SecuBizPermiConfig.isStop == query_object.isStop if query_object.isStop is not None else true(),
SecuBizPermiConfig.create_time.between( SecuBizPermiConfig.create_time.between(

8
vue-fastapi-backend/module_admin/entity/vo/metadata_config_vo.py

@ -176,14 +176,11 @@ class SecuBizPermiConfigBatchModel(BaseModel):
biz_onum_list: List[int] = Field(..., description='业务域编号列表') biz_onum_list: List[int] = Field(..., description='业务域编号列表')
obj_type: str = Field(..., description='对象类型(0:角色 1:用户)') obj_type: str = Field(..., description='对象类型(0:角色 1:用户)')
obj_value: str = Field(..., description='角色值') obj_value: Optional[str] = Field(default=None, description='角色值')
obj_name: str = Field(..., description='角色名称') obj_name: str = Field(..., description='角色名称')
isStop: Optional[bool] = Field(default=False, description='是否停用(false:运行 true:停用)') isStop: Optional[bool] = Field(default=False, description='是否停用(false:运行 true:停用)')
@NotBlank(field_name='obj_value', message='角色值不能为空')
@Size(field_name='obj_value', max_length=50, message='角色值长度不能超过50个字符')
def get_obj_value(self):
return self.obj_value
@NotBlank(field_name='obj_name', message='角色名称不能为空') @NotBlank(field_name='obj_name', message='角色名称不能为空')
@Size(field_name='obj_name', max_length=50, message='角色名称长度不能超过50个字符') @Size(field_name='obj_name', max_length=50, message='角色名称长度不能超过50个字符')
@ -191,7 +188,6 @@ class SecuBizPermiConfigBatchModel(BaseModel):
return self.obj_name return self.obj_name
def validate_fields(self): def validate_fields(self):
self.get_obj_value()
self.get_obj_name() self.get_obj_name()
class DeleteSecuBizPermiConfigModel(BaseModel): class DeleteSecuBizPermiConfigModel(BaseModel):

6
vue-fastapi-frontend/src/api/metadataConfig/metadataConfig.js

@ -91,14 +91,14 @@ export function listBizConfigAll(query) {
return request({ return request({
url: '/default-api/metadataConfig/bizConfig/listall', url: '/default-api/metadataConfig/bizConfig/listall',
method: 'get', method: 'get',
data: query params: query
}) })
} }
export function listBizConfig(query) { export function listBizConfig(query) {
return request({ return request({
url: '/default-api/metadataConfig/bizConfig/list', url: '/default-api/metadataConfig/bizConfig/list',
method: 'get', method: 'get',
data: query params: query
}) })
} }
// 查询业务配置详情 // 查询业务配置详情
@ -141,7 +141,7 @@ export function listBizPermiConfig(query) {
return request({ return request({
url: '/default-api/metadataConfig/bizPermiConfig/list', url: '/default-api/metadataConfig/bizPermiConfig/list',
method: 'get', method: 'get',
data: query params: query
}) })
} }

8
vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue

@ -31,8 +31,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数据字典类型" prop="dictType"> <el-form-item label="数据字典类型" prop="dataDictType">
<el-select v-model="formData.dictType" placeholder="请选择数据字典类型"> <el-select v-model="formData.dataDictType" placeholder="请选择数据字典类型">
<el-option label="基础数据" value="0" /> <el-option label="基础数据" value="0" />
<el-option label="指标数据" value="1" /> <el-option label="指标数据" value="1" />
</el-select> </el-select>
@ -108,7 +108,7 @@ const props = defineProps({
// //
const formRules = ref({ const formRules = ref({
dataDictVest: [{ required: true, message: '请选择字典归属', trigger: 'blur' }], dataDictVest: [{ required: true, message: '请选择字典归属', trigger: 'blur' }],
dictType: [{ required: true, message: '请选择数据字典类型', trigger: 'blur' }], dataDictType: [{ required: true, message: '请选择数据字典类型', trigger: 'blur' }],
dataStdBusiOwnershipDept: [{ required: true, message: '请选择业务认责部门', trigger: 'blur' }], dataStdBusiOwnershipDept: [{ required: true, message: '请选择业务认责部门', trigger: 'blur' }],
dataStdItOwnershipDept: [{ required: true, message: '请选择技术认责部门', trigger: 'blur' }], dataStdItOwnershipDept: [{ required: true, message: '请选择技术认责部门', trigger: 'blur' }],
dataDictNo: [{ required: true, message: '请输入数据字典编号', trigger: 'blur' }], dataDictNo: [{ required: true, message: '请输入数据字典编号', trigger: 'blur' }],
@ -172,6 +172,8 @@ const handleSubmit = () => {
const apiCall = props.isEdit ? updateStdDict(formData.value) : addStdDict(formData.value); const apiCall = props.isEdit ? updateStdDict(formData.value) : addStdDict(formData.value);
apiCall apiCall
.then(() => { .then(() => {
proxy.$modal.msgSuccess("提交审批流程成功!");
emit('refresh'); emit('refresh');
handleClose(); handleClose();
}) })

8
vue-fastapi-frontend/src/views/datastd/stddict/index.vue

@ -105,7 +105,7 @@
</el-table-column> </el-table-column>
<el-table-column label="类型" align="center"> <el-table-column label="类型" align="center">
<template #default="{ row }"> <template #default="{ row }">
{{ row.dictType == 0 ? "基础数据" : "指标数据" }} {{ row.dataDictType == 0 ? "基础数据" : "指标数据" }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="来源系统" width="150" align="center" prop="sysName" /> --> <!-- <el-table-column label="来源系统" width="150" align="center" prop="sysName" /> -->
@ -258,7 +258,7 @@ const { std_code_status, std_code_appr } = proxy.useDict(
const queryParams = ref({ const queryParams = ref({
dataDictNo: "", dataDictNo: "",
dataDictCnName: "", dataDictCnName: "",
dictType: "", dataDictType: "",
sysName: "", sysName: "",
classId: "dict", classId: "dict",
sysId: "", sysId: "",
@ -346,7 +346,7 @@ const resetQuery = () => {
queryParams.value = { queryParams.value = {
dataDictNo: "", dataDictNo: "",
dataDictCnName: "", dataDictCnName: "",
dictType: "", dataDictType: "",
sysName: "", sysName: "",
sysId: undefined, sysId: undefined,
pageNum: 1, pageNum: 1,
@ -380,7 +380,7 @@ const handleAdd = () => {
dataDictVest: "company", dataDictVest: "company",
sysId: 10000, sysId: 10000,
sysName: "公司级", sysName: "公司级",
dictType: "", dataDictType: "",
dataDictNo: "", dataDictNo: "",
dataDictEngName: "", dataDictEngName: "",
dataDictCnName: "", dataDictCnName: "",

2
vue-fastapi-frontend/src/views/metadataConfig/bizPermiConfig/index.vue

@ -237,6 +237,7 @@ function handleSelectionChange(val) {
async function getList() { async function getList() {
loading.value = true loading.value = true
try { try {
console.log(queryForm,"queryForm")
const res = await listBizPermiConfig(queryForm) const res = await listBizPermiConfig(queryForm)
permList.value = res.rows || [] permList.value = res.rows || []
total.value = res.total || 0 total.value = res.total || 0
@ -251,7 +252,6 @@ async function getBizList() {
try { try {
const res = await listBizConfigAll() const res = await listBizConfigAll()
bizOnumList.value = res.data || [] bizOnumList.value = res.data || []
console.log(bizOnumList,"ssss")
} catch (error) { } catch (error) {
ElMessage.error('获取业务域列表失败,请重试') ElMessage.error('获取业务域列表失败,请重试')
} finally { } finally {

Loading…
Cancel
Save