ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调下拉框，数据库字段

Browse Source
This commit is contained in:
sjl
2024-10-30 19:07:41 +08:00
parent 18b9ef9e51
commit d2d4153114
12 changed files with 203 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/views/authority/resource/components/ResourceDialog.vue
View File

@@ -12,10 +12,12 @@
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择资源类型">
<el-option label="菜单" :value="0"></el-option>
<el-option label="按钮" :value="1"></el-option>
<el-option label="公共资源" :value="2"></el-option>
<el-option label="服务间调用资源" :value="3"></el-option>
<el-option
v-for="item in dictStore.getDictData('resourceType')"
:key="item.id"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item label="描述" prop="remark">
@@ -35,6 +37,8 @@
import { defineProps, defineEmits,watch,ref, type Ref } from 'vue';
import { dialogSmall } from '@/utils/elementBind'
import { ElMessage, FormInstance, FormItemRule } from 'element-plus'
import { useDictStore } from '@/stores/modules/dict'
const dictStore = useDictStore()
const props = defineProps<{
visible: boolean;
dialogTitle: string;

18
frontend/src/views/authority/resource/index.vue
View File

@@ -93,20 +93,9 @@
prop: 'type',
label: '类型',
width: 150,
search: {
render: ({searchParam}) => {
return (
<div class='flx-center'>
<el-select placeholder="请选择" v-model={searchParam.type}>
<el-option label="菜单" value="0"></el-option>
<el-option label="按钮" value="1"></el-option>
<el-option label="公共资源" value="2"></el-option>
<el-option label="服务间调用资源" value="3"></el-option>
</el-select>
</div>
);
},
},
enum: dictStore.getDictData('resourceType'),
search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'code' },
},
{
prop: 'state',
@@ -134,7 +123,6 @@ const openAddDialog = () => {
path:'',
icon:'',
sort:100,
type:0,
remark: '',
state:1,
children: [],

3
frontend/src/views/authority/role/index.vue
View File

@@ -197,7 +197,7 @@ const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
openType = 'add'
else if (title === '编辑角色')
openType = 'edit'
rolePopupVisible.value = true
rolePopupTitle.value = title
@@ -210,6 +210,7 @@ const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
}
rolePopupData.value = safeRow
} else if (title === '设置权限') {
permissionUnitVisible.value = true
permissionUnitTitle.value = title

14
frontend/src/views/machine/errorSystem/components/ErrorSystemDialog.vue
View File

@@ -25,8 +25,12 @@
<el-col :span="9">
<el-form-item label="适用设备等级" prop="dev_Level">
<el-select v-model='formData.dev_Level' placeholder="请选择设备等级">
<el-option label="A级" value="A级" />
<el-option label="S级" value="S级" />
<el-option
v-for="item in dictStore.getDictData('errorLevel')"
:key="item.id"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-col>
@@ -34,8 +38,8 @@
<el-col :span="8">
<el-form-item label="状态" prop="enable">
<el-select v-model='formData.enable' placeholder="请选择状态">
<el-option label="启用" value="启用" />
<el-option label="停用" value="停用" />
<el-option label="停用" :value="0" />
<el-option label="启用" :value="1" />
</el-select>
</el-form-item>
</el-col>
@@ -149,6 +153,8 @@
import { dialogBig,dialogMiddle} from '@/utils/elementBind'
//import IndicatorTypeDialog from "@/views/machine/errorSystem/components/IndicatorTypeDialog.vue"; // 导入子组件
import {CirclePlus, Delete, EditPen,FolderOpened,CopyDocument} from '@element-plus/icons-vue'
import { useDictStore } from '@/stores/modules/dict'
const dictStore = useDictStore()
const props = defineProps<{
visible: boolean;
dialogTitle: string;

8
frontend/src/views/machine/errorSystem/index.vue
View File

@@ -91,7 +91,7 @@ const columns = ref<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
label: '误差体系名称',
},
{
prop: 'Standard_Name',
prop: 'standard_Name',
label: '参照标准名称',
},
{
@@ -104,7 +104,9 @@ const columns = ref<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
prop: 'dev_Level',
label: '适用设备等级',
width: 120,
enum: dictStore.getDictData('errorLevel'),
search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'code' },
},
{ prop: 'operation', label: '操作', fixed: 'right' ,width: 300,},
])
@@ -124,8 +126,8 @@ const openAddDialog = () => {
standard_Name:'',
standard_Time:'',
dev_Level:'',
enable:1,
state:1,
state:0,
};
dialogTitle.value = '新增误差体系';
dialogFormVisible.value = true; // 打开对话框

14
frontend/src/views/plan/planList/index.vue
View File

@@ -49,6 +49,8 @@ import PlanDialog from "@/views/plan/planList/components/PlanDialog.vue"; // 导
import Open from '@/views/plan/planList/components/PlanOpen.vue'
import { useViewSize } from '@/hooks/useViewSize'
import { useRouter } from "vue-router";
import { useDictStore } from '@/stores/modules/dict'
const dictStore = useDictStore()
const { popupBaseView, viewWidth, viewHeight } = useViewSize()
const openView = ref()
const planData = planDataList
@@ -100,19 +102,25 @@ const columns = reactive<ColumnProps<Plan.PlanList>[]>([
prop: 'test_State',
label: '检测状态',
width: 100,
search: { el: 'select', props: { filterable: true } },
enum: dictStore.getDictData('planTestState'),
search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'code' },
},
{
prop: 'report_State',
label: '检测报告状态',
width: 150,
search: { el: 'select', props: { filterable: true } },
enum: dictStore.getDictData('planReportState'),
search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'code' },
},
{
prop: 'result',
label: '检测结果',
width: 100,
search: { el: 'select', props: { filterable: true } },
enum: dictStore.getDictData('planResult'),
search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'code' },
},
{
prop: 'father_Plan_Id',