代码暂存

src/HManagement/siteManage/tagManage/components/detail.vue

@@ -67,7 +67,7 @@ export default {
   },
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name).dataTagDetailTable.tablecols
-    console.log(this.tablecols);
+    
     
   },
   methods:{

src/SManagement/sales_forecast/modules/editProduct.vue

@@ -120,7 +120,7 @@ export default {
     this.getProductList()
     this.tablecols = this.tool.tabelCol(this.$route.name).productDetailTable.tablecols
     this.addProductTablecols = this.tool.tabelCol(this.$route.name).addProductTable.tablecols
-    console.log(this.tablecols);
+    
   },
   methods: {
     /* 获取头部详情 */

src/SManagement/sales_forecast/modules/productDetail copy.vue

@@ -63,7 +63,7 @@ export default {
     this.getDetail()
     this.getSubmitList()
     this.tablecols = this.tool.tabelCol(this.$route.name).productDetailTable.tablecols.splice(0,7)
-    console.log(this.tablecols);
+    
   },
   methods: {
     /* 获取头部详情 */

src/SManagement/sales_forecast/modules/productDetail.vue

@@ -88,7 +88,7 @@ export default {
     this.getDetail()
     this.getSubmitList()
     this.tablecols = this.tool.tabelCol(this.$route.name).productDetailTable.tablecols.splice(0,7)
-    console.log(this.tablecols);
+    
   },
   methods: {
     /* 获取头部详情 */

src/components/newLayout/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="panel">
     <div class="flex-align-stretch">
-      <asideTemp style="width:160px;height:100vh;" @getModules="getModules"></asideTemp>
+      <asideTemp @getModules="getModules"></asideTemp>
       <div style="flex:1;" class="body__panel">
         <headeTemp></headeTemp>
         <div>

src/components/newLayout/modules/aside.vue

@@ -1,19 +1,22 @@
 <template>
   <div class="aside__panel">
-    <div class="logo">
+    <div v-if="!collapse" class="logo">
       <img v-show="img.usetype === 'actionlogo'" v-for="img in siteinfo.attinfos" :key="img.index" style="height:40px" :src="img.url" alt="">
     </div>
     <el-menu
+     :collapse="collapse"
       style="background:none"
       text-color="#fff"
       active-text-color="#000"
       class="el-menu-vertical-demo">
       <el-menu-item :index="String(item.systemid)" v-for="item in systemList" :key="item.index" @click="handelMenuClick(item,'system')">
+        <!-- <i class="el-icon-menu"></i> -->
         <span slot="title">{{item.systemname}}</span>
       </el-menu-item>
       <el-divider></el-divider>
       <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')">
         <div class="flex-align-center flex-between menuItem">
+          <!-- <i class="el-icon-menu"></i> -->
           <span slot="title">{{item.systemappname}}</span>
           <i class="el-icon-error menuIconClose" @click.stop="deleteMenuApp(item)"></i>
         </div>
@@ -29,7 +32,8 @@ export default {
   data () {
     return {
       systemList:[],
-      active:"0"
+      active:"0",
+      collapse:false
     }
   },
   computed:{
@@ -45,15 +49,28 @@ export default {
     },
     handelMenuAppClick (app,type) {
       let system = JSON.parse(sessionStorage.getItem('module_info'))
-      let mod = system.filter(e=>{return e.systemid === app.systemid})[0].modules.filter(e=>{return e.systemmoduleid === app.systemmoduleid})[0]
-      let clickApp = mod.apps.filter(e=>{return e.systemappid === app.systemappid})
-      
-      sessionStorage.setItem('active_modules',JSON.stringify(mod))
 
-      this.$emit('getModules',system.filter(e=>{return e.systemid === app.systemid})[0].modules,type)
+      let at_sys_modules = system.filter(e=>{
+        if (e.systemid === app.systemid)
+        return e
+      })[0].modules
 
-      this.$store.dispatch('setActiveApp',{app:clickApp[0],val:''})
-      this.$router.push({path:clickApp[0].path})
+      let at_modules = at_sys_modules.filter(e=>{
+        if (e.systemmoduleid === app.systemmoduleid)
+        return e
+      })[0]
+      let at_app = at_modules.apps.filter(e=>{
+        if (e.systemappid === app.systemappid)
+        return e
+      })[0]
+
+      sessionStorage.setItem('active_modules',JSON.stringify(at_modules))
+
+      this.$emit('getModules',at_sys_modules,type)
+
+      this.$store.dispatch('setActiveApp',{name:app.systemappname,app:at_app,val:''})
+
+      this.$router.replace({path:at_app.path})
     },
     async deleteMenuApp (item) {
       const res = await this.$api.requested({
@@ -86,6 +103,8 @@ export default {
   margin: 0 10px 0 0;
   font-weight: bold;
   transition: linear .3s;
+  min-width:160px;
+  height:100vh;
 }
 .aside__panel .el-menu-item{
   height: 40px;

src/components/newLayout/modules/header.vue

@@ -104,7 +104,7 @@ export default {
 
       this.$emit('getModules',system.filter(e=>{return e.systemid === app.systemid})[0].modules,type)
 
-      this.$store.dispatch('setActiveApp',{app:clickApp[0],val:this.searchValue})
+      this.$store.dispatch('setActiveApp',{name:app.systemappname,app:clickApp[0],val:this.searchValue})
       setTimeout(() => {
         this.$router.push({path:clickApp[0].path})
       }, 0);

src/components/newLayout/modules/menu.vue

@@ -46,7 +46,7 @@ export default {
       }
     },
     setActiveModules (mod,app) {
-      this.$store.dispatch('setActiveApp',{app:app,val:''})
+      this.$store.dispatch('setActiveApp',{name:app.systemappname,app:app,val:''})
       sessionStorage.setItem('active_modules',JSON.stringify(mod))
     },
     setDefaultData (mod) {

src/components/normal-basic-layout/index.vue

@@ -4,8 +4,8 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <p  v-if="acitveApp" style="font-size:26px;font-weight:300">{{acitveApp.meta.title}}&nbsp;<i @click="addToAsideBar" style="color:#999" :class="$route.name === acitveApp.name?'el-icon-star-on':'el-icon-star-off'"></i></p>
-            <el-divider direction="vertical"></el-divider>
+            <p style="font-size:26px;font-weight:300">{{acitveApp.meta.title}}&nbsp;<i @click="addToAsideBar" style="color:#999" class="el-icon-star-off"></i></p>
+            <div style="margin:0 8px"><el-divider direction="vertical"></el-divider></div>
             <div class="flex-align-center">
               <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
               <el-button-group v-if="tool.checkAuth($route.name,'delete')" class="inline-16">
@@ -105,7 +105,9 @@ export default {
       list:[],
       total:0,
       currentPage:0,
-      refreshTable:true
+      refreshTable:true,
+      title:'',
+      name:''
     }
   },
   methods:{
@@ -211,7 +213,7 @@ export default {
     this.layout = this.tool.tabelCol(this.$route.name)[this.tableName].tablecols
     this.tableLayout = this.layout
     this.$emit('listCreate',this.param)
-  },
+  }
 }
 
 </script>

src/components/normal-basic-layout/modules/cpAdd.vue

@@ -14,7 +14,6 @@ export default {
   computed:{
 		formComponent(){
       if (this.oldFormPath) {
-        console.log(this.oldFormPath)
         return ()=>import(`@/${this.oldFormPath.add}/add.vue`)
       } else {
         return ()=>import(`@/Form/${this.formPath}/add.vue`)

src/router/index.js

@@ -32,6 +32,7 @@ let routes = [
     name: 'main',
     // component: () => import(/* webpackChunkName: "about" */ '@/components/layout/index.vue'),
     component: () => import(/* webpackChunkName: "about" */ '@/components/newLayout/index.vue'),
+    redirect: '/home',
     children: [
       {
         path: '/home',

src/store/index.js

@@ -19,6 +19,7 @@ export default new Vuex.Store({
     checks:[],
     dataToForm:{},
     acitveApp:null,
+    appname:'',
     menuApp:[],
     searchValue:'',
     closeDrawerTemp:false,
@@ -35,10 +36,12 @@ export default new Vuex.Store({
     checks:state => state.checks,
     dataToForm:state => state.dataToForm,
     acitveApp:state => state.acitveApp,
+    appname:state => state.appname,
     menuApp:state => state.menuApp,
     searchValue:state => state.searchValue,
     closeDrawerTemp:state => state.closeDrawerTemp,
-    DrawerShow:state => state.DrawerShow
+    DrawerShow:state => state.DrawerShow,
+    
   },
   mutations: {
     setSiteInfo(state,res) {
@@ -69,19 +72,10 @@ export default new Vuex.Store({
       state.dataToForm = data
     },
     setActiveApp (state,data) {
-      sessionStorage.setItem('acitveApp', JSON.stringify(data))
-      if (state.acitveApp) {
-        state.acitveApp = data.app
-         //头部区域搜索所传入的数值
-        state.searchValue = data.val
-      } else {
-        let appData = JSON.parse(sessionStorage.getItem('acitveApp'))
-        state.acitveApp = appData.app
-         //头部区域搜索所传入的数值
-        state.searchValue = appData.val
-      }
-      
-     
+      state.appname = data.name
+      state.acitveApp = data.app
+        //头部区域搜索所传入的数值
+      state.searchValue = data.val
     },
     setAppMenu (state,data) {
       state.menuApp = data
@@ -173,6 +167,7 @@ export default new Vuex.Store({
           "shortcuttype":"systemapp"
         }
       })
+      console.log(res.data)
       commit('setAppMenu',res.data)
     },
     // 查询标签数据

src/utils/tool.js

@@ -3,24 +3,30 @@ import router from '@/router';
 export default {
   // 获取应用权限
   checkAuth (appname,auth) {
+    // console.log(appname)
     try {
-      // 获取应用数据
-      let apps = JSON.parse(sessionStorage.getItem('active_modules'))
+      let modules = JSON.parse(sessionStorage.getItem('active_modules'))
       
-      let module_list =  apps.apps
+      let apps =  modules.apps
       // 获取当前应用数据
-      let active_modules = module_list.filter(item => {
+      let active_apps = apps.filter(item => {
         return item.name === appname
       })
+      console.log(modules)
+      console.log(appname)
+      console.log(active_apps)
       // 获取当前应用权限
-      let auth_list = active_modules[0].meta.auth
-      // 判断是否拥有权限
-      let _haveAuth = auth_list.some(item=>item.option === auth)
+      // let auth_list = active_apps[0].meta.auth
+      // // 判断是否拥有权限
+      // let _haveAuth = auth_list.some(item=>item.option === auth)
 
       return _haveAuth
-    } catch (error) {      
-      router.replace('/home')
+      
+    } catch (error) {
+      // console.log(error)
+      // router.replace('/home')
     }
+    
    
   },