浏览代码

头部缩进到底部

DESKTOP-5AIG4UE\Administrator 11 月之前
父节点
当前提交
447f9513c6
共有 4 个文件被更改,包括 892 次插入838 次删除
  1. 3 3
      src/components/page/GlobalHeader.vue
  2. 767 721
      src/components/page/GlobalLayout.vue
  3. 2 1
      src/components/tools/Logo.vue
  4. 120 113
      yarn.lock

+ 3 - 3
src/components/page/GlobalHeader.vue

@@ -6,7 +6,7 @@
     :style="{ padding: '0' }">
 
     <div v-if="mode === 'sidemenu'" class="header" :class="theme">
-      <a-icon
+      <!-- <a-icon
         v-if="device==='mobile'"
         class="trigger"
         :type="collapsed ? 'menu-fold' : 'menu-unfold'"
@@ -15,9 +15,9 @@
         v-else
         class="trigger"
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
-        @click="toggle"/>
+        @click="toggle"/> -->
 
-      <span v-if="device === 'desktop'">欢迎进入山东省省级土地资产信息管理系统</span>
+      <span v-if="device === 'desktop'">山东省省级土地资产信息管理系统</span>
       <span v-else>土地资产信息上报系统</span>
 
       <user-menu :theme="theme"/>

+ 767 - 721
src/components/page/GlobalLayout.vue

@@ -1,737 +1,783 @@
 <template>
-  <a-layout class="layout" :class="[device]">
-
-    <template v-if="layoutMode === 'sidemenu'">
-      <a-drawer
-        v-if="device === 'mobile'"
-        :wrapClassName="'drawer-sider ' + navTheme"
-        placement="left"
-        @close="() => this.collapsed = false"
-        :closable="false"
-        :visible="collapsed"
-        width="200px"
-      >
-        <side-menu
-          mode="inline"
-          v-if="device === 'mobile'"
-          :menus="menus"
-          @menuSelect="menuSelect"
-          @updateMenuTitle="handleUpdateMenuTitle"
-          :theme="navTheme"
-          :collapsed="false"
-          :collapsible="true"></side-menu>
-      </a-drawer>
-      <side-menu
-        v-show="device === 'desktop'"
-        mode="inline"
-        :menus="menus"
-        :sydwdkth-message=this.sydwdkthMessage
-        :sydwth-message=this.sydwthMessage
-        @menuSelect="myMenuSelect"
-        @updateMenuTitle="handleUpdateMenuTitle"
-        :theme="navTheme"
-        :collapsed="collapsed"
-        :collapsible="true"></side-menu>
-    </template>
-    <!-- 下次优化这些代码 -->
-    <template v-else>
-      <a-drawer
-        v-if="device === 'mobile'"
-        :wrapClassName="'drawer-sider ' + navTheme"
-        placement="left"
-        @close="() => this.collapsed = false"
-        :closable="false"
-        :visible="collapsed"
-        width="200px"
-      >
-        <side-menu
-          mode="inline"
-          :menus="menus"
-          @menuSelect="menuSelect"
-          @updateMenuTitle="handleUpdateMenuTitle"
-          :theme="navTheme"
-          :collapsed="false"
-          :collapsible="true"></side-menu>
-      </a-drawer>
-    </template>
-
-    <a-layout
-      :class="[layoutMode, `content-width-${contentWidth}`]"
-      :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }">
-      <!-- layout header -->
-      <global-header
-        :mode="layoutMode"
-        :menus="menus"
-        :theme="navTheme"
-        :collapsed="collapsed"
-        :device="device"
-        @toggle="toggle"
-        @updateMenuTitle="handleUpdateMenuTitle"
-      />
-
-      <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
-        <slot></slot>
-      </a-layout-content>
-
-      <!-- layout footer -->
-<!--      <a-layout-footer style="padding: 0px">-->
-<!--        <global-footer/>-->
-<!--      </a-layout-footer>-->
-    </a-layout>
-
-    <!-- update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ---- -->
-    <!--<setting-drawer></setting-drawer>-->
-    <!-- update-end---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ---- -->
-  </a-layout>
+	<a-layout class="layout" :class="[device]">
+
+		<template v-if="layoutMode === 'sidemenu'">
+			<a-drawer v-if="device === 'mobile'" :wrapClassName="'drawer-sider ' + navTheme" placement="left"
+				@close="() => this.collapsed = false" :closable="false" :visible="collapsed" width="200px">
+				<side-menu mode="inline" v-if="device === 'mobile'" :menus="menus" @menuSelect="menuSelect"
+					@updateMenuTitle="handleUpdateMenuTitle" :theme="navTheme" :collapsed="false"
+					:collapsible="true"></side-menu>
+			</a-drawer>
+			<side-menu v-show="device === 'desktop'" mode="inline" :menus="menus" :sydwdkth-message=this.sydwdkthMessage
+				:sydwth-message=this.sydwthMessage @menuSelect="myMenuSelect" @updateMenuTitle="handleUpdateMenuTitle"
+				:theme="navTheme" :collapsed="collapsed" :collapsible="true"></side-menu>
+		</template>
+		<!-- 下次优化这些代码 -->
+		<template v-else>
+			<a-drawer v-if="device === 'mobile'" :wrapClassName="'drawer-sider ' + navTheme" placement="left"
+				@close="() => this.collapsed = false" :closable="false" :visible="collapsed" width="200px">
+				<side-menu mode="inline" :menus="menus" @menuSelect="menuSelect"
+					@updateMenuTitle="handleUpdateMenuTitle" :theme="navTheme" :collapsed="false"
+					:collapsible="true"></side-menu>
+			</a-drawer>
+		</template>
+
+		<a-layout :class="[layoutMode, `content-width-${contentWidth}`]"
+			:style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }">
+			<!-- layout header -->
+			<global-header :mode="layoutMode" :menus="menus" :theme="navTheme" :collapsed="collapsed" :device="device"
+				@toggle="toggle" @updateMenuTitle="handleUpdateMenuTitle" />
+
+			<!-- layout content -->
+			<a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
+				<slot>
+					
+				</slot>
+			</a-layout-content>
+			<div :class="collapsed ?'suojin':'suojin2'">
+				<a-icon v-if="device==='mobile'" class="trigger" :type="collapsed ? 'double-right' : 'double-left'"
+					@click="toggle"></a-icon>
+				<a-icon v-else class="trigger" :type="collapsed ? 'double-right' : 'double-left'"
+					@click="toggle" />
+			</div>
+			<!-- layout footer -->
+			<!--      <a-layout-footer style="padding: 0px">-->
+			<!--        <global-footer/>-->
+			<!--      </a-layout-footer>-->
+		</a-layout>
+
+
+
+		<!-- update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ---- -->
+		<!--<setting-drawer></setting-drawer>-->
+		<!-- update-end---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ---- -->
+	</a-layout>
 </template>
 
 <script>
-  import SideMenu from '@/components/menu/SideMenu'
-  import GlobalHeader from '@/components/page/GlobalHeader'
-  import GlobalFooter from '@/components/page/GlobalFooter'
-  import { triggerWindowResizeEvent } from '@/utils/util'
-  import { mapActions, mapState } from 'vuex'
-  import { mixin, mixinDevice } from '@/utils/mixin.js'
-  import {getAction} from "@api/manage";
-  import EventBus from "@/EventBus";
-  // update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
-  // import SettingDrawer from '@/components/setting/SettingDrawer'
-  // 注释这个因为在个人设置模块已经加载了SettingDrawer页面
-  // update-end ---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
-
-  export default {
-    name: 'GlobalLayout',
-    components: {
-      SideMenu,
-      GlobalHeader,
-      GlobalFooter,
-      // update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
-      // // SettingDrawer
-      // 注释这个因为在个人设置模块已经加载了SettingDrawer页面
-      // update-end ---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
-
-    },
-    mixins: [mixin, mixinDevice],
-    props: {
-      menu: {
-        type: Array,
-        required: false
-      },
-    },
-    data() {
-      return {
-        collapsed: false,
-        activeMenu:{},
-        menus: [],
-        sydwthMessage:0,
-        sydwdkthMessage:0
-      }
-    },
-    computed: {
-      ...mapState({
-        // 主路由
-        mainRouters: state => state.permission.addRouters,
-        // 后台菜单
-        permissionMenuList: state => state.user.permissionList
-      })
-    },
-    watch: {
-      sidebarOpened(val) {
-        this.collapsed = !val
-      }
-    },
-    created() {
-      //--update-begin----author:scott---date:20190320------for:根据后台菜单配置,判断是否路由菜单字段,动态选择是否生成路由(为了支持参数URL菜单)------
-      //this.menus = this.mainRouters.find((item) => item.path === '/').children;
-      this.menus = this.permissionMenuList;
-      this.getNumber();
-
-      //--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
-      this.collapsed=!this.sidebarOpened;
-      //--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
-  
-      // 根据后台配置菜单,重新排序加载路由信息
-      //console.log('----加载菜单逻辑----')
-      //console.log(this.mainRouters)
-      //console.log(this.permissionMenuList)
-      //console.log('----navTheme------'+this.navTheme)
-      //--update-end----author:scott---date:20190320------for:根据后台菜单配置,判断是否路由菜单字段,动态选择是否生成路由(为了支持参数URL菜单)------
-    },
-    mounted() {
-      var _this=this;
-
-      EventBus.$on("data1",function (res){
-        _this.sydwdkthMessage=res;
-      })
-
-        EventBus.$on("data",function (res){
-        _this.sydwthMessage=res;
-
-      })
-
-
-    },
-    beforeDestroy() {
-      // 移除监听事件 "share"
-      EventBus.$off('data1');
-      EventBus.$off('data');
-    },
-    methods: {
-      ...mapActions(['setSidebar']),
-      toggle() {
-        this.collapsed = !this.collapsed
-        this.setSidebar(!this.collapsed)
-        triggerWindowResizeEvent()
-      },
-      getNumber(){
-        getAction("/qcsb.qyxx/qcQyxx/getNumber").then(res => {
-          if(res.code==200){
-              this.sydwthMessage= res.result1[0],
-              this.sydwdkthMessage= res.result1[1]
-          }
-        })
-      },
-      menuSelect() {
-        if (!this.isDesktop()) {
-          this.collapsed = false
-        }
-      },
-      //update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
-      myMenuSelect(value){
-        //此处触发动态路由被点击事件
-        this.findMenuBykey(this.menus,value.key)
-        this.$emit("dynamicRouterShow",value.key,this.activeMenu.meta.title)
-      },
-      findMenuBykey(menus,key){
-        for(let i of menus){
-          if(i.path==key){
-            this.activeMenu = {...i}
-          }else if(i.children && i.children.length>0){
-            this.findMenuBykey(i.children,key)
-          }
-        }
-      },
-      //update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
-
-      // update-begin-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
-      handleUpdateMenuTitle(value) {
-        this.findMenuBykey(this.menus, value.path)
-        this.activeMenu.meta.title = value.meta.title
-        this.$emit('dynamicRouterShow', value.path, this.activeMenu.meta.title)
-      },
-      // update-end-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
-
-    }
-  }
-
+	import SideMenu from '@/components/menu/SideMenu'
+	import GlobalHeader from '@/components/page/GlobalHeader'
+	import GlobalFooter from '@/components/page/GlobalFooter'
+	import {
+		triggerWindowResizeEvent
+	} from '@/utils/util'
+	import {
+		mapActions,
+		mapState
+	} from 'vuex'
+	import {
+		mixin,
+		mixinDevice
+	} from '@/utils/mixin.js'
+	import {
+		getAction
+	} from "@api/manage";
+	import EventBus from "@/EventBus";
+	// update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
+	// import SettingDrawer from '@/components/setting/SettingDrawer'
+	// 注释这个因为在个人设置模块已经加载了SettingDrawer页面
+	// update-end ---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
+
+	export default {
+		name: 'GlobalLayout',
+		components: {
+			SideMenu,
+			GlobalHeader,
+			GlobalFooter,
+			// update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
+			// // SettingDrawer
+			// 注释这个因为在个人设置模块已经加载了SettingDrawer页面
+			// update-end ---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
+
+		},
+		mixins: [mixin, mixinDevice],
+		props: {
+			menu: {
+				type: Array,
+				required: false
+			},
+		},
+		data() {
+			return {
+				collapsed: false,
+				activeMenu: {},
+				menus: [],
+				sydwthMessage: 0,
+				sydwdkthMessage: 0
+			}
+		},
+		computed: {
+			...mapState({
+				// 主路由
+				mainRouters: state => state.permission.addRouters,
+				// 后台菜单
+				permissionMenuList: state => state.user.permissionList
+			})
+		},
+		watch: {
+			sidebarOpened(val) {
+				this.collapsed = !val
+			}
+		},
+		created() {
+			//--update-begin----author:scott---date:20190320------for:根据后台菜单配置,判断是否路由菜单字段,动态选择是否生成路由(为了支持参数URL菜单)------
+			//this.menus = this.mainRouters.find((item) => item.path === '/').children;
+			this.menus = this.permissionMenuList;
+			this.getNumber();
+
+			//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
+			this.collapsed = !this.sidebarOpened;
+			//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
+
+			// 根据后台配置菜单,重新排序加载路由信息
+			//console.log('----加载菜单逻辑----')
+			//console.log(this.mainRouters)
+			//console.log(this.permissionMenuList)
+			//console.log('----navTheme------'+this.navTheme)
+			//--update-end----author:scott---date:20190320------for:根据后台菜单配置,判断是否路由菜单字段,动态选择是否生成路由(为了支持参数URL菜单)------
+		},
+		mounted() {
+			var _this = this;
+
+			EventBus.$on("data1", function(res) {
+				_this.sydwdkthMessage = res;
+			})
+
+			EventBus.$on("data", function(res) {
+				_this.sydwthMessage = res;
+
+			})
+
+
+		},
+		beforeDestroy() {
+			// 移除监听事件 "share"
+			EventBus.$off('data1');
+			EventBus.$off('data');
+		},
+		methods: {
+			...mapActions(['setSidebar']),
+			toggle() {
+				this.collapsed = !this.collapsed
+				this.setSidebar(!this.collapsed)
+				triggerWindowResizeEvent()
+			},
+			getNumber() {
+				getAction("/qcsb.qyxx/qcQyxx/getNumber").then(res => {
+					if (res.code == 200) {
+						this.sydwthMessage = res.result1[0],
+							this.sydwdkthMessage = res.result1[1]
+					}
+				})
+			},
+			menuSelect() {
+				if (!this.isDesktop()) {
+					this.collapsed = false
+				}
+			},
+			//update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+			myMenuSelect(value) {
+				//此处触发动态路由被点击事件
+				this.findMenuBykey(this.menus, value.key)
+				this.$emit("dynamicRouterShow", value.key, this.activeMenu.meta.title)
+			},
+			findMenuBykey(menus, key) {
+				for (let i of menus) {
+					if (i.path == key) {
+						this.activeMenu = {
+							...i
+						}
+					} else if (i.children && i.children.length > 0) {
+						this.findMenuBykey(i.children, key)
+					}
+				}
+			},
+			//update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+
+			// update-begin-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+			handleUpdateMenuTitle(value) {
+				this.findMenuBykey(this.menus, value.path)
+				this.activeMenu.meta.title = value.meta.title
+				this.$emit('dynamicRouterShow', value.path, this.activeMenu.meta.title)
+			},
+			// update-end-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+
+		}
+	}
 </script>
 
 <style lang="less">
-  body {
-    // 打开滚动条固定显示
-    overflow-y: scroll;
+	body {
+		// 打开滚动条固定显示
+		overflow-y: scroll;
 
-    &.colorWeak {
-      filter: invert(80%);
-    }
-  }
+		&.colorWeak {
+			filter: invert(80%);
+		}
+	}
 
-  .layout {
-    min-height: 100vh !important;
-    overflow-x: hidden;
+	.layout {
+		min-height: 100vh !important;
+		overflow-x: hidden;
 
-    &.mobile {
+		&.mobile {
 
-      .ant-layout-content {
+			.ant-layout-content {
 
-        .content {
-          margin: 24px 0 0;
-        }
-      }
+				.content {
+					margin: 24px 0 0;
+				}
+			}
 
-      /**
+			/**
        * ant-table-wrapper
        * 覆盖的表格手机模式样式,如果想修改在手机上表格最低宽度,可以在这里改动
        */
-      .ant-table-wrapper {
-        .ant-table-content {
-          overflow-y: auto;
-        }
-        .ant-table-body {
-          // update-begin---author:sunjianlei Date:20220104 for: 【JTC-480】移动端不支持左右拖动,需要注释掉此段代码 ------------
-          //min-width: 800px;
-          // update-end---author:sunjianlei Date:20220104 for: 【JTC-480】移动端不支持左右拖动,需要注释掉此段代码 ------------
-        }
-      }
-      .sidemenu {
-        .ant-header-fixedHeader {
-
-          &.ant-header-side-opened, &.ant-header-side-closed {
-            width: 100%
-          }
-        }
-      }
-
-      .topmenu {
-        /* 必须为 topmenu  才能启用流式布局 */
-        &.content-width-Fluid {
-          .header-index-wide {
-            margin-left: 0;
-          }
-        }
-      }
-      .header, .top-nav-header-index {
-        .user-wrapper .action {
-          padding: 0 12px;
-        }
-      }
-    }
-
-    &.ant-layout-has-sider {
-      flex-direction: row;
-    }
-
-    .trigger {
-      font-size: 22px;
-      line-height: 42px;
-      padding: 0 18px;
-      cursor: pointer;
-      transition: color 300ms, background 300ms;
-
-      &:hover {
-        background: rgba(255, 255, 255, 0.3);
-      }
-    }
-
-    .topmenu {
-      .ant-header-fixedHeader {
-        position: fixed;
-        top: 0;
-        right: 0;
-        z-index: 9;
-        width: 100%;
-        transition: width .2s;
-
-        &.ant-header-side-opened {
-          width: 100%;
-        }
-
-        &.ant-header-side-closed {
-          width: 100%;
-        }
-      }
-      /* 必须为 topmenu  才能启用流式布局 */
-      &.content-width-Fluid {
-        .header-index-wide {
-          max-width: unset;
-          margin-left: 24px;
-        }
-
-        .page-header-index-wide {
-          max-width: unset;
-        }
-      }
-
-    }
-
-    .sidemenu {
-      .ant-header-fixedHeader {
-        position: fixed;
-        top: 0;
-        right: 0;
-        z-index: 9;
-        width: 100%;
-        transition: width .2s;
-
-        &.ant-header-side-opened {
-          width: calc(100% - 200px)
-        }
-
-        &.ant-header-side-closed {
-          width: calc(100% - 80px)
-        }
-      }
-    }
-
-    .header {
-      height: 64px;
-      padding: 0 12px 0 0;
-      background: #fff;
-      box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-      position: relative;
-    }
-
-    .header, .top-nav-header-index {
-
-      .user-wrapper {
-        float: right;
-        height: 100%;
-
-        .action {
-          cursor: pointer;
-          padding: 0 14px;
-          display: inline-block;
-          transition: all .3s;
-
-          height: 70%;
-          line-height: 46px;
-
-          &.action-full {
-            height: 100%;
-          }
-
-          &:hover {
-            background: rgba(255, 255, 255, 0.3);
-          }
-
-          .avatar {
-            margin: 20px 10px 20px 0;
-            color: #1890ff;
-            background: hsla(0, 0%, 100%, .85);
-            vertical-align: middle;
-          }
-
-          .icon {
-            font-size: 16px;
-            padding: 4px;
-          }
-
-          .anticon {
-            color: inherit;
-          }
-        }
-      }
-
-      &.dark {
-        .user-wrapper {
-
-          .action {
-            color: black;
-
-            &:hover {
-              background: rgba(0, 0, 0, 0.05);
-            }
-
-            .anticon {
-              color: inherit;
-            }
-          }
-        }
-      }
-    }
-
-    &.mobile {
-      .top-nav-header-index {
-
-        .header-index-wide {
-
-          .header-index-left {
-
-            .trigger {
-              color: rgba(255, 255, 255, 0.85);
-              padding: 0 12px;
-            }
-
-            .logo.top-nav-header {
-              text-align: center;
-              width: 56px;
-              line-height: 58px;
-            }
-          }
-        }
-
-        .user-wrapper .action .avatar {
-          margin: 20px 0;
-        }
-
-        &.light {
-
-          .header-index-wide {
-
-            .header-index-left {
-              .trigger {
-                color: rgba(0, 0, 0, 0.65);
-              }
-            }
-          }
-          //
-        }
-      }
-    }
-
-    &.tablet {
-      // overflow: hidden; text-overflow:ellipsis; white-space: nowrap;
-      .top-nav-header-index {
-
-        .header-index-wide {
-
-          .header-index-left {
-            .logo > a {
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-            }
-          }
-        }
-      }
-
-    }
-
-    .top-nav-header-index {
-      box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-      position: relative;
-      transition: background .3s, width .2s;
-
-      .header-index-wide {
-        width: 100%;
-        margin: auto;
-        padding: 0 20px 0 0;
-        display: flex;
-        height: 59px;
-
-        .ant-menu.ant-menu-horizontal {
-          border: none;
-          height: 64px;
-          line-height: 64px;
-        }
-
-        .header-index-left {
-          flex: 1 1;
-          display: flex;
-
-          .logo.top-nav-header {
-            width: 165px;
-            height: 64px;
-            position: relative;
-            line-height: 64px;
-            transition: all .3s;
-            overflow: hidden;
-
-            img {
-              display: inline-block;
-              vertical-align: middle;
-              height: 32px;
-            }
-
-            h1 {
-              color: #fff;
-              display: inline-block;
-              vertical-align: top;
-              font-size: 16px;
-              margin: 0 0 0 12px;
-              font-weight: 400;
-            }
-          }
-        }
-
-        .header-index-right {
-          float: right;
-          height: 59px;
-          overflow: hidden;
-          .action:hover {
-            background-color: rgba(0, 0, 0, 0.05);
-          }
-        }
-      }
-
-      &.light {
-        background-color: #fff;
-
-        .header-index-wide {
-          .header-index-left {
-            .logo {
-              h1 {
-                color: #002140;
-              }
-            }
-          }
-        }
-      }
-
-      &.dark {
-
-        .user-wrapper {
-
-          .action {
-            color: white;
-
-            &:hover {
-              background: rgba(255, 255, 255, 0.3);
-            }
-          }
-        }
-        .header-index-wide .header-index-left .trigger:hover {
-          background: rgba(255, 255, 255, 0.3);
-        }
-      }
-
-    }
-
-    // 内容区
-    .layout-content {
-      margin: 24px 24px 0px;
-      height: 64px;
-      padding: 0 12px 0 0;
-    }
-
-  }
-
-  .topmenu {
-    .page-header-index-wide {
-      margin: 0 auto;
-      width: 100%;
-    }
-  }
-
-  // drawer-sider 自定义
-  .ant-drawer.drawer-sider {
-    .sider {
-      box-shadow: none;
-    }
-
-    &.dark {
-      .ant-drawer-content {
-        background-color: rgb(0, 21, 41);
-      }
-    }
-    &.light {
-      box-shadow: none;
-      .ant-drawer-content {
-        background-color: #fff;
-      }
-    }
-
-    .ant-drawer-body {
-      padding: 0
-    }
-  }
-
-  // 菜单样式
-  .sider {
-    box-shadow: 2px 116px 6px 0 rgba(0, 21, 41, .35);
-    position: relative;
-    z-index: 10;
-
-    &.ant-fixed-sidemenu {
-      position: fixed;
-      height: 100%;
-    }
-
-    .logo {
-      height: 64px;
-      position: relative;
-      line-height: 64px;
-      padding-left: 24px;
-      -webkit-transition: all .3s;
-      transition: all .3s;
-      background: #002140;
-      overflow: hidden;
-
-      img, h1 {
-        display: inline-block;
-        vertical-align: middle;
-      }
-
-      img {
-        height: 32px;
-      }
-
-      h1 {
-        color: #fff;
-        font-size: 18px;
-        margin: 0 0 0 8px;
-        font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-        font-weight: 600;
-      }
-    }
-
-    &.light {
-      background-color: #fff;
-      box-shadow: 2px 116px 8px 0 rgba(29, 35, 41, 0.05);
-
-      .logo {
-        background: #fff;
-        box-shadow: 1px 1px 0 0 #e8e8e8;
-
-        h1 {
-          color: unset;
-        }
-      }
-
-      .ant-menu-light {
-        border-right-color: transparent;
-      }
-    }
-
-  }
-
-  // 外置的样式控制
-  .user-dropdown-menu-wrapper.ant-dropdown-menu {
-    padding: 4px 0;
-
-    .ant-dropdown-menu-item {
-      width: 160px;
-    }
-
-    .ant-dropdown-menu-item > .anticon:first-child,
-    .ant-dropdown-menu-item > a > .anticon:first-child,
-    .ant-dropdown-menu-submenu-title > .anticon:first-child
-    .ant-dropdown-menu-submenu-title > a > .anticon:first-child {
-      min-width: 12px;
-      margin-right: 8px;
-    }
-
-  }
-
-  // 数据列表 样式
-  .table-alert {
-    margin-bottom: 16px;
-  }
-
-  .table-page-search-wrapper {
-
-    .ant-form-inline {
-
-      .ant-form-item {
-        display: flex;
-        margin-bottom: 24px;
-        margin-right: 0;
-
-        .ant-form-item-control-wrapper {
-          flex: 1 1;
-          display: inline-block;
-          vertical-align: middle;
-        }
-
-        > .ant-form-item-label {
-          line-height: 32px;
-          padding-right: 8px;
-          width: auto;
-        }
-        .ant-form-item-control {
-          height: 32px;
-          line-height: 32px;
-        }
-      }
-    }
-
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-
-  }
-
-  .content {
-
-    .table-operator {
-      margin-bottom: 18px;
-
-      button {
-        margin-right: 8px;
-      }
-    }
-  }
-</style>
+			.ant-table-wrapper {
+				.ant-table-content {
+					overflow-y: auto;
+				}
+
+				.ant-table-body {
+					// update-begin---author:sunjianlei Date:20220104 for: 【JTC-480】移动端不支持左右拖动,需要注释掉此段代码 ------------
+					//min-width: 800px;
+					// update-end---author:sunjianlei Date:20220104 for: 【JTC-480】移动端不支持左右拖动,需要注释掉此段代码 ------------
+				}
+			}
+
+			.sidemenu {
+				.ant-header-fixedHeader {
+
+					&.ant-header-side-opened,
+					&.ant-header-side-closed {
+						width: 100%
+					}
+				}
+			}
+
+			.topmenu {
+
+				/* 必须为 topmenu  才能启用流式布局 */
+				&.content-width-Fluid {
+					.header-index-wide {
+						margin-left: 0;
+					}
+				}
+			}
+
+			.header,
+			.top-nav-header-index {
+				.user-wrapper .action {
+					padding: 0 12px;
+				}
+			}
+		}
+
+		&.ant-layout-has-sider {
+			flex-direction: row;
+		}
+
+		.trigger {
+			font-size: 22px;
+			line-height: 42px;
+			padding: 0 18px;
+			cursor: pointer;
+			transition: color 300ms, background 300ms;
+
+			&:hover {
+				background: rgba(255, 255, 255, 0.3);
+			}
+		}
+
+		.topmenu {
+			.ant-header-fixedHeader {
+				position: fixed;
+				top: 0;
+				right: 0;
+				z-index: 9;
+				width: 100%;
+				transition: width .2s;
+
+				&.ant-header-side-opened {
+					width: 100%;
+				}
+
+				&.ant-header-side-closed {
+					width: 100%;
+				}
+			}
+
+			/* 必须为 topmenu  才能启用流式布局 */
+			&.content-width-Fluid {
+				.header-index-wide {
+					max-width: unset;
+					margin-left: 24px;
+				}
+
+				.page-header-index-wide {
+					max-width: unset;
+				}
+			}
+
+		}
+
+		.sidemenu {
+			.ant-header-fixedHeader {
+				position: fixed;
+				top: 0;
+				right: 0;
+				z-index: 9;
+				width: 100%;
+				transition: width .2s;
+
+				&.ant-header-side-opened {
+					width: calc(100% - 200px)
+				}
+
+				&.ant-header-side-closed {
+					width: calc(100% - 80px)
+				}
+			}
+		}
+
+		.header {
+			height: 64px;
+			padding: 0 12px 0 0;
+			background: #fff;
+			box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+			position: relative;
+		}
+
+		.header,
+		.top-nav-header-index {
+
+			.user-wrapper {
+				float: right;
+				height: 100%;
+
+				.action {
+					cursor: pointer;
+					padding: 0 14px;
+					display: inline-block;
+					transition: all .3s;
+
+					height: 70%;
+					line-height: 46px;
+
+					&.action-full {
+						height: 100%;
+					}
+
+					&:hover {
+						background: rgba(255, 255, 255, 0.3);
+					}
+
+					.avatar {
+						margin: 20px 10px 20px 0;
+						color: #1890ff;
+						background: hsla(0, 0%, 100%, .85);
+						vertical-align: middle;
+					}
+
+					.icon {
+						font-size: 16px;
+						padding: 4px;
+					}
+
+					.anticon {
+						color: inherit;
+					}
+				}
+			}
+
+			&.dark {
+				.user-wrapper {
+
+					.action {
+						color: black;
+
+						&:hover {
+							background: rgba(0, 0, 0, 0.05);
+						}
+
+						.anticon {
+							color: inherit;
+						}
+					}
+				}
+			}
+		}
+
+		&.mobile {
+			.top-nav-header-index {
+
+				.header-index-wide {
+
+					.header-index-left {
+
+						.trigger {
+							color: rgba(255, 255, 255, 0.85);
+							padding: 0 12px;
+						}
+
+						.logo.top-nav-header {
+							text-align: center;
+							width: 56px;
+							line-height: 58px;
+						}
+					}
+				}
+
+				.user-wrapper .action .avatar {
+					margin: 20px 0;
+				}
+
+				&.light {
+
+					.header-index-wide {
+
+						.header-index-left {
+							.trigger {
+								color: rgba(0, 0, 0, 0.65);
+							}
+						}
+					}
+
+					//
+				}
+			}
+		}
+
+		&.tablet {
+
+			// overflow: hidden; text-overflow:ellipsis; white-space: nowrap;
+			.top-nav-header-index {
+
+				.header-index-wide {
+
+					.header-index-left {
+						.logo>a {
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+					}
+				}
+			}
+
+		}
+
+		.top-nav-header-index {
+			box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+			position: relative;
+			transition: background .3s, width .2s;
+
+			.header-index-wide {
+				width: 100%;
+				margin: auto;
+				padding: 0 20px 0 0;
+				display: flex;
+				height: 59px;
+
+				.ant-menu.ant-menu-horizontal {
+					border: none;
+					height: 64px;
+					line-height: 64px;
+				}
+
+				.header-index-left {
+					flex: 1 1;
+					display: flex;
+
+					.logo.top-nav-header {
+						width: 165px;
+						height: 64px;
+						position: relative;
+						line-height: 64px;
+						transition: all .3s;
+						overflow: hidden;
+
+						img {
+							display: inline-block;
+							vertical-align: middle;
+							height: 32px;
+						}
+
+						h1 {
+							color: #fff;
+							display: inline-block;
+							vertical-align: top;
+							font-size: 16px;
+							margin: 0 0 0 12px;
+							font-weight: 400;
+						}
+					}
+				}
+
+				.header-index-right {
+					float: right;
+					height: 59px;
+					overflow: hidden;
+
+					.action:hover {
+						background-color: rgba(0, 0, 0, 0.05);
+					}
+				}
+			}
+
+			&.light {
+				background-color: #fff;
+
+				.header-index-wide {
+					.header-index-left {
+						.logo {
+							h1 {
+								color: #002140;
+							}
+						}
+					}
+				}
+			}
+
+			&.dark {
+
+				.user-wrapper {
+
+					.action {
+						color: white;
+
+						&:hover {
+							background: rgba(255, 255, 255, 0.3);
+						}
+					}
+				}
+
+				.header-index-wide .header-index-left .trigger:hover {
+					background: rgba(255, 255, 255, 0.3);
+				}
+			}
+
+		}
+
+		// 内容区
+		.layout-content {
+			margin: 24px 24px 0px;
+			height: 64px;
+			padding: 0 12px 0 0;
+		}
+
+	}
+
+	.topmenu {
+		.page-header-index-wide {
+			margin: 0 auto;
+			width: 100%;
+		}
+	}
+
+	// drawer-sider 自定义
+	.ant-drawer.drawer-sider {
+		.sider {
+			box-shadow: none;
+		}
+
+		&.dark {
+			.ant-drawer-content {
+				background-color: rgb(0, 21, 41);
+			}
+		}
+
+		&.light {
+			box-shadow: none;
+
+			.ant-drawer-content {
+				background-color: #fff;
+			}
+		}
+
+		.ant-drawer-body {
+			padding: 0
+		}
+	}
+
+	// 菜单样式
+	.sider {
+		box-shadow: 2px 116px 6px 0 rgba(0, 21, 41, .35);
+		position: relative;
+		z-index: 10;
+
+		&.ant-fixed-sidemenu {
+			position: fixed;
+			height: calc(100% - 30px);
+		}
+
+		.logo {
+			height: 64px;
+			position: relative;
+			line-height: 64px;
+			padding-left: 24px;
+			-webkit-transition: all .3s;
+			transition: all .3s;
+			background: #002140;
+			overflow: hidden;
+
+			img,
+			h1 {
+				display: inline-block;
+				vertical-align: middle;
+			}
+
+			img {
+				height: 32px;
+			}
+
+			h1 {
+				color: #fff;
+				font-size: 18px;
+				margin: 0 0 0 8px;
+				font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+				font-weight: 600;
+			}
+		}
+
+		&.light {
+			background-color: #fff;
+			box-shadow: 2px 116px 8px 0 rgba(29, 35, 41, 0.05);
+
+			.logo {
+				background: #fff;
+				box-shadow: 1px 1px 0 0 #e8e8e8;
+
+				h1 {
+					color: unset;
+				}
+			}
+
+			.ant-menu-light {
+				border-right-color: transparent;
+			}
+		}
+
+	}
+	
+	@keyframes suo{
+	  from {
+	    width: 228px;
+	  }
+	
+	  to {
+	    width: 80px;
+	  }
+	}
+	
+	@keyframes kuo{
+	  from {
+	    width: 80px;
+	  }
+	
+	  to {
+	    width: 228px;
+	  }
+	}
+	
+	.suojin {
+		width: 228px;
+		position: fixed;
+		bottom: 0px;
+		left: 0px;
+		height: 40px;
+		text-align: center;
+		z-index: 1000;
+		background-color: rgba(255, 255, 255, 1);
+		border-top: 1px #dad2d2 solid;
+		animation: suo 0.14s linear;
+		animation-fill-mode: forwards;
+	}
+
+	.suojin2 {
+		width: 80px;
+		position: fixed;
+		bottom: 0px;
+		left: 0px;
+		height: 40px;
+		text-align: center;
+		z-index: 1000;
+		background-color: rgba(255, 255, 255, 1);
+		border-top: 1px #dad2d2 solid;
+		animation: kuo 0.12s linear;
+		animation-fill-mode: forwards;
+	}
+	
+	
+
+	// 外置的样式控制
+	.user-dropdown-menu-wrapper.ant-dropdown-menu {
+		padding: 4px 0;
+
+		.ant-dropdown-menu-item {
+			width: 160px;
+		}
+
+		.ant-dropdown-menu-item>.anticon:first-child,
+		.ant-dropdown-menu-item>a>.anticon:first-child,
+		.ant-dropdown-menu-submenu-title>.anticon:first-child .ant-dropdown-menu-submenu-title>a>.anticon:first-child {
+			min-width: 12px;
+			margin-right: 8px;
+		}
+
+	}
+
+	// 数据列表 样式
+	.table-alert {
+		margin-bottom: 16px;
+	}
+
+	.table-page-search-wrapper {
+
+		.ant-form-inline {
+
+			.ant-form-item {
+				display: flex;
+				margin-bottom: 24px;
+				margin-right: 0;
+
+				.ant-form-item-control-wrapper {
+					flex: 1 1;
+					display: inline-block;
+					vertical-align: middle;
+				}
+
+				>.ant-form-item-label {
+					line-height: 32px;
+					padding-right: 8px;
+					width: auto;
+				}
+
+				.ant-form-item-control {
+					height: 32px;
+					line-height: 32px;
+				}
+			}
+		}
+
+		.table-page-search-submitButtons {
+			display: block;
+			margin-bottom: 24px;
+			white-space: nowrap;
+		}
+
+	}
+
+	.content {
+
+		.table-operator {
+			margin-bottom: 18px;
+
+			button {
+				margin-right: 8px;
+			}
+		}
+	}
+	
+	
+</style>

+ 2 - 1
src/components/tools/Logo.vue

@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '土地资产信息管理',
+        default: '山东省省级土地资产信息管理系统',//山东省省级土地资产
         required: false
       },
       showTitle: {
@@ -45,6 +45,7 @@
     box-shadow: none !important;
     .logo {
       height: @height !important;
+	  width: 500px;
       line-height: @height !important;
       box-shadow: none !important;
       transition: background 300ms;

+ 120 - 113
yarn.lock

@@ -27,7 +27,7 @@
     "@ant-design/colors" "^3.1.0"
     "babel-runtime" "^6.26.0"
 
-"@ant-design/icons@^2.1.1":
+"@ant-design/icons@^2.0.0", "@ant-design/icons@^2.1.1":
   "integrity" "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
   "resolved" "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz"
   "version" "2.1.1"
@@ -119,7 +119,7 @@
   "resolved" "https://registry.npmjs.org/@antv/g2-plugin-slider/-/g2-plugin-slider-2.1.1.tgz"
   "version" "2.1.1"
 
-"@antv/g2@~3.5.3":
+"@antv/g2@>=3.2.8", "@antv/g2@~3.5.3":
   "integrity" "sha512-gOjfA6pwXYEC5mrLbvg1kA3jZI5J5T2kQeGse+iBBsNc1Vje7zs9G+BleUaI4MLXSnqwhsj/ohfkP7d+h4ArNg=="
   "resolved" "https://registry.npmjs.org/@antv/g2/-/g2-3.5.17.tgz"
   "version" "3.5.17"
@@ -196,7 +196,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/core@^7.0.0", "@babel/core@^7.0.0-beta.39":
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.0-beta.39":
   "integrity" "sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA=="
   "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz"
   "version" "7.10.4"
@@ -1658,12 +1658,7 @@
   "resolved" "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz"
   "version" "5.7.4"
 
-"acorn@^6.0.2":
-  "integrity" "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
-  "resolved" "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"
-  "version" "6.4.1"
-
-"acorn@^6.0.7":
+"acorn@^6.0.0 || ^7.0.0", "acorn@^6.0.2", "acorn@^6.0.7":
   "integrity" "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
   "resolved" "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"
   "version" "6.4.1"
@@ -1731,17 +1726,7 @@
   "resolved" "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
   "version" "3.5.2"
 
-"ajv@^5.0.0":
-  "integrity" "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU="
-  "resolved" "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"
-  "version" "5.5.2"
-  dependencies:
-    "co" "^4.6.0"
-    "fast-deep-equal" "^1.0.0"
-    "fast-json-stable-stringify" "^2.0.0"
-    "json-schema-traverse" "^0.3.0"
-
-"ajv@^5.2.3":
+"ajv@^5.0.0", "ajv@^5.2.3":
   "integrity" "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU="
   "resolved" "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"
   "version" "5.5.2"
@@ -1761,7 +1746,7 @@
     "fast-json-stable-stringify" "^2.0.0"
     "json-schema-traverse" "^0.3.0"
 
-"ajv@^6.1.0", "ajv@^6.10.2", "ajv@^6.12.2", "ajv@^6.5.5", "ajv@^6.9.1":
+"ajv@^6.1.0", "ajv@^6.10.2", "ajv@^6.12.2", "ajv@^6.5.5", "ajv@^6.9.1", "ajv@>=5.0.0":
   "integrity" "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="
   "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"
   "version" "6.12.3"
@@ -1855,7 +1840,7 @@
     "@types/color-name" "^1.1.1"
     "color-convert" "^2.0.1"
 
-"ant-design-vue@^1.7.2":
+"ant-design-vue@^1.7.2", "ant-design-vue@>=1.0.0":
   "integrity" "sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A=="
   "resolved" "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-1.7.8.tgz"
   "version" "1.7.8"
@@ -2141,7 +2126,7 @@
     "esutils" "^2.0.2"
     "js-tokens" "^3.0.2"
 
-"babel-core@^6.26.0":
+"babel-core@^6.26.0", "babel-core@6":
   "integrity" "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA=="
   "resolved" "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"
   "version" "6.26.3"
@@ -4107,7 +4092,7 @@
     "postcss" "^7.0.1"
     "timsort" "^0.3.0"
 
-"css-loader@^0.28.7":
+"css-loader@*", "css-loader@^0.28.7":
   "integrity" "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg=="
   "resolved" "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz"
   "version" "0.28.11"
@@ -4997,7 +4982,7 @@
   "resolved" "https://registry.npmjs.org/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz"
   "version" "3.1.0"
 
-"echarts@^5.3.3":
+"echarts@^5.0.1", "echarts@^5.3.3":
   "integrity" "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw=="
   "resolved" "https://registry.npmmirror.com/echarts/-/echarts-5.3.3.tgz"
   "version" "5.3.3"
@@ -5278,7 +5263,7 @@
     "eslint-utils" "^1.4.2"
     "regexpp" "^2.0.1"
 
-"eslint-plugin-import@^2.14.0":
+"eslint-plugin-import@^2.14.0", "eslint-plugin-import@>=2.13.0":
   "integrity" "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg=="
   "resolved" "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"
   "version" "2.22.0"
@@ -5297,7 +5282,7 @@
     "resolve" "^1.17.0"
     "tsconfig-paths" "^3.9.0"
 
-"eslint-plugin-node@^8.0.0":
+"eslint-plugin-node@^8.0.0", "eslint-plugin-node@>=7.0.0":
   "integrity" "sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w=="
   "resolved" "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz"
   "version" "8.0.1"
@@ -5309,12 +5294,12 @@
     "resolve" "^1.8.1"
     "semver" "^5.5.0"
 
-"eslint-plugin-promise@^4.0.1":
+"eslint-plugin-promise@^4.0.1", "eslint-plugin-promise@>=4.0.0":
   "integrity" "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw=="
   "resolved" "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz"
   "version" "4.2.1"
 
-"eslint-plugin-standard@^4.0.0":
+"eslint-plugin-standard@^4.0.0", "eslint-plugin-standard@>=4.0.0":
   "integrity" "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ=="
   "resolved" "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz"
   "version" "4.0.1"
@@ -5361,7 +5346,49 @@
   "resolved" "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
   "version" "1.3.0"
 
-"eslint@^4.19.1":
+"eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0", "eslint@^5.0.0", "eslint@^5.16.0", "eslint@>=1.6.0 <7.0.0", "eslint@>=3.9.0", "eslint@>=4.19.1", "eslint@>=5.0.0":
+  "integrity" "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="
+  "resolved" "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz"
+  "version" "5.16.0"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "ajv" "^6.9.1"
+    "chalk" "^2.1.0"
+    "cross-spawn" "^6.0.5"
+    "debug" "^4.0.1"
+    "doctrine" "^3.0.0"
+    "eslint-scope" "^4.0.3"
+    "eslint-utils" "^1.3.1"
+    "eslint-visitor-keys" "^1.0.0"
+    "espree" "^5.0.1"
+    "esquery" "^1.0.1"
+    "esutils" "^2.0.2"
+    "file-entry-cache" "^5.0.1"
+    "functional-red-black-tree" "^1.0.1"
+    "glob" "^7.1.2"
+    "globals" "^11.7.0"
+    "ignore" "^4.0.6"
+    "import-fresh" "^3.0.0"
+    "imurmurhash" "^0.1.4"
+    "inquirer" "^6.2.2"
+    "js-yaml" "^3.13.0"
+    "json-stable-stringify-without-jsonify" "^1.0.1"
+    "levn" "^0.3.0"
+    "lodash" "^4.17.11"
+    "minimatch" "^3.0.4"
+    "mkdirp" "^0.5.1"
+    "natural-compare" "^1.4.0"
+    "optionator" "^0.8.2"
+    "path-is-inside" "^1.0.2"
+    "progress" "^2.0.0"
+    "regexpp" "^2.0.1"
+    "semver" "^5.5.1"
+    "strip-ansi" "^4.0.0"
+    "strip-json-comments" "^2.0.1"
+    "table" "^5.2.3"
+    "text-table" "^0.2.0"
+
+"eslint@^3.18.0 || ^4.0.0", "eslint@^4.19.1", "eslint@>= 4.12.1":
   "integrity" "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="
   "resolved" "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"
   "version" "4.19.1"
@@ -5405,48 +5432,6 @@
     "table" "4.0.2"
     "text-table" "~0.2.0"
 
-"eslint@^5.16.0":
-  "integrity" "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="
-  "resolved" "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz"
-  "version" "5.16.0"
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "ajv" "^6.9.1"
-    "chalk" "^2.1.0"
-    "cross-spawn" "^6.0.5"
-    "debug" "^4.0.1"
-    "doctrine" "^3.0.0"
-    "eslint-scope" "^4.0.3"
-    "eslint-utils" "^1.3.1"
-    "eslint-visitor-keys" "^1.0.0"
-    "espree" "^5.0.1"
-    "esquery" "^1.0.1"
-    "esutils" "^2.0.2"
-    "file-entry-cache" "^5.0.1"
-    "functional-red-black-tree" "^1.0.1"
-    "glob" "^7.1.2"
-    "globals" "^11.7.0"
-    "ignore" "^4.0.6"
-    "import-fresh" "^3.0.0"
-    "imurmurhash" "^0.1.4"
-    "inquirer" "^6.2.2"
-    "js-yaml" "^3.13.0"
-    "json-stable-stringify-without-jsonify" "^1.0.1"
-    "levn" "^0.3.0"
-    "lodash" "^4.17.11"
-    "minimatch" "^3.0.4"
-    "mkdirp" "^0.5.1"
-    "natural-compare" "^1.4.0"
-    "optionator" "^0.8.2"
-    "path-is-inside" "^1.0.2"
-    "progress" "^2.0.0"
-    "regexpp" "^2.0.1"
-    "semver" "^5.5.1"
-    "strip-ansi" "^4.0.0"
-    "strip-json-comments" "^2.0.1"
-    "table" "^5.2.3"
-    "text-table" "^0.2.0"
-
 "espree@^3.5.2", "espree@^3.5.4":
   "integrity" "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="
   "resolved" "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz"
@@ -6566,7 +6551,7 @@
     "toposort" "^1.0.0"
     "util.promisify" "1.0.0"
 
-"html-webpack-plugin@^4.2.0":
+"html-webpack-plugin@^4.2.0", "html-webpack-plugin@>=2.26.0":
   "integrity" "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w=="
   "resolved" "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz"
   "version" "4.3.0"
@@ -7592,7 +7577,7 @@
     "loader-utils" "^1.1.0"
     "pify" "^3.0.0"
 
-"less@^3.9.0":
+"less@^2.3.1 || ^3.0.0", "less@^3.9.0":
   "integrity" "sha512-VkZiTDdtNEzXA3LgjQiC3D7/ejleBPFVvq+aRI9mIj+Zhmif5TvFPM244bT4rzkvOCvJ9q4zAztok1M7Nygagw=="
   "resolved" "https://registry.npmjs.org/less/-/less-3.11.3.tgz"
   "version" "3.11.3"
@@ -10479,7 +10464,7 @@
     "stealthy-require" "^1.1.1"
     "tough-cookie" "^2.3.3"
 
-"request@^2.83.0", "request@^2.87.0":
+"request@^2.34", "request@^2.83.0", "request@^2.87.0":
   "integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="
   "resolved" "https://registry.npmjs.org/request/-/request-2.88.2.tgz"
   "version" "2.88.2"
@@ -12448,7 +12433,7 @@
     "hash-sum" "^1.0.2"
     "loader-utils" "^1.0.2"
 
-"vue-template-compiler@^2.4.4", "vue-template-compiler@^2.6.10":
+"vue-template-compiler@^2.0.0", "vue-template-compiler@^2.4.4", "vue-template-compiler@^2.6.0", "vue-template-compiler@^2.6.10", "vue-template-compiler@>=2.5.0":
   "integrity" "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA=="
   "resolved" "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz"
   "version" "2.6.11"
@@ -12461,7 +12446,7 @@
   "resolved" "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
   "version" "1.9.1"
 
-"vue@^2.4.4", "vue@^2.5.17", "vue@^2.5.3", "vue@^2.6.10":
+"vue@^2.0.0", "vue@^2.4.4", "vue@^2.5.17", "vue@^2.5.3", "vue@^2.6.0", "vue@^2.6.10", "vue@>= 2.6.0 < 3", "vue@>=2.2.0", "vue@>=2.5.0":
   "integrity" "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
   "resolved" "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz"
   "version" "2.6.11"
@@ -12497,7 +12482,7 @@
   "resolved" "https://registry.npmmirror.com/vxe-table-plugin-antd/-/vxe-table-plugin-antd-1.8.10.tgz"
   "version" "1.8.10"
 
-"vxe-table@2.9.13":
+"vxe-table@>=1.15.27", "vxe-table@2.9.13":
   "integrity" "sha512-MOaJLLJtdgVbiZX8netLqG8+daB7IbjBM9+5Ppt+seyjBrNV2C4dd8JkGpGX5zPThSzkYPGz66vo404Yu5Q/EA=="
   "resolved" "https://registry.npmmirror.com/vxe-table/-/vxe-table-2.9.13.tgz"
   "version" "2.9.13"
@@ -12528,13 +12513,6 @@
     "loader-utils" "^1.1.0"
     "wasm-dce" "^1.0.0"
 
-"watchpack-chokidar2@^2.0.0":
-  "integrity" "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA=="
-  "resolved" "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"
-  "version" "2.0.0"
-  dependencies:
-    "chokidar" "^2.1.8"
-
 "watchpack@^1.4.0", "watchpack@^1.5.0", "watchpack@^1.6.1":
   "integrity" "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g=="
   "resolved" "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz"
@@ -12710,7 +12688,7 @@
   dependencies:
     "lodash" "^4.17.15"
 
-"webpack-sources@^1.0.1", "webpack-sources@^1.1.0", "webpack-sources@^1.4.0", "webpack-sources@^1.4.1":
+"webpack-sources@^1.0.1", "webpack-sources@^1.1.0", "webpack-sources@^1.4.0", "webpack-sources@^1.4.1", "webpack-sources@>=2.2.0":
   "integrity" "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="
   "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"
   "version" "1.4.3"
@@ -12718,6 +12696,60 @@
     "source-list-map" "^2.0.0"
     "source-map" "~0.6.1"
 
+"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0":
+  "integrity" "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="
+  "resolved" "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"
+  "version" "4.43.0"
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "acorn" "^6.4.1"
+    "ajv" "^6.10.2"
+    "ajv-keywords" "^3.4.1"
+    "chrome-trace-event" "^1.0.2"
+    "enhanced-resolve" "^4.1.0"
+    "eslint-scope" "^4.0.3"
+    "json-parse-better-errors" "^1.0.2"
+    "loader-runner" "^2.4.0"
+    "loader-utils" "^1.2.3"
+    "memory-fs" "^0.4.1"
+    "micromatch" "^3.1.10"
+    "mkdirp" "^0.5.3"
+    "neo-async" "^2.6.1"
+    "node-libs-browser" "^2.2.1"
+    "schema-utils" "^1.0.0"
+    "tapable" "^1.1.3"
+    "terser-webpack-plugin" "^1.4.3"
+    "watchpack" "^1.6.1"
+    "webpack-sources" "^1.4.1"
+
+"webpack@^1.0.0 || ^2.0.0 || ^3.0.0", "webpack@^1.9 || ^2 || ^2.1.0-beta || ^2.2.0-rc || ^3.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.2.0 || ^3.0.0", "webpack@^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^3.1.0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.3.0 || ^5.0.0", "webpack@^4.4.0", "webpack@^4.5.0", "webpack@^5.1.0", "webpack@^5.9.0", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0", "webpack@>=4.0.0 < 6.0.0", "webpack@2 || 3 || 4":
+  "integrity" "sha512-6GrZsvQJnG7o7mjbfjp6s5CyMfdopjt1A/X8LcYwceis9ySjqBX6Lusso2wNZ06utHj2ZvfL6L3f7hfgVeJP6g=="
+  "resolved" "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz"
+  "version" "4.5.0"
+  dependencies:
+    "acorn" "^5.0.0"
+    "acorn-dynamic-import" "^3.0.0"
+    "ajv" "^6.1.0"
+    "ajv-keywords" "^3.1.0"
+    "chrome-trace-event" "^0.1.1"
+    "enhanced-resolve" "^4.0.0"
+    "eslint-scope" "^3.7.1"
+    "loader-runner" "^2.3.0"
+    "loader-utils" "^1.1.0"
+    "memory-fs" "~0.4.1"
+    "micromatch" "^3.1.8"
+    "mkdirp" "~0.5.0"
+    "neo-async" "^2.5.0"
+    "node-libs-browser" "^2.0.0"
+    "schema-utils" "^0.4.2"
+    "tapable" "^1.0.0"
+    "uglifyjs-webpack-plugin" "^1.2.4"
+    "watchpack" "^1.5.0"
+    "webpack-sources" "^1.0.1"
+
 "webpack@^3.6.0":
   "integrity" "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ=="
   "resolved" "https://registry.npmmirror.com/webpack/-/webpack-3.12.0.tgz"
@@ -12746,7 +12778,7 @@
     "webpack-sources" "^1.0.1"
     "yargs" "^8.0.2"
 
-"webpack@^4.0.0":
+"webpack@>=2":
   "integrity" "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="
   "resolved" "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"
   "version" "4.43.0"
@@ -12775,31 +12807,6 @@
     "watchpack" "^1.6.1"
     "webpack-sources" "^1.4.1"
 
-"webpack@^4.5.0":
-  "integrity" "sha512-6GrZsvQJnG7o7mjbfjp6s5CyMfdopjt1A/X8LcYwceis9ySjqBX6Lusso2wNZ06utHj2ZvfL6L3f7hfgVeJP6g=="
-  "resolved" "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz"
-  "version" "4.5.0"
-  dependencies:
-    "acorn" "^5.0.0"
-    "acorn-dynamic-import" "^3.0.0"
-    "ajv" "^6.1.0"
-    "ajv-keywords" "^3.1.0"
-    "chrome-trace-event" "^0.1.1"
-    "enhanced-resolve" "^4.0.0"
-    "eslint-scope" "^3.7.1"
-    "loader-runner" "^2.3.0"
-    "loader-utils" "^1.1.0"
-    "memory-fs" "~0.4.1"
-    "micromatch" "^3.1.8"
-    "mkdirp" "~0.5.0"
-    "neo-async" "^2.5.0"
-    "node-libs-browser" "^2.0.0"
-    "schema-utils" "^0.4.2"
-    "tapable" "^1.0.0"
-    "uglifyjs-webpack-plugin" "^1.2.4"
-    "watchpack" "^1.5.0"
-    "webpack-sources" "^1.0.1"
-
 "websocket-driver@>=0.5.1":
   "integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
   "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
@@ -12934,7 +12941,7 @@
   dependencies:
     "async-limiter" "~1.0.0"
 
-"xe-utils@2.4.8":
+"xe-utils@>= 2.4.0 < 3", "xe-utils@2.4.8":
   "integrity" "sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q=="
   "resolved" "https://registry.npmmirror.com/xe-utils/-/xe-utils-2.4.8.tgz"
   "version" "2.4.8"