Merge branch '系统版本发布' of http://120.46.222.128:10021/elink-star/epmet-oper-pc into preview

epmet-oper-web/src/utils/loadTinymce.js

@@ -17,7 +17,8 @@ export default function loadTinymce(cb) {
         background: 'rgba(255, 255, 255, 0.5)'
     })
 
-    loadScript('https://lib.baomitu.com/tinymce/latest/tinymce.min.js', () => {
+    // loadScript('https://lib.baomitu.com/tinymce/latest/tinymce.min.js', () => {
+    loadScript('http://lib.baomitu.com/tinymce/4.9.2/tinymce.min.js', () => {
         loading.close()
         // eslint-disable-next-line no-undef
         tinymceObj = tinymce

epmet-oper-web/src/views/modules/dyform/formList.vue

@@ -137,7 +137,7 @@ export default {
             } else {
               this.$message({
                 type: 'error',
-                nessage: res.msg
+                message: res.msg
               })
             }