Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

template/admin/src/layout/component/aside.vue

@@ -1,11 +1,9 @@
 <template>
   <el-aside class="layout-aside" :class="setCollapseWidth" v-if="clientWidth > 1000">
     <Logo v-if="setShowLogo && menuList.length && getThemeConfig.layout !== 'columns'" />
-    <el-divider
-      v-if="menuList.length && !getThemeConfig.isCollapse && getThemeConfig.layout == 'columns'"
-      content-position="center"
-      >{{ catName }}</el-divider
-    >
+    <div v-if="menuList.length && !getThemeConfig.isCollapse && getThemeConfig.layout == 'columns'" class="cat-name">
+      {{ catName }}
+    </div>
     <el-scrollbar class="flex-auto" ref="layoutAsideRef">
       <Vertical :menuList="menuList" :class="setCollapseWidth" />
     </el-scrollbar>
@@ -132,3 +130,14 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.cat-name {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 50px;
+  border-bottom: 1px solid var(--prev-border-color-lighter);
+  font-weight: 500;
+  font-size: 15px;
+}
+</style>

template/admin/src/layout/navBars/breadcrumb/setings.vue

@@ -19,7 +19,7 @@
             @click="onSetLayout('defaults')"
           >
             <section class="el-container el-circular">
-              <aside class="el-aside w10 mr5"></aside>
+              <aside class="el-aside w10 mr5" style="width: 17px"></aside>
               <section class="el-container is-vertical">
                 <header class="el-header mb5" style="height: 10px"></header>
                 <main class="el-main"></main>
@@ -31,6 +31,26 @@
               </div>
             </div> -->
           </div>
+          <!-- columns 布局 -->
+          <div
+            class="layout-drawer-content-item"
+            :class="{ 'drawer-layout-active': getThemeConfig.layout === 'columns' }"
+            @click="onSetLayout('columns')"
+          >
+            <section class="el-container el-circular">
+              <aside class="el-aside mr5" style="width: 10px"></aside>
+              <aside class="el-aside-dark mr5" style="width: 17px"></aside>
+              <section class="el-container is-vertical">
+                <!-- <header class="el-header" style="height: 10px"></header> -->
+                <main class="el-main"></main>
+              </section>
+            </section>
+            <!-- <div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'columns' }">
+              <div class="layout-tips-box">
+                <p class="layout-tips-txt">{{ $t('message.layout.sixColumns') }}</p>
+              </div>
+            </div> -->
+          </div>
           <!-- classic 布局 -->
           <div
             class="layout-drawer-content-item"
@@ -38,7 +58,7 @@
             @click="onSetLayout('classic')"
           >
             <section class="el-container is-vertical el-circular">
-              <header class="el-header mb5" style="height: 10px"></header>
+              <header class="el-aside mb5" style="height: 10px"></header>
               <section class="el-container">
                 <aside class="el-aside mr5" style="width: 20px"></aside>
                 <section class="el-container is-vertical">
@@ -52,6 +72,8 @@
               </div>
             </div> -->
           </div>
+          
+          
           <!-- transverse 布局 -->
           <div
             class="layout-drawer-content-item"
@@ -59,7 +81,7 @@
             @click="onSetLayout('transverse')"
           >
             <section class="el-container is-vertical el-circular">
-              <header class="el-header mb5" style="height: 10px"></header>
+              <header class="el-aside mb5" style="height: 10px"></header>
               <section class="el-container">
                 <section class="el-container is-vertical">
                   <main class="el-main"></main>
@@ -75,26 +97,6 @@
               </div>
             </div> -->
           </div>
-          <!-- columns 布局 -->
-          <div
-            class="layout-drawer-content-item"
-            :class="{ 'drawer-layout-active': getThemeConfig.layout === 'columns' }"
-            @click="onSetLayout('columns')"
-          >
-            <section class="el-container el-circular">
-              <aside class="el-aside-dark mr5" style="width: 10px"></aside>
-              <aside class="el-aside mr5" style="width: 17px"></aside>
-              <section class="el-container is-vertical">
-                <!-- <header class="el-header" style="height: 10px"></header> -->
-                <main class="el-main"></main>
-              </section>
-            </section>
-            <!-- <div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'columns' }">
-              <div class="layout-tips-box">
-                <p class="layout-tips-txt">{{ $t('message.layout.sixColumns') }}</p>
-              </div>
-            </div> -->
-          </div>
         </div>
         <!-- 全局主题 -->
         <!-- <el-divider :content-position="contentPosotion">{{ $t('message.layout.oneTitle') }}</el-divider>

template/admin/src/layout/navBars/breadcrumb/user.vue

@@ -38,11 +38,11 @@
         :width="300"
         popper-class="el-popover-pupop-user-news"
       >
-        <el-badge :is-dot="true" @click.stop="isShowUserNewsPopover = !isShowUserNewsPopover" slot="reference">
+        <el-badge :is-dot="isDot" @click.stop="openNews" slot="reference">
           <i class="el-icon-bell" :title="$t('message.user.title4')"></i>
         </el-badge>
         <transition name="el-zoom-in-top">
-          <UserNews v-show="isShowUserNewsPopover" />
+          <UserNews v-show="isShowUserNewsPopover" @haveNews="initIsDot" />
         </transition>
       </el-popover>
     </div>
@@ -93,6 +93,7 @@ export default {
       disabledI18n: 'zh-cn',
       disabledSize: '',
       homePath: `${settings.routePre}/home`,
+      isDot: false,
     };
   },
   computed: {
@@ -116,6 +117,13 @@ export default {
     }
   },
   methods: {
+    initIsDot(status) {
+      this.isDot = status;
+    },
+    openNews() {
+      this.isShowUserNewsPopover = !this.isShowUserNewsPopover;
+      this.isDot = false;
+    },
     // 搜索点击
     onSearchClick() {
       this.$refs.searchRef.openSearch();

template/admin/src/layout/navBars/breadcrumb/userNews.vue

@@ -34,18 +34,7 @@ export default {
   name: 'layoutBreadcrumbUserNews',
   data() {
     return {
-      newsList: [
-        {
-          label: '关于版本发布的通知',
-          value: '基于 vue2.x + element ui，正式发布时间：2020年11月15日！',
-          time: '2020-11-15',
-        },
-        {
-          label: '关于学习交流的通知',
-          value: 'QQ群号码 665452019，欢迎小伙伴入群学习交流探讨！',
-          time: '2020-11-15',
-        },
-      ],
+      newsList: [],
       newOrderAudioLink: null,
     };
   },
@@ -165,12 +154,12 @@ export default {
       this.newsList = [];
     },
     // 前往通知中心点击
-    onGoToGiteeClick() {
-    },
+    onGoToGiteeClick() {},
     getNotict() {
       jnoticeRequest()
         .then((res) => {
           this.newsList = res.data || [];
+          this.$emit('haveNews', !!this.newsList.length);
         })
         .catch(() => {});
     },

template/admin/src/layout/navBars/tagsView/tagsView.vue

@@ -19,11 +19,11 @@
             v-if="v.path !== tagsRoutePath && getThemeConfig.isTagsviewIcon"
           ></i>
           <span>{{ $t(v.meta.title) }}</span>
-          <i
+          <!-- <i
             class="el-icon-refresh-right layout-navbars-tagsview-ul-li-icon ml5"
             v-if="v.path === tagsRoutePath"
             @click.stop="refreshCurrentTagsView(v.path)"
-          ></i>
+          ></i> -->
           <i
             class="el-icon-close layout-navbars-tagsview-ul-li-icon ml5"
             v-if="!v.isAffix"

template/admin/src/pages/system/backendRouting/index.vue

@@ -31,10 +31,10 @@
               <div></div>
               <div
                 class="tree-node"
-                :class="{ node: slotProps.model.method, open: formValidate.path == slotProps.model.path }"
+                :class="{ node: slotProps.model.method, open: formValidate.path == slotProps.model.path && formValidate.method == slotProps.model.method }"
                 @click.stop="onClick(slotProps.model)"
               >
-                <span class="" :class="{ open: formValidate.path == slotProps.model.path }">{{
+                <span class="" :class="{ open: formValidate.path == slotProps.model.path && formValidate.method == slotProps.model.method }">{{
                   slotProps.model.name
                 }}</span>
                 <Dropdown
@@ -172,15 +172,13 @@
               <Col span="24">
                 <div class="title">调用方式</div>
                 <FormItem label="路由地址：" prop="path">
-                  <Input
-                    v-if="isEdit"
-                    class="perW20"
-                    type="text"
-                    :rows="4"
-                    v-model.trim="formValidate.path"
-                    placeholder="请输入"
-                  />
-                  <span v-else>{{ formValidate.path || '' }}</span>
+                  <span>{{ formValidate.path || '' }}</span>
+                </FormItem>
+                <FormItem label="文件地址：" prop="path">
+                  <span>{{ formValidate.file_path || '' }}</span>
+                </FormItem>
+                <FormItem label="方法名：" prop="path">
+                  <span>{{ formValidate.action || '' }}</span>
                 </FormItem>
                 <FormItem label="请求参数：">
                   <vxe-table
@@ -1016,7 +1014,7 @@ export default {
     .tree-list{
       margin-left:10px;
       padding: 0 15px;
-
+      margin-top: 10px;
     }
     .vtl-caret{
       padding-right: 2px;
@@ -1041,7 +1039,7 @@ export default {
       padding: 3px 7px 3px 0;
     }
     .node{
-      padding:4px 2px 4px 0px;
+      padding:3px 2px 3px 0px;
     }
     .open {
       // background-color: #fff1ef;