From 8c46c6e2547717b9e21cbac267e4c0ec668550ec Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Sat, 21 Aug 2021 20:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue           |  6 +++
 src/layouts/home/index.vue             |  8 +---
 src/layouts/navbar/index.vue           |  1 +
 src/libs/auth/generateBtnPermission.js |  2 +-
 src/libs/route/addRoutes.js            |  4 +-
 src/pages/data/list/index.vue          | 64 ++++++++++++++++----------
 src/pages/index/list/index.vue         | 11 +++--
 src/pages/role/list/index.vue          |  6 +++
 src/pages/setting/person/download.vue  |  3 ++
 src/pages/setting/person/index.vue     |  2 +
 src/pages/setting/person/info.vue      |  1 +
 src/pages/stat/list/index.vue          |  4 ++
 src/pages/user/list/index.vue          |  8 +++-
 src/plugins/auth/index.js              |  2 +
 src/plugins/requests/index.js          |  1 +
 src/setting.js                         |  8 +---
 src/store/modules/user.js              |  1 +
 17 files changed, 87 insertions(+), 45 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 4ab9232..7667a81 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -113,10 +113,13 @@ export default {
         }
     },
     mounted(){
+        // 如果是客户,则存到store里去,因为客户是没有用户信息的,上面要根据这个值来判断显示与否
         if(this.customer){
             let customer = atob(decodeURI(this.customer)) == 'false' ? false : true
             this.setCustomer(customer)
         }
+        
+        // 如果登录了,才调用用户信息的接口
         this.token && this.getUserInfo()
     },
     methods: {
@@ -130,6 +133,7 @@ export default {
                 let isManager = userAccount.roleId != '0'
                 this.isUser = isManager
                 let mg = this.$route.query.mg
+                // 如果是管理员
                 if(mg && atob(decodeURI(mg)) === 'true'){
                     this.showSetting = false
                 }
@@ -161,6 +165,7 @@ export default {
                 title: '登录'
             })
         },
+        // 跳转到管理员后台
         toManager(){
             let routes = this.routes
             if(routes.length){
@@ -174,6 +179,7 @@ export default {
                 })
                 window.open(route.href)
             }else{
+                // 如果接口返回的角色权限为空,则表示没有给该角色开放任何模块权限,直接提示用户未开放
                 util.warningMsg('该角色未开放模块，请联系管理员')
             }
         },
diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index 1917ab1..ddb8fc1 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -18,13 +18,11 @@
 <script>
 import vHead from '../header'
 import vFooter from '../footer'
-import bus from '@/libs/bus'
 import Setting from '@/setting'
 export default {
     data() {
         return {
             tagsList: [],
-            hideNavList: Setting.layout.hideNavList
         };
     },
     components: {
@@ -32,11 +30,7 @@ export default {
         vFooter
     },
     computed: {
-        hideNavbar() {
-            let route = this.$route.name
-            if(this.hideNavList.includes(route)) return false
-            return true
-        }
+        
     },
     created() {
         
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 8571384..6b05f9a 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -86,6 +86,7 @@ export default {
                     this.menus = this.defaultMenus
                 }
             }else{
+                // 如果不是在后台,则显示默认的菜单和数据两个菜单
                 this.menus = [...this.defaultMenus,...this.dataMenu]
             }
         },
diff --git a/src/libs/auth/generateBtnPermission.js b/src/libs/auth/generateBtnPermission.js
index d8ed295..101f368 100644
--- a/src/libs/auth/generateBtnPermission.js
+++ b/src/libs/auth/generateBtnPermission.js
@@ -8,7 +8,7 @@ export default function(data){
     data.map(e => {
         if(e.select){
             e.children.map(n => {
-                if(n.select){
+                if(n.select){ // select为true,则表示拥有该权限
                     if(n.children.length){
                         result.push(`${e.name}:${n.name}`)
                         n.children.map(j => {
diff --git a/src/libs/route/addRoutes.js b/src/libs/route/addRoutes.js
index ea953ee..e4939b8 100644
--- a/src/libs/route/addRoutes.js
+++ b/src/libs/route/addRoutes.js
@@ -11,7 +11,7 @@ function createMeta(item){
 
 function createRoute(data){
     data.map(e => {
-        if(e.select && e.path){
+        if(e.select && e.path){ // select为true,则表示拥有该权限,同时path不为空,才生成路由集合
             let meta = createMeta(e)
             newRoutes.push({
                 name: e.path,
@@ -20,6 +20,7 @@ function createRoute(data){
                 meta
             })
         }
+        // 递归生成路由集合
         e.children && e.children.length && createRoute(e.children)
     })
 }
@@ -28,5 +29,4 @@ export default function(data,path){
     generateBtnPermission(data)
     createRoute(data)
     store.dispatch('auth/addRoutes',newRoutes)
-    // router.addRoutes(routes)
 }
\ No newline at end of file
diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue
index 9a3d7a3..43d8133 100644
--- a/src/pages/data/list/index.vue
+++ b/src/pages/data/list/index.vue
@@ -241,6 +241,7 @@ export default {
         // })
 
         this.getType()
+        // 如果是从首页点下载按钮跳转过来的,就直接显示下载弹框
         if(this.$route.query.download){
             this.download({
                 id: this.$route.query.id,
@@ -330,6 +331,7 @@ export default {
             this.$post(`${this.api.getIdQueryTable}?categoryId=${this.defaultType}&showName=${this.keyword}&pageNum=${this.page}&pageSize=${this.pageSize}&updateTime=`).then(res => {
                 this.listData = res.pageList.records
                 this.total = res.pageList.total
+                // 默认显示第一条数据的字段
                 this.listData.length && this.preview(this.listData[0],1)
             }).catch(res => {})
         },
@@ -423,6 +425,7 @@ export default {
         },
         preview(row,isDefault){
             this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
+                // 查询次数+1
                 this.$post(this.api.saveRecord,{
                     tableId: row.id,
                     type: 2,
@@ -431,6 +434,7 @@ export default {
                 let comment = res.comment
                 let previewHead = []
                 comment.map(n => {
+                    // id和操作时间不用显示
                     n.field != 'id' && n.field != 'operation_time' && previewHead.push(n)
                 })
                 this.previewHead = previewHead
@@ -438,10 +442,12 @@ export default {
                 let data = res.data
                 data.map(n => {
                     for(let i in n){
+                        // 如果是以+0000结尾的,就表明这个是时间,则转化为正常的时间格式
                         if(typeof n[i] == 'string' && n[i].endsWith('+0000')) n[i] = util.formatDate('yyyy-MM-dd hh:mm:ss',new Date(n[i]))
                     }
                 })
                 this.previewData = data
+                // 如果不是加载完数据默认显示的情况,就滚动到页面可视位置
                 isDefault || this.$nextTick(() => {
                     document.querySelector('#previewTable').scrollIntoView()
                 })
@@ -452,6 +458,7 @@ export default {
             this.fields = val ? this.fieldsList.map(n => n.comment) : []
         },
         download(row){
+            // 查询是否购买了该数据,只有购买了才能下载
             this.$get(`${this.api.isDownload}`,{
                 tableId: row.id,
                 schoolId: this.schoolId,
@@ -459,6 +466,7 @@ export default {
                 this.curRow = row
                 this.downloadVisible = true
 
+                // 查询有数据的时间段,接口会返回开始时间和结束时间,但也有写数据是没有这两个时间的
                 this.$get(`${this.api.getTableTime}`,{
                     tableId: row.id
                 }).then(res => {
@@ -466,12 +474,14 @@ export default {
                     if(list.startTime){
                         startTimeLimit = new Date(list.startTime).getTime()
                     }else{
+                        // 如果没有开始时间,则禁止选择开始时间
                         this.startTimeDisabled = true
                     }
                     if(list.endTime){
                         endTimeLimit = new Date(list.endTime).getTime()
                         this.timeDefault = list.endTime
                     }else{
+                        // 如果没有结束时间,则禁止选择结束时间
                         this.endTimeDisabled = true
                     }
                 }).catch(res => {})
@@ -501,32 +511,35 @@ export default {
             if(!this.endTime) return util.warningMsg('请选择结束时间')
             if(!this.frequency) return util.warningMsg('请选择数据频率')
             let invalid = false
-            if(this.startTime && this.endTime){
-                let startTime = new Date(this.startTime)
-                let endTime = new Date(this.endTime)
-                let frequency = this.frequency
-                
-                if(frequency == 2){
-                    let week = []
-                    while(startTime <= endTime){
-                        let weekNum = startTime.getDay()
-                        if(weekNum == 0) weekNum = 7
-                        week.push(weekNum)
-                        startTime.setTime(startTime.getTime() + 86400000)
-                    }
-                    for(let i = 1;i <= 5;i++){
-                        if(!week.includes(i)){
-                            invalid = true
-                            break
-                        }
+
+            let startTime = new Date(this.startTime)
+            let endTime = new Date(this.endTime)
+            let frequency = this.frequency
+            
+            // 只要选择的不是日频,则要判断选择的日期区间有没有包含这段频率对应的完整交易日段
+            // 比如选的是周频,则判断选择的时间区间有没有包含一段完整的星期交易日,即星期1~5,
+            // 选的是月频的话,则判断选择的时间区间有没有包含一个完整的月份,即30天;年份同理
+            if(frequency == 2){
+                let week = []
+                while(startTime <= endTime){
+                    let weekNum = startTime.getDay()
+                    if(weekNum == 0) weekNum = 7
+                    week.push(weekNum)
+                    startTime.setTime(startTime.getTime() + 86400000)
+                }
+                // 如果没有包含1~5,则提示请选择完整区间,下面同理
+                for(let i = 1;i <= 5;i++){
+                    if(!week.includes(i)){
+                        invalid = true
+                        break
                     }
-                }else if(frequency == 3){
-                    if((endTime.getTime() - startTime.getTime()) / 86400000 < 30) invalid = true
-                }else if(frequency == 4){
-                    if((endTime.getTime() - startTime.getTime()) / 86400000 < 90) invalid = true
-                }else if(frequency == 5){
-                    if((endTime.getTime() - startTime.getTime()) / 86400000 < 365) invalid = true
                 }
+            }else if(frequency == 3){
+                if((endTime.getTime() - startTime.getTime()) / 86400000 < 30) invalid = true
+            }else if(frequency == 4){
+                if((endTime.getTime() - startTime.getTime()) / 86400000 < 90) invalid = true
+            }else if(frequency == 5){
+                if((endTime.getTime() - startTime.getTime()) / 86400000 < 365) invalid = true
             }
             
             if(invalid) return util.warningMsg('请选择完整区间')
@@ -550,10 +563,13 @@ export default {
             }).then((res) => {
                 msgObj.close()
                 if(res.data.type != 'multipart/form-data') return util.warningMsg('数据总数为零！')
+                // 统一调用该方法去下载excel
                 util.downloadFileDirect(`${this.curRow.showName}.xls`,new Blob([res.data]))
 
+                // 下载记录
                 this.$get(`${this.api.downloadRecord}?tableId=${this.curRow.id}&fields=${newFields.join()}` + (startTime ? `&startTime=${startTime}` : '') + (endTime ? `&endTime=${endTime}` : '') + `&frequency=${frequency}`).then(res => {}).catch(res => {})
 
+                // 下载次数+1
                 this.$post(this.api.saveRecord,{
                     tableId: this.curRow.id,
                     type: 1,
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 4ea0a97..dadc33d 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -89,15 +89,16 @@ export default {
                 this.total = res.totalCount
             }).catch(res => {})
         },
+        // 获取热门下载数据
         getHot(){
             this.$get(this.api.queryDatabaseInfo).then(res => {
                 let list = JSON.parse(res.databaseInfo)
-                list.map(n => {
-                    n.download
-                })
+                list.map(n => n.download)
+                // 根据下载量排序
                 list.sort((a,b) => {
                     return b.download - a.download
                 })
+                // 只展示前三条
                 this.hotData = list.slice(0,3)
             }).catch(res => {})
         },
@@ -111,11 +112,14 @@ export default {
             this.getData()
         },
         download(row){
+            // 登录了才能下载,否则直接跳转到登录页
             if(this.token){
+                // 查询是否有下载权限
                 this.$get(`${this.api.isDownload}`,{
                     tableId: row.id,
                     schoolId: this.schoolId,
                 }).then(res => {
+                    // 跳转到数据页去下载
                     this.$router.push(`/data?download=true&id=${row.id}&name=${row.name}&showName=${row.showName}`)
                 }).catch(res => {})
             }else{
@@ -126,6 +130,7 @@ export default {
             }
         },
         toData(row){
+            // 登录了才能查看数据,否则直接跳转到登录页
             if(this.token){
                 this.$router.push(`/data?typeId=${row.categoryTwoId}`)
             }else{
diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue
index 17c2011..c51acc6 100644
--- a/src/pages/role/list/index.vue
+++ b/src/pages/role/list/index.vue
@@ -144,6 +144,7 @@ export default {
             this.$refs.table.clearSelection()
             this.getData()
         },
+        // 获取权限树
         getPer(){
             if(!this.permissions.length){
                 this.$get(this.api.queryPermissionMenu).then(res => {
@@ -158,11 +159,13 @@ export default {
             this.permissions.length && this.$refs.per.setCheckedNodes([])
             this.roleVisible = true
         },
+        // 递归处理勾选的权限
         handleRolePer(data,permissions){
             let result = data
             if(permissions.length){
                 permissions.map(e => {
                     if(result.includes(e.id) && e.children.length){
+                        // 如果该权限下的子权限不是每个都勾选了,就把该权限的id从已勾选的id集合里去除,因为如果不去除的话,这个权限就会勾选,同时会把该权限下的所有子权限都一起勾选
                         e.children.every(n => result.includes(n)) || result.splice(result.indexOf(e.id),1)
                     }
                     e.children.length && this.handleRolePer(data,e.children)
@@ -206,6 +209,7 @@ export default {
                 isPort: 2
             }
             this.$post(this.api.saveOrUpdate,data).then(res => {
+                // 获取已勾选的,和半勾选的(即子级没有全部勾选的节点),半勾选的一样要传给后端
                 let permissionId = [...this.$refs.per.getHalfCheckedKeys(),...this.$refs.per.getCheckedKeys()]
                 let perData = {
                     roleId: res.roleId,
@@ -220,6 +224,7 @@ export default {
             }).catch(res => {})
         },
         handleDelete(row) {
+            // 获取用户列表,如果该角色已经有绑定的用户,要更换提示
             this.$post(this.api.getUserList,{
                 createTime: '',
                 isEnable: '',
@@ -231,6 +236,7 @@ export default {
                 roleId: row.id
             }).then(res => {
                 let msg = ''
+                // 如果该角色已经绑定了用户
                 if(res.pageList.total){
                     msg = '该角色已被引用，删除后拥有该角色的账号将失去相应权限，是否删除？'
                 }else{
diff --git a/src/pages/setting/person/download.vue b/src/pages/setting/person/download.vue
index cc705c2..131232b 100644
--- a/src/pages/setting/person/download.vue
+++ b/src/pages/setting/person/download.vue
@@ -86,6 +86,7 @@ export default {
             this.getData()
         },
         download(row){
+            // 查询是否有下载的权限
             this.$get(`${this.api.isDownload}`,{
                 tableId: row.tableId,
                 schoolId: this.schoolId,
@@ -101,8 +102,10 @@ export default {
                 }).then(res => {
                     msgObj.close()
                     if(res.data.type != 'multipart/form-data') return util.warningMsg('数据总数为零！')
+                    // 统一调用该方法去下载excel
                     util.downloadFileDirect(`${row.databaseName}.xls`,new Blob([res.data]))
                     
+                    // 下载次数+1
                     this.$post(this.api.saveRecord,{
                         tableId: row.tableId,
                         type: 1,
diff --git a/src/pages/setting/person/index.vue b/src/pages/setting/person/index.vue
index 4fbddcb..438a486 100644
--- a/src/pages/setting/person/index.vue
+++ b/src/pages/setting/person/index.vue
@@ -52,6 +52,7 @@ export default {
             'avatar'
         ]),
     },
+    // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
     beforeRouteLeave(to, from, next) {
         if(this.edited){
             this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
@@ -77,6 +78,7 @@ export default {
             this.setAvatar(res.message)
         },
         selectType(key){
+            // 如果切换的是我的下载,并且有更改信息
             if(key == 2 && this.edited){
                 this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
                     type: 'warning'
diff --git a/src/pages/setting/person/info.vue b/src/pages/setting/person/info.vue
index 95e43f6..0b7cbdc 100644
--- a/src/pages/setting/person/info.vue
+++ b/src/pages/setting/person/info.vue
@@ -350,6 +350,7 @@ export default {
         };
     },
     watch: {
+        // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
         form: {
             handler(val, oldVal){
                 this.updateTime++
diff --git a/src/pages/stat/list/index.vue b/src/pages/stat/list/index.vue
index 876cb65..0e6fe19 100644
--- a/src/pages/stat/list/index.vue
+++ b/src/pages/stat/list/index.vue
@@ -180,6 +180,7 @@ export default {
         }
     },
     mounted() {
+        // 如果是从用户那边跳过来的,schoolId会因为加载顺序的问题,获取不到,所以要从url里去获取schoolId
         if(!this.schoolId){
             let schoolId = this.$route.query.schoolId
             if(schoolId) schoolId = atob(decodeURI(schoolId))
@@ -241,10 +242,12 @@ export default {
         getDatabase(){
             this.$get(`${this.api.queryDatabaseInfo}?schoolId=${this.schoolId}&startTime=${this.startTime}&endTime=${this.endTime}`).then(res => {
                 let list = JSON.parse(res.databaseInfo)
+                // 只展示前十条
                 this.listData = list.slice(0,10)
                 this.listDataAll = list
             }).catch(res => {})
         },
+        // 因为后端的数据存在redis了,所以无法做模糊查询,只能在前端实现
         searchData(){
             let list = this.listDataAll
             let result = []
@@ -305,6 +308,7 @@ export default {
         },
         exportDatabaseByMonth(){
             let data = []
+            // 如果有选择,则导出选择了的数据,否则,导出全部
             if(this.multipleSelection1.length){
                 data = this.multipleSelection1.map(n => `yearList=${n.year}`)
             }else{
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index f744fd5..328e1ca 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -371,7 +371,6 @@ export default {
                     userName: data.userName,
                     roleId: data.roleId,
                     phone: data.phone ? data.phone : '暂未绑定',
-                    // uniqueIdentification: data.uniqueIdentification,
                     workNumber: data.workNumber,
                     email: data.email,
                     schoolId: data.schoolId,
@@ -393,17 +392,22 @@ export default {
             console.log(11,val)
         },
         confirm(){
-            // return console.log(11,this.form.roleId)
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     if(this.accountRepeat) return util.errorMsg('该账号已存在！')
                     if(this.workNumberRepeat) return util.errorMsg('该学号/工号已存在！')
                     let data = this.form
+                    // 如果是新增,则取当前用户的schoolId
                     data.schoolId = data.schoolId ? data.schoolId : this.schoolId
+                    // 如果是新增,则生成个时间戳作为唯一标识
                     if(!data.userId) data.uniqueIdentification = new Date().getTime()
+
+                    // 每个用户都有个默认的角色,就是"用户",这是个基础角色,而"用户"的roleId是0,这是写死的
+                    // 如果没选择任何角色,则只有一个不可勾选的"用户"角色,则把roleId赋值为0
                     if(data.roleId.length == 1){
                         data.roleId = '0'
                     }else{
+                        // 目前的用户角色只支持勾选一个角色,如果固定取索引为1的角色id
                         data.roleId = data.roleId[1]
                     }
                     if(this.form.userId){
diff --git a/src/plugins/auth/index.js b/src/plugins/auth/index.js
index 7e14fb0..b357a4c 100644
--- a/src/plugins/auth/index.js
+++ b/src/plugins/auth/index.js
@@ -8,6 +8,7 @@ import store from '@/store'
 export default {
     inserted (el, binding, vnode) {
         let btnText = ''
+        // 如果有传值,就取传的值,否则,就取页面路由和按钮名字拼接起来
         if(binding.value){
             btnText = binding.value
         }else{
@@ -17,6 +18,7 @@ export default {
 
         if (btnText && btnPermissions && btnPermissions.length) {
             const isPermission = btnPermissions.includes(btnText)
+            // 如果按钮集合里没有该权限,就把该按钮给去除
             if (!isPermission) {
                 el.parentNode && el.parentNode.removeChild(el)
             }
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index 4be4800..b21714e 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -18,6 +18,7 @@ service.interceptors.request.use(config => {
     let storeSchoolId = store.state.user.schoolId
     let routeSchoolId = router.app._route.query.schoolId
     if(routeSchoolId) routeSchoolId = atob(decodeURI(routeSchoolId))
+    // 如果store里没有schoolId,则取url里的schoolId,从用户跳转到后台的时候因为加载顺序的问题会出现这个情况,所以要做这个处理
     if(storeSchoolId || routeSchoolId) config.headers.schoolId = storeSchoolId ? storeSchoolId : routeSchoolId
     return config
 },err => {
diff --git a/src/setting.js b/src/setting.js
index e16e999..209a159 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -25,17 +25,13 @@ const Setting = {
     // Cookies 默认保存时间，单位：天
     cookiesExpires: 1,
     /**
-     * token的key
+     * localStorage里保存的token的key
      */
     tokenKey: 'data_token',
     /**
-     * sessionStorage里state的key
+     * localStorage里保存的vuex的key
      */
     storeKey: 'data_store',
-    /**
-     * sessionStorage里username的key
-     */
-    usernameKey: 'data_username',
     /**
      * 默认密码
      */
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2446751..ee1fffd 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -47,6 +47,7 @@ export default {
                         util.local.set(Setting.tokenKey,res.data.token,43200000)
                         util.successMsg('登录成功')
                         setTimeout(() => {
+                            // 登录次数+1
                             post(api.saveRecord,{
                                 type: 3,
                             }).then(res => {}).catch(res => {})