cxmo 10 сар өмнө
parent
commit
8462f54e9c

+ 3 - 0
src/assets/svg/menu/author.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.16849 0.655151C4.37629 0.655151 2.9305 2.14667 2.9305 3.9781C2.9305 5.80954 4.37629 7.30105 6.16849 7.30105C7.96069 7.30105 9.40648 5.80954 9.40648 3.9781C9.40648 2.14667 7.96069 0.655151 6.16849 0.655151ZM6.16849 6.1976C4.99353 6.1976 4.03395 5.20768 4.03395 3.9781C4.03395 2.74853 4.99353 1.7586 6.16849 1.7586C7.34345 1.7586 8.30303 2.74853 8.30303 3.9781C8.30303 5.20768 7.34345 6.1976 6.16849 6.1976ZM0.00158247 12.6958C-0.0224711 13.0158 0.230758 13.2888 0.551755 13.2888H11.7852C12.1062 13.2888 12.3595 13.0158 12.3354 12.6957C12.1253 9.90215 10.2448 7.70918 7.92095 7.70918H4.41604C2.09096 7.70918 0.211538 9.90175 0.00158247 12.6958ZM7.92095 8.81263C9.60586 8.81263 11.0648 10.514 11.2351 12.7785L11.7852 12.1854H0.551755L1.10193 12.7784C1.27213 10.5135 2.73007 8.81263 4.41604 8.81263H7.92095ZM15.4483 3.14603C15.753 3.14603 16 2.89902 16 2.59431C16 2.2896 15.753 2.04258 15.4483 2.04258H11.4189C11.1142 2.04258 10.8672 2.2896 10.8672 2.59431C10.8672 2.89902 11.1142 3.14603 11.4189 3.14603H15.4483ZM15.4483 6.18051C15.753 6.18051 16 5.9335 16 5.62879C16 5.32408 15.753 5.07706 15.4483 5.07706H11.1747C10.87 5.07706 10.623 5.32408 10.623 5.62879C10.623 5.9335 10.87 6.18051 11.1747 6.18051H15.4483ZM15.4483 9.215C15.753 9.215 16 8.96798 16 8.66327C16 8.35856 15.753 8.11155 15.4483 8.11155H12.1515C11.8468 8.11155 11.5998 8.35856 11.5998 8.66327C11.5998 8.96798 11.8468 9.215 12.1515 9.215H15.4483Z" fill="currentColor"/>
+</svg>

+ 4 - 4
src/assets/svg/menu/usergroup.svg → src/assets/svg/menu/custom.svg

@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.00003 1C6.52575 1 7.02232 1.12482 7.46171 1.34645L6.83144 2.1586C6.57424 2.05626 6.2937 2 6.00003 2C4.75739 2 3.75003 3.00736 3.75003 4.25C3.75003 5.47717 4.73246 6.47488 5.95373 6.49953V7.49968C4.18015 7.47491 2.75003 6.02947 2.75003 4.25C2.75003 2.45507 4.2051 1 6.00003 1Z" fill="white"/>
-<path d="M0.540929 9.43593C2.18917 8.66419 4.01922 8.22779 5.95373 8.22094V9.22095C4.18421 9.22774 2.51071 9.62379 1 10.3252V12H2.85709V13H0.5C0.223857 13 0 12.7761 0 12.5V10.3086C0 9.9372 0.204537 9.59344 0.540929 9.43593Z" fill="white"/>
-<path d="M9.99992 8.31354C8.20499 8.31354 6.74992 6.85846 6.74992 5.06354C6.74992 3.26861 8.20499 1.81354 9.99992 1.81354C11.7948 1.81354 13.2499 3.26861 13.2499 5.06354C13.2499 6.85846 11.7948 8.31354 9.99992 8.31354ZM9.99992 7.31354C11.2426 7.31354 12.2499 6.30618 12.2499 5.06354C12.2499 3.8209 11.2426 2.81354 9.99992 2.81354C8.75728 2.81354 7.74992 3.8209 7.74992 5.06354C7.74992 6.30618 8.75728 7.31354 9.99992 7.31354Z" fill="white"/>
-<path d="M16 11.5178C16 11.1464 15.7954 10.8026 15.459 10.6451C13.7977 9.86723 11.9516 9.43005 9.99997 9.43005C8.04837 9.43005 6.20227 9.86723 4.54089 10.6451C4.2045 10.8026 3.99996 11.1464 3.99996 11.5178V14C3.99996 14.2761 4.22382 14.5 4.49996 14.5H15.5C15.7761 14.5 16 14.2761 16 14V11.5178ZM15 11.5344V13.5H4.99996V11.5344C6.52384 10.8269 8.21334 10.43 9.99997 10.43C11.7866 10.43 13.4761 10.8269 15 11.5344Z" fill="white"/>
+<path d="M6.00003 1C6.52575 1 7.02232 1.12482 7.46171 1.34645L6.83144 2.1586C6.57424 2.05626 6.2937 2 6.00003 2C4.75739 2 3.75003 3.00736 3.75003 4.25C3.75003 5.47717 4.73246 6.47488 5.95373 6.49953V7.49968C4.18015 7.47491 2.75003 6.02947 2.75003 4.25C2.75003 2.45507 4.2051 1 6.00003 1Z" fill="currentColor"/>
+<path d="M0.540929 9.43593C2.18917 8.66419 4.01922 8.22779 5.95373 8.22094V9.22095C4.18421 9.22774 2.51071 9.62379 1 10.3252V12H2.85709V13H0.5C0.223857 13 0 12.7761 0 12.5V10.3086C0 9.9372 0.204537 9.59344 0.540929 9.43593Z" fill="currentColor"/>
+<path d="M9.99992 8.31354C8.20499 8.31354 6.74992 6.85846 6.74992 5.06354C6.74992 3.26861 8.20499 1.81354 9.99992 1.81354C11.7948 1.81354 13.2499 3.26861 13.2499 5.06354C13.2499 6.85846 11.7948 8.31354 9.99992 8.31354ZM9.99992 7.31354C11.2426 7.31354 12.2499 6.30618 12.2499 5.06354C12.2499 3.8209 11.2426 2.81354 9.99992 2.81354C8.75728 2.81354 7.74992 3.8209 7.74992 5.06354C7.74992 6.30618 8.75728 7.31354 9.99992 7.31354Z" fill="currentColor"/>
+<path d="M16 11.5178C16 11.1464 15.7954 10.8026 15.459 10.6451C13.7977 9.86723 11.9516 9.43005 9.99997 9.43005C8.04837 9.43005 6.20227 9.86723 4.54089 10.6451C4.2045 10.8026 3.99996 11.1464 3.99996 11.5178V14C3.99996 14.2761 4.22382 14.5 4.49996 14.5H15.5C15.7761 14.5 16 14.2761 16 14V11.5178ZM15 11.5344V13.5H4.99996V11.5344C6.52384 10.8269 8.21334 10.43 9.99997 10.43C11.7866 10.43 13.4761 10.8269 15 11.5344Z" fill="currentColor"/>
 </svg>

+ 6 - 0
src/assets/svg/menu/feedback.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5007 15.0001H3.4995C2.67169 15.0001 1.99976 14.3282 1.99976 13.5004V3.50207C1.99976 2.67425 2.67169 2.00232 3.4995 2.00232H10.4983C10.7752 2.00232 10.9982 2.2254 10.9982 2.50224C10.9982 2.77907 10.7752 3.00215 10.4983 3.00215H3.4995C3.22536 3.00215 2.99959 3.22792 2.99959 3.50207V13.5004C2.99959 13.7772 3.22536 14.0003 3.4995 14.0003H12.498C12.7748 14.0003 12.9979 13.7772 12.9979 13.5004V5.49904C12.9979 5.22221 13.221 4.99913 13.4978 4.99913C13.7747 4.99913 13.9977 5.22221 13.9977 5.49904V13.4977C14.0004 14.3255 13.3258 15.0001 12.5007 15.0001Z" fill="currentColor"/>
+<path d="M9.56297 6.99879C9.43396 6.99879 9.30763 6.95041 9.20819 6.85096C9.01198 6.65476 9.01198 6.34029 9.20819 6.14409L14.1778 1.17718C14.374 0.980978 14.6885 0.980978 14.8847 1.17718C15.0809 1.37339 15.0809 1.68785 14.8847 1.88405L9.91506 6.85365C9.8183 6.95041 9.68929 6.99879 9.56297 6.99879Z" fill="currentColor"/>
+<path d="M7.49868 6.99886H4.49918C4.22235 6.99886 3.99927 6.77577 3.99927 6.49894C3.99927 6.2221 4.22235 5.99902 4.49918 5.99902H7.49868C7.77551 5.99902 7.9986 6.2221 7.9986 6.49894C7.9986 6.77577 7.77551 6.99886 7.49868 6.99886Z" fill="currentColor"/>
+<path d="M10.5009 9.99837H4.49918C4.22235 9.99837 3.99927 9.77529 3.99927 9.49845C3.99927 9.22162 4.22235 8.99854 4.49918 8.99854H10.4982C10.775 8.99854 10.9981 9.22162 10.9981 9.49845C10.9981 9.77529 10.775 9.99837 10.5009 9.99837Z" fill="currentColor"/>
+</svg>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 1 - 0
src/assets/svg/menu/media.svg


+ 3 - 0
src/assets/svg/menu/message.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="12" viewBox="0 0 16 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.4001 0.666626H1.60011C1.31722 0.666626 1.04591 0.779007 0.845867 0.979045C0.645828 1.17908 0.533447 1.45039 0.533447 1.73329V10.2666C0.533447 10.5495 0.645828 10.8208 0.845867 11.0209C1.04591 11.2209 1.31722 11.3333 1.60011 11.3333H14.4001C14.683 11.3333 14.9543 11.2209 15.1544 11.0209C15.3544 10.8208 15.4668 10.5495 15.4668 10.2666V1.73329C15.4668 1.45039 15.3544 1.17908 15.1544 0.979045C14.9543 0.779007 14.683 0.666626 14.4001 0.666626ZM13.2268 1.73329L8.00011 5.34929L2.77345 1.73329H13.2268ZM1.60011 10.2666V2.21863L7.69611 6.43729C7.78539 6.49923 7.89146 6.53242 8.00011 6.53242C8.10877 6.53242 8.21484 6.49923 8.30411 6.43729L14.4001 2.21863V10.2666H1.60011Z" fill="currentColor"/>
+</svg>

+ 0 - 3
src/assets/svg/menu/pdf.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.625 2.5C4.595 2.5 3.75 3.345 3.75 4.375V12.5H5V4.375C5 4.02375 5.27375 3.75 5.625 3.75H11.25V7.5H15V15.625C15 15.9762 14.7262 16.25 14.375 16.25H12.5V17.5H14.375C15.405 17.5 16.25 16.655 16.25 15.625V6.61625L12.1337 2.5H5.625ZM12.5 4.63375L14.1163 6.25H12.5V4.63375ZM7.325 8.755C7.08011 8.75089 6.84143 8.83222 6.65 8.985C6.48638 9.13073 6.36795 9.32029 6.30875 9.53125C6.20125 9.9125 6.225 10.2837 6.28875 10.7037C6.37625 11.2987 6.67 12.0025 6.93875 12.685C6.84625 12.9637 6.84625 13.1838 6.72875 13.4575C6.5725 13.8325 6.38125 14.0425 6.20125 14.38C5.69375 14.5462 5.13125 14.6625 4.73625 14.9025C4.395 15.1125 4.09125 15.3462 3.89625 15.7075C3.70125 16.07 3.73 16.6112 3.98375 16.9775C4.11945 17.1828 4.31367 17.3426 4.54125 17.4363C4.785 17.5238 5.04875 17.51 5.26375 17.4412C5.68875 17.31 5.98625 17.0312 6.28375 16.6937C6.5675 16.3725 6.7825 15.8313 7.04125 15.39C7.22625 15.3413 7.33875 15.2587 7.52875 15.22C7.84625 15.1512 8.05625 15.185 8.36 15.1513C8.51625 15.3325 8.61875 15.625 8.78875 15.7712C9.10625 16.04 9.4875 16.265 9.96125 16.23C10.435 16.1962 10.84 15.855 11.0738 15.425H11.0787L11.0837 15.415C11.1936 15.217 11.2415 14.9905 11.2213 14.765C11.1848 14.5317 11.0692 14.318 10.8938 14.16C10.5813 13.8863 10.2387 13.8288 9.8725 13.7887C9.61 13.755 9.2525 13.8475 8.955 13.8625C8.73 13.53 8.51625 13.33 8.32 12.915C8.27625 12.8225 8.27125 12.74 8.2325 12.6412C8.4225 12.0162 8.68625 11.3625 8.72 10.81C8.75 10.3325 8.72 9.8925 8.51625 9.4825C8.39808 9.26786 8.22589 9.08782 8.01672 8.96021C7.80755 8.83261 7.56867 8.76187 7.32375 8.755H7.325Z" fill="white"/>
-</svg>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 1 - 0
src/assets/svg/menu/piclib.svg


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 2
src/assets/svg/menu/setting.svg


+ 3 - 0
src/assets/svg/menu/submenu.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="7" width="10" height="2" fill="currentColor"/>
+</svg>

+ 0 - 4
src/assets/svg/menu/user.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5 5C11.5 6.933 9.933 8.5 8 8.5C6.067 8.5 4.5 6.933 4.5 5C4.5 3.067 6.067 1.5 8 1.5C9.933 1.5 11.5 3.067 11.5 5ZM10.5 5C10.5 3.61929 9.38071 2.5 8 2.5C6.61929 2.5 5.5 3.61929 5.5 5C5.5 6.38071 6.61929 7.5 8 7.5C9.38071 7.5 10.5 6.38071 10.5 5Z" fill="white"/>
-<path d="M13.9631 10.8528C14.297 11.0122 14.5 11.3547 14.5 11.7246V14C14.5 14.2761 14.2761 14.5 14 14.5H2C1.72386 14.5 1.5 14.2761 1.5 14V11.7246C1.5 11.3547 1.70302 11.0122 2.03686 10.8528C3.8494 9.98708 5.86651 9.5 8 9.5C10.1335 9.5 12.1506 9.98708 13.9631 10.8528ZM8 10.5C6.0334 10.5 4.17435 10.9457 2.5 11.7398V13.5H13.5V11.7398C11.8257 10.9457 9.9666 10.5 8 10.5Z" fill="white"/>
-</svg>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 1
src/assets/svg/menu/usersearch.svg


+ 8 - 2
src/components/SvgIcon.vue

@@ -23,7 +23,13 @@ const symbolId = computed(() => `#${props.name}`)
 </script>
 
 <template>
-  <svg aria-hidden="true" class="svg-icon" :width="props.size" :height="props.size">
+  <svg aria-hidden="true" class="svg-icon" :width="props.size" :height="props.size" :style="{'color':props.color}">
     <use :xlink:href="symbolId" :fill="props.color" />
   </svg>
-</template>
+</template>
+<style lang="scss" scoped>
+.svg-icon{
+    fill:currentColor;
+   /*  color:red; */
+}
+</style>

+ 1 - 1
src/layout/components/HeaderWrap.vue

@@ -77,7 +77,7 @@ const hasUnRead=ref(false)//是否有未读
   left: 0px;
   top: 0;
   right: 0;
-  height: 60px;
+  height: 48px;
   z-index: 50;
   background-color: #fff;
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1);

+ 81 - 27
src/layout/components/LeftWrap.vue

@@ -27,11 +27,53 @@ function getNavList(){
             Name:'研究员管理',
             Children:[]
         },
+        {
+            Path:'/mediaMgt',
+            Name:'音视频管理',
+            Children:[
+                {
+                    Path:'/mediaMgt/audioList',
+                    Name:'音频管理',
+                },
+                {
+                    Path:'/mediaMgt/videoList',
+                    Name:'视频管理',
+                }
+            ]
+        },
+        {
+            Path:'/customer/notification',
+            Name:'消息推送管理',
+            Children:[]
+        },
+        {
+            Path:'/mediaMgt/pictureLib',
+            Name:'图片资源库',
+            Children:[]
+        },
         {
             Path:'/customer/feedbackList',
             Name:'客户反馈',
             Children:[]
-        }
+        },
+        {
+            Path:'/system',
+            Name:'系统设置',
+            Children:[
+                {
+                    Path:'/system/userList',
+                    Name:'用户列表',
+                },
+                {
+                    Path:'/system/roleList',
+                    Name:'角色管理',
+                },
+                {
+                    Path:'/system/authSet',
+                    Name:'权限管理',
+                }
+            ]
+        },
     ]
     return 
   apiSystemRole.menuData().then(res=>{
@@ -63,11 +105,17 @@ function logout() {
 }
 
 function getMenuIcon(item){
-  if(item.Name==='用户列表') return 'menu/user'
-  if(item.Name==='潜在用户列表') return 'menu/usergroup'
-  if(item.Name==='PDF报告') return 'menu/pdf'
-  if(item.Name==='全局检索') return 'menu/usersearch'
-  return 'menu/setting'
+    const iconMap = {
+        '客户管理':'menu/custom',
+        '研究员管理':'menu/author',
+        '音视频管理':'menu/media',
+        '消息推送管理':'menu/message',
+        '图片资源库':'menu/piclib',
+        '客户反馈':'menu/feedback',
+        '系统设置':'menu/setting'
+    }
+    return iconMap[item]||'menu/setting'
+
 }
 
 </script>
@@ -77,7 +125,6 @@ function getMenuIcon(item){
     <el-menu
       class="menu-wrap"
       mode="vertical"
-      unique-opened
       router
       :default-active="$route.path"
       :collapse="menuClose"
@@ -87,36 +134,29 @@ function getMenuIcon(item){
           :index="level1.Path"
           v-if="level1.Children.length===0"
         >
-          <svg-icon :name="getMenuIcon(level1)" style="font-size:16px;"></svg-icon>
-          <span>{{ level1.Name }}</span>
+          <svg-icon 
+            :name="getMenuIcon(level1.Name)" :color="$route.path===level1.Path?'#086CE0':'#333'" style="font-size:16px;"></svg-icon>
+          <span style="margin-left: 5px;">{{ level1.Name }}</span>
         </el-menu-item>
         <el-sub-menu
           :index="level1.Path"
           v-if="level1.Children.length>0"
         >
           <template #title>
-            <svg-icon :name="getMenuIcon(level1)" style="font-size:16px"></svg-icon>
-            <span>{{ level1.Name }}</span>
+            <svg-icon :name="getMenuIcon(level1.Name)" :color="$route.path===level1.Path?'#086CE0':'#333'" style="font-size:16px"></svg-icon>
+            <span style="margin-left: 5px;">{{ level1.Name }}</span>
           </template>
           <el-menu-item
             v-for="child in level1.Children"
             :index="child.Path"
             :key="child.Path"
           >
-            <el-icon></el-icon>
-            <span>{{ child.Name }}</span>
+            <svg-icon name="menu/submenu" :color="$route.path===child.Path?'#086CE0':'#333'" style="font-size:16px;"></svg-icon>
+            <span style="margin-left: 5px;">{{ child.Name }}</span>
           </el-menu-item>
         </el-sub-menu>
       </template>
     </el-menu>
-    <div class="user-box" v-if="!menuClose">
-      <div class="name-box">
-        <svg-icon name="person" size="18px"></svg-icon>
-        <span>{{userName}}</span>
-      </div>
-      <div class="opt" @click="resetpwd">修改密码</div>
-      <div class="opt" @click="logout">退出登录</div>
-    </div>
     <el-popover placement="right" :width="100" trigger="click">
       <template #reference>
         <div style="text-align: center">
@@ -133,18 +173,19 @@ function getMenuIcon(item){
 
 <style lang="scss" scoped>
 .left-wrap {
-  --el-menu-bg-color: #086CE0;
+  --el-menu-bg-color: #fff;
   --el-menu-hover-bg-color: rgba(255, 255, 255, 0.15);
-  --el-menu-text-color: #ffffff;
-  --el-menu-active-color: #ffae4f;
+  --el-menu-text-color: #333;
+  --el-menu-active-color: #086CE0;
+  --el-menu-item-font-size:16px;
   width: 180px;
   z-index: 50;
   position: fixed;
-  top: 60px;
+  top: 48px;
   left: 0;
   bottom: 0;
   padding: 8px;
-  background-color: #086CE0;
+  background-color: #fff;
   display: flex;
   flex-direction: column;
   padding-bottom: 111px;
@@ -153,10 +194,23 @@ function getMenuIcon(item){
     flex: 1;
     height: 100%;
     border: none;
+    .el-sub-menu{
+        :deep(.el-menu-item){
+            padding-left: var(--el-menu-base-level-padding);
+        }
+        :deep(.el-sub-menu__icon-arrow){
+            transform: rotateZ(-90deg) !important;
+        }
+        &.is-opened{
+            :deep(.el-sub-menu__icon-arrow){
+                transform: rotateZ(0deg) !important;
+            }
+        }
+    }
   }
   .user-box {
     background-color: var(--el-menu-hover-bg-color);
-    color: #fff;
+    color: #333;
     text-align: center;
     padding: 20px;
     .name-box {

+ 3 - 3
src/router/modules/customer.js

@@ -26,9 +26,9 @@ export default[
         }
       },
       {
-        path:'feedbackList',
-        component:()=>import('@/views/customer/FeedbackList.vue'),
-        name:'FeedbackList',
+        path:'notification',
+        component:()=>import('@/views/customer/NotificationList.vue'),
+        name:'NotificationList',
         meta:{
             title:'消息推送管理'
         }

+ 38 - 0
src/router/modules/media.js

@@ -0,0 +1,38 @@
+import LayoutIndex from '@/layout/Index.vue'
+
+export default[
+  {
+    path:'/mediaMgt',
+    component:LayoutIndex,
+    name:'MediaMgt',
+    meta:{
+      title:'音视频管理'
+    },
+    children:[
+      {
+        path:'audioList',
+        component:()=>import('@/views/media/AudioList.vue'),
+        name:"AudioList",
+        meta:{
+          title:'音频管理'
+        },
+      },
+      {
+        path:'videoList',
+        component:()=>import('@/views/media/VideoList.vue'),
+        name:"VideoList",
+        meta:{
+          title:'视频管理'
+        },
+      },
+      {
+        path:'pictureLib',
+        component:()=>import('@/views/media/PictureLibrary.vue'),
+        name:"PictureLib",
+        meta:{
+          title:'图片资源库'
+        },
+      },
+    ]
+  }
+]

+ 0 - 22
src/router/modules/report.js

@@ -1,22 +0,0 @@
-import LayoutIndex from '@/layout/Index.vue'
-
-export default[
-  {
-    path:'/report',
-    component:LayoutIndex,
-    name:'ReportIndex',
-    meta:{
-      title:'PDF报告'
-    },
-    children:[
-      {
-        path:'pdfList',
-        component:()=>import('@/views/report/pdf/List.vue'),
-        name:"ReportPdfList",
-        meta:{
-          title:'PDF报告'
-        },
-      },
-    ]
-  }
-]

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно