developers
/
vue-fastapi-admin
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题处理

master
siyaqi 2 days ago
parent
57fe3f55e3
commit
44f788e4c5
6 changed files with 217 additions and 246 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      vue-fastapi-backend/module_admin/dao/datasec_config_dao.py
  2. 10
      vue-fastapi-backend/module_admin/service/datasec_config_service.py
  3. 409
      vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue
  4. 7
      vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityCol.vue
  5. 10
      vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityRow.vue
  6. 21
      vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue

20
vue-fastapi-backend/module_admin/dao/datasec_config_dao.py
View File

@ -75,15 +75,25 @@ class DatasecConfigDao:
"""
await db.execute(delete(DatasecConfig).where(DatasecConfig.onum.in_([metatask.onum])))
@classmethod
async def check_name_or_param_exist(cls, db: AsyncSession, metatask_name: str, metatask_param: str, exclude_onum: int = None):
async def check_name_or_param_exist(cls, db: AsyncSession, metatask_name: str = None, metatask_param: str = None, exclude_onum: int = None):
"""
检查是否存在相同的任务名称或参数字段，排除指定 onum（用于编辑）
检查是否存在指定任务名称和参数字段（同时匹配非空的字段），排除指定 onum（用于编辑）
"""
stmt = select(DatasecConfig).where(
(DatasecConfig.metatask_name == metatask_name) | (DatasecConfig.metatask_param == metatask_param)
)
conditions = []
if metatask_name: # 不为空才加条件
conditions.append(DatasecConfig.metatask_name == metatask_name)
if not conditions: # 两个都为空，直接返回 False
return False
stmt = select(DatasecConfig).where(*conditions)
if exclude_onum:
stmt = stmt.where(DatasecConfig.onum != exclude_onum)
result = await db.execute(stmt)
return result.scalars().first() is not None

10
vue-fastapi-backend/module_admin/service/datasec_config_service.py
View File

@ -37,7 +37,7 @@ class DatasecConfigService:
# 检查任务名称或参数是否已存在
exists = await DatasecConfigDao.check_name_or_param_exist(db, page_object.metatask_name, page_object.metatask_param)
if exists:
raise ServiceException(message="任务名称或参数字段已存在")
raise ServiceException(message="任务名称已存在")
# 获取流程配置
processconfig = MetaprocessconfigQueryModel()
@ -79,7 +79,13 @@ class DatasecConfigService:
code_list = data["data"]
str_list = list(map(str, code_list))
for config in processConfigList:
modified_json_str = config.taskDefinitionJson.replace("18093081592672", str_list[0]).replace("sh /home/xx/code/remote_python_sec.sh", "sh /home/xx/code/remote_python_sec.sh "+page_object.metatask_param)
# 原来的字符串替换
modified_json_str = config.taskDefinitionJson.replace("18093081592672", str_list[0])
# 拼接命令时先判断 metatask_param 是否为空
cmd = "sh /home/xx/code/remote_python_sec.sh"
if page_object.metatask_param: # 只有非空才加参数
cmd += f" {page_object.metatask_param}"
modified_json_str = modified_json_str.replace("sh /home/xx/code/remote_python_sec.sh", cmd)
modified_json_str2=config.taskRelationJson.replace("18093081592672", str_list[0])
modified_json_str3=config.locations.replace("18093081592672", str_list[0])
metaprocessconfig_dict = MetaprocessconfigModel(taskDefinitionJson=modified_json_str,# 替换taskDefinitionJson

409
vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue
View File

@ -1,243 +1,186 @@
<template>
<el-dialog
width="500px"
append-to-body
:title="isShow ? '查看数据标准' : isEdit ? '修改数据标准' : '新增数据标准'"
v-model="visible"
@close="handleClose"
<el-dialog
width="900px"
append-to-body
:title="isShow ? '查看数据标准' : isEdit ? '修改数据标准' : '新增数据标准'"
v-model="visible"
@close="handleClose"
>
<el-form
:model="formData"
ref="formRef"
label-width="120px"
:rules="formRules"
>
<el-form
:model="formData"
ref="formRef"
label-width="120px"
:rules="formRules"
>
<el-form-item label="标准归属" prop="dataStdVest">
<el-select
v-model="formData.dataStdVest"
placeholder="请选择字典归属"
maxlength="30"
@change="changeCodeType"
>
<el-option
v-for="dict in std_code_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<!-- 第一行：三列 -->
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="标准归属" prop="dataStdVest">
<el-select
v-model="formData.dataStdVest"
placeholder="请选择字典归属"
maxlength="30"
@change="changeCodeType"
>
<el-option
v-for="dict in std_code_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="来源系统" prop="srcSys" v-show="showSys">
<el-select
v-model="formData.srcSys"
:disabled="isShow"
placeholder="请选择来源系统"
@change="handleSystemChange"
>
<el-option
v-for="dict in dbResourceOldList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
</el-col>
<el-col :span="8" v-if="showSys">
<el-form-item label="来源系统" prop="srcSys">
<el-select
v-model="formData.srcSys"
:disabled="isShow"
placeholder="请选择来源系统"
@change="handleSystemChange"
>
<el-option
v-for="dict in dbResourceOldList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="公司级数据标准" prop="companyLevelDataStdNo">
<el-select
v-model="formData.companyLevelDataStdNo"
placeholder="公司级数据标准"
filterable
clearable
:filter-method="filterStdList"
>
<el-option
v-for="dict in filteredStdList"
:key="dict.onum"
:label="dict.dataStdNo + '-' + dict.dataStdEngName + '-' + dict.dataStdCnName"
:value="dict.dataStdNo"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- 第二行：三列 -->
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="标准编号" prop="dataStdNo">
<el-input
v-model="formData.dataStdNo"
:disabled="isEdit || isShow"
placeholder="请输入标准编号"
clearable
/>
</el-select>
</el-form-item>
<el-form-item label="公司级数据标准" prop="companyLevelDataStdNo">
<el-select
v-model="formData.companyLevelDataStdNo"
placeholder="公司级数据标准"
filterable
clearable
:filter-method="filterStdList"
>
<el-option
v-for="dict in filteredStdList"
:key="dict.onum"
:label="dict.dataStdNo + '-' + dict.dataStdEngName + '-' + dict.dataStdCnName"
:value="dict.dataStdNo"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准编号" prop="dataStdNo">
<el-input
v-model="formData.dataStdNo"
:disabled="isEdit || isShow"
placeholder="请输入标准编号"
clearable
/>
</el-form-item>
<el-form-item label="标准中文名" prop="dataStdCnName">
<el-input
v-model="formData.dataStdCnName"
:disabled="isShow"
placeholder="请输入标准中文名"
clearable
/>
</el-form-item>
<el-form-item label="标准英文名" prop="dataStdEngName">
<el-input
v-model="formData.dataStdEngName"
:disabled="isShow"
placeholder="请输入标准英文名"
clearable
/>
</el-form-item>
<el-form-item label="标准业务定义" prop="dataStdBusiDefn">
<el-input
type="textarea"
v-model="formData.dataStdBusiDefn"
:disabled="isShow"
placeholder="请输入标准业务定义"
clearable
rows="6"
/>
</el-form-item>
<el-form-item label="标准类型" prop="dataStdType">
<el-select
v-model="formData.dataStdType"
:disabled="isShow"
placeholder="请选择标准类型"
>
<el-option label="基础数据" value="0" />
<el-option label="指标数据" value="1" />
</el-select>
</el-form-item>
<el-form-item label="标准来源" prop="dataStdSrc">
<el-select
v-model="formData.dataStdSrc"
:disabled="isShow"
placeholder="请选择标准来源"
>
<el-option label="行业标准" value="行业标准" />
<el-option label="自建标准" value="自建标准" />
</el-select>
</el-form-item>
<el-form-item label="数据类别" prop="dataClas">
<el-select
v-model="formData.dataClas"
:disabled="isShow"
placeholder="请选择数据类别"
>
<el-option label="日期类" value="日期类" />
<el-option label="文本类" value="文本类" />
<el-option label="数值类" value="数值类" />
<el-option label="金额类" value="金额类" />
<el-option label="编码类" value="编码类" />
<el-option label="标志类" value="标志类" />
<el-option label="码值类" value="码值类" />
</el-select>
</el-form-item>
<el-form-item label="安全等级" prop="dataSecLvl">
<el-select
v-model="formData.dataSecLvl"
:disabled="isShow"
placeholder="请选择安全等级"
>
<el-option label="1级" value="1" />
<el-option label="2级" value="2" />
<el-option label="3级" value="3" />
<el-option label="4级" value="4" />
</el-select>
</el-form-item>
<el-form-item label="代码编号" prop="cdId">
<el-input
v-model="formData.cdNo"
placeholder="代码编号"
clearable
style="width: 80%;"
:disabled="true"
/>
<el-button
icon="Edit"
:disabled="isShow"
@click="codeVisible = true"
style="margin-left: 5px;"
/>
</el-form-item>
<el-form-item label="业务认责部门" prop="dataStdBusiOwnershipDept">
<el-tree-select
v-model="formData.dataStdBusiOwnershipDept"
:data="deptOptions"
:props="{ value: 'label', label: 'label', children: 'children' }"
value-key="id"
:disabled="isShow"
placeholder="请选择业务认责部门"
check-strictly
/>
</el-form-item>
<el-form-item label="业务认责人员" prop="dataStdBusiOwnershipPrsn">
<el-select
v-model="formData.dataStdBusiOwnershipPrsn"
:disabled="isShow"
placeholder="请选择业务认责人员"
>
<el-option
v-for="dict in userList"
:key="dict.id"
:label="dict.userName"
:value="dict.userName"
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准中文名" prop="dataStdCnName">
<el-input
v-model="formData.dataStdCnName"
:disabled="isShow"
placeholder="请输入标准中文名"
clearable
/>
</el-select>
</el-form-item>
<el-form-item label="技术认责部门" prop="dataStdItOwnershipDept">
<el-tree-select
v-model="formData.dataStdItOwnershipDept"
:data="deptOptions"
:props="{ value: 'label', label: 'label', children: 'children' }"
value-key="id"
:disabled="isShow"
placeholder="请选择技术认责部门"
check-strictly
/>
</el-form-item>
<el-form-item label="技术认责人员" prop="dataStdItOwnershipPrsn">
<el-select
v-model="formData.dataStdItOwnershipPrsn"
:disabled="isShow"
placeholder="请选择技术认责人员"
>
<el-option
v-for="dict in userList"
:key="dict.id"
:label="dict.userName"
:value="dict.userName"
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准英文名" prop="dataStdEngName">
<el-input
v-model="formData.dataStdEngName"
:disabled="isShow"
placeholder="请输入标准英文名"
clearable
/>
</el-select>
</el-form-item>
<el-row justify="center" style="margin-top: 20px;" v-if="!isShow">
<el-col :span="4" style="padding-right: 10px;">
<el-button @click="handleClose" style="width: 100%" plain>取消</el-button>
</el-col>
<el-col :span="4" style="padding-left: 10px;">
<el-button type="primary" @click="handleSubmit" style="width: 100%">保存</el-button>
</el-col>
</el-row>
</el-form>
</el-form-item>
</el-col>
</el-row>
<!-- 第三行：标准业务定义独占一行 -->
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="标准业务定义" prop="dataStdBusiDefn">
<el-input
type="textarea"
v-model="formData.dataStdBusiDefn"
:disabled="isShow"
placeholder="请输入标准业务定义"
clearable
rows="4"
/>
</el-form-item>
</el-col>
</el-row>
<!-- 第四行：三列 -->
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="标准类型" prop="dataStdType">
<el-select
v-model="formData.dataStdType"
:disabled="isShow"
placeholder="请选择标准类型"
>
<el-option label="基础数据" value="0" />
<el-option label="指标数据" value="1" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准来源" prop="dataStdSrc">
<el-select
v-model="formData.dataStdSrc"
:disabled="isShow"
placeholder="请选择标准来源"
>
<el-option label="行业标准" value="行业标准" />
<el-option label="自建标准" value="自建标准" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="数据类别" prop="dataClas">
<el-select
v-model="formData.dataClas"
:disabled="isShow"
placeholder="请选择数据类别"
>
<el-option label="日期类" value="日期类" />
<el-option label="文本类" value="文本类" />
<el-option label="数值类" value="数值类" />
<el-option label="金额类" value="金额类" />
<el-option label="编码类" value="编码类" />
<el-option label="标志类" value="标志类" />
<el-option label="码值类" value="码值类" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- 其余字段也按三列布局排布即可 -->
<el-row justify="center" style="margin-top: 20px;" v-if="!isShow">
<el-col :span="4" style="padding-right: 10px;">
<el-button @click="handleClose" style="width: 100%" plain>取消</el-button>
</el-col>
<el-col :span="4" style="padding-left: 10px;">
<el-button type="primary" @click="handleSubmit" style="width: 100%">保存</el-button>
</el-col>
</el-row>
</el-form>
</el-dialog>
<el-dialog title="选择代码" v-model="codeVisible" width="1000px" append-to-body>
<code-components ref="showCodeDialog" v-if="codeVisible" />
<template #footer>
<el-button @click="codeVisible = false">取消</el-button>
<el-button type="primary" @click="handleCodeSelect">确定</el-button>
</template>
</el-dialog>
</el-dialog>
</template>
<script setup>

7
vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityCol.vue
View File

@ -498,9 +498,14 @@ function changeMetaSecurityObj(data){
if(data=="0"){
userOrRoleList.value=userList.value
}else {
}else if(data=="1"){
userOrRoleList.value=roleList.value
} else {
userOrRoleList.value=[]
}
form.value.objValue = dialogTitle.value === '添加列配置' ? [] : '';

10
vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityRow.vue
View File

@ -419,15 +419,19 @@ function getRoleOrUserList() {
});
}
function changeMetaSecurityObj(data){
if(data=="0"){
if(data=="0"){
userOrRoleList.value=userList.value
}else {
}else if(data=="1"){
userOrRoleList.value=roleList.value
}
} else {
userOrRoleList.value=[]
}
form.value.objValue = dialogTitle.value === '添加行配置' ? [] : '';
}

21
vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue
View File

@ -9,19 +9,21 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="归属" align="center" width="200">
<template #default="{ row }">
{{
row.dataDictVest === 'company'
? '公司级'
: '系统级(' + row.sysName + ')'
}}
</template>
<el-table-column label="归属" align="center" width="200">
<template #default="scope">
<span v-if="scope.row.dataDictVest === 'company'">公司级</span>
<span v-else-if="scope.row.dataDictVest === 'sys'">
{{
getNameById(scope.row.srcSys)
}}
</span>
</template>
</el-table-column>
<el-table-column label="类型" align="center">
<template #default="{ row }">
{{ row.dictType == 0 ? '基础数据' : '指标数据' }}
{{ row.dataDictType == 0 ? "基础数据" : "指标数据" }}
</template>
</el-table-column>
@ -201,6 +203,7 @@
<script setup>
import { ref, watch } from 'vue';
import { listStdDictAppr, getStdDictAppr ,listStdMainSelect} from '@/api/datastd/std';
import { getNameById, getIdByName } from '@/utils/dsSysUtils';
const props = defineProps({
flowId: {

Write Preview
Loading…
Cancel
Save