From ace847c89da4a0a772aa513b4343d8fc54a0adc9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 十月 2025 17:49:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/visitorSources.vue | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index b0dc5c6..fd34b2d 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -1,5 +1,5 @@
<template>
- <div class="box">
+ <div class="box" style="height:100%;overflow-y: auto" >
<el-form :model="form" ref="form" label-width="140px">
<div>
<span style="font-size: 15px; font-weight: bold">浜哄憳鎺堟潈閰嶇疆锛�</span>
@@ -20,8 +20,8 @@
</div>
<el-form-item label="鏉ヨ棰勭害鏂瑰紡:" prop="reservationWay">
<el-radio-group v-model="form.reservationWay">
- <el-radio :label="0">棰勭害鍏嶇櫥璁�</el-radio>
- <el-radio :label="1">棰勭害鍚庣櫥璁�(闇�瑕侀厤澶囪瀹㈡満)</el-radio>
+ <el-radio :label="1">棰勭害鍏嶇櫥璁�</el-radio>
+ <el-radio :label="0">棰勭害鍚庣櫥璁�(闇�瑕侀厤澶囪瀹㈡満)</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="琚浜烘牎楠屾柟寮�:" prop="checkVisit">
@@ -75,25 +75,28 @@
/>
</el-form-item>
<el-form-item label="鍦ㄥ洯椤荤煡:" prop="visitNotice">
- <el-tiptap
+ <!-- <el-tiptap
style="width: 50%"
v-model="form.visitNotice"
:extensions="extensions"
- />
+ /> -->
+ <RichEditor style="width: 70%" :richData="form.visitNotice" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
</el-form-item>
<el-form-item label="璁垮棰勭害鎸囧崡:" prop="visitNotice">
- <el-tiptap
+ <!-- <el-tiptap
style="width: 50%"
v-model="form.visitTips"
:extensions="extensions"
- />
+ /> -->
+ <RichEditor style="width: 70%" :richData="form.visitTips" :styleEditor="styleEditor" @getWangedditor="getWangedditor1" :readonly="false"/>
</el-form-item>
<el-form-item label="璁垮鍏ュ洯瀵艰鍥�:" prop="visitNotice">
- <el-tiptap
+ <!-- <el-tiptap
style="width: 50%"
v-model="form.visitMap"
:extensions="extensions"
- />
+ /> -->
+ <RichEditor style="width: 70%" :richData="form.visitMap" :styleEditor="styleEditor" @getWangedditor="getWangedditor2" :readonly="false"/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">淇濆瓨閰嶇疆椤�</el-button>
@@ -104,6 +107,7 @@
<script>
import { getVisitConfigDTO, updateVisitConfig } from '@/api/system/common'
+import RichEditor from '@/components/common/RichEditor'
import {
// necessary extensions
Doc,
@@ -131,7 +135,9 @@
import { upload } from '@/api/system/common'
export default {
name: 'visitorSources',
-
+ components: {
+ RichEditor
+ },
data() {
return {
form: {
@@ -148,6 +154,7 @@
visitTips: '',
frezzDays: null
},
+ styleEditor:'border: 1px solid #ccc;display: inline-block;',
extensions: [
new Doc(),
new Text(),
@@ -188,6 +195,15 @@
},
methods: {
+ getWangedditor(val){
+ this.form.visitNotice =val
+ },
+ getWangedditor1(val){
+ this.form.visitTips =val
+ },
+ getWangedditor2(val){
+ this.form.visitMap =val
+ },
getData() {
getVisitConfigDTO({})
.then(res => {
@@ -225,8 +241,18 @@
}
}
</script>
-
<style lang="scss" scoped>
+.el-container /deep/ .el-main{
+ width: 100%;
+ overflow-y: auto !important ;
+ height: calc(100% - 94px);
+}
+/deep/ .el-main{
+ width: 100%;
+ //height: 100%;
+ overflow-y: auto !important ;
+ height: calc(100% - 94px);
+}
.box {
width: 100%;
padding: 30px;
--
Gitblit v1.9.3