暂存

src/App.vue

@@ -8,7 +8,10 @@
     data () {
       return {}
     },
-    methods:{},
+    methods:{
+    },
+    created () {
+    },
     watch: {
       $route(val) {
         try {

src/components/newLayout/index.vue

@@ -37,39 +37,7 @@ export default {
   methods:{
     getModules (mod,type) {
       // this.$refs['menu'].setModules(mod,type)
-    },
-     // 查询应用授权
-    async query_userauth () {
-      const res = await this.$api.requested({
-        "classname": "sysmanage.develop.userauthforweb.userauth",
-        "method": "query_userauth",
-        "content": {
-          "place":1
-        }
-      })
-
-      this.auth_data = res.data
-      sessionStorage.setItem('module_info', JSON.stringify(this.auth_data))
-      // this.$router.push('/main')
-    },
-    // 查询文件夹ID信息
-    async querySite_Parameter () {
-      const res = await this.$api.requested({
-        "classname": "webmanage.site.site",
-        "method": "querySite_Parameter",
-        "content": {
-        }
-      })
-      let obj = {
-        appfolderid: res.data.appfolderid, // 应用附件文件夹ID
-        salematerialfolderid: res.data.salematerialfolderid // 营销物文件夹ID
-      }
-      sessionStorage.setItem('folderid',JSON.stringify(obj))
-    }   
-  },
-  created () {
-    this.query_userauth()
-    this.querySite_Parameter()
+    }
   }
 }
 

src/components/newLayout/modules/aside.vue

@@ -139,19 +139,17 @@ export default {
     outStyle () {
       clearTimeout(this.timer)
       this.fixedMenu = 'no__panel'
-    },
-    
+    }
   },
   mounted () {
     this.systemList = JSON.parse(sessionStorage.getItem('module_info'))
 
     this.$store.dispatch('setAppMenu')
-
+    
     let active_model = JSON.parse(sessionStorage.getItem('active_modules'))
 
     this.$store.dispatch('setActiveApp',{app:active_model.apps[0],val:''})
-  },
-  created () {
+    
   }
 }
 

src/components/newLayout/modules/header.vue

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

src/components/newLayout/modules/menu.vue

@@ -29,15 +29,6 @@ export default {
     })
   },
   methods:{
-    // setModules (mod,type) {
-    //   this.modules = mod
-    //   if (type === 'system') {
-    //     this.setActiveModules(mod[0],mod[0].apps[0])
-    //     let inactivePath = mod[0].apps[0].path
-    //     this.$router.push({path:inactivePath})
-    //   }
-      
-    // },
     hasMoreApp (mod) {
       if (mod.apps.length > 1) {
         return true
@@ -51,9 +42,14 @@ export default {
       sessionStorage.setItem('active_modules',JSON.stringify(mod))
     },
     setDefaultData (mod) {
-      let system = JSON.parse(sessionStorage.getItem('module_info'))
-      // this.setModules(system[0].modules)
-      this.$store.dispatch('getModules',{mod:system[0].modules})
+      let active_modules = JSON.parse(sessionStorage.getItem('active_modules'))
+      let sys_modules = JSON.parse(sessionStorage.getItem('module_info'))
+      let arr = sys_modules.filter(e=>{
+        if (e.systemid === active_modules.systemid) {
+          return e
+        }
+      })
+      this.$store.dispatch('getModules',{mod:arr[0].modules})
     },
     handleSelect(key, keyPath) {
       this.activeIndex = key

src/components/newLayout/modules/navRight.vue

@@ -30,9 +30,6 @@ export default {
     async query_userauth () {
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.userauthforweb.userauth",
-        // "method": "query_quickApps",
-        // "content": {
-        // }
         "method": "query_userauth",
         "content": {
           "place":2
@@ -57,9 +54,6 @@ export default {
       let at_app = app
       
       sessionStorage.setItem('active_modules',JSON.stringify(at_modules))
-
-      // this.$emit('getModules',at_sys_modules,type)
-
       this.$store.dispatch('setActiveApp',{name:app.name,app:at_app,val:''})
       this.$router.push({path:app.path})
     },

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

@@ -20,7 +20,7 @@
       </div>
       <div>
         <el-descriptions :column="5" size="mini">
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" v-for="item in mainAreaData" :key="item.index" :label="item.label">{{item.value?item.value:'--'}}</el-descriptions-item>
+          <el-descriptions-item content-class-name="my-content" v-for="item in mainAreaData" :key="item.index" :label="item.label">{{item.value?item.value:'--'}}</el-descriptions-item>
         </el-descriptions>
       </div>
     </div>

src/components/normal-basic-layout/details/modules/followUp/editLog.vue

@@ -57,7 +57,9 @@ export default {
       this.form = Object.assign({},this.form,this.data)
     },
     onSuccess(res) {
-      this.attachmentids = [...this.attachmentids,...res.data.attachmentids]
+      res.attinfos = JSON.parse(res.attinfos)
+      this.attachmentids = [...this.attachmentids,...res.attinfos.data]
+      this.$emit('onSuccess')
     },
 
     // 更新接口
@@ -65,7 +67,7 @@ export default {
       const res = await this.$api.requested({
         "id": 20220930121601,
         "content": {
-          "sys_datafollowupid":0,
+          "sys_datafollowupid":this.data.sys_datafollowupid,
             "ownertable":this.ownertable,
             "ownerid":this.$route.query.id,
             "type":"",

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -21,8 +21,8 @@
                 </div>
                 <div class="follow-progress">
                   <p>{{i.content}}</p>
-                  <div class="flex-align-center" style="margin-bottom:5px">
-                    <previewImage v-show="checkFileType(img.postfix) === 'img'" style="width:80px;height:80px;margin-left:5px" v-for="img in i.attinfos" :key="img.index" :image="img" :deletebtn="true" @onSuccess="queryLogs"></previewImage>
+                  <div class="flex-align-center flex-wrap" style="margin-bottom:5px">
+                    <previewImage v-show="checkFileType(img.postfix) === 'img'" style="width:60px;height:60px;margin-left:5px" v-for="img in i.attinfos" :key="img.index" :image="img" :deletebtn="true" @onSuccess="queryLogs"></previewImage>
                   </div>
                   <div v-show="checkFileType(file.postfix) === 'file'"  class="flex-align-center pionter" style="margin-bottom:10px;" v-for="file in i.attinfos" :key="file.index">
                     <a class="file__link" :href="file.url">{{file.document}}</a>
@@ -164,4 +164,7 @@ export default {
 .normal-panel{
   border-radius: 5px;
 }
+.flex-wrap{
+  flex-wrap: wrap
+};
 </style>

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

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <p style="font-size:26px;font-weight:300">{{customTitle ? customTitle : acitveApp.meta.title}}&nbsp;<i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i></p>
+            <p v-if="acitveApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : acitveApp.meta.title}}&nbsp;<i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'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>
@@ -46,9 +46,8 @@
               <slot :data="scope" name="tbOpreation"></slot>
             </template>
           </tableTemp>
-          <div class="container normal-panel" style="text-align:right">
+          <div v-if="hidePagination" class="container normal-panel" style="text-align:right">
             <el-pagination
-              v-if="hidePagination"
               background
               small
               @size-change="handleSizeChange"

src/components/previewImage/index.vue

@@ -1,11 +1,15 @@
 <template>
   <div class="image-panel">
-    <i v-if="deletebtn" class="el-icon-error close-btn" @click="deleteFileLink"></i>
     <el-image 
+      ref="preview"
       style="width: 100%;"
       :src="image.url" 
       :preview-src-list="srcList">
     </el-image>
+    <div class="mode flex-align-center flex-around">
+      <i class="el-icon-view" @click="onPreview"></i>
+      <i v-if="deletebtn" class="el-icon-delete" @click="deleteFileLink"></i>
+    </div>
   </div>
 </template>
 
@@ -28,6 +32,9 @@ export default {
       })
       res.code === 1?this.$emit('onSuccess'):''
     },
+    onPreview() {
+      this.$refs.preview.clickHandler()
+    },
   },
   watch: {
     image: {
@@ -48,7 +55,20 @@ export default {
 
 </script>
 <style scoped>
-.demo-image__preview{
+.image-panel{
   position: relative;
 }
+.image-panel:hover .mode{
+  display: flex;
+}
+.mode{
+  display: none;
+  position: absolute;
+  top:0;
+  left:0;
+  height: 100%;
+  width: 100%;
+  font-size: 16px;
+  background: rgba(0,0,0,.8);
+}
 </style>

src/components/uploadBindMediaStock/components/filelist.vue

@@ -12,25 +12,41 @@
         </div>
       </el-col>
     </el-row>
-    <el-row :gutter="10" class="folder-list">
-      <el-col :span="2" v-for="folder in list" :key="folder.id" v-show="folder. postfix !== 'FOLDER'">
-        <div class="folder-item" :class="folder.checked?'checked':''">
-          <el-checkbox class="folder-checkbox" v-model="folder.checked" @change="onChange(folder)"></el-checkbox>
-          <div class="img-panel">
-            <img v-if="folder. postfix === 'DOC' || folder. postfix === 'DOCX'"  src="../../../assets/file_icons/word.png" alt="">
-            <img v-else-if="folder. postfix === 'PDF'"  src="../../../assets/file_icons/PDF.png" alt="">
-            <img v-else-if="folder. postfix === 'MP4' || folder. postfix === 'AVI'"  src="../../../assets/file_icons/video.png" alt="">
-            <img v-else-if="folder. postfix === 'XLS' || folder. postfix === 'XLSX'"  src="../../../assets/file_icons/xls.png" alt="">
-            <img v-else-if="folder. postfix === 'PNG' || folder. postfix === 'JPG'|| folder. postfix === 'JPEG'"  src="../../../assets/file_icons/image.png" alt="">
-            <img v-else-if="folder. postfix === 'PPT' || folder. postfix === 'PPTX'"  src="../../../assets/file_icons/PPT.png" alt="">
-            <img v-else-if="folder. postfix === 'FOLDER'"  src="../../../assets/file_icons/folder.png" alt="">
-            <img v-else  src="../../../assets/file_icons/unknow.png" alt="">
+    <div class="flex-align-stretch flex-warp">
+      <div v-for="(folder) in list" :key="folder.id" class="folder-item" :class="folder.ischeck?'checked':''">
+        <el-checkbox class="folder-checkbox" v-model="folder.ischeck" @change="onChange(folder)"></el-checkbox>
+        <div @click.stop="folderDetails(folder)" class="img-panel">
+          <div class="image__item__panel" v-if="folder.postfix === 'DOC' || folder.postfix === 'DOCX'">
+            <img  src="@/assets/file_icons/word.png" alt="">
+          </div>
+          <div class="image__item__panel" v-else-if="folder.postfix === 'PDF'">
+            <img  src="@/assets/file_icons/PDF.png" alt="">
+          </div>
+          <div class="image__item__panel" v-else-if="folder.postfix === 'MP4' || folder.postfix === 'AVI'" >
+            <img src="@/assets/file_icons/video.png" alt="">
+          </div>
+          <div class="image__item__panel" v-else-if="folder.postfix === 'XLS' || folder.postfix === 'XLSX'">
+            <img  src="@/assets/file_icons/excel.png" alt="">
+          </div>
+          <div class="image__item__panel" v-else-if="folder.postfix === 'PNG' || folder.postfix === 'JPG'|| folder.postfix === 'JPEG'" >
+            <img :src="folder.url" alt="">
+          </div>
+            <div class="image__item__panel" v-else-if="folder.postfix === 'SVG'" >
+            <img src="@/assets/file_icons/image.png" alt="">
+          </div>
+          <div class="image__item__panel" v-else-if="folder.postfix === 'PPT' || folder.postfix === 'PPTX'">
+            <img  src="@/assets/file_icons/PPT.png" alt="">
+          </div>
+          <div class="image__item__panel" v-else-if="folder.postfix === 'FOLDER'">
+            <img  src="@/assets/file_icons/folder.png" alt="">
+          </div>
+          <div class="image__item__panel" v-else >
+            <img  src="@/assets/file_icons/unknow.png" alt="">
           </div>
-          <input v-if="folder.newfolder" type="text" v-model="folder.document" autofocus size="mini" @blur="changeFolderName(folder)">
-          <p v-else>{{folder.document}}</p>
         </div>
-      </el-col>
-    </el-row>
+        <p>{{folder.document}}</p>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -58,4 +74,51 @@ export default {
 
 </script>
 <style>
+</style>
+<style scoped>
+.image__item__panel{
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  height: 64px;
+  width: 64px;
+  margin: 0 auto;
+  overflow: hidden;
+}
+.image__item__panel img{
+  height: 70%;
+  max-width: 64px;
+}
+.flex-warp {
+  flex-wrap: wrap;
+}
+.folder-item p{
+  width: 100px;
+  margin:0 auto;
+  padding: 0 10px;
+  line-height: 25px;
+  text-align: center;
+  font-size: 12px;
+  /* margin-top:10px; */
+  word-break: break-all;
+
+  text-overflow: ellipsis;
+
+  display: -webkit-box;
+
+  -webkit-box-orient: vertical;
+
+  -webkit-line-clamp: 2; /* 这里是超出几行省略 */
+
+  overflow: hidden;
+}
+.img-panel {
+  width: 64px;
+  height: 64px;
+  margin:0 auto;
+  text-align: center;
+}
+.img-panel > img{
+  width: 80%;
+}
 </style>

src/components/uploadBindMediaStock/index.vue

@@ -3,9 +3,9 @@
   <el-button class="normal-margin" size="small" type="primary" @click="onShow">从媒体库选择</el-button>
   <el-dialog title="媒体库" append-to-body :visible.sync="dialogMediaVisible" width="90%" top="30px">
     <list ref="list" :accept="accept" @folderChecked="folderChecked" @toFolderDetail="toFolderDetail">
-      <div slot="upload">
+      <!-- <div slot="upload">
         <el-button v-if="clickHistory.length > 1" size="mini" type="text" icon="el-icon-back" @click="backFolder">返回上一级</el-button>
-      </div>
+      </div> -->
     </list>
     <div class="dialog-footer">
       <el-button size="small" @click="dialogMediaVisible = false" class="normal-btn-width">取 消</el-button>

src/components/uploadBindMediaStock/modules/list.vue

@@ -10,26 +10,46 @@
         <i class="el-icon-refresh" style="margin-left:16px" @click="queryAttachment(params.content.where.condition = '')"></i>
       </div>
     </div>
-    <div ref="ele" style="height:calc(100vh - 405px);overflow-y:scroll" class="container normal-panel">
-      <el-row :gutter="10" class="folder-list">
-        <el-col :span="3" v-for="folder in list" :key="folder.id">
-          <div class="folder-item" :class="folder.ischeck?'checked':''">
-            <el-checkbox v-show="folder.postfix !== 'FOLDER'" class="folder-checkbox" v-model="folder.ischeck" @change="onChange(folder)"></el-checkbox>
-            <div @click.stop="folderDetails(folder)" class="img-panel">
-              <img v-if="folder.postfix === 'DOC' || folder.postfix === 'DOCX'"  src="../../../assets/file_icons/word.png" alt="">
-              <img v-else-if="folder.postfix === 'PDF'"  src="../../../assets/file_icons/PDF.png" alt="">
-              <img v-else-if="folder.postfix === 'MP4' || folder.postfix === 'AVI'"  src="../../../assets/file_icons/video.png" alt="">
-              <img v-else-if="folder.postfix === 'XLS' || folder.postfix === 'XLSX'"  src="../../../assets/file_icons/excel.png" alt="">
-              <img v-else-if="folder.postfix === 'PNG' || folder.postfix === 'JPG'|| folder.postfix === 'JPEG'"  src="../../../assets/file_icons/image.png" alt="">
-              <img v-else-if="folder.postfix === 'PPT' || folder.postfix === 'PPTX'"  src="../../../assets/file_icons/PPT.png" alt="">
-              <img v-else-if="folder.postfix === 'FOLDER'"  src="../../../assets/file_icons/folder.png" alt="">
-              <img v-else  src="../../../assets/file_icons/unknow.png" alt="">
+    <div ref="ele" style="height:calc(100vh - 255px);overflow-y:scroll" class="container normal-panel">
+      <div class="flex-align-center normal-margin">
+        <el-button v-if="fileRouter.length > 1" type="text" size="mini" class="inline-16" @click="toPreFile">返回上一级</el-button>
+        <div class="fileRouter__history" v-for="(route,index) in fileRouter" :key="route.index" @click="folderDetails(route,index)">{{route.document}}&nbsp;<span v-show="fileRouter.length - 1 !== index"> > </span>&nbsp;</div>
+      </div>
+      <div class="flex-align-stretch flex-warp">
+        <div v-for="(folder) in list" :key="folder.id" class="folder-item" :class="folder.ischeck?'checked':''">
+          <el-checkbox class="folder-checkbox" v-model="folder.ischeck" @change="onChange(folder)"></el-checkbox>
+          <div @click.stop="folderDetails(folder)" class="img-panel">
+            <div class="image__item__panel" v-if="folder.postfix === 'DOC' || folder.postfix === 'DOCX'">
+              <img  src="@/assets/file_icons/word.png" alt="">
+            </div>
+            <div class="image__item__panel" v-else-if="folder.postfix === 'PDF'">
+              <img  src="@/assets/file_icons/PDF.png" alt="">
+            </div>
+            <div class="image__item__panel" v-else-if="folder.postfix === 'MP4' || folder.postfix === 'AVI'" >
+              <img src="@/assets/file_icons/video.png" alt="">
+            </div>
+            <div class="image__item__panel" v-else-if="folder.postfix === 'XLS' || folder.postfix === 'XLSX'">
+              <img  src="@/assets/file_icons/excel.png" alt="">
+            </div>
+            <div class="image__item__panel" v-else-if="folder.postfix === 'PNG' || folder.postfix === 'JPG'|| folder.postfix === 'JPEG'" >
+              <img :src="folder.url" alt="">
+            </div>
+             <div class="image__item__panel" v-else-if="folder.postfix === 'SVG'" >
+              <img src="@/assets/file_icons/image.png" alt="">
+            </div>
+            <div class="image__item__panel" v-else-if="folder.postfix === 'PPT' || folder.postfix === 'PPTX'">
+              <img  src="@/assets/file_icons/PPT.png" alt="">
+            </div>
+            <div class="image__item__panel" v-else-if="folder.postfix === 'FOLDER'">
+              <img  src="@/assets/file_icons/folder.png" alt="">
+            </div>
+            <div class="image__item__panel" v-else >
+              <img  src="@/assets/file_icons/unknow.png" alt="">
             </div>
-            <input v-if="folder.newfolder" type="text" v-model="folder.document" autofocus size="mini" @blur="changeFolderName(folder)">
-            <p v-else>{{folder.document}}</p>
           </div>
-        </el-col>
-      </el-row>
+          <p>{{folder.document}}</p>
+        </div>
+      </div>
       <div v-if="list.length === 0" class="flex-align-center" style="height:calc(100vh - 200px);justify-content:space-around">
         <el-empty description="暂无文件,请点击左上角的“上传”按钮添加"></el-empty>
       </div>
@@ -70,6 +90,10 @@ export default {
       sort:[],
       total:0,
       currentPage:0,
+      fileRouter:[{
+        postfix:'FOLDER',
+        document:'全部文件'
+      }]
     }
   },
   methods:{
@@ -101,9 +125,6 @@ export default {
       this.params.content.pageNumber = val
       this.queryAttachment(this.params.content.where.parentid)
     },
-    changeFolderName (folder) {
-      this.$emit('onNameChange',folder)
-    },
     onChange (folder) {
       let checkArray = []
       this.list.forEach((e,index)=>{
@@ -113,16 +134,26 @@ export default {
       })
       this.$emit('folderChecked',checkArray)
     },
-    async folderDetails (folder) {
-      event.stopPropagation();
+    async folderDetails (folder,index) {
+      console.log(folder,index)
       if (folder.postfix === 'FOLDER') {
-        this.$emit('toFolderDetail',folder.attachmentid)
+        if (index === undefined) {
+          let _isSame = this.fileRouter.some(m=>folder.attachmentid === m.attachmentid)
+          _isSame?'':this.fileRouter.push(folder)
+        } else {
+          this.fileRouter = this.fileRouter.slice(0,index + 1)
+        }
       }
+      this.$emit('toFolderDetail',folder.attachmentid)
     },
     restChecked () {
       this.list.forEach((e,index)=>{
         e.ischeck = false
       })
+    },
+    toPreFile () {
+      this.fileRouter.pop()
+      this.$emit('toFolderDetail',this.fileRouter.at(-1).attachmentid)
     }
   },
   mounted () {
@@ -177,7 +208,7 @@ export default {
 }
 .img-panel {
   width: 64px;
-  /* height: 64px; */
+  height: 64px;
   margin:0 auto;
   text-align: center;
 }
@@ -206,7 +237,70 @@ export default {
 }
 </style>
 <style scoped>
+.folder-item {
+  position: relative;
+  width: 120px;
+  padding:10px 5px;
+  text-align: center;
+  color:#333;
+  margin-bottom: 15px;
+  margin-left:30px;
+  cursor: pointer;
+  font-size: 14px;
+}
+.flex-warp {
+  flex-wrap: wrap;
+}
+.folder-item p{
+  width: 100px;
+  margin:0 auto;
+  padding: 0 10px;
+  line-height: 25px;
+  text-align: center;
+  font-size: 12px;
+  /* margin-top:10px; */
+  word-break: break-all;
+
+  text-overflow: ellipsis;
+
+  display: -webkit-box;
+
+  -webkit-box-orient: vertical;
+
+  -webkit-line-clamp: 2; /* 这里是超出几行省略 */
+
+  overflow: hidden;
+}
 .border-bottom{
   border-bottom: 1px solid #f1f2f3;
 }
+.image__item__panel{
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  height: 64px;
+  width: 64px;
+  margin: 0 auto;
+  overflow: hidden;
+}
+.image__item__panel img{
+  height: 70%;
+  max-width: 64px;
+}
+.op__panel{
+  display: none;
+  position: absolute;
+  right:0px;
+  top:0px;
+  padding: 0px 5px;
+  background: #fff;
+}
+.folder-item:hover .op__panel{
+  display: block;
+}
+.fileRouter__history {
+  font-size: 12px;
+  line-height: 30px;
+  cursor: pointer;
+}
 </style>

src/store/index.js

@@ -76,6 +76,7 @@ export default new Vuex.Store({
     },
     
     setActiveApp (state,data) {
+      console.log('执行setActiveApp')
       sessionStorage.setItem('acitveApp',JSON.stringify(data.app))
       state.appname = data.name
       state.acitveApp = JSON.parse(sessionStorage.getItem('acitveApp'))
@@ -84,7 +85,6 @@ export default new Vuex.Store({
     },
     systemModules (state,data) {
       state.sys_modules = data
-      console.log(state.sys_modules,'mod')
     },
     setAppMenu (state,data) {
       state.menuApp = data

src/utils/basic-data.js

@@ -32,11 +32,45 @@ function getEnterpriseList () {
     enterpriseList = res.data
   })
 }
-
+ // 查询应用授权
+ function query_userauth () {
+  return new Promise((reslove, reject)=>{
+    api.requested({
+      "classname": "sysmanage.develop.userauthforweb.userauth",
+      "method": "query_userauth",
+      "content": {
+        "place":1
+      }
+    }).then((res)=>{
+      let active_modules = res.data[0].modules[0]
+      sessionStorage.setItem('module_info', JSON.stringify(res.data))
+      sessionStorage.setItem('active_modules', JSON.stringify(active_modules))
+      reslove()
+  
+    })
+  })
+}
+// 查询文件夹ID信息
+function querySite_Parameter () {
+  api.requested({
+    "classname": "webmanage.site.site",
+    "method": "querySite_Parameter",
+    "content": {
+    }
+  }).then((res)=>{
+    let obj = {
+      appfolderid: res.data.appfolderid, // 应用附件文件夹ID
+      salematerialfolderid: res.data.salematerialfolderid // 营销物文件夹ID
+    }
+    sessionStorage.setItem('folderid',JSON.stringify(obj))
+  })
+}
 arealist ()
 getEnterpriseList()
 
 export default{
+  query_userauth,
+  querySite_Parameter,
   data () {
     return {
       areaData,

src/views/login/login.vue

@@ -166,9 +166,10 @@ export default {
         this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
         sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
         sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
-        this.query_userauth()
-        this.querySite_Parameter()
-        
+        this.basicData.query_userauth().then(()=>{
+          this.basicData.querySite_Parameter()
+          this.$router.push({path:'/main'})
+        })
       } else {
         this.$notify({
           title: '失败',
@@ -177,34 +178,6 @@ export default {
         })
       }
     },
-    // 查询应用授权
-    async query_userauth () {
-      const res = await this.$api.requested({
-        "classname": "sysmanage.develop.userauthforweb.userauth",
-        "method": "query_userauth",
-        "content": {
-          "place":1
-        }
-      })
-
-      this.auth_data = res.data
-      sessionStorage.setItem('module_info', JSON.stringify(this.auth_data))
-      this.$router.push('/main')
-    },
-    // 查询文件夹ID信息
-    async querySite_Parameter () {
-      const res = await this.$api.requested({
-        "classname": "webmanage.site.site",
-        "method": "querySite_Parameter",
-        "content": {
-        }
-      })
-      let obj = {
-        appfolderid: res.data.appfolderid, // 应用附件文件夹ID
-        salematerialfolderid: res.data.salematerialfolderid // 营销物文件夹ID
-      }
-      sessionStorage.setItem('folderid',JSON.stringify(obj))
-    },
   }
 }
 

src/views/mediaStock/modules/list.vue

@@ -174,7 +174,6 @@ export default {
       this.$emit('folderChecked',checkArray)
     },
     folderDetails (folder,index) {
-      console.log(folder,index)
       if (folder.postfix === 'FOLDER') {
         if (index >= 0) {
           this.fileRouter = this.fileRouter.slice(0,index + 1)
@@ -205,7 +204,6 @@ export default {
     },
     toPreFile () {
       this.fileRouter.pop()
-      console.log(this.fileRouter)
       this.$router.replace({path:'/mediaStock',query:{id:this.fileRouter.at(-1).attachmentid}})
     }