diff --git a/frontend/.env.development b/frontend/.env.development
index 345f0f4..e4424ec 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -18,5 +18,6 @@ VITE_PWA=false
VITE_API_URL=/api
# 开发环境跨域代理,支持配置多个
-# VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
-VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]
\ No newline at end of file
+VITE_PROXY=[["/api","http://192.168.1.122:18092/"]]
+# VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
+# VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]
\ No newline at end of file
diff --git a/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue b/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
index ff78606..09127cd 100644
--- a/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
+++ b/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
@@ -3,8 +3,8 @@
v-bind="dialogSmall">
-
-
+
+
@@ -44,12 +44,12 @@ const rules: Ref>> = ref({
})
const dialogFormRef = ref()
-const {dialogVisible, titleType, formContent, dictTypeCode} = useMetaInfo();
+const {dialogVisible, titleType, formContent, dictTypeName} = useMetaInfo();
function useMetaInfo() {
const dialogVisible = ref(false)
const titleType = ref('add')
- const dictTypeCode = ref('')
+ const dictTypeName = ref('')
const formContent = ref({
id: "",
@@ -62,7 +62,7 @@ function useMetaInfo() {
state: 1,
})
- return {dialogVisible, titleType, formContent, dictTypeCode};
+ return {dialogVisible, titleType, formContent, dictTypeName};
}
let dialogTitle = computed(() => {
@@ -86,12 +86,12 @@ const close = () => {
resetFormContent()
dialogFormRef.value?.resetFields()
}
-const open = (sign: string, typeId: string, code: string, data: Dict.ResDictData) => {
+const open = (sign: string, typeId: string, name: string, data: Dict.ResDictData) => {
resetFormContent()
titleType.value = sign
formContent.value.typeId = typeId
- dictTypeCode.value = code
+ dictTypeName.value = name
dialogVisible.value = true
if (data.id) {
formContent.value = {...data}
diff --git a/frontend/src/views/system/dictionary/dictData/index.vue b/frontend/src/views/system/dictionary/dictData/index.vue
index ba5c5a7..c1e59e6 100644
--- a/frontend/src/views/system/dictionary/dictData/index.vue
+++ b/frontend/src/views/system/dictionary/dictData/index.vue
@@ -38,7 +38,7 @@ const proTable = ref()
const dialogVisible = ref(false)
//字典数据所属的字典类型Id
const dictTypeId = ref('')
-const dictTypeCode = ref('')
+const dictTypeName = ref('')
const initParam = reactive({typeId: ''})
@@ -113,7 +113,7 @@ const columns = reactive[]>([
const open = (row: Dict.ResDictType) => {
dialogVisible.value = true
dictTypeId.value = row.id
- dictTypeCode.value = row.code
+ dictTypeName.value = row.name
initParam.typeId = row.id
}
@@ -121,7 +121,7 @@ defineExpose({open})
// 打开 dialog(新增、查看、编辑)
const openDialog = (titleType: string, row: Partial = {}) => {
- dataPopup.value?.open(titleType, dictTypeId.value, dictTypeCode.value, row)
+ dataPopup.value?.open(titleType, dictTypeId.value, dictTypeName.value, row)
}
// 批量删除字典数据