修改OSS配置的UI

.env.production

@@ -15,7 +15,7 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
-VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API = 'https://domain.com/api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

src/api/system/post/types.ts

@@ -13,7 +13,6 @@ export interface PostVO extends BaseEntity {
 export interface PostForm {
   postId: number | string | undefined;
   deptId: number | string | undefined;
-  postCode: string;
   postName: string;
   postCategory: string;
   postSort: number;
@@ -24,7 +23,6 @@ export interface PostForm {
 export interface PostQuery extends PageQuery {
   deptId: number | string;
   belongDeptId: number | string;
-  postCode: string;
   postName: string;
   postCategory: string;
   status: string;

src/router/index.ts

@@ -88,6 +88,20 @@ export const constantRoutes: RouteRecordRaw[] = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
+  },
+  {
+    path: '/system/oss',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/system/oss/index.vue'),
+        name: 'Oss',
+        meta: { title: '对象存储' }
+      }
+    ]
   }
 ];
 

src/views/order/index.vue

@@ -141,6 +141,7 @@ const currentTab = ref(undefined);
 
 const statusTabs = [
   { label: '全部', value: undefined },
+  { label: '已撤销', value: -1 },
   { label: '待审核', value: 0 },
   { label: '已驳回', value: 1 },
   { label: '待签批', value: 2 },

src/views/system/oss/config.vue

@@ -90,8 +90,9 @@
           </el-form-item>
 
           <el-form-item class="action-item">
-            <el-button type="primary" class="save-btn" icon="Check" :loading="buttonLoading"
-              @click="submitForm">保存配置</el-button>
+            <el-button v-hasPermi="['system:oss:list']" type="success" icon="Link" @click="handleTest">配置测试</el-button>
+            <el-button v-hasPermi="['system:ossConfig:edit']" type="primary" class="save-btn" icon="Check"
+              :loading="buttonLoading" @click="submitForm">保存配置</el-button>
             <el-button icon="Refresh" @click="resetForm">重置</el-button>
           </el-form-item>
         </el-form>
@@ -101,9 +102,11 @@
 </template>
 
 <script setup name="OssConfig" lang="ts">
+import { useRouter } from 'vue-router';
 import { listOssConfig, addOssConfig, updateOssConfig } from '@/api/system/ossConfig';
 import { OssConfigForm } from '@/api/system/ossConfig/types';
 
+const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const buttonLoading = ref(false);
@@ -187,6 +190,10 @@ function submitForm() {
   });
 }
 
+function handleTest() {
+  router.push('/system/oss/index');
+}
+
 function initOssConfig() {
   listOssConfig({} as any).then(res => {
     if (res.rows && res.rows.length > 0) {

src/views/system/oss/index.vue

@@ -35,11 +35,11 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:oss:upload']" type="primary" plain icon="Upload"
+            <el-button v-hasPermi="['system:oss:uploadFile']" type="primary" plain icon="Upload"
               @click="handleFile">上传文件</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:oss:upload']" type="primary" plain icon="Upload"
+            <el-button v-hasPermi="['system:oss:uploadImage']" type="primary" plain icon="Upload"
               @click="handleImage">上传图片</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -48,15 +48,6 @@
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:oss:edit']" :type="previewListResource ? 'danger' : 'warning'" plain
-              @click="handlePreviewListResource(!previewListResource)">预览开关 : {{ previewListResource ? '禁用' : '启用'
-              }}</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:ossConfig:list']" type="info" plain icon="Operation"
-              @click="handleOssConfig">配置管理</el-button>
-          </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -118,7 +109,6 @@ import { listOss, delOss } from '@/api/system/oss';
 import ImagePreview from '@/components/ImagePreview/index.vue';
 import { OssForm, OssQuery, OssVO } from '@/api/system/oss/types';
 
-const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const ossList = ref<OssVO[]>([]);
@@ -260,10 +250,6 @@ const handleOrderChange = (prop: string, order: string) => {
   queryParams.value.isAsc = isAscArr.join(',');
   getList();
 };
-/** 任务日志列表查询 */
-const handleOssConfig = () => {
-  router.push('/system/oss-config/index');
-};
 /** 文件按钮操作 */
 const handleFile = () => {
   reset();
@@ -287,18 +273,6 @@ const submitForm = () => {
 const handleDownload = (row: OssVO) => {
   proxy?.$download.oss(row.ossId);
 };
-/** 预览开关按钮  */
-const handlePreviewListResource = async (preview: boolean) => {
-  const text = preview ? '启用' : '停用';
-  try {
-    await proxy?.$modal.confirm('确认要"' + text + '""预览列表图片"配置吗?');
-    await proxy?.updateConfigByKey('sys.oss.previewListResource', preview);
-    await getList();
-    proxy?.$modal.msgSuccess(text + '成功');
-  } catch {
-    return;
-  }
-};
 /** 删除按钮操作 */
 const handleDelete = async (row?: OssVO) => {
   const ossIds = row?.ossId || ids.value;

src/views/system/post/index.vue

@@ -16,9 +16,6 @@
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
               <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-                <el-form-item label="岗位编码" prop="postCode">
-                  <el-input v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
                 <el-form-item label="岗位名称" prop="postName">
                   <el-input v-model="queryParams.postName" placeholder="请输入岗位名称" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
@@ -68,7 +65,6 @@
           <el-table v-loading="loading" border :data="postList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column v-if="false" label="岗位编号" align="center" prop="postId" />
-            <el-table-column label="岗位编码" align="center" prop="postCode" />
             <el-table-column label="岗位名称" align="center" prop="postName" />
             <el-table-column label="部门" align="center" prop="deptName" />
             <el-table-column label="排序" align="center" prop="postSort" />
@@ -107,16 +103,13 @@
                 :props="{ value: 'id', label: 'label', children: 'children' } as any" value-key="id" placeholder="请选择部门"
                 check-strictly />
             </el-form-item>
-            <el-form-item label="岗位编码" prop="postCode">
-              <el-input v-model="form.postCode" placeholder="请输入编码名称" />
-            </el-form-item>
             <el-form-item label="岗位顺序" prop="postSort">
               <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
             </el-form-item>
             <el-form-item label="岗位状态" prop="status">
               <el-radio-group v-model="form.status">
                 <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
-                  }}</el-radio>
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
@@ -164,7 +157,6 @@ const dialog = reactive<DialogOption>({
 const initFormData: PostForm = {
   postId: undefined,
   deptId: undefined,
-  postCode: '',
   postName: '',
   postCategory: '',
   postSort: 0,
@@ -179,14 +171,12 @@ const data = reactive<PageData<PostForm, PostQuery>>({
     pageSize: 10,
     deptId: undefined,
     belongDeptId: undefined,
-    postCode: '',
     postName: '',
     postCategory: '',
     status: ''
   },
   rules: {
     postName: [{ required: true, message: '岗位名称不能为空', trigger: 'blur' }],
-    postCode: [{ required: true, message: '岗位编码不能为空', trigger: 'blur' }],
     deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
     postSort: [{ required: true, message: '岗位顺序不能为空', trigger: 'blur' }]
   }