From 4b5449e7440f6c9770dff0ffc3905814270d9444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Tue, 6 Aug 2024 11:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/logger/fileLog.ts             |  8 ++++----
 src/views/content/layout/edit.vue     |  2 +-
 src/views/content/layoutItem/edit.vue |  9 +++++----
 src/views/data/dict/index.vue         |  4 ++--
 src/views/data/param/edit.vue         | 11 +++++++++++
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/api/logger/fileLog.ts b/src/api/logger/fileLog.ts
index 9d62045..d5c4474 100644
--- a/src/api/logger/fileLog.ts
+++ b/src/api/logger/fileLog.ts
@@ -5,7 +5,7 @@ import { http } from '@/utils/http/axios';
  */
 export function getFileLogList(params?) {
   return http.request({
-    url: '/file/page',
+    url: '/file/log/page',
     method: 'GET',
     params,
   });
@@ -15,7 +15,7 @@ export function getFileLogList(params?) {
  */
 export function getFileLogDetail(id) {
   return http.request({
-    url: '/file/detail/'+id,
+    url: '/file/log/detail/'+id,
     method: 'get',
   });
 }
@@ -24,7 +24,7 @@ export function getFileLogDetail(id) {
  */
 export function fileLogDelete(id) {
   return http.request({
-    url: '/file/delete/'+id,
+    url: '/file/log/delete/'+id,
     method: 'DELETE',
   });
 }
@@ -33,7 +33,7 @@ export function fileLogDelete(id) {
  */
 export function fileLogBatchDelete(data:any) {
   return http.request({
-    url: '/file/batchDelete',
+    url: '/file/log/batchDelete',
     method: 'DELETE',
     data
   });
diff --git a/src/views/content/layout/edit.vue b/src/views/content/layout/edit.vue
index 381e868..eb8c597 100644
--- a/src/views/content/layout/edit.vue
+++ b/src/views/content/layout/edit.vue
@@ -13,7 +13,7 @@
         label-width="80px"
     >
     <el-form-item label="位置编号" prop="location"  :rules="{ required: true, message: '请输入位置编号', trigger: 'blur' }">
-        <number-input v-model="formData.location" type="textarea"  placeholder="请输入位置编号"/>
+        <number-input v-model="formData.location"  placeholder="请输入位置编号"/>
       </el-form-item>
       <el-form-item
           label="位置描述"
diff --git a/src/views/content/layoutItem/edit.vue b/src/views/content/layoutItem/edit.vue
index 4b3ad64..df7413f 100644
--- a/src/views/content/layoutItem/edit.vue
+++ b/src/views/content/layoutItem/edit.vue
@@ -14,11 +14,11 @@
     >
     <el-form-item label="页面布局" prop="layoutId" class="flex-1" :rules="{ required: true, message: '请选择页面布局', trigger: 'change' }">
           <el-select v-model="formData.layoutId" class="flex-1" clearable placeholder="请选择页面布局">
-            <el-option v-for="(item, index) in layoutList" :key="index" :label="item.name" :value="item.id" />
+            <el-option v-for="(item, index) in layoutList" :key="index" :label="item.description" :value="item.id" />
           </el-select>
         </el-form-item>
     <el-form-item label="位置编号" prop="location"  :rules="{ required: true, message: '请输入位置编号', trigger: 'blur' }">
-        <number-input v-model="formData.location" type="textarea"  placeholder="请输入位置编号"/>
+        <number-input v-model="formData.location"  placeholder="请输入位置编号"/>
       </el-form-item>
       <el-form-item
           label="位置描述"
@@ -43,8 +43,8 @@
             <el-option label="通知公告" :value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="页面编号" prop="typeId"  :rules="{ required: true, message: '请输入页面编号', trigger: 'blur' }">
-        <number-input v-model="formData.typeId"  placeholder="请输入页面编号"/>
+        <el-form-item label="业务类型编号" prop="typeId"  :rules="{ required: true, message: '请输入业务类型编号', trigger: 'blur' }">
+        <number-input v-model="formData.typeId"  placeholder="请输入业务类型编号"/>
       </el-form-item>
       <el-form-item
             label="图片路径"
@@ -90,6 +90,7 @@ const formData = reactive({
   type:'',
   typeId:'',
   location: "",
+  imgName:'',
   image:'',
   sort: 0
 });
diff --git a/src/views/data/dict/index.vue b/src/views/data/dict/index.vue
index 637b7e3..a78a3db 100644
--- a/src/views/data/dict/index.vue
+++ b/src/views/data/dict/index.vue
@@ -20,8 +20,8 @@
             </el-row>
             <div style="margin-top:15px;">
               <el-button type="primary" @click="dictRefresh" v-perm="['sys:dict:cache']">刷新缓存</el-button>
-              <el-button type="primary" @click="addDict">新建</el-button>
-              <el-button type="danger" :disabled="!selectionData.length" @click="handleDelete()">删除</el-button>
+              <el-button type="primary" @click="addDict" v-perm="['sys:dict:add']">新建</el-button>
+              <el-button type="danger" v-perm="['sys:dict:delete']" :disabled="!selectionData.length" @click="handleDelete()">删除</el-button>
             </div>
           </template>
           <BasicTable :columns="columns" :showTableSetting="false" :request="loadDataTable" :row-key="(row) => row.id"
diff --git a/src/views/data/param/edit.vue b/src/views/data/param/edit.vue
index da0b0ab..213e981 100644
--- a/src/views/data/param/edit.vue
+++ b/src/views/data/param/edit.vue
@@ -24,6 +24,16 @@
             clearable
         />
       </el-form-item>
+      <el-form-item label="参数类型" prop="type"
+      :rules="{ required: true, message: '请选择参数类型', trigger: 'change' }">
+          <el-select
+              v-model="formData.type"
+              placeholder="请选择参数类型"
+          >
+            <el-option label="系统" :value="0"></el-option>
+            <el-option label="业务" :value="1"></el-option>
+          </el-select>
+        </el-form-item>
       <el-form-item
           label="参数编码"
           prop="code"
@@ -83,6 +93,7 @@ const formRef = shallowRef<FormInstance>();
 const formData = reactive({
   id: "",
   name: "",
+  type:"",
   code:'',
   value:'',
   status: 1,