Merge branch 'master' of http://42.194.163.46:9001/zrd/web

.env.prod

@@ -22,7 +22,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/admin/
 
 # 输出路径
 VITE_OUT_DIR=dist-prod

src/components/UploadFile/src/UploadFile.vue

@@ -80,7 +80,7 @@ const emit = defineEmits(['update:modelValue'])
 
 const props = defineProps({
   modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
-  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf', 'png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传

src/views/member/userinfoai/UserInfoAiForm.vue

@@ -1,20 +1,17 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="100px"
-      v-loading="formLoading"
     >
-      <el-form-item label="用户编号" prop="userId">
-        <el-input v-model="formData.userId" placeholder="请输入用户编号" />
-      </el-form-item>
       <el-form-item label="提取有效信息" prop="textInformation">
         <el-input v-model="formData.textInformation" placeholder="请输入提取有效信息" />
       </el-form-item>
-      <el-form-item label="材料类型#information_type" prop="informationType">
-        <el-select v-model="formData.informationType" placeholder="请选择材料类型#information_type">
+      <el-form-item label="材料类型" prop="informationType">
+        <el-select v-model="formData.informationType" placeholder="请选择材料类型">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.INFORMATION_TYPE)"
             :key="dict.value"
@@ -23,26 +20,21 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否选中#info_status" prop="infoStatus">
-        <el-radio-group v-model="formData.infoStatus">
-          <el-radio
-            v-for="dict in getStrDictOptions(DICT_TYPE.FILE_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
+      <el-form-item label="文件" prop="infoFiles">
+        <UploadFile v-model="formData.infoFiles" />
+      </el-form-item>
+      <el-form-item label="补充信息" prop="additionalInfo">
+        <el-input v-model="formData.additionalInfo" placeholder="请输入补充信息" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
-<script setup lang="ts">
-import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+<script lang="ts" setup>
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { UserInfoAiApi, UserInfoAiVO } from '@/api/member/userinfoai'
 
 /** 用户信息 表单 */
@@ -62,9 +54,7 @@ const formData = ref({
   informationType: undefined,
   infoStatus: undefined
 })
-const formRules = reactive({
-  userId: [{ required: true, message: '用户编号不能为空', trigger: 'blur' }]
-})
+const formRules = reactive({})
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
@@ -120,4 +110,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

src/views/member/userinfoai/index.vue

@@ -2,47 +2,47 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="用户编号" prop="userId">
         <el-input
           v-model="queryParams.userId"
-          placeholder="请输入用户编号"
+          class="!w-240px"
           clearable
+          placeholder="请输入用户编号"
           @keyup.enter="handleQuery"
-          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="提取有效信息" prop="textInformation">
         <el-input
           v-model="queryParams.textInformation"
-          placeholder="请输入提取有效信息"
+          class="!w-240px"
           clearable
+          placeholder="请输入提取有效信息"
           @keyup.enter="handleQuery"
-          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-220px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
-      <el-form-item label="材料类型#information_type" prop="informationType">
+      <el-form-item label="材料类型" prop="informationType">
         <el-select
           v-model="queryParams.informationType"
-          placeholder="请选择材料类型#information_type"
-          clearable
           class="!w-240px"
+          clearable
+          placeholder="请选择材料类型"
         >
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.INFORMATION_TYPE)"
@@ -52,12 +52,12 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否选中#info_status" prop="infoStatus">
+      <el-form-item label="是否选中" prop="infoStatus">
         <el-select
           v-model="queryParams.infoStatus"
-          placeholder="请选择是否选中#info_status"
-          clearable
           class="!w-240px"
+          clearable
+          placeholder="请选择是否选中"
         >
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.FILE_STATUS)"
@@ -68,24 +68,32 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
         <el-button
-          type="primary"
+          v-hasPermi="['member:user-info-ai:create']"
           plain
+          type="primary"
           @click="openForm('create')"
-          v-hasPermi="['member:user-info-ai:create']"
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
         </el-button>
         <el-button
-          type="success"
+          v-hasPermi="['member:user-info-ai:export']"
+          :loading="exportLoading"
           plain
+          type="success"
           @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['member:user-info-ai:export']"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
         </el-button>
       </el-form-item>
     </el-form>
@@ -93,42 +101,42 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="自增主键" align="center" prop="id" />
-      <el-table-column label="用户编号" align="center" prop="userId" />
-      <el-table-column label="提取有效信息" align="center" prop="textInformation" />
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="自增主键" prop="id" />
+      <el-table-column align="center" label="用户编号" prop="userId" />
+      <el-table-column align="center" label="提取有效信息" prop="textInformation" />
       <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
         align="center"
+        label="创建时间"
         prop="createTime"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="材料类型#information_type" align="center" prop="informationType">
+      <el-table-column align="center" label="材料类型" prop="informationType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFORMATION_TYPE" :value="scope.row.informationType" />
         </template>
       </el-table-column>
-      <el-table-column label="是否选中#info_status" align="center" prop="infoStatus">
+      <el-table-column align="center" label="是否选中" prop="infoStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.FILE_STATUS" :value="scope.row.infoStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="120px">
+      <el-table-column align="center" label="操作" min-width="120px">
         <template #default="scope">
           <el-button
+            v-hasPermi="['member:user-info-ai:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['member:user-info-ai:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['member:user-info-ai:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['member:user-info-ai:delete']"
           >
             删除
           </el-button>
@@ -137,9 +145,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -148,8 +156,8 @@
   <UserInfoAiForm ref="formRef" @success="getList" />
 </template>
 
-<script setup lang="ts">
-import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+<script lang="ts" setup>
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { UserInfoAiApi, UserInfoAiVO } from '@/api/member/userinfoai'
@@ -238,4 +246,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>