diff --git a/.env.development b/.env.development
index d1c8a3e7c..e6abb72d8 100644
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,7 @@ VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
-# VUE_APP_NODE_ENV=dev_sdtdt
-VUE_APP_NODE_ENV=dev
+VUE_APP_NODE_ENV=dev_sdtdt
+# VUE_APP_NODE_ENV=dev
#项目根路径
VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue
index 8f7f561d6..89323c172 100644
--- a/src/views/components/tinymce2/index.vue
+++ b/src/views/components/tinymce2/index.vue
@@ -93,7 +93,7 @@ export default {
toolbar:
// "formats undo redo paste print fontsizeselect fontselect template fullpage|wordcount ltr rtl visualchars visualblocks toc spellchecker searchreplace|save preview pagebreak nonbreaking|media image|outdent indent aligncenter alignleft alignright alignjustify lineheight underline quicklink h2 h3 blockquote numlist bullist table removeformat forecolor backcolor bold italic strikethrough hr charmap link insertdatetime|subscript superscript cut codesample code |anchor preview fullscreen|help",
"formats undo redo|fontsizeselect|fontselect|forecolor backcolor bold italic underline strikethrough removeformat|image media link|outdent indent|aligncenter alignleft alignright alignjustify lineheight quicklink h2 h3 blockquote numlist bullist table|subscript superscript codesample code|preview fullscreen|wordcount|help",
- content_style: "p {margin: 5px 0; font-size: 14px}",
+ content_style: "p {margin: 5px 0; font-size: 14px} img{max-width:100%;}",
fontsize_formats: "12px 14px 16px 18px 24px 36px 48px 56px 72px",
font_formats:
"微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;",
@@ -152,6 +152,21 @@ export default {
// tinymce.init; // 初始化
const revert_data = (content) => {
+ // content =
+ // '
';
+ // content = content.replace(/<(img).*?(>|\/>|<\/img>)/g, function (mats) {
+ // if (mats.indexOf("style") < 0) {
+ // return mats.replace(
+ // /<\s*img/,
+ // '