Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/layout/components/Navbar.vue

@@ -4,8 +4,11 @@
     <!-- <breadcrumb class="breadcrumb-container" /> -->
     <div class="navbar_top">
       <div class="nav_left">
-        <div class="log_icon"><img src="" /></div>
-        <div class="log_name">行李数据整合及应用</div>
+        <div class="log_icon">
+          <img src="../../assets/logo/pic_logo_top.png" />
+        </div>
+        <div class="dividing"></div>
+        <div class="log_name">国航行李数据整合及应用</div>
       </div>
       <div class="right-menu">
         <el-dropdown>
@@ -145,22 +148,30 @@ export default {
     align-items: center;
     justify-content: space-between;
     // border-bottom: 1px solid #f2f6fc;
-    padding-left: 24px;
+    padding-left: 14px;
     > .nav_left {
       height: 100%;
       display: flex;
       align-items: center;
       > .log_icon {
-        width: 32px;
+        width: 24px;
         height: 32px;
         border-radius: 50%;
-        margin-right: 16px;
+        display: flex;
+        align-items: center;
         > img {
-          width: 32px;
-          height: 32px;
+          width: 24px;
+          height: 24px;
           border-radius: 50%;
         }
       }
+      > .dividing {
+        width: 1px;
+        height: 16px;
+        margin-left: 8px;
+        margin-right: 12px;
+        background: #ffffff;
+      }
       > .log_name {
         font-size: 14px;
         font-family: Microsoft YaHei;

src/layout/components/OrgTree/index.vue

@@ -9,7 +9,13 @@
 <template>
   <div class="orgTree">
     <div class="orgTreeContent">
-      <vue2-org-tree :data="dataList" :horizontal="true" collapsable @on-expand="onExpand" :render-content="renderContent" />
+      <vue2-org-tree
+        :data="dataList"
+        :horizontal="true"
+        collapsable
+        @on-expand="onExpand"
+        :render-content="renderContent"
+      />
     </div>
   </div>
 </template>
@@ -20,18 +26,18 @@ export default {
   props: {
     dataList: {
       type: Object,
-      default: () => { },
+      default: () => {},
     },
     renderContent: {
       type: Function,
     },
   },
-  mounted () {
+  mounted() {
     this.toggleExpand(this.dataList, true);
   },
   watch: {
     dataList: {
-      handler (val, old) {
+      handler(val, old) {
         if (val != old) {
           this.toggleExpand(val, true);
         }
@@ -40,7 +46,7 @@ export default {
     },
   },
   methods: {
-    collapse (list) {
+    collapse(list) {
       const _this = this;
       list.forEach(function (child) {
         if (child.expand) {
@@ -50,7 +56,7 @@ export default {
       });
     },
     //展开
-    onExpand (e, data) {
+    onExpand(e, data) {
       const _this = this;
       if ("expand" in data) {
         data.expand = !data.expand;
@@ -61,18 +67,18 @@ export default {
         _this.$set(data, "expand", true);
       }
       if (data.expand) {
-        this.$emit('expandData', data)
+        this.$emit("expandData", data);
       }
     },
     //节点关闭按钮点击
-    onNodeClick (e, data) {
+    onNodeClick(e, data) {
       const _this = this;
       if (e.target.className === "icon el-icon-close") {
         this.decompose(_this.dataList.children, data.id);
       }
     },
     //删除指定数据
-    decompose (data, id) {
+    decompose(data, id) {
       for (let i = 0; i < data.length; i++) {
         if (data[i].id === id) {
           data.splice(i, 1);
@@ -82,7 +88,7 @@ export default {
       }
     },
     //是否完全展开
-    toggleExpand (data, val) {
+    toggleExpand(data, val) {
       const _this = this;
       if (Array.isArray(data)) {
         data.forEach(function (item) {

src/layout/components/Sidebar/index.vue

@@ -2,8 +2,23 @@
   <div :class="{ 'has-logo': showLogo }">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu class="navMenu" :default-active="activeMenu" :collapse="isCollapse" :background-color="variables.menusBg" :text-color="variables.menuText" :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
-        <sidebar-item v-for="(route, index) in permission_routes" :key="index" :item="route" :base-path="route.path" />
+      <el-menu
+        class="navMenu"
+        :default-active="activeMenu"
+        :collapse="isCollapse"
+        :background-color="variables.menusBg"
+        :text-color="variables.menuText"
+        :unique-opened="false"
+        :active-text-color="variables.menuActiveText"
+        :collapse-transition="false"
+        mode="vertical"
+      >
+        <sidebar-item
+          v-for="(route, index) in permission_routes"
+          :key="index"
+          :item="route"
+          :base-path="route.path"
+        />
       </el-menu>
     </el-scrollbar>
   </div>
@@ -19,8 +34,11 @@ export default {
   components: { SidebarItem, Logo },
   computed: {
     ...mapGetters(["sidebar", "permission_routes"]),
-    routes () {
-      const power = typeof this.userPowerList == 'string' ? JSON.parse(this.userPowerList) : this.userPowerList;
+    routes() {
+      const power =
+        typeof this.userPowerList == "string"
+          ? JSON.parse(this.userPowerList)
+          : this.userPowerList;
       return power;
       // const datas = this.$router.options.routes;
       // const arrs = [];
@@ -43,7 +61,7 @@ export default {
       //   return datas;
       // }
     },
-    activeMenu () {
+    activeMenu() {
       const route = this.$route;
       const { meta, path } = route;
       // if set path, the sidebar will highlight the path you set
@@ -52,13 +70,13 @@ export default {
       }
       return path;
     },
-    showLogo () {
+    showLogo() {
       return this.$store.state.settings.sidebarLogo;
     },
-    variables () {
+    variables() {
       return variables;
     },
-    isCollapse () {
+    isCollapse() {
       return !this.sidebar.opened;
     },
   },

src/layout/index.vue

@@ -1,9 +1,15 @@
 <template>
-  <div class="app-wrapper">
-    <sidebar class="sidebar-container" style="width: 88px" />
+  <div class="app-wrapper" @change="eveclk">
+    <sidebar
+      class="sidebar-container"
+      id="sidebar-container"
+      style="width: 88px"
+      @mouseover.native="eveclk"
+      @mouseleave.native="upLeft"
+    />
     <div class="main-container">
       <navbar />
-      <app-main />
+      <app-main id="main-containers" />
     </div>
     <!--修改密码弹框-->
     <Dialog width="496px" customClass="dataStoreInfoDialog" :flag="pwdflag">
@@ -95,6 +101,7 @@ export default {
         new: "",
         again: "",
       },
+      left: "0%",
       dataRules: {
         //数据项表单验证
         old: [{ required: true, message: "请输入旧密码", trigger: "blur" }],
@@ -109,6 +116,14 @@ export default {
     ...mapGetters(["pwdflag", "outflag", "name"]),
   },
   methods: {
+    eveclk() {
+      document.getElementById("sidebar-container").style.left = "0%";
+      // document.getElementById("main-containers").style.paddingLeft = "50px";
+    },
+    upLeft() {
+      document.getElementById("sidebar-container").style.left = "-2.5%";
+      // document.getElementById("main-containers").style.paddingLeft = "30px";
+    },
     //存储数据项-提交
     addSubmit(formName) {
       this.$refs[formName].validate((valid) => {