From 89e540640b87f4be8656a5bc78f4a5dbcdf1c21f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 01 七月 2025 15:53:41 +0800
Subject: [PATCH] ss
---
admin/src/components/common/RichEditor.vue | 189 ++++++++++++-----------
admin/src/components/base/BaseOpera.vue | 15 +
/dev/null | 139 -----------------
server/pom.xml | 2
admin/src/components/business/OperaCarouselWindow.vue | 19 +
admin/src/views/business/information.vue | 21 --
server/src/main/resources/application-pro.yml | 1
admin/src/components/business/OperaInformationWindow.vue | 29 ++-
admin/vue.config.js | 2
admin/src/views/business/bottom.vue | 2
admin/src/views/business/carousel.vue | 21 --
11 files changed, 155 insertions(+), 285 deletions(-)
diff --git a/admin/src/components/base/BaseOpera.vue b/admin/src/components/base/BaseOpera.vue
index 7a13410..4a364eb 100644
--- a/admin/src/components/base/BaseOpera.vue
+++ b/admin/src/components/base/BaseOpera.vue
@@ -80,16 +80,17 @@
this.api.create(this.form)
.then(() => {
// that.$tip.apiSuccess('鏂板缓鎴愬姛')
- that.$dialog.actionConfirmButton('鏄惁鍋滅暀璇ラ〉闈㈢户缁柊寤烘暟鎹紵', '鏂板缓鎴愬姛','缁х画娣诲姞','鍏抽棴杩斿洖')
- .then(() => {
+ // that.$dialog.actionConfirmButton('鏄惁鍋滅暀璇ラ〉闈㈢户缁柊寤烘暟鎹紵', '鏂板缓鎴愬姛','缁х画娣诲姞','鍏抽棴杩斿洖')
+ // .then(() => {
that.$refs.form.resetFields()
+ that.visible = false
that.form[this.configData['field.id']] = null
that.$emit('success')
- })
- .catch(() => {
- that.visible = false
- that.$emit('success')
- })
+ // })
+ // .catch(() => {
+ // that.visible = false
+ // that.$emit('success')
+ // })
})
.catch(e => {
this.$tip.apiFailed(e)
diff --git a/admin/src/components/business/OperaCarouselWindow.vue b/admin/src/components/business/OperaCarouselWindow.vue
index 75b8ccf..b540d6e 100644
--- a/admin/src/components/business/OperaCarouselWindow.vue
+++ b/admin/src/components/business/OperaCarouselWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="60%"
+ width="calc(100% - 250px)"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -11,7 +11,7 @@
<el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
</el-form-item>
<el-form-item label="姒傝堪" prop="detail">
- <el-input type="textarea" v-model="form.detail" placeholder="璇疯緭鍏ユ弿杩�" v-trim/>
+ <el-input type="textarea" :rows="10" v-model="form.detail" placeholder="璇疯緭鍏ユ弿杩�" v-trim/>
</el-form-item>
<div style="display: flex">
<el-form-item label="缂╃暐鍥�" prop="thumbnailImgurl" style="display:inline-block;flex: 1">
@@ -54,8 +54,9 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import RichEditor from '@/components/common/RichEditor'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
+import RichEditor from '@/components/common/RichEditor'
+import '@wangeditor/editor/dist/css/style.css'
export default {
name: 'OperaCarouselWindow',
extends: BaseOpera,
@@ -63,7 +64,7 @@
data () {
return {
// 琛ㄥ崟鏁版嵁
- styleEditor: 'border: 1px solid #ccc;display: inline-block;height:500px',
+ styleEditor: 'border: 1px solid #ccc;display: inline-block;height:800px; ',
form: {
id: null,
remark: '',
@@ -122,6 +123,7 @@
for (const key in this.form) {
this.form[key] = target[key]
}
+ console.log(111+this.form.content)
})
},
// 涓婁紶鍥剧墖
@@ -139,3 +141,12 @@
}
}
</script>
+<style>
+::v-deep .w-e-text-container {
+ height: 420px !important;
+}
+.w-e-text-container .w-e-scroll {
+ height: 500px !important;
+ -webkit-overflow-scrolling: touch;
+}
+</style>
diff --git a/admin/src/components/business/OperaInformationWindow.vue b/admin/src/components/business/OperaInformationWindow.vue
index 981dcbc..fbb573b 100644
--- a/admin/src/components/business/OperaInformationWindow.vue
+++ b/admin/src/components/business/OperaInformationWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="60%"
+ width="calc(100% - 250px)"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -16,13 +16,14 @@
</div>
</el-form-item>
<el-form-item label="绠�浠�" prop="detail">
- <el-input type="textarea" v-model="form.detail" placeholder="璇疯緭鍏ョ畝浠�" v-trim/>
+ <el-input type="textarea" :rows="10" v-model="form.detail" placeholder="璇疯緭鍏ョ畝浠�" v-trim/>
</el-form-item>
<el-form-item label="鍙戝竷鏃ユ湡" prop="releaseDate" >
<el-date-picker v-model="form.releaseDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"> </el-date-picker>
</el-form-item>
<el-form-item label="鍐呭" prop="content" >
- <RichEditor :richData="form.content" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
+ <RichEditor :richData="form.content" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
+ <!-- <RichEditor :richData="form.content" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>-->
</el-form-item>
<el-form-item label="鐘舵��" prop="status" required class="form-item-status">
<el-switch v-model="form.status" :active-value="0" :inactive-value="1" active-color="#13ce66"/>
@@ -40,8 +41,10 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import RichEditor from '@/components/common/RichEditor'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
+import RichEditor from '@/components/common/RichEditor'
+import '@wangeditor/editor/dist/css/style.css'
+import dayjs from 'dayjs';
export default {
name: 'OperaInformationWindow',
extends: BaseOpera,
@@ -49,7 +52,7 @@
data () {
return {
// 琛ㄥ崟鏁版嵁
- styleEditor: 'border: 1px solid #ccc;display: inline-block;height:500px',
+ styleEditor: 'border: 1px solid #ccc;display: inline-block;height:800px;min-height :500px;',
form: {
id: null,
remark: '',
@@ -90,11 +93,9 @@
remark: '',
title: '',
detail: '',
- releaseDate: new Date(),
+ releaseDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
imgurl: '',
- imgurlFull: '',
- thumbnailImgurl: '',
- thumbnailImgurlFull: '',
+ fullImgurl: '',
jumpType: 0,
content: '',
sortnum: '',
@@ -108,6 +109,7 @@
for (const key in this.form) {
this.form[key] = target[key]
}
+ console.log(111+this.form.content)
})
},
// 涓婁紶鍥剧墖
@@ -121,3 +123,12 @@
}
}
</script>
+<style>
+::v-deep .w-e-text-container {
+ height: 420px !important;
+}
+.w-e-text-container .w-e-scroll {
+ height: 500px !important;
+ -webkit-overflow-scrolling: touch;
+}
+</style>
diff --git a/admin/src/components/business/OperaInformationWindow1.vue b/admin/src/components/business/OperaInformationWindow1.vue
deleted file mode 100644
index b648cba..0000000
--- a/admin/src/components/business/OperaInformationWindow1.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
- <GlobalWindow
- :title="title"
- width="calc(100% - 250px)"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
- <el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
- </el-form-item>
- <el-form-item label="鏍囬" prop="title">
- <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="describe">
- <el-input v-model="form.describe" placeholder="璇疯緭鍏ユ弿杩�" v-trim/>
- </el-form-item>
- <el-form-item label="鍐呭" prop="contnet">
- <el-input v-model="form.contnet" placeholder="璇疯緭鍏ュ唴瀹�" v-trim/>
- </el-form-item>
- <el-form-item label="灏侀潰鍥剧墖鍦板潃" prop="imgurl">
- <el-input v-model="form.imgurl" placeholder="璇疯緭鍏ュ皝闈㈠浘鐗囧湴鍧�" v-trim/>
- </el-form-item>
- <el-form-item label="鍙戝竷鏃堕棿" prop="leleaseDate">
- <el-date-picker v-model="form.leleaseDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ彂甯冩椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
- </el-form-item>
- </el-form>
- </GlobalWindow>
-</template>
-
-<script>
-import BaseOpera from '@/components/base/BaseOpera'
-import GlobalWindow from '@/components/common/GlobalWindow'
-export default {
- name: 'OperaInformationWindow',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- // 琛ㄥ崟鏁版嵁
- form: {
- id: null,
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
- title: '',
- describe: '',
- contnet: '',
- imgurl: '',
- leleaseDate: '',
- sortnum: ''
- },
- // 楠岃瘉瑙勫垯
- rules: {
- }
- }
- },
- created () {
- this.config({
- api: '/business/information',
- 'field.id': 'id'
- })
- }
-}
-</script>
diff --git a/admin/src/components/common/RichEditor.vue b/admin/src/components/common/RichEditor.vue
index 7bf2a32..33b44f0 100644
--- a/admin/src/components/common/RichEditor.vue
+++ b/admin/src/components/common/RichEditor.vue
@@ -1,7 +1,7 @@
<template>
<div :style="styleEditor">
<Toolbar style="border-bottom: 1px solid #ccc" :editor="editor" :defaultConfig="toolbarConfig" :mode="mode" />
- <Editor :style="style" class="declass" v-model="html" :defaultConfig="editorConfig" :mode="mode"
+ <Editor style="min-height: 80px; overflow-y: hidden;" v-model="html" :defaultConfig="editorConfig" :mode="mode"
@onCreated="onCreated" @onChange="onChange" />
</div>
</template>
@@ -9,7 +9,7 @@
<script>
import Vue from 'vue'
import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { Loading } from 'element-ui'
+import { Loading } from 'element-ui';
let loadingInstance = null
export default Vue.extend({
props: {
@@ -18,54 +18,53 @@
default: ''
},
styleEditor: '',
- style:'',
- readonly: false // 鏄惁鍙互杈撳叆
+ readonly: false, // 鏄惁鍙互杈撳叆
},
- name: 'RichEditor',
+ name:'RichEditor',
components: { Editor, Toolbar },
- data () {
+ data() {
return {
editor: null,
html: '',
toolbarConfig: { // 宸ュ叿鏍忛厤缃�
- toolbarKeys: this.readonly ? ['fullScreen'] : [ // 鏄剧ず鎸囧畾鐨勮彍鍗曢」
- 'bold', // 绮椾綋
- 'underline', // 涓嬪垝绾�
- 'italic', // 鏂滀綋
- 'through', // 鍒犻櫎绾�
- 'code', // 琛屽唴浠ｇ爜
- 'sub', // 涓嬫爣
- 'sup', // 涓婃爣
- 'clearStyle', // 娓呴櫎鏍煎紡
- 'color', // 瀛椾綋棰滆壊
- 'bgColor', // 鑳屾櫙鑹�
- 'fontSize', // 瀛楀彿
- 'fontFamily', // 瀛椾綋
- 'indent', // 澧炲姞缂╄繘
- 'delIndent', // 鍑忓皯缂╄繘
- 'justifyLeft', // 宸﹀榻�
- 'justifyRight', // 鍙冲榻�
- 'justifyCenter', // 灞呬腑瀵归綈
- 'justifyJustify', // 涓ょ瀵归綈
- 'lineHeight', // 琛岄珮
+ toolbarKeys: this.readonly ? ["fullScreen"]: [ // 鏄剧ず鎸囧畾鐨勮彍鍗曢」
+ "bold", // 绮椾綋
+ "underline", // 涓嬪垝绾�
+ "italic", // 鏂滀綋
+ "through", // 鍒犻櫎绾�
+ "code", // 琛屽唴浠ｇ爜
+ "sub", // 涓嬫爣
+ "sup", // 涓婃爣
+ "clearStyle", // 娓呴櫎鏍煎紡
+ "color", // 瀛椾綋棰滆壊
+ "bgColor", // 鑳屾櫙鑹�
+ "fontSize", // 瀛楀彿
+ "fontFamily", // 瀛椾綋
+ "indent", // 澧炲姞缂╄繘
+ "delIndent", // 鍑忓皯缂╄繘
+ "justifyLeft", // 宸﹀榻�
+ "justifyRight", // 鍙冲榻�
+ "justifyCenter", // 灞呬腑瀵归綈
+ "justifyJustify", // 涓ょ瀵归綈
+ "lineHeight", // 琛岄珮
// "viewImageLink", // 鏌ョ湅閾炬帴
- 'divider', // 鍒嗗壊绾�
- 'emotion', // 琛ㄦ儏
- 'insertLink', // 鎻掑叆閾炬帴
+ "divider", // 鍒嗗壊绾�
+ "emotion", // 琛ㄦ儏
+ "insertLink", // 鎻掑叆閾炬帴
// "editLink", // 淇敼閾炬帴
// "unLink", // 鍙栨秷閾炬帴
// "viewLink", // 鏌ョ湅閾炬帴
- 'codeBlock', // 浠ｇ爜鍧�
- 'blockquote', // 寮曠敤
- 'headerSelect', // 鏍囬
+ "codeBlock", // 浠ｇ爜鍧�
+ "blockquote", // 寮曠敤
+ "headerSelect", // 鏍囬
// "header1", // 鏍囬1
// "header2", // 鏍囬2
// "header3", // 鏍囬3
// "header4", // 鏍囬4
// "header5", // 鏍囬5
// "todo", // 寰呭姙
- 'redo', // 閲嶅仛
- 'undo', // 鎾ら攢
+ "redo", // 閲嶅仛
+ "undo", // 鎾ら攢
// "enter", // 鍥炶溅
// "bulletedList", // 鏃犲簭鍒楄〃
// "numberedList", // 鏈夊簭鍒楄〃
@@ -85,20 +84,20 @@
"tableHeader", // 琛ㄥご
"tableFullWidth", // 瀹藉害鑷�傚簲
] // 涓嬬骇鑿滃崟 key 锛屽繀濉�
- }, */
+ },*/
// 涓婁紶鍥剧墖鍒嗙粍
{
key: 'img-style', // 蹇呭～锛岃浠� group 寮�澶�
title: '鍥剧墖', // 蹇呭～
// iconSvg: '<svg>....</svg>', // 鍙��
menuKeys: [
- 'uploadImage', // 涓婁紶鍥剧墖
- 'insertImage', // 缃戠粶鍥剧墖
- 'deleteImage', // 鍒犻櫎鍥剧墖
- 'editImage', // 缂栬緫鍥剧墖
- 'imageWidth30', // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮30
- 'imageWidth50', // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮50
- 'imageWidth100' // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮100
+ "uploadImage", // 涓婁紶鍥剧墖
+ "insertImage", // 缃戠粶鍥剧墖
+ "deleteImage", // 鍒犻櫎鍥剧墖
+ "editImage", // 缂栬緫鍥剧墖
+ "imageWidth30", // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮30
+ "imageWidth50", // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮50
+ "imageWidth100", // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮100
] // 涓嬬骇鑿滃崟 key 锛屽繀濉�
},
// 瑙嗛鍒嗙粍
@@ -107,18 +106,18 @@
title: '瑙嗛', // 蹇呭～
// iconSvg: '<svg>....</svg>', // 鍙��
menuKeys: [
- 'insertVideo', // 鎻掑叆缃戠粶瑙嗛
- 'uploadVideo', // 涓婁紶瑙嗛
- 'editVideoSize' // 淇敼瑙嗛灏哄
+ "insertVideo", // 鎻掑叆缃戠粶瑙嗛
+ "uploadVideo", // 涓婁紶瑙嗛
+ "editVideoSize", // 淇敼瑙嗛灏哄
] // 涓嬬骇鑿滃崟 key 锛屽繀濉�
},
- 'fullScreen' // 鍏ㄥ睆
+ "fullScreen", // 鍏ㄥ睆
],
excludeKeys: [ // 闅愯棌鎸囧畾鐨勮彍鍗曢」
// 'headerSelect',
// 'video-style'
// 鎺掗櫎鑿滃崟缁勶紝鍐欒彍鍗曠粍 key 鐨勫�煎嵆鍙�
- ]
+ ],
},
editorConfig: { // 缂栬緫鍣ㄩ厤缃�
@@ -130,10 +129,10 @@
MENU_CONF: {
// 鍥剧墖涓婁紶
uploadImage: {
- server: process.env.VUE_APP_API_PREFIX + '/web/public/uploadLocal?folder=',
+ server: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal?folder=',
fieldName: 'file',
// 鍗曚釜鏂囦欢鐨勬渶澶т綋绉檺鍒讹紝榛樿涓� 2M
- maxFileSize: 20 * 1024 * 1024, // 10M
+ maxFileSize: 10 * 1024 * 1024, // 10M
// 鏈�澶氬彲涓婁紶鍑犱釜鏂囦欢锛岄粯璁や负 100
maxNumberOfFiles: 10,
// 閫夋嫨鏂囦欢鏃剁殑绫诲瀷闄愬埗锛岄粯璁や负 ['image/*'] 銆傚涓嶆兂闄愬埗锛屽垯璁剧疆涓� []
@@ -148,20 +147,20 @@
// 璺ㄥ煙鏄惁浼犻�� cookie 锛岄粯璁や负 false
withCredentials: true,
// 瓒呮椂鏃堕棿锛岄粯璁や负 10 绉�
- timeout: 10 * 1000, // 10 绉�
+ timeout: 10 * 1000, //10 绉�
// 涓婁紶鍓�
- onBeforeUpload (files) {
+ onBeforeUpload(files) {
loadingInstance = Loading.service({
lock: true,
text: '涓婁紶涓�...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
- })
- return files
+ });
+ return files;
},
// 鑷畾涔夋彃鍏ュ浘鐗�
- customInsert (res, insertFn) {
- console.log(res)
+ customInsert(res, insertFn) {
+ console.log(res);
// 鍥犱负鑷畾涔夋彃鍏ュ鑷磑nSuccess涓巓nFailed鍥炶皟鍑芥暟涓嶈捣浣滅敤,鑷繁鎵嬪姩澶勭悊
// 鍏堝叧闂瓑寰呯殑Message
loadingInstance = Loading.service({
@@ -169,7 +168,7 @@
text: '涓婁紶涓�...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
- }).close()
+ }).close();
if (res.code === 200) {
// Message.success({
// message: `${res.data.originalName} 涓婁紶鎴愬姛`
@@ -179,27 +178,27 @@
// message: `${res.data.originalName} 涓婁紶澶辫触锛岃閲嶆柊灏濊瘯`
// });
}
- insertFn(res.data.url, res.data.originname, res.data.imgname)
+ insertFn(res.data.url, res.data.originname, res.data.imgname);
},
// 鍗曚釜鏂囦欢涓婁紶鎴愬姛涔嬪悗
- onSuccess (file, res) {
- console.log(`${file.originalFilename} 涓婁紶鎴愬姛`, res)
+ onSuccess(file, res) {
+ console.log(`${file.originalFilename} 涓婁紶鎴愬姛`, res);
},
// 鍗曚釜鏂囦欢涓婁紶澶辫触
- onFailed (file, res) {
- console.log(`${file.originalFilename} 涓婁紶澶辫触`, res)
- loadingInstance.close()
+ onFailed(file, res) {
+ console.log(`${file.originalFilename} 涓婁紶澶辫触`, res);
+ loadingInstance.close();
},
// 涓婁紶杩涘害鐨勫洖璋冨嚱鏁�
- onProgress (progress) {
- console.log('progress', progress)
+ onProgress(progress) {
+ console.log('progress', progress);
// progress 鏄� 0-100 鐨勬暟瀛�
},
// 涓婁紶閿欒锛屾垨鑰呰Е鍙� timeout 瓒呮椂
- onError (file, err, res) {
- loadingInstance.close()
- console.log(`${file.originalFilename} 涓婁紶鍑洪敊`, err, res)
+ onError(file, err, res) {
+ loadingInstance.close();
+ console.log(`${file.originalFilename} 涓婁紶鍑洪敊`, err, res);
}
},
// 瑙嗛涓婁紶
@@ -230,11 +229,11 @@
// 瓒呮椂鏃堕棿锛岄粯璁や负 30 绉�
timeout: 1000 * 1000, // 1000 绉�,
// 涓婁紶涔嬪墠瑙﹀彂
- onBeforeUpload (file) {
- return file
+ onBeforeUpload(file) {
+ return file;
},
// 鑷畾涔夋彃鍏ヨ棰�
- customInsert (res, insertFn) {
+ customInsert(res, insertFn) {
// 鍥犱负鑷畾涔夋彃鍏ュ鑷磑nSuccess涓巓nFailed鍥炶皟鍑芥暟涓嶈捣浣滅敤,鑷繁鎵嬪姩澶勭悊
// 鍏堝叧闂瓑寰呯殑Message
// Message.closeAll();
@@ -247,11 +246,11 @@
// message: `${res.data.originalName} 涓婁紶澶辫触锛岃閲嶆柊灏濊瘯`
// });
}
- insertFn(res.data.url, res.data.url)
+ insertFn(res.data.url, res.data.url);
},
// 涓婁紶杩涘害鐨勫洖璋冨嚱鏁�
- onProgress (progress) {
- console.log(progress)
+ onProgress(progress) {
+ console.log(progress);
// onProgress(progress) { // JS 璇硶
// progress 鏄� 0-100 鐨勬暟瀛�
},
@@ -266,8 +265,8 @@
// this.errorMsg(file);
// },
// 涓婁紶閿欒锛屾垨鑰呰Е鍙� timeout 瓒呮椂
- onError (file, err, res) {
- console.log(`${file.name} 涓婁紶鍑洪敊`, err, res)
+ onError(file, err, res) {
+ console.log(`${file.name} 涓婁紶鍑洪敊`, err, res);
// Notification.error({
// title: '閿欒',
// message: `${file.name} 涓婁紶澶辫触锛岃閲嶆柊灏濊瘯`
@@ -276,38 +275,47 @@
}
}
},
- mode: 'default' // or 'simple'
+ mode: 'default', // or 'simple'
}
},
watch: {
richData: function (value) {
this.html = value
+ console.log("onChange123", value); // onChange 鏃惰幏鍙栫紪杈戝櫒鏈�鏂板唴瀹�
+ this.$nextTick(()=>{
+ this.html = value
+ })
},
readonly: function (value) {
this.readonly = value
},
styleEditor: function (value) {
this.styleEditor = value
- }
+ },
},
- mounted () {
+ mounted() {
// 闇�瑕佸湪缂栬緫鍣ㄥ垱寤哄畬姣曞悗鍦ㄨ祴鍊�
- this.$nextTick(() => {
+ this.$nextTick(()=>{
this.html = this.richData
})
},
methods: {
// 缂栬緫鍣ㄥ垱寤哄畬姣曟椂鐨勫洖璋冨嚱鏁�
- onCreated (editor) {
+ onCreated(editor) {
+ var that =this
this.editor = Object.seal(editor) // 涓�瀹氳鐢� Object.seal() 锛屽惁鍒欎細鎶ラ敊
+ setTimeout(function (){
+ that.html = that.richData
+ // alert(that.html)
+ },15000)
},
// 缂栬緫鍣ㄥ唴瀹广�侀�夊尯鍙樺寲鏃剁殑鍥炶皟鍑芥暟
- onChange (editor) {
+ onChange(editor) {
this.$emit('getWangedditor', editor.getHtml())
- console.log('onChange', editor.getHtml()) // onChange 鏃惰幏鍙栫紪杈戝櫒鏈�鏂板唴瀹�
- }
+ console.log("onChange", editor.getHtml()); // onChange 鏃惰幏鍙栫紪杈戝櫒鏈�鏂板唴瀹�
+ },
},
- beforeDestroy () {
+ beforeDestroy() {
// 缂栬緫鍣ㄩ攢姣佹椂鐨勫洖璋冨嚱鏁般�傝皟鐢� editor.destroy() 鍗冲彲閿�姣佺紪杈戝櫒
const editor = this.editor
if (editor == null) return
@@ -315,8 +323,13 @@
}
})
</script>
-<style lang="scss">
-.declass{
- min-height: 80px; overflow-y: hidden;
+<style>
+::v-deep .w-e-text-container {
+ height: 420px !important;
}
-</style>>
+.w-e-text-container .w-e-scroll {
+ height: 500px !important;
+ -webkit-overflow-scrolling: touch;
+}
+</style>
+
diff --git a/admin/src/views/business/bottom.vue b/admin/src/views/business/bottom.vue
index 44bb9f8..f2bee33 100644
--- a/admin/src/views/business/bottom.vue
+++ b/admin/src/views/business/bottom.vue
@@ -1,5 +1,5 @@
<template>
- <div class="box" style="height:100%;overflow-y: auto" >
+ <div class="box" style="max-height:calc(100% - 60px);margin-bottom:50px;overflow-y: auto" >
<el-form :model="form" ref="form" label-width="140px">
<div style="margin: 0px 0 50px 0">
<span style="font-size: 15px; font-weight: bold">銆�1銆戠綉绔欓厤缃細</span>
diff --git a/admin/src/views/business/carousel.vue b/admin/src/views/business/carousel.vue
index f26948b..6318f9b 100644
--- a/admin/src/views/business/carousel.vue
+++ b/admin/src/views/business/carousel.vue
@@ -7,8 +7,8 @@
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="searchForm.status" clearable @change="search" placeholder="鐘舵��">
- <el-option label="姝ｅ父" value="1"></el-option>
- <el-option label="绂佺敤" value="0"></el-option>
+ <el-option label="姝ｅ父" value="0"></el-option>
+ <el-option label="绂佺敤" value="1"></el-option>
</el-select>
</el-form-item>
<section>
@@ -23,6 +23,7 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:carousel:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -119,22 +120,8 @@
showContent: '',
showTitle: '',
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
title: '',
- describe: '',
- imgurl: '',
- thumbnailImgurl: '',
- type: '',
- jumpType: '',
- contnet: '',
- sortnum: '',
- status: ''
+ status: null
}
}
},
diff --git a/admin/src/views/business/information.vue b/admin/src/views/business/information.vue
index 131fb7c..a3c12d3 100644
--- a/admin/src/views/business/information.vue
+++ b/admin/src/views/business/information.vue
@@ -7,8 +7,8 @@
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="searchForm.status" clearable @change="search" placeholder="鐘舵��">
- <el-option label="姝ｅ父" value="1"></el-option>
- <el-option label="绂佺敤" value="0"></el-option>
+ <el-option label="姝ｅ父" value="0"></el-option>
+ <el-option label="绂佺敤" value="1"></el-option>
</el-select>
</el-form-item>
<section>
@@ -23,6 +23,7 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:information:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -112,22 +113,8 @@
showContent: '',
showTitle: '',
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
title: '',
- describe: '',
- imgurl: '',
- thumbnailImgurl: '',
- type: '',
- jumpType: '',
- contnet: '',
- sortnum: '',
- status: ''
+ status: null
}
}
},
diff --git a/admin/src/views/business/information1.vue b/admin/src/views/business/information1.vue
deleted file mode 100644
index 4d56d5d..0000000
--- a/admin/src/views/business/information1.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
- <TableLayout :permissions="['business:information:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏍囬" prop="title">
- <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="describe">
- <el-input v-model="searchForm.describe" placeholder="璇疯緭鍏ユ弿杩�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍐呭" prop="contnet">
- <el-input v-model="searchForm.contnet" placeholder="璇疯緭鍏ュ唴瀹�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="灏侀潰鍥剧墖鍦板潃" prop="imgurl">
- <el-input v-model="searchForm.imgurl" placeholder="璇疯緭鍏ュ皝闈㈠浘鐗囧湴鍧�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍙戝竷鏃堕棿" prop="releaseDate">
- <el-date-picker v-model="searchForm.releaseDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ彂甯冩椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:information:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:information:create', 'business:information:delete']">
- <li><el-button type="primary" @click="$refs.operaInformationWindow.open('鏂板缓鍔ㄦ�佸挩璇�')" icon="el-icon-plus" v-permissions="['business:information:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:information:delete']">鍒犻櫎</el-button></li>
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="describe" label="鎻忚堪" min-width="100px"></el-table-column>
- <el-table-column prop="contnet" label="鍐呭" min-width="100px"></el-table-column>
- <el-table-column prop="imgurl" label="灏侀潰鍥剧墖鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="releaseDate" label="鍙戝竷鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:information:update', 'business:information:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInformationWindow.open('缂栬緫鍔ㄦ�佸挩璇�', row)" icon="el-icon-edit" v-permissions="['business:information:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:information:delete']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaInformationWindow ref="operaInformationWindow" @success="handlePageChange"/>
- </TableLayout>
-</template>
-
-<script>
-import BaseTable from '@/components/base/BaseTable'
-import TableLayout from '@/layouts/TableLayout'
-import Pagination from '@/components/common/Pagination'
-import OperaInformationWindow from '@/components/business/OperaInformationWindow'
-export default {
- name: 'Information',
- extends: BaseTable,
- components: { TableLayout, Pagination, OperaInformationWindow },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
- title: '',
- describe: '',
- contnet: '',
- imgurl: '',
- releaseDate: '',
- sortnum: ''
- }
- }
- },
- created () {
- this.config({
- module: '鍔ㄦ�佸挩璇�',
- api: '/business/information',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.search()
- }
-}
-</script>
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 0708e91..7f6e90b 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -7,7 +7,7 @@
}
module.exports = {
publicPath: process.env.VUE_APP_CONTEXT_PATH,
- outputDir: 'admin',
+ outputDir: 'dmttwebsite_admin',
assetsDir: 'static',
lintOnSave: false,
devServer: {
diff --git a/server/pom.xml b/server/pom.xml
index 323a2dd..f81ea66 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -7,7 +7,7 @@
<artifactId>dmttwebsite</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>
- <name>official_website</name>
+ <name>dmttwebsite</name>
<description></description>
<parent>
diff --git a/server/src/main/resources/application-pro.yml b/server/src/main/resources/application-pro.yml
index c277212..f308ba0 100644
--- a/server/src/main/resources/application-pro.yml
+++ b/server/src/main/resources/application-pro.yml
@@ -33,7 +33,6 @@
required: true
ssl:
enable: true
-
debug_model: true
# Swagger閰嶇疆
--
Gitblit v1.9.3