diff --git a/.env.development b/.env.development
index 2da64a7..e8c7b3c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://124.71.184.231:8891/nyzy
+VUE_APP_API_BASE_URL=http://127.0.0.1:8891/nyzy
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 5251881..eddad2c 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,5 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://124.71.184.231:8891/nyzy
+VUE_APP_API_BASE_URL=http://172.16.18.220:8891/nyzy
+VUE_APP_API_BASE_URL2=http://124.71.184.231:8891/nyzy
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/public/img/nyzy_yc.jpg b/public/img/nyzy_yc.jpg
new file mode 100644
index 0000000..0628cb5
Binary files /dev/null and b/public/img/nyzy_yc.jpg differ
diff --git a/src/components/jeecg/JEditor.vue b/src/components/jeecg/JEditor.vue
index 516f684..63ab6bb 100644
--- a/src/components/jeecg/JEditor.vue
+++ b/src/components/jeecg/JEditor.vue
@@ -15,7 +15,8 @@
   import Editor from '@tinymce/tinymce-vue'
   import 'tinymce/themes/silver/theme'
   import 'tinymce/plugins/image'
-  import 'tinymce/plugins/link'
+  //import 'tinymce/plugins/link'
+  import '@/components/jeecg/tinymce/plugins/link2'
   import 'tinymce/plugins/media'
   import 'tinymce/plugins/table'
   import 'tinymce/plugins/lists'
@@ -57,9 +58,9 @@
                     "styleselect formatselect fontselect fontsizeselect | table tabledelete tablecellprops tablemergecells| blockquote subscript superscript removeformat | ltr rtl " +
                     "tablesplitcells tableinsertrowbefore tableinsertrowafter tabledeleterow tablerowprops tablecutrow " + 
                     "tablecopyrow tablepasterowbefore tablepasterowafter tableinsertcolbefore tableinsertcolafter tabledeletecol | " + 
-                    "image media fullscreen",
+                    "image media fullscreen lineheight",
                     "insertdatetime charmap emoticons hr pagebreak template code pastetext print visualblocks visualchars " +
-                    "nonbreaking searchreplace preview kityformula-editor indent2em ",
+                    "nonbreaking searchreplace preview kityformula-editor indent2em   ",
         ],
         branding:false
       }
@@ -71,9 +72,12 @@
           language_url: '/tinymce/langs/zh_CN.js',
           language: 'zh_CN',
           skin_url: '/tinymce/skins/lightgray',
-          height: 300,
+          height: 500,
           plugins: this.plugins,
           toolbar: this.toolbar,
+          contextmenu: false,
+          //contextmenu_never_use_native: true,
+          lineheight_formats: '1 1.1 1.2 1.3 1.4 1.5 2 2.5 3 3.5',
           branding: false,
           menubar: false,
           toolbar_drawer: false,
@@ -163,5 +167,8 @@
   }
 
 </script>
-<style scoped>
+<style scoped lang="less">
+.tox-sidebar-wrap{
+  height: 1600px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/jeecg/tinymce/plugins/link2/index.js b/src/components/jeecg/tinymce/plugins/link2/index.js
new file mode 100644
index 0000000..ff52930
--- /dev/null
+++ b/src/components/jeecg/tinymce/plugins/link2/index.js
@@ -0,0 +1,7 @@
+// Exports the "link" plugin for usage with module loaders
+// Usage:
+//   CommonJS:
+//     require('tinymce/plugins/link')
+//   ES2015:
+//     import 'tinymce/plugins/link'
+require('./plugin.js');
\ No newline at end of file
diff --git a/src/components/jeecg/tinymce/plugins/link2/plugin.js b/src/components/jeecg/tinymce/plugins/link2/plugin.js
new file mode 100644
index 0000000..13958ef
--- /dev/null
+++ b/src/components/jeecg/tinymce/plugins/link2/plugin.js
@@ -0,0 +1,1293 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ *
+ * Version: 5.10.5 (2022-05-25)
+ */
+(function () {
+    'use strict';
+
+    var global$7 = tinymce.util.Tools.resolve('tinymce.PluginManager');
+
+    var global$6 = tinymce.util.Tools.resolve('tinymce.util.VK');
+
+    var typeOf = function (x) {
+      var t = typeof x;
+      if (x === null) {
+        return 'null';
+      } else if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) {
+        return 'array';
+      } else if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) {
+        return 'string';
+      } else {
+        return t;
+      }
+    };
+    var isType = function (type) {
+      return function (value) {
+        return typeOf(value) === type;
+      };
+    };
+    var isSimpleType = function (type) {
+      return function (value) {
+        return typeof value === type;
+      };
+    };
+    var eq = function (t) {
+      return function (a) {
+        return t === a;
+      };
+    };
+    var isString = isType('string');
+    var isArray = isType('array');
+    var isNull = eq(null);
+    var isBoolean = isSimpleType('boolean');
+    var isFunction = isSimpleType('function');
+
+    var noop = function () {
+    };
+    var constant = function (value) {
+      return function () {
+        return value;
+      };
+    };
+    var identity = function (x) {
+      return x;
+    };
+    var tripleEquals = function (a, b) {
+      return a === b;
+    };
+    var never = constant(false);
+    var always = constant(true);
+
+    var none = function () {
+      return NONE;
+    };
+    var NONE = function () {
+      var call = function (thunk) {
+        return thunk();
+      };
+      var id = identity;
+      var me = {
+        fold: function (n, _s) {
+          return n();
+        },
+        isSome: never,
+        isNone: always,
+        getOr: id,
+        getOrThunk: call,
+        getOrDie: function (msg) {
+          throw new Error(msg || 'error: getOrDie called on none.');
+        },
+        getOrNull: constant(null),
+        getOrUndefined: constant(undefined),
+        or: id,
+        orThunk: call,
+        map: none,
+        each: noop,
+        bind: none,
+        exists: never,
+        forall: always,
+        filter: function () {
+          return none();
+        },
+        toArray: function () {
+          return [];
+        },
+        toString: constant('none()')
+      };
+      return me;
+    }();
+    var some = function (a) {
+      var constant_a = constant(a);
+      var self = function () {
+        return me;
+      };
+      var bind = function (f) {
+        return f(a);
+      };
+      var me = {
+        fold: function (n, s) {
+          return s(a);
+        },
+        isSome: always,
+        isNone: never,
+        getOr: constant_a,
+        getOrThunk: constant_a,
+        getOrDie: constant_a,
+        getOrNull: constant_a,
+        getOrUndefined: constant_a,
+        or: self,
+        orThunk: self,
+        map: function (f) {
+          return some(f(a));
+        },
+        each: function (f) {
+          f(a);
+        },
+        bind: bind,
+        exists: bind,
+        forall: bind,
+        filter: function (f) {
+          return f(a) ? me : NONE;
+        },
+        toArray: function () {
+          return [a];
+        },
+        toString: function () {
+          return 'some(' + a + ')';
+        }
+      };
+      return me;
+    };
+    var from = function (value) {
+      return value === null || value === undefined ? NONE : some(value);
+    };
+    var Optional = {
+      some: some,
+      none: none,
+      from: from
+    };
+
+    var nativeIndexOf = Array.prototype.indexOf;
+    var nativePush = Array.prototype.push;
+    var rawIndexOf = function (ts, t) {
+      return nativeIndexOf.call(ts, t);
+    };
+    var contains = function (xs, x) {
+      return rawIndexOf(xs, x) > -1;
+    };
+    var map = function (xs, f) {
+      var len = xs.length;
+      var r = new Array(len);
+      for (var i = 0; i < len; i++) {
+        var x = xs[i];
+        r[i] = f(x, i);
+      }
+      return r;
+    };
+    var each$1 = function (xs, f) {
+      for (var i = 0, len = xs.length; i < len; i++) {
+        var x = xs[i];
+        f(x, i);
+      }
+    };
+    var foldl = function (xs, f, acc) {
+      each$1(xs, function (x, i) {
+        acc = f(acc, x, i);
+      });
+      return acc;
+    };
+    var flatten = function (xs) {
+      var r = [];
+      for (var i = 0, len = xs.length; i < len; ++i) {
+        if (!isArray(xs[i])) {
+          throw new Error('Arr.flatten item ' + i + ' was not an array, input: ' + xs);
+        }
+        nativePush.apply(r, xs[i]);
+      }
+      return r;
+    };
+    var bind = function (xs, f) {
+      return flatten(map(xs, f));
+    };
+    var findMap = function (arr, f) {
+      for (var i = 0; i < arr.length; i++) {
+        var r = f(arr[i], i);
+        if (r.isSome()) {
+          return r;
+        }
+      }
+      return Optional.none();
+    };
+
+    var is = function (lhs, rhs, comparator) {
+      if (comparator === void 0) {
+        comparator = tripleEquals;
+      }
+      return lhs.exists(function (left) {
+        return comparator(left, rhs);
+      });
+    };
+    var cat = function (arr) {
+      var r = [];
+      var push = function (x) {
+        r.push(x);
+      };
+      for (var i = 0; i < arr.length; i++) {
+        arr[i].each(push);
+      }
+      return r;
+    };
+    var someIf = function (b, a) {
+      return b ? Optional.some(a) : Optional.none();
+    };
+
+    var assumeExternalTargets = function (editor) {
+      var externalTargets = editor.getParam('link_assume_external_targets', false);
+      if (isBoolean(externalTargets) && externalTargets) {
+        return 1;
+      } else if (isString(externalTargets) && (externalTargets === 'http' || externalTargets === 'https')) {
+        return externalTargets;
+      }
+      return 0;
+    };
+    var hasContextToolbar = function (editor) {
+      return editor.getParam('link_context_toolbar', false, 'boolean');
+    };
+    var getLinkList = function (editor) {
+      return editor.getParam('link_list');
+    };
+    var getDefaultLinkTarget = function (editor) {
+      return editor.getParam('default_link_target');
+    };
+    var getTargetList = function (editor) {
+      return editor.getParam('target_list', true);
+    };
+    var getRelList = function (editor) {
+      return editor.getParam('rel_list', [], 'array');
+    };
+    var getLinkClassList = function (editor) {
+      return editor.getParam('link_class_list', [], 'array');
+    };
+    var shouldShowLinkTitle = function (editor) {
+      return editor.getParam('link_title', true, 'boolean');
+    };
+    var allowUnsafeLinkTarget = function (editor) {
+      return editor.getParam('allow_unsafe_link_target', false, 'boolean');
+    };
+    var useQuickLink = function (editor) {
+      return editor.getParam('link_quicklink', false, 'boolean');
+    };
+    var getDefaultLinkProtocol = function (editor) {
+      return editor.getParam('link_default_protocol', 'http', 'string');
+    };
+
+    var global$5 = tinymce.util.Tools.resolve('tinymce.util.Tools');
+
+    var getValue = function (item) {
+      return isString(item.value) ? item.value : '';
+    };
+    var getText = function (item) {
+      if (isString(item.text)) {
+        return item.text;
+      } else if (isString(item.title)) {
+        return item.title;
+      } else {
+        return '';
+      }
+    };
+    var sanitizeList = function (list, extractValue) {
+      var out = [];
+      global$5.each(list, function (item) {
+        var text = getText(item);
+        if (item.menu !== undefined) {
+          var items = sanitizeList(item.menu, extractValue);
+          out.push({
+            text: text,
+            items: items
+          });
+        } else {
+          var value = extractValue(item);
+          out.push({
+            text: text,
+            value: value
+          });
+        }
+      });
+      return out;
+    };
+    var sanitizeWith = function (extracter) {
+      if (extracter === void 0) {
+        extracter = getValue;
+      }
+      return function (list) {
+        return Optional.from(list).map(function (list) {
+          return sanitizeList(list, extracter);
+        });
+      };
+    };
+    var sanitize = function (list) {
+      return sanitizeWith(getValue)(list);
+    };
+    var createUi = function (name, label) {
+      return function (items) {
+        return {
+          name: name,
+          type: 'listbox',
+          label: label,
+          items: items
+        };
+      };
+    };
+    var ListOptions = {
+      sanitize: sanitize,
+      sanitizeWith: sanitizeWith,
+      createUi: createUi,
+      getValue: getValue
+    };
+
+    var __assign = function () {
+      __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p))
+              t[p] = s[p];
+        }
+        return t;
+      };
+      return __assign.apply(this, arguments);
+    };
+
+    var keys = Object.keys;
+    var hasOwnProperty = Object.hasOwnProperty;
+    var each = function (obj, f) {
+      var props = keys(obj);
+      for (var k = 0, len = props.length; k < len; k++) {
+        var i = props[k];
+        var x = obj[i];
+        f(x, i);
+      }
+    };
+    var objAcc = function (r) {
+      return function (x, i) {
+        r[i] = x;
+      };
+    };
+    var internalFilter = function (obj, pred, onTrue, onFalse) {
+      var r = {};
+      each(obj, function (x, i) {
+        (pred(x, i) ? onTrue : onFalse)(x, i);
+      });
+      return r;
+    };
+    var filter = function (obj, pred) {
+      var t = {};
+      internalFilter(obj, pred, objAcc(t), noop);
+      return t;
+    };
+    var has = function (obj, key) {
+      return hasOwnProperty.call(obj, key);
+    };
+    var hasNonNullableKey = function (obj, key) {
+      return has(obj, key) && obj[key] !== undefined && obj[key] !== null;
+    };
+
+    var global$4 = tinymce.util.Tools.resolve('tinymce.dom.TreeWalker');
+
+    var global$3 = tinymce.util.Tools.resolve('tinymce.util.URI');
+
+    var isAnchor = function (elm) {
+      return elm && elm.nodeName.toLowerCase() === 'a';
+    };
+    var isLink = function (elm) {
+      return isAnchor(elm) && !!getHref(elm);
+    };
+    var collectNodesInRange = function (rng, predicate) {
+      if (rng.collapsed) {
+        return [];
+      } else {
+        var contents = rng.cloneContents();
+        var walker = new global$4(contents.firstChild, contents);
+        var elements = [];
+        var current = contents.firstChild;
+        do {
+          if (predicate(current)) {
+            elements.push(current);
+          }
+        } while (current = walker.next());
+        return elements;
+      }
+    };
+    var hasProtocol = function (url) {
+      return /^\w+:/i.test(url);
+    };
+    var getHref = function (elm) {
+      var href = elm.getAttribute('data-mce-href');
+      return href ? href : elm.getAttribute('href');
+    };
+    var applyRelTargetRules = function (rel, isUnsafe) {
+      var rules = ['noopener'];
+      var rels = rel ? rel.split(/\s+/) : [];
+      var toString = function (rels) {
+        return global$5.trim(rels.sort().join(' '));
+      };
+      var addTargetRules = function (rels) {
+        rels = removeTargetRules(rels);
+        return rels.length > 0 ? rels.concat(rules) : rules;
+      };
+      var removeTargetRules = function (rels) {
+        return rels.filter(function (val) {
+          return global$5.inArray(rules, val) === -1;
+        });
+      };
+      var newRels = isUnsafe ? addTargetRules(rels) : removeTargetRules(rels);
+      return newRels.length > 0 ? toString(newRels) : '';
+    };
+    var trimCaretContainers = function (text) {
+      return text.replace(/\uFEFF/g, '');
+    };
+    var getAnchorElement = function (editor, selectedElm) {
+      selectedElm = selectedElm || editor.selection.getNode();
+      if (isImageFigure(selectedElm)) {
+        return editor.dom.select('a[href]', selectedElm)[0];
+      } else {
+        return editor.dom.getParent(selectedElm, 'a[href]');
+      }
+    };
+    var getAnchorText = function (selection, anchorElm) {
+      var text = anchorElm ? anchorElm.innerText || anchorElm.textContent : selection.getContent({ format: 'text' });
+      return trimCaretContainers(text);
+    };
+    var hasLinks = function (elements) {
+      return global$5.grep(elements, isLink).length > 0;
+    };
+    var hasLinksInSelection = function (rng) {
+      return collectNodesInRange(rng, isLink).length > 0;
+    };
+    var isOnlyTextSelected = function (editor) {
+      var inlineTextElements = editor.schema.getTextInlineElements();
+      var isElement = function (elm) {
+        return elm.nodeType === 1 && !isAnchor(elm) && !has(inlineTextElements, elm.nodeName.toLowerCase());
+      };
+      var elements = collectNodesInRange(editor.selection.getRng(), isElement);
+      return elements.length === 0;
+    };
+    var isImageFigure = function (elm) {
+      return elm && elm.nodeName === 'FIGURE' && /\bimage\b/i.test(elm.className);
+    };
+    var getLinkAttrs = function (data) {
+      var attrs = [
+        'title',
+        'rel',
+        'class',
+        'target'
+      ];
+      return foldl(attrs, function (acc, key) {
+        data[key].each(function (value) {
+          acc[key] = value.length > 0 ? value : null;
+        });
+        return acc;
+      }, { href: data.href });
+    };
+    var handleExternalTargets = function (href, assumeExternalTargets) {
+      if ((assumeExternalTargets === 'http' || assumeExternalTargets === 'https') && !hasProtocol(href)) {
+        return assumeExternalTargets + '://' + href;
+      }
+      return href;
+    };
+    var applyLinkOverrides = function (editor, linkAttrs) {
+      var newLinkAttrs = __assign({}, linkAttrs);
+      if (!(getRelList(editor).length > 0) && allowUnsafeLinkTarget(editor) === false) {
+        var newRel = applyRelTargetRules(newLinkAttrs.rel, newLinkAttrs.target === '_blank');
+        newLinkAttrs.rel = newRel ? newRel : null;
+      }
+      if (Optional.from(newLinkAttrs.target).isNone() && getTargetList(editor) === false) {
+        newLinkAttrs.target = getDefaultLinkTarget(editor);
+      }
+      newLinkAttrs.href = handleExternalTargets(newLinkAttrs.href, assumeExternalTargets(editor));
+      return newLinkAttrs;
+    };
+    var updateLink = function (editor, anchorElm, text, linkAttrs) {
+      text.each(function (text) {
+        if (has(anchorElm, 'innerText')) {
+          anchorElm.innerText = text;
+        } else {
+          anchorElm.textContent = text;
+        }
+      });
+      editor.dom.setAttribs(anchorElm, linkAttrs);
+      editor.selection.select(anchorElm);
+    };
+    var createLink = function (editor, selectedElm, text, linkAttrs) {
+      if (isImageFigure(selectedElm)) {
+        linkImageFigure(editor, selectedElm, linkAttrs);
+      } else {
+        text.fold(function () {
+          editor.execCommand('mceInsertLink', false, linkAttrs);
+        }, function (text) {
+          editor.insertContent(editor.dom.createHTML('a', linkAttrs, editor.dom.encode(text)));
+        });
+      }
+    };
+    var linkDomMutation = function (editor, attachState, data) {
+      var selectedElm = editor.selection.getNode();
+      var anchorElm = getAnchorElement(editor, selectedElm);
+      var linkAttrs = applyLinkOverrides(editor, getLinkAttrs(data));
+      editor.undoManager.transact(function () {
+        if (data.href === attachState.href) {
+          attachState.attach();
+        }
+        if (anchorElm) {
+          editor.focus();
+          updateLink(editor, anchorElm, data.text, linkAttrs);
+        } else {
+          createLink(editor, selectedElm, data.text, linkAttrs);
+        }
+      });
+    };
+    var unlinkSelection = function (editor) {
+      var dom = editor.dom, selection = editor.selection;
+      var bookmark = selection.getBookmark();
+      var rng = selection.getRng().cloneRange();
+      var startAnchorElm = dom.getParent(rng.startContainer, 'a[href]', editor.getBody());
+      var endAnchorElm = dom.getParent(rng.endContainer, 'a[href]', editor.getBody());
+      if (startAnchorElm) {
+        rng.setStartBefore(startAnchorElm);
+      }
+      if (endAnchorElm) {
+        rng.setEndAfter(endAnchorElm);
+      }
+      selection.setRng(rng);
+      editor.execCommand('unlink');
+      selection.moveToBookmark(bookmark);
+    };
+    var unlinkDomMutation = function (editor) {
+      editor.undoManager.transact(function () {
+        var node = editor.selection.getNode();
+        if (isImageFigure(node)) {
+          unlinkImageFigure(editor, node);
+        } else {
+          unlinkSelection(editor);
+        }
+        editor.focus();
+      });
+    };
+    var unwrapOptions = function (data) {
+      var cls = data.class, href = data.href, rel = data.rel, target = data.target, text = data.text, title = data.title;
+      return filter({
+        class: cls.getOrNull(),
+        href: href,
+        rel: rel.getOrNull(),
+        target: target.getOrNull(),
+        text: text.getOrNull(),
+        title: title.getOrNull()
+      }, function (v, _k) {
+        return isNull(v) === false;
+      });
+    };
+    var sanitizeData = function (editor, data) {
+      var href = data.href;
+      return __assign(__assign({}, data), { href: global$3.isDomSafe(href, 'a', editor.settings) ? href : '' });
+    };
+    var link = function (editor, attachState, data) {
+      var sanitizedData = sanitizeData(editor, data);
+      editor.hasPlugin('rtc', true) ? editor.execCommand('createlink', false, unwrapOptions(sanitizedData)) : linkDomMutation(editor, attachState, sanitizedData);
+    };
+    var unlink = function (editor) {
+      editor.hasPlugin('rtc', true) ? editor.execCommand('unlink') : unlinkDomMutation(editor);
+    };
+    var unlinkImageFigure = function (editor, fig) {
+      var img = editor.dom.select('img', fig)[0];
+      if (img) {
+        var a = editor.dom.getParents(img, 'a[href]', fig)[0];
+        if (a) {
+          a.parentNode.insertBefore(img, a);
+          editor.dom.remove(a);
+        }
+      }
+    };
+    var linkImageFigure = function (editor, fig, attrs) {
+      var img = editor.dom.select('img', fig)[0];
+      if (img) {
+        var a = editor.dom.create('a', attrs);
+        img.parentNode.insertBefore(a, img);
+        a.appendChild(img);
+      }
+    };
+
+    var isListGroup = function (item) {
+      return hasNonNullableKey(item, 'items');
+    };
+    var findTextByValue = function (value, catalog) {
+      return findMap(catalog, function (item) {
+        if (isListGroup(item)) {
+          return findTextByValue(value, item.items);
+        } else {
+          return someIf(item.value === value, item);
+        }
+      });
+    };
+    var getDelta = function (persistentText, fieldName, catalog, data) {
+      var value = data[fieldName];
+      var hasPersistentText = persistentText.length > 0;
+      return value !== undefined ? findTextByValue(value, catalog).map(function (i) {
+        return {
+          url: {
+            value: i.value,
+            meta: {
+              text: hasPersistentText ? persistentText : i.text,
+              attach: noop
+            }
+          },
+          text: hasPersistentText ? persistentText : i.text
+        };
+      }) : Optional.none();
+    };
+    var findCatalog = function (catalogs, fieldName) {
+      if (fieldName === 'link') {
+        return catalogs.link;
+      } else if (fieldName === 'anchor') {
+        return catalogs.anchor;
+      } else {
+        return Optional.none();
+      }
+    };
+    var init = function (initialData, linkCatalog) {
+      var persistentData = {
+        text: initialData.text,
+        title: initialData.title
+      };
+      var getTitleFromUrlChange = function (url) {
+        return someIf(persistentData.title.length <= 0, Optional.from(url.meta.title).getOr(''));
+      };
+      var getTextFromUrlChange = function (url) {
+        return someIf(persistentData.text.length <= 0, Optional.from(url.meta.text).getOr(url.value));
+      };
+      var onUrlChange = function (data) {
+        var text = getTextFromUrlChange(data.url);
+        var title = getTitleFromUrlChange(data.url);
+        if (text.isSome() || title.isSome()) {
+          return Optional.some(__assign(__assign({}, text.map(function (text) {
+            return { text: text };
+          }).getOr({})), title.map(function (title) {
+            return { title: title };
+          }).getOr({})));
+        } else {
+          return Optional.none();
+        }
+      };
+      var onCatalogChange = function (data, change) {
+        var catalog = findCatalog(linkCatalog, change.name).getOr([]);
+        return getDelta(persistentData.text, change.name, catalog, data);
+      };
+      var onChange = function (getData, change) {
+        var name = change.name;
+        if (name === 'url') {
+          return onUrlChange(getData());
+        } else if (contains([
+            'anchor',
+            'link'
+          ], name)) {
+          return onCatalogChange(getData(), change);
+        } else if (name === 'text' || name === 'title') {
+          persistentData[name] = getData()[name];
+          return Optional.none();
+        } else {
+          return Optional.none();
+        }
+      };
+      return { onChange: onChange };
+    };
+    var DialogChanges = {
+      init: init,
+      getDelta: getDelta
+    };
+
+    var global$2 = tinymce.util.Tools.resolve('tinymce.util.Delay');
+
+    var global$1 = tinymce.util.Tools.resolve('tinymce.util.Promise');
+
+    var delayedConfirm = function (editor, message, callback) {
+      var rng = editor.selection.getRng();
+      global$2.setEditorTimeout(editor, function () {
+        editor.windowManager.confirm(message, function (state) {
+          editor.selection.setRng(rng);
+          callback(state);
+        });
+      });
+    };
+    var tryEmailTransform = function (data) {
+      var url = data.href;
+      var suggestMailTo = url.indexOf('@') > 0 && url.indexOf('/') === -1 && url.indexOf('mailto:') === -1;
+      return suggestMailTo ? Optional.some({
+        message: 'The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?',
+        preprocess: function (oldData) {
+          return __assign(__assign({}, oldData), { href: 'mailto:' + url });
+        }
+      }) : Optional.none();
+    };
+    var tryProtocolTransform = function (assumeExternalTargets, defaultLinkProtocol) {
+      return function (data) {
+        var url = data.href;
+        var suggestProtocol = assumeExternalTargets === 1 && !hasProtocol(url) || assumeExternalTargets === 0 && /^\s*www(\.|\d\.)/i.test(url);
+        return suggestProtocol ? Optional.some({
+          message: 'The URL you entered seems to be an external link. Do you want to add the required ' + defaultLinkProtocol + ':// prefix?',
+          preprocess: function (oldData) {
+            return __assign(__assign({}, oldData), { href: defaultLinkProtocol + '://' + url });
+          }
+        }) : Optional.none();
+      };
+    };
+    var preprocess = function (editor, data) {
+      return findMap([
+        tryEmailTransform,
+        tryProtocolTransform(assumeExternalTargets(editor), getDefaultLinkProtocol(editor))
+      ], function (f) {
+        return f(data);
+      }).fold(function () {
+        return global$1.resolve(data);
+      }, function (transform) {
+        return new global$1(function (callback) {
+          delayedConfirm(editor, transform.message, function (state) {
+            callback(state ? transform.preprocess(data) : data);
+          });
+        });
+      });
+    };
+    var DialogConfirms = { preprocess: preprocess };
+
+    var getAnchors = function (editor) {
+      var anchorNodes = editor.dom.select('a:not([href])');
+      var anchors = bind(anchorNodes, function (anchor) {
+        var id = anchor.name || anchor.id;
+        return id ? [{
+            text: id,
+            value: '#' + id
+          }] : [];
+      });
+      return anchors.length > 0 ? Optional.some([{
+          text: 'None',
+          value: ''
+        }].concat(anchors)) : Optional.none();
+    };
+    var AnchorListOptions = { getAnchors: getAnchors };
+
+    var getClasses = function (editor) {
+      var list = getLinkClassList(editor);
+      if (list.length > 0) {
+        return ListOptions.sanitize(list);
+      }
+      return Optional.none();
+    };
+    var ClassListOptions = { getClasses: getClasses };
+
+    var global = tinymce.util.Tools.resolve('tinymce.util.XHR');
+
+    var parseJson = function (text) {
+      try {
+        return Optional.some(JSON.parse(text));
+      } catch (err) {
+        return Optional.none();
+      }
+    };
+    var getLinks = function (editor) {
+      var extractor = function (item) {
+        return editor.convertURL(item.value || item.url, 'href');
+      };
+      var linkList = getLinkList(editor);
+      return new global$1(function (callback) {
+        if (isString(linkList)) {
+          global.send({
+            url: linkList,
+            success: function (text) {
+              return callback(parseJson(text));
+            },
+            error: function (_) {
+              return callback(Optional.none());
+            }
+          });
+        } else if (isFunction(linkList)) {
+          linkList(function (output) {
+            return callback(Optional.some(output));
+          });
+        } else {
+          callback(Optional.from(linkList));
+        }
+      }).then(function (optItems) {
+        return optItems.bind(ListOptions.sanitizeWith(extractor)).map(function (items) {
+          if (items.length > 0) {
+            var noneItem = [{
+                text: 'None',
+                value: ''
+              }];
+            return noneItem.concat(items);
+          } else {
+            return items;
+          }
+        });
+      });
+    };
+    var LinkListOptions = { getLinks: getLinks };
+
+    var getRels = function (editor, initialTarget) {
+      var list = getRelList(editor);
+      if (list.length > 0) {
+        var isTargetBlank_1 = is(initialTarget, '_blank');
+        var enforceSafe = allowUnsafeLinkTarget(editor) === false;
+        var safeRelExtractor = function (item) {
+          return applyRelTargetRules(ListOptions.getValue(item), isTargetBlank_1);
+        };
+        var sanitizer = enforceSafe ? ListOptions.sanitizeWith(safeRelExtractor) : ListOptions.sanitize;
+        return sanitizer(list);
+      }
+      return Optional.none();
+    };
+    var RelOptions = { getRels: getRels };
+
+    var fallbacks = [
+      {
+        text: 'Current window',
+        value: ''
+      },
+      {
+        text: 'New window',
+        value: '_blank'
+      }
+    ];
+    var getTargets = function (editor) {
+      var list = getTargetList(editor);
+      if (isArray(list)) {
+        return ListOptions.sanitize(list).orThunk(function () {
+          return Optional.some(fallbacks);
+        });
+      } else if (list === false) {
+        return Optional.none();
+      }
+      return Optional.some(fallbacks);
+    };
+    var TargetOptions = { getTargets: getTargets };
+
+    var nonEmptyAttr = function (dom, elem, name) {
+      var val = dom.getAttrib(elem, name);
+      return val !== null && val.length > 0 ? Optional.some(val) : Optional.none();
+    };
+    var extractFromAnchor = function (editor, anchor) {
+      var dom = editor.dom;
+      var onlyText = isOnlyTextSelected(editor);
+      var text = onlyText ? Optional.some(getAnchorText(editor.selection, anchor)) : Optional.none();
+      var url = anchor ? Optional.some(dom.getAttrib(anchor, 'href')) : Optional.none();
+      var target = anchor ? Optional.from(dom.getAttrib(anchor, 'target')) : Optional.none();
+      var rel = nonEmptyAttr(dom, anchor, 'rel');
+      var linkClass = nonEmptyAttr(dom, anchor, 'class');
+      var title = nonEmptyAttr(dom, anchor, 'title');
+      return {
+        url: url,
+        text: text,
+        title: title,
+        target: target,
+        rel: rel,
+        linkClass: linkClass
+      };
+    };
+    var collect = function (editor, linkNode) {
+      return LinkListOptions.getLinks(editor).then(function (links) {
+        var anchor = extractFromAnchor(editor, linkNode);
+        return {
+          anchor: anchor,
+          catalogs: {
+            targets: TargetOptions.getTargets(editor),
+            rels: RelOptions.getRels(editor, anchor.target),
+            classes: ClassListOptions.getClasses(editor),
+            anchor: AnchorListOptions.getAnchors(editor),
+            link: links
+          },
+          optNode: Optional.from(linkNode),
+          flags: { titleEnabled: shouldShowLinkTitle(editor) }
+        };
+      });
+    };
+    var DialogInfo = { collect: collect };
+
+    var handleSubmit = function (editor, info) {
+      return function (api) {
+        var data = api.getData();
+        if (!data.url.value) {
+          unlink(editor);
+          api.close();
+          return;
+        }
+        var getChangedValue = function (key) {
+          return Optional.from(data[key]).filter(function (value) {
+            return !is(info.anchor[key], value);
+          });
+        };
+        var changedData = {
+          href: data.url.value,
+          text: getChangedValue('text'),
+          target: getChangedValue('target'),
+          rel: getChangedValue('rel'),
+          class: getChangedValue('linkClass'),
+          title: getChangedValue('title')
+        };
+        var attachState = {
+          href: data.url.value,
+          attach: data.url.meta !== undefined && data.url.meta.attach ? data.url.meta.attach : noop
+        };
+        DialogConfirms.preprocess(editor, changedData).then(function (pData) {
+          link(editor, attachState, pData);
+        });
+        api.close();
+      };
+    };
+    var collectData = function (editor) {
+      var anchorNode = getAnchorElement(editor);
+      return DialogInfo.collect(editor, anchorNode);
+    };
+    var getInitialData = function (info, defaultTarget) {
+      var anchor = info.anchor;
+      var url = anchor.url.getOr('');
+      return {
+        url: {
+          value: url,
+          meta: { original: { value: url } }
+        },
+        text: anchor.text.getOr(''),
+        title: anchor.title.getOr(''),
+        anchor: url,
+        link: url,
+        rel: anchor.rel.getOr(''),
+        target: anchor.target.or(defaultTarget).getOr(''),
+        linkClass: anchor.linkClass.getOr('')
+      };
+    };
+    var makeDialog = function (settings, onSubmit, editor) {
+      var urlInput = [{
+          name: 'url',
+          type: 'urlinput',
+          filetype: 'file',
+          label: 'URL'
+        }];
+      var displayText = settings.anchor.text.map(function () {
+        return {
+          name: 'text',
+          type: 'input',
+          label: 'Text to display'
+        };
+      }).toArray();
+      var titleText = settings.flags.titleEnabled ? [{
+          name: 'title',
+          type: 'input',
+          label: 'Title'
+        }] : [];
+      var defaultTarget = Optional.from(getDefaultLinkTarget(editor));
+      var initialData = getInitialData(settings, defaultTarget);
+      var catalogs = settings.catalogs;
+      var dialogDelta = DialogChanges.init(initialData, catalogs);
+      var body = {
+        type: 'panel',
+        items: flatten([
+          urlInput,
+          displayText,
+          titleText,
+          cat([
+            catalogs.anchor.map(ListOptions.createUi('anchor', 'Anchors')),
+            catalogs.rels.map(ListOptions.createUi('rel', 'Rel')),
+            catalogs.targets.map(ListOptions.createUi('target', 'Open link in...')),
+            catalogs.link.map(ListOptions.createUi('link', 'Link list')),
+            catalogs.classes.map(ListOptions.createUi('linkClass', 'Class'))
+          ])
+        ])
+      };
+      return {
+        title: 'Insert/Edit Link',
+        size: 'normal',
+        body: body,
+        buttons: [
+          {
+            type: 'cancel',
+            name: 'cancel',
+            text: 'Cancel'
+          },
+          {
+            type: 'submit',
+            name: 'save',
+            text: 'Save',
+            primary: true
+          }
+        ],
+        initialData: initialData,
+        onChange: function (api, _a) {
+          var name = _a.name;
+          dialogDelta.onChange(api.getData, { name: name }).each(function (newData) {
+            api.setData(newData);
+          });
+        },
+        onSubmit: onSubmit
+      };
+    };
+    var open$1 = function (editor) {
+      var data = collectData(editor);
+      data.then(function (info) {
+        var onSubmit = handleSubmit(editor, info);
+        return makeDialog(info, onSubmit, editor);
+      }).then(function (spec) {
+        editor.windowManager.open(spec);
+      });
+    };
+
+    var appendClickRemove = function (link, evt) {
+      document.body.appendChild(link);
+      link.dispatchEvent(evt);
+      document.body.removeChild(link);
+    };
+    var open = function (url) {
+      var link = document.createElement('a');
+      link.target = '_blank';
+      link.href = url;
+      link.rel = 'noreferrer noopener';
+      var evt = document.createEvent('MouseEvents');
+      evt.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+      appendClickRemove(link, evt);
+    };
+
+    var getLink = function (editor, elm) {
+      return editor.dom.getParent(elm, 'a[href]');
+    };
+    var getSelectedLink = function (editor) {
+      return getLink(editor, editor.selection.getStart());
+    };
+    var hasOnlyAltModifier = function (e) {
+      return e.altKey === true && e.shiftKey === false && e.ctrlKey === false && e.metaKey === false;
+    };
+    var gotoLink = function (editor, a) {
+      if (a) {
+        var href = getHref(a);
+        if (/^#/.test(href)) {
+          var targetEl = editor.$(href);
+          if (targetEl.length) {
+            editor.selection.scrollIntoView(targetEl[0], true);
+          }
+        } else {
+          open(a.href);
+        }
+      }
+    };
+    var openDialog = function (editor) {
+      return function () {
+        open$1(editor);
+      };
+    };
+    var gotoSelectedLink = function (editor) {
+      return function () {
+        gotoLink(editor, getSelectedLink(editor));
+      };
+    };
+    var setupGotoLinks = function (editor) {
+      editor.on('click', function (e) {
+        var link = getLink(editor, e.target);
+        if (link && global$6.metaKeyPressed(e)) {
+          e.preventDefault();
+          gotoLink(editor, link);
+        }
+      });
+      editor.on('keydown', function (e) {
+        var link = getSelectedLink(editor);
+        if (link && e.keyCode === 13 && hasOnlyAltModifier(e)) {
+          e.preventDefault();
+          gotoLink(editor, link);
+        }
+      });
+    };
+    var toggleState = function (editor, toggler) {
+      editor.on('NodeChange', toggler);
+      return function () {
+        return editor.off('NodeChange', toggler);
+      };
+    };
+    var toggleActiveState = function (editor) {
+      return function (api) {
+        var updateState = function () {
+          return api.setActive(!editor.mode.isReadOnly() && getAnchorElement(editor, editor.selection.getNode()) !== null);
+        };
+        updateState();
+        return toggleState(editor, updateState);
+      };
+    };
+    var toggleEnabledState = function (editor) {
+      return function (api) {
+        var updateState = function () {
+          return api.setDisabled(getAnchorElement(editor, editor.selection.getNode()) === null);
+        };
+        updateState();
+        return toggleState(editor, updateState);
+      };
+    };
+    var toggleUnlinkState = function (editor) {
+      return function (api) {
+        var hasLinks$1 = function (parents) {
+          return hasLinks(parents) || hasLinksInSelection(editor.selection.getRng());
+        };
+        var parents = editor.dom.getParents(editor.selection.getStart());
+        api.setDisabled(!hasLinks$1(parents));
+        return toggleState(editor, function (e) {
+          return api.setDisabled(!hasLinks$1(e.parents));
+        });
+      };
+    };
+
+    var register = function (editor) {
+      editor.addCommand('mceLink', function () {
+        if (useQuickLink(editor)) {
+          editor.fire('contexttoolbar-show', { toolbarKey: 'quicklink' });
+        } else {
+          openDialog(editor)();
+        }
+      });
+    };
+
+    var setup = function (editor) {
+      editor.addShortcut('Meta+K', '', function () {
+        editor.execCommand('mceLink');
+      });
+    };
+
+    var setupButtons = function (editor) {
+      editor.ui.registry.addToggleButton('link', {
+        icon: 'link',
+        tooltip: 'Insert/edit link',
+        onAction: openDialog(editor),
+        onSetup: toggleActiveState(editor)
+      });
+      editor.ui.registry.addButton('openlink', {
+        icon: 'new-tab',
+        tooltip: 'Open link',
+        onAction: gotoSelectedLink(editor),
+        onSetup: toggleEnabledState(editor)
+      });
+      editor.ui.registry.addButton('unlink', {
+        icon: 'unlink',
+        tooltip: 'Remove link',
+        onAction: function () {
+          return unlink(editor);
+        },
+        onSetup: toggleUnlinkState(editor)
+      });
+    };
+    var setupMenuItems = function (editor) {
+      editor.ui.registry.addMenuItem('openlink', {
+        text: 'Open link',
+        icon: 'new-tab',
+        onAction: gotoSelectedLink(editor),
+        onSetup: toggleEnabledState(editor)
+      });
+      editor.ui.registry.addMenuItem('link', {
+        icon: 'link',
+        text: 'Link...',
+        shortcut: 'Meta+K',
+        onAction: openDialog(editor)
+      });
+      editor.ui.registry.addMenuItem('unlink', {
+        icon: 'unlink',
+        text: 'Remove link',
+        onAction: function () {
+          return unlink(editor);
+        },
+        onSetup: toggleUnlinkState(editor)
+      });
+    };
+    var setupContextMenu = function (editor) {
+      var inLink = 'link unlink openlink';
+      var noLink = 'link';
+      editor.ui.registry.addContextMenu('link', {
+        update: function (element) {
+          return hasLinks(editor.dom.getParents(element, 'a')) ? inLink : noLink;
+        }
+      });
+    };
+    var setupContextToolbars = function (editor) {
+      var collapseSelectionToEnd = function (editor) {
+        editor.selection.collapse(false);
+      };
+      var onSetupLink = function (buttonApi) {
+        var node = editor.selection.getNode();
+        buttonApi.setDisabled(!getAnchorElement(editor, node));
+        return noop;
+      };
+      var getLinkText = function (value) {
+        var anchor = getAnchorElement(editor);
+        var onlyText = isOnlyTextSelected(editor);
+        if (!anchor && onlyText) {
+          var text = getAnchorText(editor.selection, anchor);
+          return Optional.some(text.length > 0 ? text : value);
+        } else {
+          return Optional.none();
+        }
+      };
+      editor.ui.registry.addContextForm('quicklink', {
+        launch: {
+          type: 'contextformtogglebutton',
+          icon: 'link',
+          tooltip: 'Link',
+          onSetup: toggleActiveState(editor)
+        },
+        label: 'Link',
+        predicate: function (node) {
+          return !!getAnchorElement(editor, node) && hasContextToolbar(editor);
+        },
+        initValue: function () {
+          var elm = getAnchorElement(editor);
+          return !!elm ? getHref(elm) : '';
+        },
+        commands: [
+          {
+            type: 'contextformtogglebutton',
+            icon: 'link',
+            tooltip: 'Link',
+            primary: true,
+            onSetup: function (buttonApi) {
+              var node = editor.selection.getNode();
+              buttonApi.setActive(!!getAnchorElement(editor, node));
+              return toggleActiveState(editor)(buttonApi);
+            },
+            onAction: function (formApi) {
+              var value = formApi.getValue();
+              var text = getLinkText(value);
+              var attachState = {
+                href: value,
+                attach: noop
+              };
+              link(editor, attachState, {
+                href: value,
+                text: text,
+                title: Optional.none(),
+                rel: Optional.none(),
+                target: Optional.none(),
+                class: Optional.none()
+              });
+              collapseSelectionToEnd(editor);
+              formApi.hide();
+            }
+          },
+          {
+            type: 'contextformbutton',
+            icon: 'unlink',
+            tooltip: 'Remove link',
+            onSetup: onSetupLink,
+            onAction: function (formApi) {
+              unlink(editor);
+              formApi.hide();
+            }
+          },
+          {
+            type: 'contextformbutton',
+            icon: 'new-tab',
+            tooltip: 'Open link',
+            onSetup: onSetupLink,
+            onAction: function (formApi) {
+              gotoSelectedLink(editor)();
+              formApi.hide();
+            }
+          }
+        ]
+      });
+    };
+
+    function Plugin () {
+      global$7.add('link', function (editor) {
+        setupButtons(editor);
+        setupMenuItems(editor);
+        setupContextMenu(editor);
+        setupContextToolbars(editor);
+        setupGotoLinks(editor);
+        register(editor);
+        setup(editor);
+      });
+    }
+
+    Plugin();
+
+}());
diff --git a/src/components/jeecg/tinymce/plugins/link2/plugin.min.js b/src/components/jeecg/tinymce/plugins/link2/plugin.min.js
new file mode 100644
index 0000000..fc9019b
--- /dev/null
+++ b/src/components/jeecg/tinymce/plugins/link2/plugin.min.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ *
+ * Version: 5.10.5 (2022-05-25)
+ */
+!function(){"use strict";function t(r){return function(t){return e=typeof(n=t),(null===n?"null":"object"==e&&(Array.prototype.isPrototypeOf(n)||n.constructor&&"Array"===n.constructor.name)?"array":"object"==e&&(String.prototype.isPrototypeOf(n)||n.constructor&&"String"===n.constructor.name)?"string":e)===r;var n,e}}function n(n){return function(t){return typeof t===n}}function h(){}function i(t){return function(){return t}}function e(t){return t}function r(t,n){return t===n}function o(){return v}var u,a=tinymce.util.Tools.resolve("tinymce.PluginManager"),c=tinymce.util.Tools.resolve("tinymce.util.VK"),l=t("string"),d=t("array"),p=function(t){return u===t},f=n("boolean"),s=n("function"),m=i(!1),g=i(!(u=null)),v={fold:function(t,n){return t()},isSome:m,isNone:g,getOr:e,getOrThunk:y,getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:i(null),getOrUndefined:i(void 0),or:e,orThunk:y,map:o,each:h,bind:o,exists:m,forall:g,filter:function(){return v},toArray:function(){return[]},toString:i("none()")};function y(t){return t()}function k(t,o,i){return function(t){for(var n,e=0,r=t.length;e<r;e++)n=t[e],i=o(i,n,e)}(t),i}function x(t){for(var n=[],e=0,r=t.length;e<r;++e){if(!d(t[e]))throw new Error("Arr.flatten item "+e+" was not an array, input: "+t);at.apply(n,t[e])}return n}function b(t,n){for(var e=0;e<t.length;e++){var r=n(t[e],e);if(r.isSome())return r}return it.none()}function O(t,n,e){return void 0===e&&(e=r),t.exists(function(t){return e(t,n)})}function w(t,n){return t?it.some(n):it.none()}function C(t){var n=t.getParam("link_assume_external_targets",!1);return f(n)&&n?1:!l(n)||"http"!==n&&"https"!==n?0:n}function N(t){return t.getParam("default_link_target")}function A(t){return t.getParam("target_list",!0)}function T(t){return t.getParam("rel_list",[],"array")}function P(t){return t.getParam("allow_unsafe_link_target",!1,"boolean")}function S(t){return l(t.value)?t.value:""}function _(n){return void 0===n&&(n=S),function(t){return it.from(t).map(function(t){return ct(t,n)})}}function R(t,i,u,a){return function(t){for(var n=mt(t),e=0,r=n.length;e<r;e++){var o=n[e];!function(t,n){(i(t,n)?u:a)(t,n)}(t[o],o)}}(t),1}function D(t,n){return gt.call(t,n)}function L(t){return t&&"a"===t.nodeName.toLowerCase()}function E(t){return L(t)&&!!pt(t)}function M(t,n){if(t.collapsed)return[];for(var e=t.cloneContents(),r=new dt(e.firstChild,e),o=[],i=e.firstChild;n(i)&&o.push(i),i=r.next(););return o}function U(t){return/^\w+:/i.test(t)}function B(t,n){function e(t){return t.filter(function(t){return-1===lt.inArray(o,t)})}var r,o=["noopener"],i=t?t.split(/\s+/):[],u=n?0<(r=e(r=i)).length?r.concat(o):o:e(i);return 0<u.length?lt.trim(u.sort().join(" ")):""}function I(t,n){return n=n||t.selection.getNode(),vt(n)?t.dom.select("a[href]",n)[0]:t.dom.getParent(n,"a[href]")}function K(t,n){return(n?n.innerText||n.textContent:t.getContent({format:"text"})).replace(/\uFEFF/g,"")}function z(t){return 0<lt.grep(t,E).length}function j(t){var n=t.schema.getTextInlineElements();return 0===M(t.selection.getRng(),function(t){return 1===t.nodeType&&!L(t)&&!D(n,t.nodeName.toLowerCase())}).length}function V(l,c,f){var t,n,e,r,o,i,u,s=l.selection.getNode(),m=I(l,s),g=(n=l,e=k(["title","rel","class","target"],function(n,e){return t[e].each(function(t){n[e]=0<t.length?t:null}),n},{href:(t=f).href}),u=st({},e),0<T(n).length||!1!==P(n)||(r=B(u.rel,"_blank"===u.target),u.rel=r||null),it.from(u.target).isNone()&&!1===A(n)&&(u.target=N(n)),u.href=(o=u.href,"http"!==(i=C(n))&&"https"!==i||U(o)?o:i+"://"+o),u);l.undoManager.transact(function(){var n,t,e,r,o,i,u,a;f.href===c.href&&c.attach(),m?(l.focus(),o=l,i=m,u=f.text,a=g,u.each(function(t){D(i,"innerText")?i.innerText=t:i.textContent=t}),o.dom.setAttribs(i,a),o.selection.select(i)):(n=l,e=f.text,r=g,vt(t=s)?kt(n,t,r):e.fold(function(){n.execCommand("mceInsertLink",!1,r)},function(t){n.insertContent(n.dom.createHTML("a",r,n.dom.encode(t)))}))})}function q(t,n,e){var r,o,i,u,a,l,c,f,s,m,g=(r=t,o=e.href,st(st({},e),{href:ht.isDomSafe(o,"a",r.settings)?o:""}));t.hasPlugin("rtc",!0)?t.execCommand("createlink",!1,(a=g.class,l=g.href,c=g.rel,f=g.target,s=g.text,m=g.title,R({class:a.getOrNull(),href:l,rel:c.getOrNull(),target:f.getOrNull(),text:s.getOrNull(),title:m.getOrNull()},function(t,n){return!1===p(t)},(i=u={},function(t,n){i[n]=t}),h),u)):V(t,n,g)}function F(t){var l;t.hasPlugin("rtc",!0)?t.execCommand("unlink"):(l=t).undoManager.transact(function(){var t,n,e,r,o,i,u,a=l.selection.getNode();vt(a)?yt(l,a):(n=(t=l).dom,r=(e=t.selection).getBookmark(),o=e.getRng().cloneRange(),i=n.getParent(o.startContainer,"a[href]",t.getBody()),u=n.getParent(o.endContainer,"a[href]",t.getBody()),i&&o.setStartBefore(i),u&&o.setEndAfter(u),e.setRng(o),t.execCommand("unlink"),e.moveToBookmark(r)),l.focus()})}function W(t){var n=t.href;return 0<n.indexOf("@")&&-1===n.indexOf("/")&&-1===n.indexOf("mailto:")?it.some({message:"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",preprocess:function(t){return st(st({},t),{href:"mailto:"+n})}}):it.none()}function H(t,n,e){var r=t.getAttrib(n,e);return null!==r&&0<r.length?it.some(r):it.none()}function G(d){var t,n=I(t=d);Tt(t,n).then(function(t){var n,e,i,u,r=function(t){var e=t.getData();if(!e.url.value)return F(i),void t.close();function n(n){return it.from(e[n]).filter(function(t){return!O(u.anchor[n],t)})}var r={href:e.url.value,text:n("text"),target:n("target"),rel:n("rel"),class:n("linkClass"),title:n("title")},o={href:e.url.value,attach:void 0!==e.url.meta&&e.url.meta.attach?e.url.meta.attach:h};Ct(i,r).then(function(t){q(i,o,t)}),t.close()},o=i=d,a=(n=u=t).anchor.text.map(function(){return{name:"text",type:"input",label:"Text to display"}}).toArray(),l=n.flags.titleEnabled?[{name:"title",type:"input",label:"Title"}]:[],c=it.from(N(o)),f=n.anchor,s={url:{value:e=f.url.getOr(""),meta:{original:{value:e}}},text:f.text.getOr(""),title:f.title.getOr(""),anchor:e,link:e,rel:f.rel.getOr(""),target:f.target.or(c).getOr(""),linkClass:f.linkClass.getOr("")},m=n.catalogs,g=bt(s,m);return{title:"Insert/Edit Link",size:"normal",body:{type:"panel",items:x([[{name:"url",type:"urlinput",filetype:"file",label:"URL"}],a,l,function(t){for(var n=[],e=function(t){n.push(t)},r=0;r<t.length;r++)t[r].each(e);return n}([m.anchor.map(ft.createUi("anchor","Anchors")),m.rels.map(ft.createUi("rel","Rel")),m.targets.map(ft.createUi("target","Open link in...")),m.link.map(ft.createUi("link","Link list")),m.classes.map(ft.createUi("linkClass","Class"))])])},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:s,onChange:function(n,t){var e=t.name;g.onChange(n.getData,{name:e}).each(function(t){n.setData(t)})},onSubmit:r}}).then(function(t){d.windowManager.open(t)})}function J(t,n){return t.dom.getParent(n,"a[href]")}function X(t){return J(t,t.selection.getStart())}function $(t,n){var e,r;n&&(e=pt(n),/^#/.test(e)?(r=t.$(e)).length&&t.selection.scrollIntoView(r[0],!0):function(t){var n=document.createElement("a");n.target="_blank",n.href=t,n.rel="noreferrer noopener";var e,r,o=document.createEvent("MouseEvents");o.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),e=n,r=o,document.body.appendChild(e),e.dispatchEvent(r),document.body.removeChild(e)}(n.href))}function Q(t){return function(){G(t)}}function Y(t){return function(){$(t,X(t))}}function Z(t,n){return t.on("NodeChange",n),function(){return t.off("NodeChange",n)}}function tt(e){return function(t){function n(){return t.setActive(!e.mode.isReadOnly()&&null!==I(e,e.selection.getNode()))}return n(),Z(e,n)}}function nt(e){return function(t){function n(){return t.setDisabled(null===I(e,e.selection.getNode()))}return n(),Z(e,n)}}function et(r){return function(n){function e(t){return z(t)||0<M(r.selection.getRng(),E).length}var t=r.dom.getParents(r.selection.getStart());return n.setDisabled(!e(t)),Z(r,function(t){return n.setDisabled(!e(t.parents))})}}function rt(t){var n=x(function(t,n){for(var e=t.length,r=new Array(e),o=0;o<e;o++){var i=t[o];r[o]=n(i,o)}return r}(t.dom.select("a:not([href])"),function(t){var n=t.name||t.id;return n?[{text:n,value:"#"+n}]:[]}));return 0<n.length?it.some([{text:"None",value:""}].concat(n)):it.none()}var ot=function(e){function t(){return o}function n(t){return t(e)}var r=i(e),o={fold:function(t,n){return n(e)},isSome:g,isNone:m,getOr:r,getOrThunk:r,getOrDie:r,getOrNull:r,getOrUndefined:r,or:t,orThunk:t,map:function(t){return ot(t(e))},each:function(t){t(e)},bind:n,exists:n,forall:n,filter:function(t){return t(e)?o:v},toArray:function(){return[e]},toString:function(){return"some("+e+")"}};return o},it={some:ot,none:o,from:function(t){return null==t?v:ot(t)}},ut=Array.prototype.indexOf,at=Array.prototype.push,lt=tinymce.util.Tools.resolve("tinymce.util.Tools"),ct=function(t,i){var u=[];return lt.each(t,function(t){var n,e,r,o=l((n=t).text)?n.text:l(n.title)?n.title:"";void 0!==t.menu?(e=ct(t.menu,i),u.push({text:o,items:e})):(r=i(t),u.push({text:o,value:r}))}),u},ft={sanitize:function(t){return _(S)(t)},sanitizeWith:_,createUi:function(n,e){return function(t){return{name:n,type:"listbox",label:e,items:t}}},getValue:S},st=function(){return(st=Object.assign||function(t){for(var n,e=1,r=arguments.length;e<r;e++)for(var o in n=arguments[e])Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=n[o]);return t}).apply(this,arguments)},mt=Object.keys,gt=Object.hasOwnProperty,dt=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),ht=tinymce.util.Tools.resolve("tinymce.util.URI"),pt=function(t){return t.getAttribute("data-mce-href")||t.getAttribute("href")},vt=function(t){return t&&"FIGURE"===t.nodeName&&/\bimage\b/i.test(t.className)},yt=function(t,n){var e,r=t.dom.select("img",n)[0];!r||(e=t.dom.getParents(r,"a[href]",n)[0])&&(e.parentNode.insertBefore(r,e),t.dom.remove(e))},kt=function(t,n,e){var r,o=t.dom.select("img",n)[0];o&&(r=t.dom.create("a",e),o.parentNode.insertBefore(r,o),r.appendChild(o))},xt=function(e,t){return b(t,function(t){return D(n=t,"items")&&void 0!==n.items&&null!==n.items?xt(e,t.items):w(t.value===e,t);var n})},bt=function(t,c){function f(t,n){var e,r,o,i,u,a,l=("link"===(e=n.name)?c.link:"anchor"===e?c.anchor:it.none()).getOr([]);return r=s.text,o=n.name,i=l,u=t[o],a=0<r.length,void 0!==u?xt(u,i).map(function(t){return{url:{value:t.value,meta:{text:a?r:t.text,attach:h}},text:a?r:t.text}}):it.none()}var s={text:t.text,title:t.title};return{onChange:function(t,n){var e,r,o,i,u,a,l=n.name;return"url"===l?(r=t(),o=r.url,u=w(s.text.length<=0,it.from(o.meta.text).getOr(o.value)),i=r.url,a=w(s.title.length<=0,it.from(i.meta.title).getOr("")),u.isSome()||a.isSome()?it.some(st(st({},u.map(function(t){return{text:t}}).getOr({})),a.map(function(t){return{title:t}}).getOr({}))):it.none()):(e=["anchor","link"],-1<ut.call(e,l)?f(t(),n):("text"!==l&&"title"!==l||(s[l]=t()[l]),it.none()))}}},Ot=tinymce.util.Tools.resolve("tinymce.util.Delay"),wt=tinymce.util.Tools.resolve("tinymce.util.Promise"),Ct=function(u,a){return b([W,(e=C(u),r=u.getParam("link_default_protocol","http","string"),function(t){var n=t.href;return 1===e&&!U(n)||0===e&&/^\s*www(\.|\d\.)/i.test(n)?it.some({message:"The URL you entered seems to be an external link. Do you want to add the required "+r+":// prefix?",preprocess:function(t){return st(st({},t),{href:r+"://"+n})}}):it.none()})],function(t){return t(a)}).fold(function(){return wt.resolve(a)},function(i){return new wt(function(n){var e=u,t=i.message,r=function(t){n(t?i.preprocess(a):a)},o=e.selection.getRng();Ot.setEditorTimeout(e,function(){e.windowManager.confirm(t,function(t){e.selection.setRng(o),r(t)})})})});var e,r},Nt=tinymce.util.Tools.resolve("tinymce.util.XHR"),At=[{text:"Current window",value:""},{text:"New window",value:"_blank"}],Tt=function(m,g){return t=(e=m).getParam("link_list"),new wt(function(n){l(t)?Nt.send({url:t,success:function(t){return n(function(t){try{return it.some(JSON.parse(t))}catch(t){return it.none()}}(t))},error:function(t){return n(it.none())}}):s(t)?t(function(t){return n(it.some(t))}):n(it.from(t))}).then(function(t){return t.bind(ft.sanitizeWith(n)).map(function(t){return 0<t.length?[{text:"None",value:""}].concat(t):t})}).then(function(t){var n,e,r,o,i,u,a,l,c,f,s=(e=g,r=(n=m).dom,o=j(n)?it.some(K(n.selection,e)):it.none(),i=e?it.some(r.getAttrib(e,"href")):it.none(),u=e?it.from(r.getAttrib(e,"target")):it.none(),a=H(r,e,"rel"),l=H(r,e,"class"),{url:i,text:o,title:H(r,e,"title"),target:u,rel:a,linkClass:l});return{anchor:s,catalogs:{targets:(f=A(m),d(f)?ft.sanitize(f).orThunk(function(){return it.some(At)}):!1===f?it.none():it.some(At)),rels:function(t,n){var e=T(t);if(0<e.length){var r=O(n,"_blank");return(!1===P(t)?ft.sanitizeWith(function(t){return B(ft.getValue(t),r)}):ft.sanitize)(e)}return it.none()}(m,s.target),classes:0<(c=m.getParam("link_class_list",[],"array")).length?ft.sanitize(c):it.none(),anchor:rt(m),link:t},optNode:it.from(g),flags:{titleEnabled:m.getParam("link_title",!0,"boolean")}}});function n(t){return e.convertURL(t.value||t.url,"href")}var e,t};a.add("link",function(t){var n,e,r,o,i,u,a;function l(t){var n=a.selection.getNode();return t.setDisabled(!I(a,n)),h}(n=t).ui.registry.addToggleButton("link",{icon:"link",tooltip:"Insert/edit link",onAction:Q(n),onSetup:tt(n)}),n.ui.registry.addButton("openlink",{icon:"new-tab",tooltip:"Open link",onAction:Y(n),onSetup:nt(n)}),n.ui.registry.addButton("unlink",{icon:"unlink",tooltip:"Remove link",onAction:function(){return F(n)},onSetup:et(n)}),(e=t).ui.registry.addMenuItem("openlink",{text:"Open link",icon:"new-tab",onAction:Y(e),onSetup:nt(e)}),e.ui.registry.addMenuItem("link",{icon:"link",text:"Link...",shortcut:"Meta+K",onAction:Q(e)}),e.ui.registry.addMenuItem("unlink",{icon:"unlink",text:"Remove link",onAction:function(){return F(e)},onSetup:et(e)}),(r=t).ui.registry.addContextMenu("link",{update:function(t){return z(r.dom.getParents(t,"a"))?"link unlink openlink":"link"}}),(a=t).ui.registry.addContextForm("quicklink",{launch:{type:"contextformtogglebutton",icon:"link",tooltip:"Link",onSetup:tt(a)},label:"Link",predicate:function(t){return!!I(a,t)&&a.getParam("link_context_toolbar",!1,"boolean")},initValue:function(){var t=I(a);return t?pt(t):""},commands:[{type:"contextformtogglebutton",icon:"link",tooltip:"Link",primary:!0,onSetup:function(t){var n=a.selection.getNode();return t.setActive(!!I(a,n)),tt(a)(t)},onAction:function(t){var n=t.getValue(),e=function(t){var n=I(a),e=j(a);if(n||!e)return it.none();var r=K(a.selection,n);return it.some(0<r.length?r:t)}(n);q(a,{href:n,attach:h},{href:n,text:e,title:it.none(),rel:it.none(),target:it.none(),class:it.none()}),a.selection.collapse(!1),t.hide()}},{type:"contextformbutton",icon:"unlink",tooltip:"Remove link",onSetup:l,onAction:function(t){F(a),t.hide()}},{type:"contextformbutton",icon:"new-tab",tooltip:"Open link",onSetup:l,onAction:function(t){Y(a)(),t.hide()}}]}),(u=t).on("click",function(t){var n=J(u,t.target);n&&c.metaKeyPressed(t)&&(t.preventDefault(),$(u,n))}),u.on("keydown",function(t){var n=X(u);n&&13===t.keyCode&&!0===t.altKey&&!1===t.shiftKey&&!1===t.ctrlKey&&!1===t.metaKey&&(t.preventDefault(),$(u,n))}),(o=t).addCommand("mceLink",function(){o.getParam("link_quicklink",!1,"boolean")?o.fire("contexttoolbar-show",{toolbarKey:"quicklink"}):Q(o)()}),(i=t).addShortcut("Meta+K","",function(){i.execCommand("mceLink")})})}();
\ No newline at end of file
diff --git a/src/views/blFwl/BlFwlList.vue b/src/views/blFwl/BlFwlList.vue
new file mode 100644
index 0000000..d40e9d7
--- /dev/null
+++ b/src/views/blFwl/BlFwlList.vue
@@ -0,0 +1,196 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="访问时间">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.fwsj_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.fwsj_end"></j-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+             <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a> -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
+      <a-button type="primary" icon="download" @click="handleExportXls('网站访问量')">导出</a-button>
+      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown> -->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <bl-fwl-modal ref="modalForm" @ok="modalFormOk"></bl-fwl-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import BlFwlModal from './modules/BlFwlModal'
+  import JDate from '@/components/jeecg/JDate.vue'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'BlFwlList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      JDate,
+      BlFwlModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '网站访问量管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'ip',
+            align:"center",
+            dataIndex: 'ipAddress'
+          },
+          {
+            title:'访问时间',
+            align:"center",
+            dataIndex: 'fwsj'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/blFwl/blFwl/list",
+          delete: "/blFwl/blFwl/delete",
+          deleteBatch: "/blFwl/blFwl/deleteBatch",
+          exportXlsUrl: "/blFwl/blFwl/exportXls",
+          importExcelUrl: "blFwl/blFwl/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'ipAddress',text:'ip',dictCode:''})
+        fieldList.push({type:'datetime',value:'fwsj',text:'访问时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/blFwl/modules/BlFwlForm.vue b/src/views/blFwl/modules/BlFwlForm.vue
new file mode 100644
index 0000000..0d12b1d
--- /dev/null
+++ b/src/views/blFwl/modules/BlFwlForm.vue
@@ -0,0 +1,163 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="ip" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['ipAddress']" placeholder="请输入ip"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="访问时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择访问时间" v-decorator="['fwsj']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'  
+
+  export default {
+    name: 'BlFwlForm',
+    components: {
+      JFormContainer,
+      JDate,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/blFwl/blFwl/add",
+          edit: "/blFwl/blFwl/edit",
+          queryById: "/blFwl/blFwl/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'ipAddress','fwsj'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'ipAddress','fwsj'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/blFwl/modules/BlFwlModal.vue b/src/views/blFwl/modules/BlFwlModal.vue
new file mode 100644
index 0000000..7c0a3c6
--- /dev/null
+++ b/src/views/blFwl/modules/BlFwlModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <bl-fwl-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></bl-fwl-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import BlFwlForm from './BlFwlForm'
+  export default {
+    name: 'BlFwlModal',
+    components: {
+      BlFwlForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/gateway/common/header.vue b/src/views/gateway/common/header.vue
index 6a586e7..4d05f09 100644
--- a/src/views/gateway/common/header.vue
+++ b/src/views/gateway/common/header.vue
@@ -1,284 +1,373 @@
 <template>
   <div :class="banClass">
     <div class="header">
-		<div class="h_down clearfloat">
-			<div class="logo left"><img src="img/logo.png" ></div>
-			<div class="h_home right" style="padding: 30px 0 0 10px;">
-				<a href="javascript:void(0)" @click="addShow">设为首页</a>
-				<a href="javascript:void(0)"> | </a>
-				<a href="javascript:void(0)" @click="addFavo">加入收藏</a>
-			</div>
-			<div class="sch_downbox right">
-				<input v-model="searchText" placeholder="请输入要搜索的内容" @keyup.enter="() => {searchText?$to('listPageSearch',{findStr:searchText}):''}"/>
-				<span class="sch_img right" @click="() => {searchText?$to('listPageSearch',{findStr:searchText}):''}"><img src="img/search.png" ></span>
-			</div>
-		</div>
-	</div>
-	<div id="MutiNav">
-		<ul class="multiUl">
-			<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-				<a class="mulgo" href="javascript:void(0);" title="首页" @click="$to('home',{pid:'home'})">
-					<span class="mulgochie">首页</span>
-				</a>
-				<blockquote>
-					<div class="ChildNavIn">
-						<div class="gersawd clearfloat">
-							<div class="vdas">
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:301})" class="fjsjkih2 left">
-									<span><i class="iconfont">&#xe672;</i></span>
-									<span>工作动态</span>
-								</a>
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:302})" class="fjsjkih2 left">
-									<span><i class="iconfont">&#xe67e;</i></span>
-									<span>行业要闻</span>
-								</a>
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:401})" class="fjsjkih2 left">
-									<span><i class="iconfont">&#xe854;</i></span>
-									<span>数据中心</span>
-								</a>
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:304})" class="fjsjkih2 left">
-									<span><i class="iconfont">&#xe627;</i></span>
-									<span>科研成果</span>
-								</a>
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:305})" class="fjsjkih2 left">
-									<span><i class="iconfont">&#xe748;</i></span>
-									<span>政策文件</span>
-								</a>
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:306})" class="fjsjkih2 left">
-									<span><i class="iconfont">&#xe7c2;</i></span>
-									<span>最新动态</span>
-								</a>
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:303})" class="fjsjkih2 left">
-									<span><i class="iconfont">&#xe777;</i></span>
-									<span>合作交流</span>
-								</a>
-								<a href="javascript:void(0);"  @click="$to('listPage3',{pid:1,id:501})" class="fjsjkih2 left" style="border: 0;">
-									<span><i class="iconfont">&#xe71e;</i></span>
-									<span>专题专栏</span>
-								</a>
-							</div>
-						</div>
-					</div>
-				</blockquote>
-			</li>
-			<li class="multiUlli" >
-				<a class="mulgo" href="javascript:void(0);" title="关于本所" @click="$to('gybs',{pid:'gybs'})">
-					<span class="mulgochie">关于本所</span>
-				</a>
-			</li>
-			<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-				<a class="mulgo" href="javascript:void(0);" title="区域农业资源" @click="$to('listPage2',{pid:101,id:10101})">
-					<span class="mulgochie">区域农业资源</span>
-				</a>
-				<blockquote>
-					<div class="ChildNavIn">
-						<ul>
-							<li class="clearfloat">
-								<a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2',{pid:101,id:10101})">
-									<span><i class="iconfont">&#xe855;</i></span>
-									<span>西部杂粮杂豆</span>
-								</a>
-								<div class="xbcot right">
-									<template v-for="(col,colIndex) in xbzlzdList" >
-										<a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2',{id:col.id})">{{col.name}}</a>
-									</template>
-								</div>
-							</li>
-							<li class="clearfloat">
-								<a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2',{pid:101,id:10102})">
-									<span><i class="iconfont">&#xe611;</i></span>
-									<span>东部经济资源</span>
-								</a>
-								<div class="xbcot right">
-									<template v-for="(col,colIndex) in dbjjzyList" >
-										<a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2',{id:col.id})">{{col.name}}</a>
-									</template>
-								</div>
-							</li>
-							<li class="clearfloat">
-								<a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2',{pid:101,id:10103})">
-									<span><i class="iconfont">&#xe622;</i></span>
-									<span>中部粮食资源</span>
-								</a>
-								<div class="xbcot right">
-									<template v-for="(col,colIndex) in zblszyList" >
-										<a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2',{id:col.id})">{{col.name}}</a>
-									</template>
-								</div>
-							</li>
-							<li class="clearfloat">
-								<a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2',{pid:101,id:10104})">
-									<span><i class="iconfont">&#xe607;</i></span>
-									<span>适宜吉林省<br>种质资源</span>
-								</a>
-								<div class="xbcot right">
-									<template v-for="(col,colIndex) in syjlsList" >
-										<a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2',{id:col.id})">{{col.name}}</a>
-									</template>
-								</div>
-							</li>
-							<li class="clearfloat">
-								<a href="javascript:void(0)" class="xbzlzd" style="width: 100%;" @click="$to('listPage2',{pid:101,id:10105})">
-									<span><i class="iconfont">&#xe646;</i></span>
-									<span>其他</span>
-								</a>
-							</li>
-						</ul>
-					</div>
-				</blockquote>
-			</li>
-			<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-				<a class="mulgo" href="javascript:void(0);" title="农业产业化" @click="$to('listPage',{pid:102,id:10201})">
-					<span class="mulgochie">农业产业化</span>
-				</a>
-				<blockquote>
-					<div class="ChildNavIn">
-						<div class="gersawd clearfloat">
-							<div class="vdas">
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:102,id:10201})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe601;</i></span>
-									<span>特色农业产业化</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:102,id:10202})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe632;</i></span>
-									<span>粮食产业化</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:102,id:10203})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe841;</i></span>
-									<span>畜牧业产业化</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:102,id:10204})" class="fjsjkih left" style="border: 0;">
-									<span><i class="iconfont">&#xe646;</i></span>
-									<span>其他</span>
-								</a>
-							</div>
-						</div>
-					</div>
-				</blockquote>
-			</li>
-			<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-				<a class="mulgo"  title="布局规划" href="javascript:void(0);"  @click="$to('listPage',{pid:103,id:10301})">
-					<span class="mulgochie">布局规划</span>
-				</a>
-				<blockquote>
-					<div class="ChildNavIn">
-						<div class="gersawd clearfloat">
-							<div class="vdas">
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:103,id:10301})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe7e4;</i></span>
-									<span>吉林省农业资源规划</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:103,id:10302})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe856;</i></span>
-									<span>西部特色经济作物区域布局</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:103,id:10306})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe8f9;</i></span>
-									<span>东部特色资源区域布局</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:103,id:10303})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe615;</i></span>
-									<span>中部粮食加工业区域布局</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:103,id:10304})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe61b;</i></span>
-									<span>历史区划数据</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:103,id:10305})" class="fjsjkih left" style="border: 0;">
-									<span><i class="iconfont">&#xe646;</i></span>
-									<span>其他</span>
-								</a>
-							</div>
-						</div>
-					</div>
-				</blockquote>
-			</li>
-			<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-				<a class="mulgo" title="绿色农业" href="javascript:void(0);"  @click="$to('listPage',{pid:104,id:10401})">
-					<span class="mulgochie">绿色农业</span>
-				</a>
-				<blockquote>
-					<div class="ChildNavIn">
-						<div class="gersawd clearfloat">
-							<div class="vdas">
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:104,id:10401})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe63a;</i></span>
-									<span>保护性耕作</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:104,id:10402})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe636;</i></span>
-									<span>农业资源循环利用</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:104,id:10403})" class="fjsjkih left">
-									<span><i class="iconfont">&#xec4d;</i></span>
-									<span>农产品安全</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:104,id:10404})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe9e7;</i></span>
-									<span>棚膜经济</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:104,id:10405})" class="fjsjkih left" style="border: 0;">
-									<span><i class="iconfont">&#xe646;</i></span>
-									<span>其他</span>
-								</a>
-							</div>
-						</div>
-					</div>
-				</blockquote>
-			</li>
-			<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-				<a class="mulgo" title="科研动态" href="javascript:void(0);"  @click="$to('listPage',{pid:105,id:10501})">
-					<span class="mulgochie">科研动态</span>
-				</a>
-				<blockquote>
-					<div class="ChildNavIn">
-						<div class="gersawd clearfloat">
-							<div class="vdas">
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:105,id:10501})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe60e;</i></span>
-									<span>资源区划</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:105,id:10502})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe604;</i></span>
-									<span>农业产业化</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:105,id:10503})" class="fjsjkih left" style="border: 0;">
-									<span><i class="iconfont">&#xe646;</i></span>
-									<span>其他</span>
-								</a>
-							</div>
-						</div>
-					</div>
-				</blockquote>
-			</li>
-			<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu" >
-				<a class="mulgo" title="助力乡村振兴" href="javascript:void(0);"  @click="$to('listPage',{pid:106,id:10601})">
-					<span class="mulgochie">助力乡村振兴</span>
-				</a>
-				<blockquote>
-					<div class="ChildNavIn">
-						<div class="gersawd clearfloat">
-							<div class="vdas">
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:106,id:10601})" class="fjsjkih left">
-									<span><i class="iconfont">&#xe6a1;</i></span>
-									<span>助力乡村振兴</span>
-								</a>
-								<a href="javascript:void(0);" @click="$to('listPage',{pid:106,id:10602})" class="fjsjkih left" style="border: 0;">
-									<span><i class="iconfont">&#xe646;</i></span>
-									<span>其他</span>
-								</a>
-							</div>
-						</div>
-					</div>
-				</blockquote>
-			</li>
-			<li class="multiUlli">
-				<a class="mulgo" title="其他" href="javascript:void(0);"  @click="$to('listPage',{pid:107})">
-					<span class="mulgochie">其他</span>
-				</a>
-			</li>
-		</ul>
-	</div>
+      <div class="h_down clearfloat">
+        <div class="logo left"><img src="img/logo.png" /></div>
+        <div class="h_home right" style="padding: 30px 0 0 10px">
+          <a href="javascript:void(0)" @click="addShow">设为首页</a>
+          <a href="javascript:void(0)"> | </a>
+          <a href="javascript:void(0)" @click="addFavo">加入收藏</a>
+        </div>
+        <div class="sch_downbox right">
+          <input
+            v-model="searchText"
+            placeholder="请输入要搜索的内容"
+            @keyup.enter="
+              () => {
+                searchText ? $to('listPageSearch', { findStr: searchText }) : ''
+              }
+            "
+          />
+          <span
+            class="sch_img right"
+            @click="
+              () => {
+                searchText ? $to('listPageSearch', { findStr: searchText }) : ''
+              }
+            "
+            ><img src="img/search.png"
+          /></span>
+        </div>
+      </div>
+    </div>
+    <div id="MutiNav">
+      <ul class="multiUl">
+        <li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
+          <a class="mulgo" href="javascript:void(0);" title="首页" @click="$to('home', { pid: 'home' })">
+            <span class="mulgochie">首页</span>
+          </a>
+          <blockquote>
+            <div class="ChildNavIn">
+              <div class="gersawd clearfloat">
+                <div class="vdas">
+                  <a href="javascript:void(0);" @click="$to('listPage3', { pid: 1, id: 301 })" class="fjsjkih2 left">
+                    <span><i class="iconfont">&#xe672;</i></span>
+                    <span>工作动态</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage3', { pid: 1, id: 302 })" class="fjsjkih2 left">
+                    <span><i class="iconfont">&#xe67e;</i></span>
+                    <span>行业要闻</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage3', { pid: 1, id: 401 })" class="fjsjkih2 left">
+                    <span><i class="iconfont">&#xe854;</i></span>
+                    <span>数据中心</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage3', { pid: 1, id: 304 })" class="fjsjkih2 left">
+                    <span><i class="iconfont">&#xe627;</i></span>
+                    <span>科研成果</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage3', { pid: 1, id: 305 })" class="fjsjkih2 left">
+                    <span><i class="iconfont">&#xe748;</i></span>
+                    <span>政策文件</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage3', { pid: 1, id: 306 })" class="fjsjkih2 left">
+                    <span><i class="iconfont">&#xe7c2;</i></span>
+                    <span>最新动态</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage3', { pid: 1, id: 303 })" class="fjsjkih2 left">
+                    <span><i class="iconfont">&#xe777;</i></span>
+                    <span>合作交流</span>
+                  </a>
+                  <a
+                    href="javascript:void(0);"
+                    @click="$to('listPage3', { pid: 1, id: 501 })"
+                    class="fjsjkih2 left"
+                    style="border: 0"
+                  >
+                    <span><i class="iconfont">&#xe71e;</i></span>
+                    <span>专题专栏</span>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </blockquote>
+        </li>
+        <li class="multiUlli">
+          <a class="mulgo" href="javascript:void(0);" title="关于本所" @click="$to('gybs', { pid: 'gybs' })">
+            <span class="mulgochie">关于本所</span>
+          </a>
+        </li>
+        <li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
+          <a
+            class="mulgo"
+            href="javascript:void(0);"
+            title="区域农业资源"
+            @click="$to('listPage2', { pid: 101, id: 10101 })"
+          >
+            <span class="mulgochie">区域农业资源</span>
+          </a>
+          <blockquote>
+            <div class="ChildNavIn">
+              <ul>
+                <li class="clearfloat">
+                  <a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2', { pid: 101, id: 10101 })">
+                    <span><i class="iconfont">&#xe855;</i></span>
+                    <span>西部杂粮杂豆</span>
+                  </a>
+                  <div class="xbcot right">
+                    <template v-for="(col, colIndex) in xbzlzdList">
+                      <a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2', { id: col.id })">{{
+                        col.name
+                      }}</a>
+                    </template>
+                  </div>
+                </li>
+                <li class="clearfloat">
+                  <a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2', { pid: 101, id: 10102 })">
+                    <span><i class="iconfont">&#xe611;</i></span>
+                    <span>东部经济资源</span>
+                  </a>
+                  <div class="xbcot right">
+                    <template v-for="(col, colIndex) in dbjjzyList">
+                      <a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2', { id: col.id })">{{
+                        col.name
+                      }}</a>
+                    </template>
+                  </div>
+                </li>
+                <li class="clearfloat">
+                  <a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2', { pid: 101, id: 10103 })">
+                    <span><i class="iconfont">&#xe622;</i></span>
+                    <span>中部粮食资源</span>
+                  </a>
+                  <div class="xbcot right">
+                    <template v-for="(col, colIndex) in zblszyList">
+                      <a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2', { id: col.id })">{{
+                        col.name
+                      }}</a>
+                    </template>
+                  </div>
+                </li>
+                <li class="clearfloat">
+                  <a href="javascript:void(0);" class="xbzlzd left" @click="$to('listPage2', { pid: 101, id: 10104 })">
+                    <span><i class="iconfont">&#xe607;</i></span>
+                    <span>适宜吉林省<br />种质资源</span>
+                  </a>
+                  <div class="xbcot right">
+                    <template v-for="(col, colIndex) in syjlsList">
+                      <a href="javascript:void(0);" :key="colIndex" @click="$to('listPage2', { id: col.id })">{{
+                        col.name
+                      }}</a>
+                    </template>
+                  </div>
+                </li>
+                <li class="clearfloat">
+                  <a
+                    href="javascript:void(0)"
+                    class="xbzlzd"
+                    style="width: 100%"
+                    @click="$to('listPage2', { pid: 101, id: 10105 })"
+                  >
+                    <span><i class="iconfont">&#xe646;</i></span>
+                    <span>其他</span>
+                  </a>
+                </li>
+              </ul>
+            </div>
+          </blockquote>
+        </li>
+        <li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
+          <a
+            class="mulgo"
+            href="javascript:void(0);"
+            title="农业产业化"
+            @click="$to('listPage', { pid: 102, id: 10201 })"
+          >
+            <span class="mulgochie">农业产业化</span>
+          </a>
+          <blockquote>
+            <div class="ChildNavIn">
+              <div class="gersawd clearfloat">
+                <div class="vdas">
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 102, id: 10201 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe601;</i></span>
+                    <span>特色农业产业化</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 102, id: 10202 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe632;</i></span>
+                    <span>粮食产业化</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 102, id: 10203 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe841;</i></span>
+                    <span>畜牧业产业化</span>
+                  </a>
+                  <a
+                    href="javascript:void(0);"
+                    @click="$to('listPage', { pid: 102, id: 10204 })"
+                    class="fjsjkih left"
+                    style="border: 0"
+                  >
+                    <span><i class="iconfont">&#xe646;</i></span>
+                    <span>其他</span>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </blockquote>
+        </li>
+        <li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
+          <a
+            class="mulgo"
+            title="布局规划"
+            href="javascript:void(0);"
+            @click="$to('listPage', { pid: 103, id: 10301 })"
+          >
+            <span class="mulgochie">布局规划</span>
+          </a>
+          <blockquote>
+            <div class="ChildNavIn">
+              <div class="gersawd clearfloat">
+                <div class="vdas">
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 103, id: 10301 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe7e4;</i></span>
+                    <span>吉林省农业资源规划</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 103, id: 10302 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe856;</i></span>
+                    <span>西部特色经济作物区域布局</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 103, id: 10306 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe8f9;</i></span>
+                    <span>东部特色资源区域布局</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 103, id: 10303 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe615;</i></span>
+                    <span>中部粮食加工业区域布局</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 103, id: 10304 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe61b;</i></span>
+                    <span>历史区划数据</span>
+                  </a>
+                  <a
+                    href="javascript:void(0);"
+                    @click="$to('listPage', { pid: 103, id: 10305 })"
+                    class="fjsjkih left"
+                    style="border: 0"
+                  >
+                    <span><i class="iconfont">&#xe646;</i></span>
+                    <span>其他</span>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </blockquote>
+        </li>
+        <li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
+          <a
+            class="mulgo"
+            title="绿色农业"
+            href="javascript:void(0);"
+            @click="$to('listPage', { pid: 104, id: 10401 })"
+          >
+            <span class="mulgochie">绿色农业</span>
+          </a>
+          <blockquote>
+            <div class="ChildNavIn">
+              <div class="gersawd clearfloat">
+                <div class="vdas">
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 104, id: 10401 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe63a;</i></span>
+                    <span>保护性耕作</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 104, id: 10402 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe636;</i></span>
+                    <span>农业资源循环利用</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 104, id: 10403 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xec4d;</i></span>
+                    <span>农产品安全</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 104, id: 10404 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe9e7;</i></span>
+                    <span>棚膜经济</span>
+                  </a>
+                  <a
+                    href="javascript:void(0);"
+                    @click="$to('listPage', { pid: 104, id: 10405 })"
+                    class="fjsjkih left"
+                    style="border: 0"
+                  >
+                    <span><i class="iconfont">&#xe646;</i></span>
+                    <span>其他</span>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </blockquote>
+        </li>
+        <li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
+          <a
+            class="mulgo"
+            title="科研动态"
+            href="javascript:void(0);"
+            @click="$to('listPage', { pid: 105, id: 10501 })"
+          >
+            <span class="mulgochie">科研动态</span>
+          </a>
+          <blockquote>
+            <div class="ChildNavIn">
+              <div class="gersawd clearfloat">
+                <div class="vdas">
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 105, id: 10501 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe60e;</i></span>
+                    <span>资源区划</span>
+                  </a>
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 105, id: 10502 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe604;</i></span>
+                    <span>农业产业化</span>
+                  </a>
+                  <a
+                    href="javascript:void(0);"
+                    @click="$to('listPage', { pid: 105, id: 10503 })"
+                    class="fjsjkih left"
+                    style="border: 0"
+                  >
+                    <span><i class="iconfont">&#xe646;</i></span>
+                    <span>其他</span>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </blockquote>
+        </li>
+        <li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
+          <a
+            class="mulgo"
+            title="助力乡村振兴"
+            href="javascript:void(0);"
+            @click="$to('listPage', { pid: 106, id: 10601 })"
+          >
+            <span class="mulgochie">助力乡村振兴</span>
+          </a>
+          <blockquote>
+            <div class="ChildNavIn">
+              <div class="gersawd clearfloat">
+                <div class="vdas">
+                  <a href="javascript:void(0);" @click="$to('listPage', { pid: 106, id: 10601 })" class="fjsjkih left">
+                    <span><i class="iconfont">&#xe6a1;</i></span>
+                    <span>助力乡村振兴</span>
+                  </a>
+                  <a
+                    href="javascript:void(0);"
+                    @click="$to('listPage', { pid: 106, id: 10602 })"
+                    class="fjsjkih left"
+                    style="border: 0"
+                  >
+                    <span><i class="iconfont">&#xe646;</i></span>
+                    <span>其他</span>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </blockquote>
+        </li>
+        <li class="multiUlli">
+          <a class="mulgo" title="其他" href="javascript:void(0);" @click="$to('listPage', { pid: 107 })">
+            <span class="mulgochie">其他</span>
+          </a>
+        </li>
+      </ul>
+    </div>
   </div>
 </template>
 
@@ -286,151 +375,185 @@
 import { getwayMixin } from '@/views/gateway/mixins/getwayMixin'
 import { getAction } from '@/api/manage'
 
-let mst;
+let mst
 
 export default {
-  mixins:[getwayMixin],
-  props:{
-  },
-  computed:{
-  },
-  data(){
+  mixins: [getwayMixin],
+  props: {},
+  computed: {},
+  data() {
     return {
       window,
       searchText: '',
       columnList: [],
-	  xbzlzdList:[],
-	  dbjjzyList:[],
-	  zblszyList:[],
-	  syjlsList:[],
+      xbzlzdList: [],
+      dbjjzyList: [],
+      zblszyList: [],
+      syjlsList: [],
     }
   },
-  mounted(){
-    this.loadData();
+  mounted() {
+    this.loadData()
   },
-  computed:{
-	  banClass(){
-		  let r = 'detailHtml';
-		  var pid = this.$route.query.pid
-        var fullPath = this.$route.fullPath
-		console.log('fullPath--->',fullPath,pid);
-		//   if(!pid){
-		// 	r = 'ban';
-		//   }
-		  switch (pid) {
-			  case 101: r =  'baner8'; break;
-			  case 102: r =  'baner4'; break;
-			  case 103: r =  'baner'; break;
-			  case 104: r =  'baner5'; break;
-			  case 105: r =  'baner3'; break;
-			  case 106: r =  'baner7'; break;
-			  case 107: r =  'baner6'; break;
-			  case 'gybs': r =  'baner2'; break;
-			  case 'home': r =  'ban'; break;
-			  case 501: r =  'detailHtml'; break;
-			  case 306: r =  'detailHtml'; break; 
-			  case 305: r =  'detailHtml'; break; 
-			  case 304: r =  'detailHtml'; break; 
-			  case 303: r =  'detailHtml'; break; 
-			  case 302: r =  'detailHtml'; break; 
-			  case 301: r =  'baner9'; break;  
-			  case 1: r =  'baner9'; break;  
-			  default:
-				  break;
-		  }
-		  
-		  if(fullPath.indexOf('detailedPage')>-1){
-			r = "detailHtml";
-		  }else if(fullPath.indexOf('home')>-1){
-			r = "ban";
-		  }
-		  return r;
-	  }
+  computed: {
+    banClass() {
+      let r = 'detailHtml'
+      var pid = this.$route.query.pid+""
+      var fullPath = this.$route.fullPath
+      console.log('fullPath--->', fullPath, pid)
+      console.log('pid--->', pid)
+      switch (pid) {
+        case '101': r = 'baner8'
+          break
+        case '102': r = 'baner4'
+          break
+        case '103': r = 'baner'
+          break
+        case '104': r = 'baner5'
+          break
+        case '105': r = 'baner3'
+          break
+        case '106': r = 'baner7'
+          break
+        case '107': r = 'baner6'
+          break
+        case 'gybs':  r = 'baner2'
+          break
+        case 'home': r = 'ban'
+          break
+        case '401': r = 'baner9'
+          break
+        case '40101': r = 'baner9'
+          break
+        case '40102': r = 'baner9'
+          break
+        case '40103': r = 'baner9'
+          break
+        case '501': r = 'baner9'
+          break
+        case '306': r = 'baner9'
+          break
+        case '305': r = 'baner9'
+          break
+        case '30501': r = 'baner9'
+          break
+        case '30502': r = 'baner9'
+          break
+        case '304': r = 'baner9'
+          break
+        case '30401': r = 'baner9'
+          break
+        case '30402': r = 'baner9'
+          break
+        case '30403': r = 'baner9'
+          break
+        case '303': r = 'baner9'
+          break
+        case '302': r = 'baner9'
+          break
+        case '301': r = 'baner9'
+          break
+        case '1': r = 'baner9'
+          break
+        default:
+          break
+      }
+
+      if (fullPath.indexOf('home') > -1) {
+        r = 'ban'
+      }else if(fullPath.indexOf('detailedPage2') > -1){
+        r = 'baner8'
+      }
+      console.log('r--->', r)
+      return r
+    },
   },
-  updated(){
-  },
-  methods:{
-	addFavo() {
-		alert("您的浏览器不支持加入收藏功能，请使用Ctrl+D进行添加！")
-	},
-	addShow() {
-		alert("您的浏览器不支持设为首页，请按照下面步骤进行操作：1.打开浏览器设置。2.点击设置网页。3.复制本网址，然后进行粘贴点击确定！")
-	},
-    loadData(){
-    	if(this.$route.query.findStr){
-        	this.searchText = this.$route.query.findStr;
-      	}
-		//查询区域农业资源--西部杂粮杂豆  内容列表
-	  	getAction('/gateway/gatewayColumn/list',{pageSize:-1,isRelease:'Y',parent:10101}).then((res)=>{
-			if(res.success){
-				let list = res.result.records||res.result;
-				this.xbzlzdList = list;
-			}
-		});
-		//查询区域农业资源--东部经济资源  内容列表
-	  	getAction('/gateway/gatewayColumn/list',{pageSize:-1,isRelease:'Y',parent:10102}).then((res)=>{
-			if(res.success){
-				let list = res.result.records||res.result;
-				this.dbjjzyList = list;
-			}
-		});
-		//查询区域农业资源--中部粮食资源  内容列表
-	  	getAction('/gateway/gatewayColumn/list',{pageSize:-1,isRelease:'Y',parent:10103}).then((res)=>{
-			if(res.success){
-				let list = res.result.records||res.result;
-				this.zblszyList = list;
-			}
-		});
-		//查询区域农业资源--适宜吉林省  内容列表
-	  	getAction('/gateway/gatewayColumn/list',{pageSize:-1,isRelease:'Y',parent:10104}).then((res)=>{
-			if(res.success){
-				let list = res.result.records||res.result;
-				this.syjlsList = list;
-			}
-		});
+  updated() {},
+  methods: {
+    addFavo() {
+      alert('您的浏览器不支持加入收藏功能，请使用Ctrl+D进行添加！')
+    },
+    addShow() {
+      alert(
+        '您的浏览器不支持设为首页，请按照下面步骤进行操作：1.打开浏览器设置。2.点击设置网页。3.复制本网址，然后进行粘贴点击确定！'
+      )
+    },
+    loadData() {
+      if (this.$route.query.findStr) {
+        this.searchText = this.$route.query.findStr
+      }
+      //查询区域农业资源--西部杂粮杂豆  内容列表
+      getAction('/gateway/gatewayColumn/list', { pageSize: -1, isRelease: 'Y', parent: 10101 }).then((res) => {
+        if (res.success) {
+          let list = res.result.records || res.result
+          this.xbzlzdList = list
+        }
+      })
+      //查询区域农业资源--东部经济资源  内容列表
+      getAction('/gateway/gatewayColumn/list', { pageSize: -1, isRelease: 'Y', parent: 10102 }).then((res) => {
+        if (res.success) {
+          let list = res.result.records || res.result
+          this.dbjjzyList = list
+        }
+      })
+      //查询区域农业资源--中部粮食资源  内容列表
+      getAction('/gateway/gatewayColumn/list', { pageSize: -1, isRelease: 'Y', parent: 10103 }).then((res) => {
+        if (res.success) {
+          let list = res.result.records || res.result
+          this.zblszyList = list
+        }
+      })
+      //查询区域农业资源--适宜吉林省  内容列表
+      getAction('/gateway/gatewayColumn/list', { pageSize: -1, isRelease: 'Y', parent: 10104 }).then((res) => {
+        if (res.success) {
+          let list = res.result.records || res.result
+          this.syjlsList = list
+        }
+      })
       //查询栏目
-    //   getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',type:'!!BLANK'}).then((res)=>{
-    //     if(res.success){
-    //       let list = res.result.records||res.result;
-    //       let map = {};
-    //       //转成，map
-    //       let parentList = list.filter(x => {
-    //         if(x.parent){
-    //           return false;
-    //         }else{
-    //           map[x.id] = x;
-    //           return true;
-    //         }
-    //       });
-    //       //孩子找父亲
-    //       list.forEach(x => {
-    //         let parent = map[x.parent] || {};
-    //         if(!parent.list) parent.list = [];
-    //         parent.list.push(x);
-    //       });
-    //       this.columnList = parentList;
-    //     }
-    //   });
+      //   getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',type:'!!BLANK'}).then((res)=>{
+      //     if(res.success){
+      //       let list = res.result.records||res.result;
+      //       let map = {};
+      //       //转成，map
+      //       let parentList = list.filter(x => {
+      //         if(x.parent){
+      //           return false;
+      //         }else{
+      //           map[x.id] = x;
+      //           return true;
+      //         }
+      //       });
+      //       //孩子找父亲
+      //       list.forEach(x => {
+      //         let parent = map[x.parent] || {};
+      //         if(!parent.list) parent.list = [];
+      //         parent.list.push(x);
+      //       });
+      //       this.columnList = parentList;
+      //     }
+      //   });
     },
     //鼠标移入菜单上，显示其下菜单
-    openMenu(e){
-      var curItem = jQuery(e.target);
-      mst = setTimeout(function(){//延时触发
-        curItem.find("blockquote").slideDown('fast');
-        mst = null;
-      });
+    openMenu(e) {
+      var curItem = jQuery(e.target)
+      mst = setTimeout(function () {
+        //延时触发
+        curItem.find('blockquote').slideDown('fast')
+        mst = null
+      })
     },
     //鼠标移出菜单时，隐藏其下菜单
-    closeMenu(e){
-      if(mst)clearTimeout(mst);
-      jQuery(e.target).find("blockquote").slideUp('fast');
-    }
+    closeMenu(e) {
+      if (mst) clearTimeout(mst)
+      jQuery(e.target).find('blockquote').slideUp('fast')
+    },
   },
 }
 </script>
 
 <style lang="less" scoped>
-#MutiNav .multiUl .multiUlli a.mulgo{
-	line-height: 50px;
+#MutiNav .multiUl .multiUlli a.mulgo {
+  line-height: 50px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/gateway/common/main.vue b/src/views/gateway/common/main.vue
index b28ea0d..ef8052e 100644
--- a/src/views/gateway/common/main.vue
+++ b/src/views/gateway/common/main.vue
@@ -8,8 +8,8 @@
                     <div id="scrollDiv">
                         <el-carousel height="100px" direction="vertical" :autoplay="true" indicator-position="outside" ref="prev">
                             <el-carousel-item v-for="(tt,ttIndex) in ttList" :key="ttIndex" class="toutiaoItem">
-                                <h2 class="toutiaoH" style="cursor:pointer;" @click="$to('detailedPage',{id:tt.id})">{{tt.title}}</h2>
-                                <p class="elli" style="cursor:pointer;" @click="$to('detailedPage',{id:tt.id})">{{$tfnm(tt,'content',60)}}</p>
+                                <h2 class="toutiaoH" style="cursor:pointer;" @click="$to('detailedPage',{id:tt.id,pid:tt.columnId})">{{tt.title}}</h2>
+                                <p class="elli" style="cursor:pointer;" @click="$to('detailedPage',{id:tt.id,pid:tt.columnId})">{{$tfnm(tt,'content',60)}}</p>
                             </el-carousel-item>
                         
                         <div style="position: absolute;top: 34px;right: 14px;z-index: 99999;">
@@ -25,9 +25,9 @@
                         <div id="inlunbo" class="pos1">
                             <el-carousel style="width: 590px;height: 400px;" indicator-position="none" ref="prev2" @change="hdpChange" >
                                 <el-carousel-item v-for="(lbt,lbtIndex) in lbtList" :key="lbtIndex">
-                                    <a href="javascript:void(0);" @click="$to('detailedPage',{id:lbt.id})"><img :src="$tImg(lbt,'cover')"></a>
+                                    <a href="javascript:void(0);" @click="$to('detailedPage',{id:lbt.id,pid:lbt.columnId})"><img :src="$tImg(lbt,'cover')"></a>
                                     <div class="luntxt">
-                                        <a href="javascript:void(0);" class="ltxta elli" @click="$to('detailedPage',{id:lbt.id})" style="color:white !important;">{{lbt.title}}</a>
+                                        <a href="javascript:void(0);" class="ltxta elli" @click="$to('detailedPage',{id:lbt.id,pid:lbt.columnId})" style="color:white !important;">{{lbt.title}}</a>
                                     </div>
                                 </el-carousel-item>
                             </el-carousel>
@@ -52,7 +52,7 @@
                                 <div class="tab_boxdas"  v-show="currentTab == 301">
                                     <ul>
                                         <li>
-                                            <span class="tagup" @click="$to('detailedPage3',{id:gzdtList[0].id})" style="cursor:pointer;">
+                                            <span class="tagup" @click="$to('detailedPage3',{id:gzdtList[0].id,pid:gzdtList[0].columnId})" style="cursor:pointer;">
                                                 <h3 class="elli">{{gzdtList[0].title}}</h3>
                                                 <p class="over-line2">{{$tfnm(gzdtList[0],'content',84)}}</p>
                                             </span>
@@ -60,7 +60,7 @@
                                         <template v-for="(gzdt,gzdtIndex) in gzdtList">
                                         <li :key="gzdtIndex" >
                                             <template  v-if="gzdtIndex>0">
-                                            <a class="clearfloat" href="javascript:void(0);" @click="$to('detailedPage3',{id:gzdt.id})">
+                                            <a class="clearfloat" href="javascript:void(0);" @click="$to('detailedPage3',{id:gzdt.id,pid:gzdt.columnId})">
                                                 <h3 class="elli">> {{gzdt.title}}</h3>
                                                 <span>{{gzdt.createTime}}</span>
                                             </a>
@@ -72,14 +72,14 @@
                                 <div class="tab_boxdas"  v-show="currentTab == 302">
                                     <ul>
                                         <li>
-                                            <span class="tagup" @click="$to('detailedPage3',{id:hyywList[0].id})" style="cursor:pointer;">
+                                            <span class="tagup" @click="$to('detailedPage3',{id:hyywList[0].id,pid:hyywList[0].columnId})" style="cursor:pointer;">
                                                 <h3 class="elli">{{hyywList[0].title}}</h3>
                                                 <p class="over-line2">{{$tfnm(hyywList[0],'content',84)}}</p>
                                             </span>
                                         </li>
                                         <li v-for="(hyyw,hyywIndex) in hyywList" :key="hyywIndex" >
                                             <template  v-if="hyywIndex>0">
-                                            <a class="clearfloat" href="javascript:void(0);" @click="$to('detailedPage3',{id:hyyw.id})">
+                                            <a class="clearfloat" href="javascript:void(0);" @click="$to('detailedPage3',{id:hyyw.id,pid:hyyw.columnId})">
                                                 <h3 class="elli">> {{hyyw.title}}</h3>
                                                 <span>{{hyyw.createTime}}</span>
                                             </a>
@@ -147,7 +147,7 @@
                     <div class="h_ldown">
                         <ul>
                             <li  v-for="(kycg,kycgIndex) in sjzxList" :key="kycgIndex">
-                                <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id})" class="elli">
+                                <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id,pid:kycg.columnId})" class="elli">
                                     <span class="spimg">></span>
                                     {{kycg.title}}
                                 </a>
@@ -171,7 +171,7 @@
                         <div class="h_ldown">
                             <ul>
                                 <li  v-for="(kycg,kycgIndex) in kycgList" :key="kycgIndex">
-                                    <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id})" class="elli">
+                                    <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id,pid:kycg.columnId})" class="elli">
                                         <span class="spimg">></span>
                                         {{kycg.title}}
                                     </a>
@@ -195,7 +195,7 @@
                     <div class="h_ldown">
                         <ul>
                             <li  v-for="(kycg,kycgIndex) in zcwjList" :key="kycgIndex">
-                                <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id})" class="elli">
+                                <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id,pid:kycg.columnId})" class="elli">
                                     <span class="spimg">></span>
                                     {{kycg.title}}
                                 </a>
@@ -213,7 +213,7 @@
                     <a href="javascript:void(0);"  @click="$to('listPage3',{id:'306',pid:'1'})" class="right">更多></a>
                 </div>
                 <div class="h_ldown" style="margin-top: 14px;">
-                    <div class="tsnyzyb" @click="$to('detailedPage3',{id:tsnyzyList[0].id})"  style="cursor:pointer;">
+                    <div class="tsnyzyb" @click="$to('detailedPage3',{id:tsnyzyList[0].id,pid:tsnyzyList[0].columnId})"  style="cursor:pointer;">
                         <a href="javascript:void(0);" class="elli" style="color:white !important">{{tsnyzyList[0].title}}</a>
                         <div class="tsnyzyimg"><img :src="tsnyzyList[0].cover?$tImg(tsnyzyList[0],'cover'):'img/tu3.png'" alt="" style="width:300px;height:146px;"></div>
                     </div>
@@ -221,7 +221,7 @@
                         <template v-for="(kycg,kycgIndex) in tsnyzyList">
                             <template  v-if="kycgIndex>0">
                                 <li   :key="kycgIndex">
-                                        <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id})" class="elli">
+                                        <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id,pid:kycg.columnId})" class="elli">
                                             <span class="spimg">></span>
                                             {{kycg.title}}
                                         </a>
@@ -238,8 +238,8 @@
                     <a href="javascript:void(0);"  @click="$to('listPage3',{id:303,pid:1})" class="right">更多></a>
                 </div>
                 <div class="h_rdown" style="margin-top: 14px;">
-                    <div class="spbox clearfloat"  @click="$to('detailedPage3',{id:hzjlList[0].id})"  style="cursor:pointer;">
-                        <span class="spimg"><img :src="hzjlList[0].cover?$tImg(hzjlList[0],'cover'):'img/kycg_1.png'"  style="width:210px;height:146px;"></span>
+                    <div class="spbox clearfloat"  @click="$to('detailedPage3',{id:hzjlList[0].id,pid:hzjlList[0].columnId})"  style="cursor:pointer;">
+                        <span class="spimg"><img :src="hzjlList[0].cover?$tImg(hzjlList[0],'cover'):'img/hzjl_main.jpg'"  style="width:210px;height:146px;"></span>
                         <div class="spcont">
                             <a class="spydsb elli">{{hzjlList[0].title}}</a>
                             <p class="over-line2">{{$tfnm(hzjlList[0],'content',84)}}</p>
@@ -253,7 +253,7 @@
                         <template v-for="(kycg,kycgIndex) in hzjlList" >
                             <template v-if="kycgIndex>0">
                                 <li style="margin-top: 13px;" :key="kycgIndex">
-                                    <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id})" class="clearfloat">
+                                    <a href="javascript:void(0);" @click="$to('detailedPage3',{id:kycg.id,pid:kycg.columnId})" class="clearfloat">
                                         <span class="sadfa">></span>
                                         <h4 class="elli">{{kycg.title}}</h4>
                                         <span class="sadfasp">{{getYearMonthDay(kycg.updateTime || kycg.createTime)}}</span>
@@ -284,7 +284,7 @@
 </template>
 
 <script>
-import { getAction } from '@/api/manage'
+import { getAction , httpAction } from '@/api/manage'
 import { getwayMixin } from '@/views/gateway/mixins/getwayMixin'
 import vueSeamlessScroll from './vue-seamless-scroll'
 
@@ -348,13 +348,33 @@ export default {
   },
   methods:{
     hdpChange(record){
-        console.log('hdpChange-->',record);
         document.getElementById('hdp0').style="background-color: #fff;color: #000;"
         document.getElementById('hdp1').style="background-color: #fff;color: #000;"
         document.getElementById('hdp2').style="background-color: #fff;color: #000;"
         document.getElementById('hdp'+record).style="background-color: #801b1f;color: #fff;"
     },
     loadData(){
+
+      var webip = "";
+      var request = new XMLHttpRequest();
+      request.open('GET', 'https://api.ipify.org?format=json', true);
+      request.onload = function () {
+      if (request.status >= 200 && request.status < 400) {
+        var data = JSON.parse(request.responseText);
+        console.log("data.ip_______>",data.ip);
+        webip = data.ip;
+        
+      httpAction("/blFwl/blFwl/add",{ipAddress:webip},"post").then((res)=>{ })
+      }
+      };
+      request.onerror = function () {
+        console.error('Error occurred during the network request');
+      httpAction("/blFwl/blFwl/add",{ipAddress:webip},"post").then((res)=>{ })
+      };
+      request.send();
+
+
+
       //头条
       getAction('/gateway/gatewayArticle/list',{pageSize:3,isRelease:'Y',columnId:'201',column: 'createTime',order: 'desc'}).then((res)=>{
         if(res.success){
@@ -368,7 +388,10 @@ export default {
           let list = res.result.records||res.result;
           this.lbtList = list;
           setTimeout(() => {
-            this.hdpChange(0)
+        document.getElementById('hdp0').style="background-color: #fff;color: #000;"
+        document.getElementById('hdp1').style="background-color: #fff;color: #000;"
+        document.getElementById('hdp2').style="background-color: #fff;color: #000;"
+        document.getElementById('hdp0').style="background-color: #801b1f;color: #fff;"
           }, 100);
         }
       });
diff --git a/src/views/gateway/detailedPage.vue b/src/views/gateway/detailedPage.vue
index 55005d5..b3c1532 100644
--- a/src/views/gateway/detailedPage.vue
+++ b/src/views/gateway/detailedPage.vue
@@ -20,10 +20,17 @@
 						<span v-show="articleData.author">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;作者：<span>{{articleData.author}}</span></span>
 					</div>
 					<p v-html="linkOpenToNewPage(articleData.content)"></p>
-					<div v-if="articleData.files" style="cursor:pointer;" @click="downloadFile(articleData.files)">
-            <span>附件：</span>
-            <span>{{fujian(articleData.files)}}</span>
-          </div>
+					<div v-if="articleData.files" style="cursor:pointer;">
+						<span>附件：</span>
+						<div v-if="articleData.files.indexOf(',')>-1">
+							<div v-for="(fj,index) in articleData.files.split(',')" :key="index">
+								<span  @click="downloadFile(fj)">{{fujian(fj)}}</span>
+							</div>
+						</div>
+						<div v-else>
+						<span  @click="downloadFile(articleData.files)">{{fujian(articleData.files)}}</span>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -75,7 +82,6 @@ export default {
       return arr[1];
     },
     linkOpenToNewPage(v){
-      console.log('linkOpenToNewPage => ',v,typeof v);
       if(v && v.indexOf("<a ")>-1){
         v = v.replaceAll("<a ",'<a target="_blank"')
       }
@@ -135,5 +141,8 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+/deep/ img{
+  width: auto !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/gateway/detailedPage2.vue b/src/views/gateway/detailedPage2.vue
index 97587a8..65d0220 100644
--- a/src/views/gateway/detailedPage2.vue
+++ b/src/views/gateway/detailedPage2.vue
@@ -21,9 +21,16 @@
 					</div>
 					<p v-html="linkOpenToNewPage(articleData.content)"></p>
 					
-					<div v-if="articleData.files" style="cursor:pointer;" @click="downloadFile(articleData.files)">
+					<div v-if="articleData.files" style="cursor:pointer;">
 						<span>附件：</span>
-						<span>{{fujian(articleData.files)}}</span>
+						<div v-if="articleData.files.indexOf(',')>-1">
+							<div v-for="(fj,index) in articleData.files.split(',')" :key="index">
+								<span  @click="downloadFile(fj)">{{fujian(fj)}}</span>
+							</div>
+						</div>
+						<div v-else>
+						<span  @click="downloadFile(articleData.files)">{{fujian(articleData.files)}}</span>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -120,6 +127,11 @@ export default {
 					code: '1010204',
 					picPath:'img/nyzy_lgzy.jpg'
 				},
+				{
+					title: '烟草',
+					code: '1010205',
+					picPath:'img/nyzy_lgzy.jpg'
+				},
 			]
 		},
 		{
@@ -216,7 +228,6 @@ export default {
       return arr[1];
     },
     linkOpenToNewPage(v){
-      console.log('linkOpenToNewPage => ',v,typeof v);
       if(v && v.indexOf("<a ")>-1){
         v = v.replaceAll("<a ",'<a target="_blank"')
       }
@@ -315,8 +326,10 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="less">
+/deep/ img{
+  width: auto !important;
+}
 .iconClass{
 	width:15px;
 	height:15px;
diff --git a/src/views/gateway/detailedPage3.vue b/src/views/gateway/detailedPage3.vue
index a275a59..dbf8f90 100644
--- a/src/views/gateway/detailedPage3.vue
+++ b/src/views/gateway/detailedPage3.vue
@@ -21,10 +21,17 @@
 					</div>
 					<p v-html="linkOpenToNewPage(articleData.content)"></p>
           
-					<div v-if="articleData.files" style="cursor:pointer;" @click="downloadFile(articleData.files)">
-            <span>附件：</span>
-            <span>{{fujian(articleData.files)}}</span>
-          </div>
+					<div v-if="articleData.files" style="cursor:pointer;">
+						<span>附件：</span>
+						<div v-if="articleData.files.indexOf(',')>-1">
+							<div v-for="(fj,index) in articleData.files.split(',')" :key="index">
+								<span  @click="downloadFile(fj)">{{fujian(fj)}}</span>
+							</div>
+						</div>
+						<div v-else>
+						<span  @click="downloadFile(articleData.files)">{{fujian(articleData.files)}}</span>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -78,7 +85,6 @@ export default {
       return arr[1];
     },
     linkOpenToNewPage(v){
-      console.log('linkOpenToNewPage => ',v,typeof v);
       if(v && v.indexOf("<a ")>-1){
         v = v.replaceAll("<a ",'<a target="_blank"')
       }
@@ -177,5 +183,8 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+/deep/ img{
+  width: auto !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/gateway/gybs.vue b/src/views/gateway/gybs.vue
index 9e4bba0..f8bcd17 100644
--- a/src/views/gateway/gybs.vue
+++ b/src/views/gateway/gybs.vue
@@ -8,7 +8,9 @@
 				<div class="gybsr right">
 					<h4>本所简介</h4>
 					<span></span>
-					<p>{{parentData.jjContent}}</p>
+					<div style="max-height:300px;overflow-y: auto;">
+					<p >{{parentData.jjContent}}</p>
+					</div>
 				</div>
 			</div>
 			<div class="gybser clearfloat">
diff --git a/src/views/gateway/listPage.vue b/src/views/gateway/listPage.vue
index 0da9f4c..47d898e 100644
--- a/src/views/gateway/listPage.vue
+++ b/src/views/gateway/listPage.vue
@@ -19,14 +19,14 @@
 				<ul>
           <template v-for="(col,colIndex) in columnList" >
             <li v-if="col.id == thisColumn.id" :key="colIndex" class="active2"><a href="javascript:void(0);" class="active3" style="margin-left: 20px;font-size: 16px;">{{col.name}}</a></li>
-            <li v-if="col.id != thisColumn.id" :key="colIndex"><a href="javascript:void(0);" style="margin-left: 20px;font-size: 16px;" @click="$to('listPage',{pid:col.parent,id:col.id})">{{col.name}}</a></li>
+            <li v-if="col.id != thisColumn.id" :key="colIndex"><a href="javascript:void(0);" style="margin-left: 20px;font-size: 16px;" @click="$to('listPage',{pid:pid,id:col.id})">{{col.name}}</a></li>
           </template>
 				</ul>
 			</div>
 			<div class="cyh_contr right">
 				<ul>
 					<li v-for="(art,artIndex) in articleList" :key="artIndex">
-						<a href="javascript:void(0);" class="cyh_coa clearfloat" @click="$to('detailedPage',{id:art.id})">
+						<a href="javascript:void(0);" class="cyh_coa clearfloat" @click="$to('detailedPage',{pid:pid,id:art.id})">
 							<div class="cyhl left">
 								<h3 class="elli">{{art.title}}</h3>
 								<p class="over-line2">{{$tfnm(art,'content',104)}}</p>
diff --git a/src/views/gateway/listPage2.vue b/src/views/gateway/listPage2.vue
index b6f0721..ef11a51 100644
--- a/src/views/gateway/listPage2.vue
+++ b/src/views/gateway/listPage2.vue
@@ -6,8 +6,8 @@
 				<span><img src="img/shouye.png" style="width: 16px;margin: 11px 4px 0 0;"></span>
 				<span>当前位置：</span>
 				<a href="javascript:void(0);" @click="$to('home')">首页 ></a>
-				<a href="javascript:void(0);" v-show="parentData2.name && parentData2.name != '首页'&& parentData2.name != '区域农业资源'&& parentData2.name != '工作动态'" >{{parentData2.name}} > </a>
-				<a href="javascript:void(0);" v-show="parentData.name && parentData.name != '首页'" >{{parentData.name}} > </a>
+				<a href="javascript:void(0);" @click="wzFun(parentData2.id?parentData2.id:(parentData2.parent+'01'))" v-show="parentData2.name && parentData2.name != '首页'&& parentData2.name != '区域农业资源'&& parentData2.name != '工作动态'" >{{parentData2.name}} > </a>
+				<a href="javascript:void(0);" @click="wzFun(parentData.id?parentData.id:(parentData.parent+'01'))" v-show="parentData.name && parentData.name != '首页'&& parentData.name != '区域农业资源'" >{{parentData.name}} > </a>
 				<a href="javascript:void(0);">{{syname}}</a>
 			</div>
 		</div>
@@ -44,13 +44,13 @@
 										<a-tree-node key="101010101">
 											<span slot="title" @click="nyzyFun('101010101')">
 												<img src="img/icon_yz.png" class="iconClass">
-												<span style="float:left;font-size:12px">育种</span>
+												<span style="float:left;font-size:12px">高粱育种</span>
 											</span>
 										</a-tree-node>
 										<a-tree-node key="101010102" >
 											<span slot="title" @click="nyzyFun('101010102')">
 												<img src="img/icon_zp.png" class="iconClass">
-												<span style="float:left;font-size:12px">栽培</span>
+												<span style="float:left;font-size:12px">高粱栽培</span>
 											</span>
 										</a-tree-node>
 									</a-tree-node>
@@ -62,13 +62,13 @@
 										<a-tree-node key="101010201">
 											<span slot="title" @click="nyzyFun('101010201')">
 												<img src="img/icon_yz.png" class="iconClass">
-												<span style="float:left;font-size:12px">育种</span>
+												<span style="float:left;font-size:12px">花生育种</span>
 											</span>
 										</a-tree-node>
 										<a-tree-node key="101010202">
 											<span slot="title" @click="nyzyFun('101010202')">
 												<img src="img/icon_zp.png" class="iconClass">
-												<span style="float:left;font-size:12px">栽培</span>
+												<span style="float:left;font-size:12px">花生栽培</span>
 											</span>
 										</a-tree-node>
 									</a-tree-node>
@@ -80,13 +80,13 @@
 										<a-tree-node key="101010301">
 											<span slot="title" @click="nyzyFun('101010301')">
 												<img src="img/icon_yz.png" class="iconClass">
-												<span style="float:left;font-size:12px">育种</span>
+												<span style="float:left;font-size:12px">绿豆育种</span>
 											</span>
 										</a-tree-node>
 										<a-tree-node key="101010302">
 											<span slot="title" @click="nyzyFun('101010302')">
 												<img src="img/icon_zp.png" class="iconClass">
-												<span style="float:left;font-size:12px">栽培</span>
+												<span style="float:left;font-size:12px">绿豆栽培</span>
 											</span>
 										</a-tree-node>
 									</a-tree-node>
@@ -98,13 +98,13 @@
 										<a-tree-node key="101010401">
 											<span slot="title" @click="nyzyFun('101010401')">
 												<img src="img/icon_yz.png" class="iconClass">
-												<span style="float:left;font-size:12px">育种</span>
+												<span style="float:left;font-size:12px">小豆育种</span>
 											</span>
 										</a-tree-node>
 										<a-tree-node key="101010402">
 											<span slot="title" @click="nyzyFun('101010402')">
 												<img src="img/icon_zp.png" class="iconClass">
-												<span style="float:left;font-size:12px">栽培</span>
+												<span style="float:left;font-size:12px">小豆栽培</span>
 											</span>
 										</a-tree-node>
 									</a-tree-node>
@@ -116,13 +116,13 @@
 										<a-tree-node key="101010501">
 											<span slot="title" @click="nyzyFun('101010501')">
 												<img src="img/icon_yz.png" class="iconClass">
-												<span style="float:left;font-size:12px">育种</span>
+												<span style="float:left;font-size:12px">燕麦育种</span>
 											</span>
 										</a-tree-node>
 										<a-tree-node key="101010502">
 											<span slot="title" @click="nyzyFun('101010502')">
 												<img src="img/icon_zp.png" class="iconClass">
-												<span style="float:left;font-size:12px">栽培</span>
+												<span style="float:left;font-size:12px">燕麦栽培</span>
 											</span>
 										</a-tree-node>
 									</a-tree-node>
@@ -134,13 +134,13 @@
 										<a-tree-node key="101010601">
 											<span slot="title" @click="nyzyFun('101010601')">
 												<img src="img/icon_yz.png" class="iconClass">
-												<span style="float:left;font-size:12px">育种</span>
+												<span style="float:left;font-size:12px">谷子育种</span>
 											</span>
 										</a-tree-node>
 										<a-tree-node key="101010602">
 											<span slot="title" @click="nyzyFun('101010602')">
 												<img src="img/icon_zp.png" class="iconClass">
-												<span style="float:left;font-size:12px">栽培</span>
+												<span style="float:left;font-size:12px">谷子栽培</span>
 											</span>
 										</a-tree-node>
 									</a-tree-node>
@@ -152,13 +152,13 @@
 										<a-tree-node key="101010701">
 											<span slot="title" @click="nyzyFun('101010701')">
 												<img src="img/icon_yz.png" class="iconClass">
-												<span style="float:left;font-size:12px">育种</span>
+												<span style="float:left;font-size:12px">向日葵育种</span>
 											</span>
 										</a-tree-node>
 										<a-tree-node key="101010702">
 											<span slot="title" @click="nyzyFun('101010702')">
 												<img src="img/icon_zp.png" class="iconClass">
-												<span style="float:left;font-size:12px">栽培</span>
+												<span style="float:left;font-size:12px">向日葵栽培</span>
 											</span>
 										</a-tree-node>
 									</a-tree-node>
@@ -426,6 +426,11 @@ export default {
 			code: '1010204',
 			picPath:'img/nyzy_lgzy.jpg'
 		},
+		{
+			title: '烟草',
+			code: '1010205',
+			picPath:'img/nyzy_yc.jpg'
+		},
 		]
 		},
 		{
@@ -542,6 +547,14 @@ export default {
       this.$emit('change', {current, pageSize})
       this.loadData()
     },
+	wzFun(record){
+		console.log('wzFun--->',record.length,record);
+		if(record.length>=3 &&record.length<6){
+			this.typeFun(record)
+		}else if(record.length>=6){
+			this.nyzyFun(record)
+		}
+	},
 	nyzyFun(record){
 		
       	this.ipagination.current = 1;
@@ -584,6 +597,7 @@ export default {
 		columnId = (columnId || this.pid) || '-1'
 		}
 		
+		this.ipagination.total = '1'
         var par = {isRelease:'Y',columnId,...findParam,column: 'createTime',order: 'desc'}
         par.pageNo = this.ipagination.current;
         par.pageSize = this.ipagination.pageSize;
@@ -593,10 +607,13 @@ export default {
 			this.articleList = list;
 			if(res.result.total){
 				this.ipagination.total = res.result.total;
+				if(this.ipagination.total == 0){
+					this.ipagination.total = '1'
+				}
 			}
 		}
 		});
-		
+		console.log('this.ipagination.total-->', this.ipagination.total);
 	},
 	typeFun(record){
 		this.typeOption = record
@@ -632,7 +649,9 @@ export default {
     },
     loadData(){
 		var typeOption = this.id
-		
+		this.parentData2 = {}
+		this.parentData = {}
+		this.ipagination.total = '1'
 		//查询栏目（包含当前的和候选的）
 		getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',fpid:typeOption,column: 'sort',order: 'asc'}).then((res)=>{
 			if(res.success){
diff --git a/src/views/gateway/listPage3.vue b/src/views/gateway/listPage3.vue
index fc53c50..7db894f 100644
--- a/src/views/gateway/listPage3.vue
+++ b/src/views/gateway/listPage3.vue
@@ -143,7 +143,7 @@
 			<div class="cyh_contr right">
 				<ul>
 					<li v-for="(art,artIndex) in articleList" :key="artIndex">
-						<a href="javascript:void(0);" class="cyh_coa clearfloat" @click="$to('detailedPage3',{id:art.id})">
+						<a href="javascript:void(0);" class="cyh_coa clearfloat" @click="$to('detailedPage3',{id:art.id,pid:pid})">
 							<div class="cyhl left">
 								<h3 class="elli">{{art.title}}</h3>
 								<p class="over-line2">{{$tfnm(art,'content',104)}}</p>
@@ -227,7 +227,8 @@ export default {
       openId = this.id
     } 
     this.openKeys = [`${openId}`];
-    this.loadData(openId);
+    console.log('mounted-->',openId);
+    this.loadData(this.id,openId);
   },
   watch:{
     pid(){
@@ -264,39 +265,43 @@ export default {
     handleClick(record){
       this.ipagination.current = 1;
       var list = record.keyPath
-      console.log('handleClick-->',list);
+      console.log('handleClick-->',record,list);
       this.openKeys = [`${list[1]}`];
       this.loadData(record.key)
     },
-    loadData(id){
+    loadData(id,pid){
       //如果没有ID自动选中一个
       // if(this.id){
-
+      console.log('loadData id-->',id);
 		  document.documentElement.scrollTop = 0;
-        let columnId = id||this.queryParam.id;
+      let columnId = id||this.id;
+        // if(this.$route.query.id){
+        //   columnId = this.$route.query.id
+        // }
         this.queryParam.id = columnId
-        console.log('columnId-->',columnId);
+        console.log('columnId-->',this.queryParam.id,id,columnId);
         if(columnId == '301'){this.syname = "工作动态"}
         else if(columnId == '302'){this.syname = "行业要闻"}
-        else if(columnId == '304'){this.syname = "科研成果";columnId = '30401'}
+        else if(columnId == '304'){this.syname = "成果登记";columnId = '30401'}
         else if(columnId == '30401'){this.syname = "成果登记"}
         else if(columnId == '30402'){this.syname = "获奖情况"}
         else if(columnId == '30403'){this.syname = "发表论文"}
-        else if(columnId == '305'){this.syname = "政策文件";columnId = '30501'}
+        else if(columnId == '305'){this.syname = "省内政策";columnId = '30501'}
         else if(columnId == '30501'){this.syname = "省内政策"}
         else if(columnId == '30502'){this.syname = "国内政策"}
         else if(columnId == '306'){this.syname = "特色农业资源最新动态"}
         else if(columnId == '303'){this.syname = "合作交流"}
-        else if(columnId == '501'){this.syname = "专题专栏";columnId = '50101'}
+        else if(columnId == '501'){this.syname = "土壤";columnId = '50101'}
         else if(columnId == '50101'){this.syname = "土壤"}
         else if(columnId == '50102'){this.syname = "水资源"}
         else if(columnId == '50103'){this.syname = "气候资源"}
         else if(columnId == '50104'){this.syname = "生物资源"}
-        else if(columnId == '401'){this.syname = "数据中心"; columnId='40101'}
+        else if(columnId == '401'){this.syname = "微观经济调查"; columnId='40101'}
         else if(columnId == '40101'){this.syname = "微观经济调查"}
         else if(columnId == '40102'){this.syname = "农业资源数据"}
         else if(columnId == '40103'){this.syname = "遥感数据"}
-
+        
+        console.log('this.syname-->',this.syname);
 
       //查询栏目（包含当前的和候选的）
       getAction('/gateway/gatewayColumn/list',{pageSize:-1,isEnable:'Y',fpid:columnId,column: 'sort',order: 'asc'}).then((res)=>{