From f177373e0ef25071107c400972c15acf01c53c86 Mon Sep 17 00:00:00 2001 From: Double-_-Z <2492419643@qq.com> Date: Wed, 16 Jul 2025 11:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=A0=E6=9D=90=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/platform/material.js | 11 ++- src/api/system/area.js | 9 +-- src/api/system/customer.js | 9 +-- src/components/Crud/crud.js | 9 ++- src/components/WangEditor/index.vue | 18 ++++- src/views/platform/article/add.vue | 97 +++++++++++++++--------- src/views/platform/material/index.vue | 104 ++++++++++++++++---------- src/views/system/area/index.vue | 80 ++++++++++---------- src/views/system/customer/index.vue | 7 +- 9 files changed, 205 insertions(+), 139 deletions(-) diff --git a/src/api/platform/material.js b/src/api/platform/material.js index 0651b01..5b0dc91 100644 --- a/src/api/platform/material.js +++ b/src/api/platform/material.js @@ -2,23 +2,22 @@ import request from '@/utils/request' export function add(data) { return request({ - url: 'api/material', + url: 'aerocraftAdminApi/cpMaterial', method: 'post', data }) } -export function del(ids) { +export function del(id) { return request({ - url: 'api/material', - method: 'delete', - data: ids + url: `aerocraftAdminApi/cpMaterial/${id}`, + method: 'delete' }) } export function edit(data) { return request({ - url: 'api/material', + url: 'aerocraftAdminApi/cpMaterial', method: 'put', data }) diff --git a/src/api/system/area.js b/src/api/system/area.js index ee06956..90df8be 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,23 +2,22 @@ import request from '@/utils/request' export function add(data) { return request({ - url: 'api/area', + url: 'aerocraftAdminApi/emArea', method: 'post', data }) } -export function del(ids) { +export function del(id) { return request({ - url: 'api/area', + url: `aerocraftAdminApi/emArea/${id}`, method: 'delete', - data: ids }) } export function edit(data) { return request({ - url: 'api/area', + url: 'aerocraftAdminApi/emArea', method: 'put', data }) diff --git a/src/api/system/customer.js b/src/api/system/customer.js index 9a545c3..e05bfaa 100644 --- a/src/api/system/customer.js +++ b/src/api/system/customer.js @@ -2,23 +2,22 @@ import request from '@/utils/request' export function add(data) { return request({ - url: 'api/customer', + url: 'api/cnCustomer', method: 'post', data }) } -export function del(ids) { +export function del(id) { return request({ - url: 'api/customer', + url: `api/cnCustomer/${id}`, method: 'delete', - data: ids }) } export function enable(data) { return request({ - url: 'api/customer', + url: 'api/cnCustomer', method: 'put', data }) diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js index 4c20189..795c44f 100644 --- a/src/components/Crud/crud.js +++ b/src/components/Crud/crud.js @@ -40,6 +40,7 @@ function CRUD(options) { edit: (form) => {}, get: (id) => {} }, + initData: null, // 主页操作栏显示哪些按钮 optShow: { add: true, @@ -135,8 +136,12 @@ function CRUD(options) { table.store.states.treeData = {} table.store.states.lazyTreeNodeMap = {} } - crud.page.total = data.totalElements - crud.data = data.content + if(crud.initData){ + crud.initData(crud,data); + }else{ + crud.page.total = data.totalElements + crud.data = data.content + } crud.resetDataStatus() // time 毫秒后显示表格 setTimeout(() => { diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue index 61bb2eb..e81eae3 100644 --- a/src/components/WangEditor/index.vue +++ b/src/components/WangEditor/index.vue @@ -7,7 +7,7 @@ :default-config="toolbarConfig" :mode="editMode" /> -
+
{ const data = res.data - const url = _this.baseApi + '/file/' + data.type + '/' + data.realName + const url = _this.baseApi + '/file/图片/' + data.newFileName // 最后插入图片 insertFn(url, '', '') }) } + }, + 'uploadVideo': { + // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 [] + allowedFileTypes: ['video/*'], + // 自定义上传 + async customUpload(file, insertFn) { // JS 语法 + upload(_this.fileUploadApi, file).then(res => { + const data = res.data + const url = _this.baseApi + '/file/视频/' + data.newFileName + // 最后插入视频 + insertFn(url, '', '') + }) + } } }}, editMode: 'default', @@ -78,6 +91,7 @@ export default { computed: { ...mapGetters([ 'imagesUploadApi', + 'fileUploadApi', 'baseApi' ]) }, diff --git a/src/views/platform/article/add.vue b/src/views/platform/article/add.vue index 84f3869..27c85d0 100644 --- a/src/views/platform/article/add.vue +++ b/src/views/platform/article/add.vue @@ -27,15 +27,15 @@ - + - - + + @@ -45,8 +45,8 @@ - - + + @@ -81,6 +81,11 @@ diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 1bde4b1..4576240 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -82,7 +82,7 @@ export default { name: 'Area', components: { udOperation, pagination }, cruds() { - return CRUD({ title: '区域', url: 'api/area', crudMethod: { ...crudArea }, optShow: { add: true } }) + return CRUD({ title: '区域', url: '/aerocraftAdminApi/emArea', crudMethod: { ...crudArea }, optShow: { add: true } }) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { @@ -98,42 +98,43 @@ export default { { required: true, message: `名称不能为空`, trigger: 'blur' }, ], }, - list: [{ - id: 1, - label: '爱尚云', - children: [{ - id: 2, - label: '北京区域', - children: [] - }, - { - id: 3, - label: '上海区域', - children: [] - }, - { - id: 4, - label: '深圳区域', - children: [] - }, - { - id: 5, - label: '广州区域', - children: [{ - id: 6, - label: '白云山景区', - children: [] - }, { - id: 7, - label: '白水寨景区', - children: [] - }, { - id: 8, - label: '越秀公园景区', - children: [] - }] - }] - }], + list: [], + // { + // id: 1, + // label: '爱尚云', + // children: [{ + // id: 2, + // label: '北京区域', + // children: [] + // }, + // { + // id: 3, + // label: '上海区域', + // children: [] + // }, + // { + // id: 4, + // label: '深圳区域', + // children: [] + // }, + // { + // id: 5, + // label: '广州区域', + // children: [{ + // id: 6, + // label: '白云山景区', + // children: [] + // }, { + // id: 7, + // label: '白水寨景区', + // children: [] + // }, { + // id: 8, + // label: '越秀公园景区', + // children: [] + // }] + // }] + // }], parentId: '', parentName: '', parentArr: [] @@ -141,8 +142,6 @@ export default { }, async created() { const id = await this.getTree() - this.crud.data = [{ id: 1, name: '越秀公园', num: 1 }] - this.crud.resetDataStatus() }, methods: { // 节点点击 @@ -163,6 +162,9 @@ export default { // console.log(this.parentArr, 'parentArr') // this.getList(id) }, + [CRUD.HOOK.beforeRefresh](crud, form) { + crud.query.current = crud.page.page; + }, getTree() { return new Promise(resolve => { // tree().then(res => { diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue index cdaa296..d325e3c 100644 --- a/src/views/system/customer/index.vue +++ b/src/views/system/customer/index.vue @@ -107,7 +107,7 @@ export default { // 数据字典 dicts: ['common_gender'], cruds() { - return CRUD({ title: '客户', url: 'api/customer', crudMethod: { ...crudCustomer }, optShow: { add: true, reset: true }}) + return CRUD({ title: '客户', url: '/aerocraftAdminApi/cnCustomer', crudMethod: { ...crudCustomer }, optShow: { add: true, reset: true }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data(){ @@ -150,13 +150,14 @@ export default { } }, created() { - this.crud.data.push({ id: 1, nickName: '测试', gender: 0, phone: '12345678901', userType: '普通用户', enable: 1, createTime: '2020-01-01' }) - this.crud.resetDataStatus() }, methods: { // 启/停用客户账号 toEnable(row){ row.enable = Number(row.enable) === 1 ? 0 : 1; + }, + [CRUD.HOOK.beforeRefresh](crud, form) { + crud.query.current = crud.page.page; } } }