Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-htqd

# Conflicts:
#	src/store/modules/permission.js

src/permission.js

@@ -14,8 +14,7 @@ NProgress.configure({
   showSpinner: false
 }) // NProgress Configuration
 
-const whiteList = ['/login'] // no redirect whitelist
-
+const whiteList = ['/login', '/dashboard'] // no redirect whitelist
 router.beforeEach(async (to, from, next) => {
   // start progress bar
   NProgress.start()
@@ -39,8 +38,8 @@ router.beforeEach(async (to, from, next) => {
       } else {
         try {
           // get user info
-          const accessRoutes = await store.dispatch('permission/generateRoutes');
-          router.addRoutes(accessRoutes);
+          // const accessRoutes = await store.dispatch('permission/generateRoutes');
+          // router.addRoutes(accessRoutes);
           // const {
           //   roles
           // } = await store.dispatch('user/getInfo')
@@ -57,7 +56,7 @@ router.beforeEach(async (to, from, next) => {
     }
   } else {
     /* has no token*/
-
+    console.error(to.path)
     if (whiteList.indexOf(to.path) !== -1) {
       // in the free login whitelist, go directly
       next()

src/utils/request.js

@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
+  withCredentials: true, // send cookies when cross-domain requests
   timeout: 5000 // request timeout
 })
 

src/views/operationLog/logManagement.vue

@@ -6,7 +6,7 @@
         <el-row>
           <el-col :span="14" style="height: 45px">
             <span type="primary" class="batch_text">
-              <i class="el-icon-tickets"></i>数据列表</span>
+              </span>
             <el-button type="danger" plain icon="el-icon-delete" size="small" @click="delBtn()">删除</el-button>
             <el-button type="warning" plain icon="el-icon-download" size="small" class="top_btn" @click="exportBtn()">导出
             </el-button>
@@ -100,29 +100,29 @@
     logList,
     delInfo,
     exportInfo
-  } from "@/api/operationLog";
+  } from '@/api/operationLog';
   export default {
     components: {
-      "el-image-viewer": () =>
-        import("element-ui/packages/image/src/image-viewer"),
+      'el-image-viewer': () =>
+        import('element-ui/packages/image/src/image-viewer'),
     },
     data() {
       return {
         tableData: [],
         //筛选
-        searchkeyWord: "",
+        searchkeyWord: '',
         //分页
         currentPage: 1,
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        search: "",
+        search: '',
         //图片预览
         srcList: [],
         imgsVisible: false,
         //筛选时间
-        startDate: "",
-        endDate: "",
+        startDate: '',
+        endDate: '',
         value1: [],
         //批量
         musterList: [],
@@ -139,28 +139,28 @@
       let date1 = new Date().setTime(date.getTime() - 24 * 60 * 60 * 1000); //一天前的时间蹉
       date1 = new Date(parseInt(date1))
         .toLocaleString()
-        .split(" ")[0]
-        .replaceAll("/", "-");
+        .split(' ')[0]
+        .replaceAll('/', '-');
       console.log(date1);
 
       this.startDate =
-        date1.split("-")[0] +
-        "-" +
-        (date1.split("-")[1] < 10 ?
-          "0" + date1.split("-")[1] :
-          date1.split("-")[1]) +
-        "-" +
-        (date1.split("-")[2] < 10 ?
-          "0" + date1.split("-")[2] :
-          date1.split("-")[2]);
+        date1.split('-')[0] +
+        '-' +
+        (date1.split('-')[1] < 10 ?
+          '0' + date1.split('-')[1] :
+          date1.split('-')[1]) +
+        '-' +
+        (date1.split('-')[2] < 10 ?
+          '0' + date1.split('-')[2] :
+          date1.split('-')[2]);
       this.endDate =
         date.getFullYear() +
-        "-" +
+        '-' +
         (date.getMonth() + 1 < 10 ?
-          "0" + (date.getMonth() + 1) :
+          '0' + (date.getMonth() + 1) :
           date.getMonth()) +
-        "-" +
-        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()); //當前時間
+        '-' +
+        (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()); //當前時間
       this.value1 = [this.startDate, this.endDate];
       this.getList();
     },
@@ -182,14 +182,14 @@
           endDate: this.formInfo.endDate,
         }).then((response) => {
           let blob = response.data;
-          let a = document.createElement("a");
+          let a = document.createElement('a');
           //由于后台返回文件名称是通过response返回的
           //因此需要从response headers中content-disposition响应头中获取文件名称fileName，如上图所示
           // let headers = response.headers;
           // let fileName = headers["content-disposition"];
           // fileName = fileName.split('=')[1]
           //download是a标签的一个属性，可以自定义文件名称
-          a.download = "日志记录.xlsx";
+          a.download = '日志记录.xlsx';
           let binaryData = [];
           binaryData.push(blob);
           // a.href = URL.createObjectURL(blob);
@@ -216,22 +216,22 @@
       },
       delBtn() {
         if (this.musterList.length == 0) {
-          this.$message.error("请勾选操作的条目！");
+          this.$message.error('请勾选操作的条目！');
           return;
         }
-        this.$confirm("确定删除信息？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm('确定删除信息？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         }).then(() => {
           delInfo({
             hyOperLogList: this.musterList
           }).then((response) => {
             if (response.code == 200) {
               this.$notify({
-                title: "成功",
-                message: "删除成功！",
-                type: "success",
+                title: '成功',
+                message: '删除成功！',
+                type: 'success',
               });
               this.getList();
             }