diff --git a/package-lock.json b/package-lock.json index 0434e7f..a81448a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12078,6 +12078,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tinymce-paragraphspacing": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tinymce-paragraphspacing/-/tinymce-paragraphspacing-1.0.1.tgz", + "integrity": "sha512-sR6+vBvxplRv6SyT51Zbfc5k3xZ0ro1G+nBopoeb/3WVCUAyUtpETB+3N8gsuOvckM7NxCEZ/PtZTgznaerzTw==" + }, "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", diff --git a/package.json b/package.json index 01a10ae..602185d 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "postcss-px2rem": "^0.3.0", "px2rem-loader": "^0.1.9", "sortablejs": "^1.14.0", + "tinymce-paragraphspacing": "^1.0.1", "vue": "^2.6.10", "vue-cropper": "^0.5.8", "vue-cropperjs": "^3.0.0", diff --git a/public/styles/css/editor.css b/public/styles/css/editor.css index edb485a..9d3366a 100644 --- a/public/styles/css/editor.css +++ b/public/styles/css/editor.css @@ -6,6 +6,14 @@ font-family: ProximaNova; src: url('./styles/font/ProximaNova-Regular.otf'); } +@font-face { + font-family: PingFang; + src: url('./styles/font/PingFang-Regular.otf'); +} +@font-face { + font-family: PingFang SC; + src: url('./styles/font/PingFang-Regular.otf'); +} .mce-content-body:not([dir='rtl']) blockquote { padding: 8px 15px; border-left: 0; @@ -92,7 +100,9 @@ } .tiny-wrap .people .pic { max-width: 400px; - margin-right: 50px; +} +.tiny-wrap .people .texts { + margin-left: 50px; } .tiny-wrap .people h6 { font-size: 24px; diff --git a/public/styles/font/PingFang-Regular.otf b/public/styles/font/PingFang-Regular.otf new file mode 100644 index 0000000..11032b6 Binary files /dev/null and b/public/styles/font/PingFang-Regular.otf differ diff --git a/public/styles/tinymce/langs/zh_CN.js b/public/styles/tinymce/langs/zh_CN.js index 25740bc..74ad47b 100644 --- a/public/styles/tinymce/langs/zh_CN.js +++ b/public/styles/tinymce/langs/zh_CN.js @@ -218,6 +218,7 @@ tinymce.addI18n('zh_CN', { "Top": "上方对齐", "Middle": "居中对齐", "Bottom": "下方对齐", +"Format Painter": "格式刷", "Header cell": "表头单元格", "Row group": "行组", "Column group": "列组", diff --git a/public/styles/tinymce/plugins/formatpainter/plugin.min.js b/public/styles/tinymce/plugins/formatpainter/plugin.min.js new file mode 100644 index 0000000..055e9c7 --- /dev/null +++ b/public/styles/tinymce/plugins/formatpainter/plugin.min.js @@ -0,0 +1 @@ +!function(l){"use strict";var e,r,n,t,o,i,m,a,d,u,c,s,v,f,p=function(e){var r=e,n=function(){return r};return{get:n,set:function(e){r=e},clone:function(){return p(n())}}},g=function(e){return parseInt(e,10)},h=function(e,r,n){return{major:e,minor:r,patch:n}},b=function(e){var r=/([0-9]+)\.([0-9]+)\.([0-9]+)(?:(\-.+)?)/.exec(e);return r?h(g(r[1]),g(r[2]),g(r[3])):h(0,0,0)},y=function(e,r){var n=e-r;return 0===n?0:0
- +
-
-
- +
+
+
@@ -41,11 +41,10 @@
-->
- + 上传
@@ -57,7 +56,7 @@ import { VueCropper } from 'vue-cropper' -import {compress, compressAccurately} from 'image-conversion' +import { compress, compressAccurately } from 'image-conversion' export default { components: { VueCropper @@ -86,22 +85,30 @@ export default { fixed: { type: Boolean, default: true + }, + // 默认生成截图框宽度 (默认:80%) + autoCropWidth: { + type: Number, + default: 480 + }, + // 默认生成截图框高度 (默认:80%) + autoCropHeight: { + type: Number, + default: 124 } }, - data() { + data () { return { previews: {}, // 预览数据 option: { img: '', // 裁剪图片的地址 (默认:空) size: 0.8, // 裁剪生成图片的质量 (默认:1) full: true, // 是否输出原图比例的截图 选true生成的图片会非常大 (默认:false) - outputType: 'jpg', // 裁剪生成图片的格式 (默认:jpg) + outputType: 'png', // 裁剪生成图片的格式 (默认:jpg) canMove: true, // 上传图片是否可以移动 (默认:true) original: false, // 上传图片按照原始比例渲染 (默认:false) canMoveBox: true, // 截图框能否拖动 (默认:true) autoCrop: true, // 是否默认生成截图框 (默认:false) - autoCropWidth: 480, // 默认生成截图框宽度 (默认:80%) - autoCropHeight: 124, // 默认生成截图框高度 (默认:80%) fixedBox: false, // 固定截图框大小 不允许改变 (默认:false) fixed: true, // 是否开启截图框宽高固定比例 (默认:true) fixedNumber: [1, 0.26], // 截图框比例 (默认:[1:1]) @@ -111,38 +118,38 @@ export default { } }, methods: { - changeScale(num) { + changeScale (num) { // 图片缩放 num = num || 1 this.$refs.cropper.changeScale(num) }, - rotateLeft() { + rotateLeft () { // 向左旋转 this.$refs.cropper.rotateLeft() }, - rotateRight() { + rotateRight () { // 向右旋转 this.$refs.cropper.rotateRight() }, - updateImg(file) { + updateImg (file) { this.option.img = file.url this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95 }, - realTime(data) { + realTime (data) { // 实时预览 this.previews = data }, - close() { + close () { }, - uploadImg(type) { + uploadImg (type) { this.isDisabled = true // 将剪裁好的图片回传给父组件 const that = this if (type === 'blob') { this.$refs.cropper.getCropBlob(data => { - compress(data, 0.8).then(res => { - that.$emit('upload', res) - }) + // compress(data, 1).then(res => { + that.$emit('upload', data) + // }) }) } else { this.$refs.cropper.getCropData(data => { @@ -155,81 +162,81 @@ export default { diff --git a/src/components/modules/content.vue b/src/components/modules/content.vue index dc231b6..211f488 100644 --- a/src/components/modules/content.vue +++ b/src/components/modules/content.vue @@ -31,7 +31,7 @@ @@ -51,7 +51,7 @@ @@ -68,22 +68,6 @@

只支持.jpg,.png格式

- - - - @@ -122,9 +121,18 @@ export default { // 编辑内容 editHistory (row, i = 0) { this.data.form = JSON.parse(JSON.stringify(row)) + if (!this.data.labelWidth) this.data.labelWidth = '60px' this.curModule = i this.contentVisible = true }, + // 删除行(通用) + delRow (list, i) { + this.$confirm('确定要删除吗?', '提示', { + type: 'warning' + }).then(() => { + list.splice(i, 1) + }).catch(() => { }) + }, close () { this.$emit('update:visible', false) }, diff --git a/src/components/modules/link.vue b/src/components/modules/link.vue index cc6426f..82e2f06 100644 --- a/src/components/modules/link.vue +++ b/src/components/modules/link.vue @@ -91,6 +91,7 @@ \ No newline at end of file diff --git a/src/pages/column/page/aboutNew.vue b/src/pages/column/page/aboutNew.vue new file mode 100644 index 0000000..7ea1ae1 --- /dev/null +++ b/src/pages/column/page/aboutNew.vue @@ -0,0 +1,462 @@ + + + + + \ No newline at end of file diff --git a/src/pages/column/page/application.vue b/src/pages/column/page/application.vue index cfdf0aa..2eb703a 100644 --- a/src/pages/column/page/application.vue +++ b/src/pages/column/page/application.vue @@ -3,25 +3,33 @@

页面设置/APPLICATION

- 预览 + 预览 保存为草稿 - 发布 + 发布 放弃编辑
- + -
点击更换banner与链接
+
点击更换banner与链接
- +

{{ modules[1].form.title }}

@@ -31,25 +39,38 @@
{{ modules[1].form.des }}
- +
-
点击更改图片、标题概述与链接
+
点击更改图片、标题概述与链接
- +
-
+

{{ modules[2].form.title }}

{{ modules[2].form.des }}

-
点击更换标题与描述
+
点击更换标题与描述
    -
  • - - +
  • + +

    {{ item.title }}

    -
    点击更标题与链接
    +
    点击更标题与链接
@@ -60,13 +81,17 @@

{{ modules[4].form.title }}

{{ modules[4].form.des }}

-
点击更换标题与描述
+
点击更换标题与描述
    -
  • - +
  • +

    {{ item.title }}

    -
    点击更改图片、标题与链接
    +
    点击更改图片、标题与链接
@@ -77,11 +102,13 @@

{{ modules[6].form.title }}

{{ modules[6].form.des }}

-
点击更换标题与描述
+
点击更换标题与描述
  • - +
    2022 New Year Message from President Sun Dongbai

    2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen (IASF)…

    @@ -89,7 +116,8 @@
  • - +
    2022 New Year Message from President Sun Dongbai

    2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen (IASF)…

    @@ -97,7 +125,8 @@
  • - +
    2022 New Year Message from President Sun Dongbai

    2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen (IASF)…

    @@ -105,7 +134,8 @@
  • - +
    2022 New Year Message from President Sun Dongbai

    2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen (IASF)…

    @@ -113,7 +143,8 @@
  • - +
    2022 New Year Message from President Sun Dongbai

    2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen (IASF)…

    @@ -121,20 +152,25 @@
  • - +
    2022 New Year Message from President Sun Dongbai

    2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen (IASF)…

    2022.08.12
  • -
    点击更换标题与描述
    +
    点击更换标题与描述
- - + + @@ -143,12 +179,12 @@ import mixins from '@/mixins/page' import Modules from '@/const/modules' export default { mixins: [mixins], - data() { + data () { return { modules: Modules.application } }, - mounted() { + mounted () { this.$store.commit('user/setCrumbs', [ { name: '站点管理', @@ -168,147 +204,149 @@ export default { ]) }, methods: { - + } }; \ No newline at end of file diff --git a/src/pages/column/page/contactUs.vue b/src/pages/column/page/contactUs.vue index fb63472..9238503 100644 --- a/src/pages/column/page/contactUs.vue +++ b/src/pages/column/page/contactUs.vue @@ -136,8 +136,8 @@ export default { } .block { padding: 2rem 0; - background: url(http://139.159.254.212/images/contactUs/3.png) 0 130px no-repeat, - url(http://139.159.254.212/images/contactUs/4.png) bottom right no-repeat; + background: url(https://huorantech.com/images/contactUs/3.png) 0 130px no-repeat, + url(https://huorantech.com/images/contactUs/4.png) bottom right no-repeat; background-color: #f7f8fa; } .inner { diff --git a/src/pages/column/page/deviceIntroBeam.vue b/src/pages/column/page/deviceIntroBeam.vue index 62c77e0..67802f7 100644 --- a/src/pages/column/page/deviceIntroBeam.vue +++ b/src/pages/column/page/deviceIntroBeam.vue @@ -69,7 +69,8 @@
-
{{ modules[4].form.title }}
+
@@ -123,10 +124,10 @@ export default { \ No newline at end of file diff --git a/src/pages/column/page/researchTeam.vue b/src/pages/column/page/researchTeam.vue index 205a862..2b13100 100644 --- a/src/pages/column/page/researchTeam.vue +++ b/src/pages/column/page/researchTeam.vue @@ -33,20 +33,20 @@
  • - 姓名 / 岗位
    - 专业 超低温总体
    - 荣誉 杰青 万人 @@ -143,7 +143,7 @@ export default { width: calc((100% - 10px) / 2); padding: 20px 30px; margin: 0 10px 10px 0; - background: url(http://139.159.254.212/images/researchTeam/2.png) 0 0 / cover no-repeat; + background: url(https://huorantech.com/images/researchTeam/2.png) 0 0 / cover no-repeat; &:nth-child(even) { margin-right: 0; } diff --git a/src/pages/column/page/sfel.vue b/src/pages/column/page/sfel.vue index ceeebdb..cc7a19c 100644 --- a/src/pages/column/page/sfel.vue +++ b/src/pages/column/page/sfel.vue @@ -45,7 +45,7 @@
    IASF is driven to serve the Science and industry, and solve grand challenges through research and innovation. We are open and creative
    @@ -56,7 +56,7 @@
    • 2022-09-09 | Research

      @@ -68,7 +68,7 @@
    • 2022-09-09 | Research

      @@ -80,7 +80,7 @@
    • 2022-09-09 | Research

      @@ -157,7 +157,7 @@
      • 喜讯!储存环三次谐波腔的带束实验验证及超导高频频腔
        @@ -166,7 +166,7 @@
      • 光明区总工会为一线科研人员送上新春祝福
        @@ -175,7 +175,7 @@
      • 深圳综合粒子设施研究院与中国科学院
        @@ -210,14 +210,14 @@
        关于2021年度深圳综合粒子设施研究院采购意向公开表
        • 专业技术培训 | 自由电子激光装置中的结构
          @@ -244,7 +244,7 @@
        • 专业技术培训 | 自由电子激光装置中的结构
          @@ -271,7 +271,7 @@
        • 专业技术培训 | 自由电子激光装置中的结构
          @@ -322,7 +322,7 @@ style="margin-right: 20px">
          关于2021年度深圳综合粒子设施研究院采购意向公开表
          @@ -330,7 +330,7 @@ data-wow-delay="0.5s">
          关于2021年度深圳综合粒子设施研究院采购意向公开表
        diff --git a/src/pages/column/page/sfelNew.vue b/src/pages/column/page/sfelNew.vue new file mode 100644 index 0000000..64ea3d5 --- /dev/null +++ b/src/pages/column/page/sfelNew.vue @@ -0,0 +1,876 @@ + + + + + \ No newline at end of file diff --git a/src/pages/column/page/speech.vue b/src/pages/column/page/speech.vue index 9489bd5..7746603 100644 --- a/src/pages/column/page/speech.vue +++ b/src/pages/column/page/speech.vue @@ -96,7 +96,7 @@ export default {