微调

2024-11-11 11:09:20 +08:00
parent 50bebf451d
commit 3526432052
11 changed files with 351 additions and 64 deletions
--- a/frontend/src/views/system/dictionary/dictData/index.vue
+++ b/frontend/src/views/system/dictionary/dictData/index.vue
@@ -88,8 +88,8 @@ const columns = reactive<ColumnProps<Dict.ResDictData>[]>([
      return (
          <>
            {
-              (<el-tag type={scope.row.level === 1 ? 'info' : scope.row.level === 2 ? 'warning' : 'danger'}>
-                {scope.row.level === 1 ? '普通' : scope.row.level === 2 ? '中等' : '严重'}
+              (<el-tag type={scope.row.level === 0 ? 'info' : scope.row.level === 1 ? 'warning' : 'danger'}>
+                {scope.row.level === 0 ? '普通' : scope.row.level === 1 ? '中等' : '严重'}
              </el-tag>)
            }
          </>
--- a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
+++ b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
@@ -6,7 +6,7 @@
          <el-form-item label='数据模型' :label-width='140' prop='dataType'>
            <el-select v-model="formContent.dataType"  clearable placeholder="请选择数据模型">
            <el-option
-              v-for="item in dictStore.getDictData('High_Cate')"
+              v-for="item in dictStore.getDictData('Cs_Data_Type')"
              :key="item.id"
              :label="item.name"
              :value="item.code"
@@ -25,7 +25,7 @@
          <el-form-item label='相别' :label-width='140' prop='phase'>
            <el-select v-model="formContent.phase"  clearable placeholder="请选择相别">
            <el-option
-              v-for="item in dictStore.getDictData('High_Cate')"
+              v-for="item in dictStore.getDictData('phase')"
              :key="item.id"
              :label="item.name"
              :value="item.code"
@@ -65,7 +65,7 @@
          <el-form-item label='报表数据来源' :label-width='140' prop='resourcesId'>
            <el-select v-model="formContent.resourcesId"  clearable placeholder="请选择报表数据来源">
            <el-option
-              v-for="item in dictStore.getDictData('Dev_Series')"
+              v-for="item in dictStore.getDictData('Data_Day')"
              :key="item.id"
              :label="item.name"
              :value="item.code"
@@ -75,7 +75,7 @@
          <el-form-item label='数据表表名' :label-width='140' prop='classId'>
            <el-select v-model="formContent.classId"  clearable placeholder="请选择数据表表名">
            <el-option
-              v-for="item in dictStore.getDictData('High_Cate')"
+              v-for="item in dictStore.getDictData('Data')"
              :key="item.id"
              :label="item.name"
              :value="item.code"
@@ -91,7 +91,7 @@
          <el-form-item label='超标判断方式' :label-width='140' prop='formula'>
            <el-select v-model="formContent.formula"  clearable placeholder="请选择超标判断方式">
            <el-option
-              v-for="item in dictStore.getDictData('formula')"
+              v-for="item in dictStore.getDictData('Limit_Value_Judgment')"
              :key="item.id"
              :label="item.name"
              :value="item.code"
--- a/frontend/src/views/system/dictionary/dictPq/index.vue
+++ b/frontend/src/views/system/dictionary/dictPq/index.vue
@@ -50,7 +50,7 @@
      prop: 'dataType',
      label: '数据模型',
      width: 180,
-      enum: dictStore.getDictData('High_Cate'),
+      enum: dictStore.getDictData('Cs_Data_Type'),
      search: { el: 'select', props: { filterable: true } },
      fieldNames: { label: 'name', value: 'code' },
    },
@@ -90,7 +90,7 @@
      prop: 'phase',
      label: '相别',
      width: 180,
-      enum: dictStore.getDictData('High_Cate'),
+      enum: dictStore.getDictData('phase'),
      fieldNames: { label: 'name', value: 'code' },
    },
    {
@@ -156,7 +156,7 @@
      prop: 'classId',
      label: '数据表表名',
      width: 180,
-      enum: dictStore.getDictData('High_Cate'),
+      enum: dictStore.getDictData('Data'),
      fieldNames: { label: 'name', value: 'code' },
      
    },
@@ -164,7 +164,7 @@
      prop: 'resourcesId',
      label: '报表数据来源',
      width: 180,
-      enum: dictStore.getDictData('Dev_Series'),
+      enum: dictStore.getDictData('Data_Day'),
      fieldNames: { label: 'name', value: 'code' },
      render: (scope) => {
        const codes = scope.row.resourcesId;
@@ -175,7 +175,7 @@
      prop: 'operation',
      label: '操作',
      fixed: 'right',
-      width: 330,
+      minWidth: 200,
    },
  ])
  
--- a/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
+++ b/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
@@ -0,0 +1,143 @@
+<template>
+    <el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind='dialogSmall' @close="close">
+        <el-form :model='formContent' ref='dialogFormRef' :rules='rules' >
+          <el-form-item label='字典名称' :label-width='100' prop='name'>
+            <el-input v-model='formContent.name' placeholder='请输入字典名称' autocomplete='off' />
+          </el-form-item>
+          <el-form-item label='序号' :label-width='100'>
+            <el-input-number v-model='formContent.sort' :min="0" controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+          <el-form-item label='编码' :label-width='100' prop='code'>
+            <el-input v-model='formContent.code' placeholder='请输入字典编码' autocomplete='off' />
+          </el-form-item>
+          <el-form-item label='描述' :label-width='100' prop='remark'>
+            <el-input v-model='formContent.remark' placeholder='请输入字典描述' autocomplete='off'  :rows="2"
+            type="textarea"/>
+          </el-form-item>
+        </el-form>
+     
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button @click='close()'>取消</el-button>
+          <el-button type='primary' @click='save()'>
+            保存
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </template>
+  <script setup lang='ts'>
+  import { dialogSmall } from '@/utils/elementBind'
+  import { type Dict } from '@/api/system/dictionary/interface'
+  import { ElMessage, type FormItemRule } from 'element-plus'
+  import { addDictTree, updateDictTree } from '@/api/system/dictionary/dictTree'
+  import { computed, type Ref, ref } from 'vue';
+  import { useDictStore } from '@/stores/modules/dict'
+  const dictStore = useDictStore()
+  const selectedStatMethods = ref<string[]>([])
+  // 定义弹出组件元信息
+  const dialogFormRef = ref()
+  function useMetaInfo() {
+    const dialogVisible = ref(false)
+    const titleType = ref('add')
+    const formContent = ref<Dict.ResDictTree>({
+      id: '',
+      pid: '',
+      pids: '',
+      name: '',
+      code: ' ',
+      sort: 100,
+      remark: '',
+      status: 1,
+      children: [],
+    })
+    return { dialogVisible, titleType, formContent }
+  }
+  
+  const { dialogVisible, titleType, formContent } = useMetaInfo()
+  // 清空formContent
+  const resetFormContent = () => {
+    formContent.value = {
+      id: '',
+      pid: '',
+      pids: '',
+      name: '',
+      code: ' ',
+      sort: 100,
+      remark: '',
+      status: 1,
+      children: [],
+    }
+  }
+  
+  let dialogTitle = computed(() => {
+    return titleType.value === 'add' ? '新增字典类型' : '编辑字典类型'
+  })
+  
+  // 定义表单校验规则
+  const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+    dataType: [{ required: true, message: '数据模型必选！', trigger: 'change' }],
+    name: [{ required: true, message: '指标名称必填！', trigger: 'blur' }],
+  })
+  
+  // 关闭弹窗
+  const close = () => {
+    dialogVisible.value = false
+    // 清空dialogForm中的值
+    resetFormContent()
+    // 重置表单
+    dialogFormRef.value?.resetFields()
+    selectedStatMethods.value = []
+  }
+  
+  // 保存数据
+  const save = () => {
+    try {
+        dialogFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+          if (formContent.value.id) {
+            const result = await updateDictTree(formContent.value);
+                if(result.code != 'A0000'){
+                  ElMessage.error({ message: result.message})
+                }else{
+                  ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                }
+             
+          } else {
+            const result = await addDictTree(formContent.value);
+              if(result.code != 'A0000'){
+                  ElMessage.error({ message: result.message})
+                }else{
+                  ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                }
+          }
+          close()
+          // 刷新表格
+          await props.refreshTable!()
+        }
+      })
+    } catch (err) {
+      console.error('验证过程中出现错误', err)
+    }
+  }
+  
+  // 打开弹窗，可能是新增，也可能是编辑
+  const open = (sign: string, data: Dict.ResDictTree) => {
+    titleType.value = sign
+    dialogVisible.value = true
+    if (data.id) {
+      formContent.value = { ...data }
+    } else {
+      resetFormContent()
+    }
+  }
+  
+  // 对外映射
+  defineExpose({ open })
+  const props = defineProps<{
+    refreshTable: (() => Promise<void>) | undefined;
+  }>()
+  
+
+  
+  </script>
--- a/frontend/src/views/system/dictionary/dictTree/index.vue
+++ b/frontend/src/views/system/dictionary/dictTree/index.vue
@@ -0,0 +1,85 @@
+<template>
+    <div class='table-box' ref='popupBaseView'>
+      <ProTable
+          ref='proTable'
+          :columns='columns'
+          :request-api='getDictTreeList'
+      >
+        <template #tableHeader>
+          <el-button type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
+        </template>
+  
+        <template #operation='scope'>
+          <el-button type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
+          <el-button type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
+          <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
+        </template>
+      </ProTable>
+    </div>
+    <TreePopup :refresh-table='proTable?.getTableList' ref='treePopup'/>
+  </template>
+  
+  <script setup lang='tsx' name='dict'>
+  import {CirclePlus, Delete, EditPen, Download, View} from '@element-plus/icons-vue'
+  import {type Dict} from '@/api/system/dictionary/interface'
+  import type { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+  import TreePopup from '@/views/system/dictionary/dictTree/components/treePopup.vue'
+  import {useDictStore} from '@/stores/modules/dict'
+  import {useHandleData} from '@/hooks/useHandleData'
+  import {
+    getDictTreeList,
+    deleteDictTree,
+  } from '@/api/system/dictionary/dictTree'
+  import { reactive, ref } from 'vue'
+
+  const dictStore = useDictStore()
+
+  const proTable = ref<ProTableInstance>()
+  const treePopup = ref()
+ 
+  const columns = reactive<ColumnProps<Dict.ResDictTree>[]>([
+    {
+      prop: 'name',
+      label: '字典名称',
+      width: 180,
+    },
+    {
+      prop: 'code',
+      label: '编码',
+      width: 180,
+    },
+    {
+      prop: 'remark',
+      label: '描述',
+      width: 180,
+    },
+    {
+      prop: 'status',
+      label: '状态',
+      width: 180,
+    },
+    {
+      prop: 'operation',
+      label: '操作',
+      fixed: 'right',
+      minWidth: 200,
+    },
+  ])
+  
+
+  // 打开 drawer(新增、编辑)
+  const openDialog = (titleType: string, row: Partial<Dict.ResDictTree> = {}) => {
+    treePopup.value?.open(titleType, row)
+    
+  }
+  
+  
+  // 删除字典类型
+  const handleDelete = async (params: Dict.ResDictTree) => {
+    await useHandleData(deleteDictTree, [params.id], `删除【${params.name}】树形字典类型`)
+    proTable.value?.getTableList()
+  }
+  
+  
+  </script>
+