diff --git a/package-lock.json b/package-lock.json index 06f59b4..fc4c5e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5119,9 +5119,9 @@ } }, "dompurify": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.3.tgz", - "integrity": "sha512-8Hv7Q0FuwD9rWoB6qI2eZsfKbGXfoUVuGHHrE15vgk4ReOKwOkSgbqb2OMFtc0d5besOEkoLkcyuV10zQ2X5gw==" + "version": "2.2.6", + "resolved": "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz", + "integrity": "sha1-VJRdxcC0XOWuIocFd36OWdey7cQ=" }, "domready": { "version": "1.0.8", @@ -12537,8 +12537,8 @@ }, "vue-dompurify-html": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/vue-dompurify-html/-/vue-dompurify-html-2.3.0.tgz", - "integrity": "sha512-Iz9wI4iiJF+rzC2x3r8quw/VXrkwgMsWXt9p0Le4wXtolBXwMDJOmK3QNMiNg36bzU2b0f3En/wjidoeRVNZ7A==", + "resolved": "https://registry.npm.taobao.org/vue-dompurify-html/download/vue-dompurify-html-2.3.0.tgz", + "integrity": "sha1-sXXt2lc2LPewPShkRo+mROBaKtA=", "requires": { "dompurify": "^2.0.0" } diff --git a/src/common/portrait.styl b/src/common/portrait.styl index 0189af9..2be3f58 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -3,6 +3,31 @@ padding: 12px; } +.pl-1{ + padding-left: 4px; +} + +.pl-2{ + padding-left: 8px; +} + +.pl-3{ + padding-left: 12px; +} + +.pl-4{ + padding-left: 16px; +} + +.pl-5{ + padding-left: 20px; +} + +.px-1{ + padding-left: 4px; + padding-right: 4px; +} + .px-2{ padding-left: 8px; padding-right: 8px; @@ -152,6 +177,15 @@ background: white; } +.green{ + background: #4CAF50; +} + +.white--text{ + color: #fff; +} + + // flex .d-flex{ display: flex; @@ -193,6 +227,10 @@ align-items: center; } +.align-left{ + align-items: start; +} + .flex-1{ display: flex; flex: 1; @@ -254,22 +292,13 @@ h2{ } .baseColor{ - color: #13ACC4 + color: #1890ff } .bg{ background: #F5F5F5 } -.ant-btn-primary{ - background-color: #13ACC4 - border-color: #13ACC4; -} - -.ant-btn-link:hover, .ant-btn-link:focus{ - color: #13ACC4; -} - .fill-width{ width:100%; } diff --git a/src/components/BtnCom/BtnCon.vue b/src/components/BtnCom/BtnCon.vue index fffeff5..e7275a6 100644 --- a/src/components/BtnCom/BtnCon.vue +++ b/src/components/BtnCom/BtnCon.vue @@ -29,14 +29,13 @@ export default { border-right: 1px solid #ccc; .btn { - background: #13acc4; - border: 1px solid #04b6d2; + background: #1890ff; + border: 1px solid #1890ff; padding: 4px; border-radius: 5px; color: #fff; cursor: pointer; margin-bottom: 8px; - // width: fit-content; } } diff --git a/src/components/QuillEditor/QuillEditor.vue b/src/components/QuillEditor/QuillEditor.vue index 8cc3383..ff6285e 100644 --- a/src/components/QuillEditor/QuillEditor.vue +++ b/src/components/QuillEditor/QuillEditor.vue @@ -118,7 +118,13 @@ export default { } .ql-toolbar.ql-snow { background: #f5f5f5; + border: 1px solid #d9d9d9; } + +.ql-container.ql-snow { + border: 1px solid #d9d9d9; +} + .ql-snow .ql-tooltip[data-mode='link']::before { content: '请输入链接地址:'; } diff --git a/src/main.js b/src/main.js index a13818b..8fc39d9 100644 --- a/src/main.js +++ b/src/main.js @@ -11,7 +11,9 @@ import echarts from 'echarts'; import 'echarts-gl'; import 'echarts/map/js/province/shanxi.js'; //对应的省份 import './plugins/vue-quill-editor.js'; +import VueDOMPurifyHTML from 'vue-dompurify-html'; // Vue.use(echarts); +Vue.use(VueDOMPurifyHTML); Vue.prototype.$echarts = echarts; // import './assets/icon/iconfont.css'; // import VueDOMPurifyHTML from 'vue-dompurify-html'; diff --git a/src/plugins/ant-design-vue.js b/src/plugins/ant-design-vue.js index 39119e5..ecb2b55 100644 --- a/src/plugins/ant-design-vue.js +++ b/src/plugins/ant-design-vue.js @@ -29,6 +29,8 @@ import { Progress, carousel, Spin, + Card, + List, } from 'ant-design-vue'; import { ConfigProvider } from 'ant-design-vue'; Vue.component(ConfigProvider.name, ConfigProvider); @@ -59,6 +61,8 @@ Vue.use(BackTop); Vue.use(Progress); Vue.use(carousel); Vue.use(Spin); +Vue.use(Card); +Vue.use(List); Vue.prototype.$message = message; Vue.prototype.$notification = notification; diff --git a/src/router/index.js b/src/router/index.js index 22afc9e..1c1738f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,6 +24,12 @@ const routes = [ name: 'Meeting', component: () => import('@/views/Meeting/Meeting.vue'), }, + // 会议纪要预览 + { + path: '/meetingPreview', + name: 'MeetingPreview', + component: () => import('@/views/MeetingPreview/MeetingPreview.vue'), + }, ]; const router = new VueRouter({ diff --git a/src/views/Meeting/Meeting.vue b/src/views/Meeting/Meeting.vue index 02ad1b6..4ca3f1a 100644 --- a/src/views/Meeting/Meeting.vue +++ b/src/views/Meeting/Meeting.vue @@ -1,32 +1,36 @@ @@ -95,24 +100,6 @@ import QuillEditor from 'components/QuillEditor/QuillEditor.vue'; import moment from 'moment'; -// 工具栏配置 -const toolbarOptions = [ - ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线 - ['blockquote', 'code-block'], // 引用 代码块 - [{ header: 1 }, { header: 2 }], // 1、2 级标题 - [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表 - [{ script: 'sub' }, { script: 'super' }], // 上标/下标 - [{ indent: '-1' }, { indent: '+1' }], // 缩进 - [{ direction: 'rtl' }], // 文本方向 - [{ size: ['small', false, 'large', 'huge'] }], // 字体大小 - [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 - [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 - // [{ font: [] }], // 字体种类 - [{ align: [] }], // 对齐方式 - ['clean'], // 清除文本格式 - ['link', 'image', 'video'], // 链接、图片、视频 -]; - const formItemLayout = { labelCol: { span: 4 }, wrapperCol: { span: 18 }, @@ -176,10 +163,7 @@ export default { diff --git a/src/views/MeetingPreview/MeetingPreview.vue b/src/views/MeetingPreview/MeetingPreview.vue new file mode 100644 index 0000000..6ef6586 --- /dev/null +++ b/src/views/MeetingPreview/MeetingPreview.vue @@ -0,0 +1,72 @@ + + + + +