From e650cd4ca7f1d6b69e61cca49699f44edc0bb6be Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 20 九月 2024 16:56:32 +0800
Subject: [PATCH] 项目关联模型添加  字段

---
 /dev/null                                                 |  135 ---------------------------------------------
 src/views/model/mpk/project/ProjectPackageModelDialog.vue |    6 +
 2 files changed, 4 insertions(+), 137 deletions(-)

diff --git a/src/views/model/mpk/project/ProjectPackageModelDialog.vue b/src/views/model/mpk/project/ProjectPackageModelDialog.vue
index 531b66f..a9d7f10 100644
--- a/src/views/model/mpk/project/ProjectPackageModelDialog.vue
+++ b/src/views/model/mpk/project/ProjectPackageModelDialog.vue
@@ -31,9 +31,9 @@
         row-key="id"
         border
       >
+        <el-table-column prop="pyChineseName" label="模型中文名称"/>
         <el-table-column prop="pyName" label="模型名称"/>
-        <el-table-column prop="pkgName" label="包名"/>
-        <el-table-column prop="pyModule" label="模型路径" width="300px"/>
+        <el-table-column prop="pyType" label="模型类型" :formatter="(r,c,v) => getDictLabel(DICT_TYPE.MODEL_TYPE,v)"/>
         <el-table-column prop="remark" label="备注" width="300px"/>
         <el-table-column label="模型方法" type="expand" width="100px">
           <template #default="props">
@@ -41,6 +41,7 @@
               <el-table-column align="center" label="方法名" prop="methodName" />
               <el-table-column align="center" label="参数长度" prop="dataLength" />
               <el-table-column align="center" label="是否有model" prop="model" :formatter="(row,column,cellValue) => cellValue === 1 ? 'true' : 'false'" />
+              <el-table-column align="center" label="结果key" prop="resultKey" />
             </el-table>
           </template>
         </el-table-column>
@@ -60,6 +61,7 @@
   import * as projectHistoryApi from '@/api/mpk/projectPackageHistory'
   import * as projectApi from '@/api/mpk/project'
   import { dateFormatter } from '@/utils/formatTime'
+  import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 
 
   const { t } = useI18n() // 国际化
diff --git a/src/views/model/mpk/project/SelectForm.vue b/src/views/model/mpk/project/SelectForm.vue
deleted file mode 100644
index 78f6890..0000000
--- a/src/views/model/mpk/project/SelectForm.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="80px"
-    >
-      <el-row :gutter="8">
-        <el-col :span="12">
-          <el-form-item label="key" prop="selectKey">
-            <el-input v-model="formData.settingKey" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="8">
-        <el-col :span="12">
-          <el-form-item label="name" prop="name">
-            <el-input v-model="formData.name" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script lang="ts" setup>
-  import * as ProjectApi from '@/api/mpk/project'
-  import * as MpkApi from '@/api/mpk/mpk'
-  import {FormRules} from 'element-plus'
-  import {generateUUID} from "@/utils";
-
-
-  const {t} = useI18n() // 国际化
-  const message = useMessage() // 消息弹窗
-
-  const dialogVisible = ref(false) // 弹窗的是否展示
-  const dialogTitle = ref('选项设置') // 弹窗的标题
-  const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
-  const formData = ref({
-    settingKey: undefined,
-    name: undefined,
-    type: undefined,
-    valueType: undefined,
-    value: undefined,
-    max: undefined,
-    min: undefined,
-  })
-
-
-  const formRules = reactive<FormRules>({
-    settingKey: [
-      {required: true, message: 'key不能为空', trigger: 'blur'},
-    ],
-    name: [
-      {required: true, message: '参数名称不能为空', trigger: 'blur'},
-    ],
-    type: [
-      {required: true, message: '输入类型不能为空', trigger: 'blur'},
-    ],
-    valueType: [
-      {required: true, message: '参数类型不能为空', trigger: 'blur'},
-    ]
-  })
-
-  const formRef = ref() // 表单 Ref
-
-  let methodSettingsRef = undefined
-  let infoRef = undefined
-  /** 打开弹窗 */
-  const open = async (info,methodSettings) => {
-    dialogVisible.value = true
-    resetForm()
-    // 修改时,设置数据
-    if (info) {
-      infoRef = info
-      formLoading.value = true
-      try {
-        formData.value = {...info}
-      } finally {
-        formLoading.value = false
-      }
-    }else {
-      methodSettingsRef = methodSettings
-    }
-  }
-  defineExpose({open}) // 提供 open 方法,用于打开弹窗
-
-
-  // 数据回调
-  const emit = defineEmits(['addSettingCallback'])
-  /** 提交表单 */
-  const submitForm = async () => {
-    // 校验表单
-    if (!formRef) return
-    const valid = await formRef.value.validate()
-    if (!valid) return
-    // 提交请求
-    formLoading.value = true
-    try {
-      if (infoRef) {
-        // 修改
-        for (let key in formData.value) {
-          infoRef[key] = formData.value[key];
-        }
-      }else {
-        // 新增
-        const info = {...formData.value};
-        info.id = generateUUID()
-        methodSettingsRef.push(info)
-      }
-      dialogVisible.value = false
-    } finally {
-      formLoading.value = false
-    }
-  }
-
-  /** 重置表单 */
-  const resetForm = () => {
-    formData.value = {
-      settingKey: undefined,
-      name: undefined,
-      type: undefined,
-      valueType: undefined,
-      value: undefined,
-      max: undefined,
-      min: undefined,
-    }
-    formRef.value?.resetFields()
-  }
-</script>

--
Gitblit v1.9.3