Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

 <template>
 <template>
   <!-- 编辑 -->
   <!-- 编辑 -->
-  <el-dialog :close-on-click-modal="false" top="0" custom-class="dialogBox editDialogBox mainCenter"
+  <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox editDialogBox mainCenter"
     :visible.sync="dialogVisible" width="85%">
     :visible.sync="dialogVisible" width="85%">
     <div slot="title" class="dialog_title" ref="dialogTitle">
     <div slot="title" class="dialog_title" ref="dialogTitle">
       <b>{{ title || '标题' }}</b>
       <b>{{ title || '标题' }}</b>
@@ -218,6 +218,9 @@ export default {
     },
     },
     closeDialog () {
     closeDialog () {
       this.dialogVisible = false;
       this.dialogVisible = false;
+      //关闭弹框时将tabs项置空
+      this.editItem = "";
+      this.headerList = [];
     },
     },
     submitForm () {
     submitForm () {
       let _this = this;
       let _this = this;

 <template>
 <template>
-  <el-menu router :default-active="activeMenu" mode="horizontal">
+  <el-menu router :default-active="activeMenu" mode="horizontal" menu-trigger="click">
     <!-- 权限菜单 -->
     <!-- 权限菜单 -->
     <sidebar-item v-for="route in permission_routes.slice(1, 4)" :key="route.path" :item="route"
     <sidebar-item v-for="route in permission_routes.slice(1, 4)" :key="route.path" :item="route"
       :base-path="route.path" />
       :base-path="route.path" />

@@ -253,7 +253,8 @@ table td {
 // element 下拉框样式
 // element 下拉框样式
 .el-menu--popup,
 .el-menu--popup,
 .el-select-dropdown {
 .el-select-dropdown {
-  background-color: #031A46 !important;
+  background: url("~@/image/slbg.png") no-repeat;
+  background-size: 100% 100%;
   padding: 10px;
   padding: 10px;
   border: none;
   border: none;
 }
 }
@@ -265,20 +266,25 @@ table td {
 .el-popper[x-placement^="bottom"] .popper__arrow {
 .el-popper[x-placement^="bottom"] .popper__arrow {
   display: none;
   display: none;
 }
 }
+
 .el-popper[x-placement^="bottom"] {
 .el-popper[x-placement^="bottom"] {
   margin-top: 0px;
   margin-top: 0px;
 }
 }
+
 // 时间选择框样式
 // 时间选择框样式
 .el-date-picker {
 .el-date-picker {
-  .el-input__inner{
+  .el-input__inner {
     background-color: #031a46;
     background-color: #031a46;
   }
   }
-  .el-picker-panel{
+
+  .el-picker-panel {
     border: none;
     border: none;
   }
   }
-  .el-picker-panel__footer{
+
+  .el-picker-panel__footer {
     background-color: #031a46;
     background-color: #031a46;
   }
   }
+
   .el-date-table td.disabled div {
   .el-date-table td.disabled div {
     background-color: #074487;
     background-color: #074487;
   }
   }
@@ -400,9 +406,12 @@ table td {
 
 
 // 时间组件input框部分
 // 时间组件input框部分
 .el-date-editor {
 .el-date-editor {
-  [class^="el-icon-"], [class*=" el-icon-"] {
+
+  [class^="el-icon-"],
+  [class*=" el-icon-"] {
     display: none;
     display: none;
   }
   }
+
   .el-range-separator {
   .el-range-separator {
     color: #E3F1FF;
     color: #E3F1FF;
   }
   }
@@ -416,9 +425,9 @@ table td {
 .el-menu--horizontal .el-menu .el-menu-item,
 .el-menu--horizontal .el-menu .el-menu-item,
 .el-select-dropdown__item,
 .el-select-dropdown__item,
 .el-menu--horizontal .el-menu .el-submenu__title {
 .el-menu--horizontal .el-menu .el-submenu__title {
-  background: #074487 !important;
+  background: url("~@/image/slitembg.png") no-repeat;
+  background-size: 100% 100%;
   margin: 5px 0;
   margin: 5px 0;
-  border: 1px solid #074487;
   color: #02D9FD !important;
   color: #02D9FD !important;
 }
 }
 
 
@@ -426,8 +435,8 @@ table td {
 .el-select-dropdown__item:hover,
 .el-select-dropdown__item:hover,
 .el-select-dropdown__item.selected,
 .el-select-dropdown__item.selected,
 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
-  background: #074487;
-  border: 1px solid #02D9FD;
+  background: url("~@/image/xzslitembg.png") no-repeat;
+  background-size: 100% 100%;
   color: #FFFFFF !important;
   color: #FFFFFF !important;
   font-weight: 700;
   font-weight: 700;
-}
+}
\ No newline at end of file