cxw-010203

src/permission.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-08 09:26:42
- * @LastEditTime: 2021-10-23 17:40:41
+ * @LastEditTime: 2021-10-25 09:09:47
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/permission.js
@@ -12,11 +12,12 @@ import "nprogress/nprogress.css"
 
 const whitePath = ['/', '/login', '/industryDataExport','/index']
 const token = sessionStorage.getItem('token');
+// console.log(token)
 router.beforeEach((to, from, next) => {
+    NProgress.start()
     if(!token && !whitePath.includes(to.path)) {
         next('/login');
-    } else {
-        NProgress.start()
+    } else { 
         next()
     }
    

src/views/MarketingAnalysis/index.vue

@@ -0,0 +1,23 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-10-25 09:05:39
+ * @LastEditTime: 2021-10-25 09:06:46
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: /data-show/src/views/MarketingAnalysis/index.vue
+-->
+<template>
+    <div class="d-container">
+
+    </div>
+</template>
+
+<script>
+export default {
+    name: "MarketingAnalysis"
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Myself/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-09 16:57:27
- * @LastEditTime: 2021-10-23 17:25:22
+ * @LastEditTime: 2021-10-25 09:37:12
  * @LastEditors: Please set LastEditors
  * @Description: 个人中心
  * @FilePath: /data-show/src/views/Myself/index.vue
@@ -29,14 +29,14 @@
                     <div class="d1" style="width: 350px">
                         <img class="m1" src="../../assets/images/Index/ic_sjh.png" />
                         <div class="dd1">
-                            <div class="ss1"><span>13643446943</span></div>
+                            <div class="ss1"><span>{{getUser.phone}}</span></div>
                             <span class="ss2">关联手机号</span>
                         </div>
                     </div>
                     <div class="d1" style="margin-right: 36px; width: 470px">
                         <img class="m1" src="../../assets/images/Index/ic_sj.png" />
                         <div class="dd1">
-                            <div class="ss1"><span>2021-08-28 12:00:00</span></div>
+                            <div class="ss1"><span>{{getUser.lastLoginTime}}</span></div>
                             <span class="ss2">上次登录时间</span>
                         </div>
                     </div>
@@ -46,8 +46,8 @@
                 <v-label-div title="数据导出管理"></v-label-div>
                 <div class="ms-d2-inner">
                     <v-table :columns="columns" :data="tbData" row-key="id">
-                        <span slot="action">
-                            <a>下载</a>
+                        <span slot="action" slot-scope="text, record">
+                            <a :href="record.FilePath">下载</a>
                         </span>
                     </v-table>
                 </div>
@@ -67,8 +67,8 @@
                     <phoneForm ref="phoneForm" @nextStep="handlerNext" v-if="nextType === 1"></phoneForm>
                     <modifyForm v-if="nextType === 2" ref="modifyForm" :forgetForm="accout" @success="handlerSuc"></modifyForm>
                     <div class="stepEst" v-if="nextType === 3">
-                      <span>222</span>
-                        <span style="font-size: 20px;color:#fff">密码修改成功，请重新登录</span>
+                        <img class="m1" src="../../assets/images/Index/img_xgcg.png" />
+                        <span class="s1" style="font-size: 20px;color:#fff">密码修改成功，请重新登录</span>
                     </div>
                 </div>
             </div>
@@ -112,18 +112,18 @@ export default {
             columns: [
                 {
                     title: "文件名称",
-                    key: "name",
-                    dataIndex: "name",
+                    key: "Folder",
+                    dataIndex: "Folder",
                 },
                 {
                     title: "生成状态",
-                    dataIndex: "age",
-                    key: "age",
+                    dataIndex: "statuStr",
+                    key: "statuStr",
                 },
                 {
                     title: "导出时间",
-                    dataIndex: "address",
-                    key: "address",
+                    dataIndex: "AddTime",
+                    key: "AddTime",
                 },
                 {
                     title: "操作",
@@ -154,7 +154,7 @@ export default {
             } else if (this.nextType === 2) {
                 this.$refs.modifyForm.onSuccess();
             } else {
-              this.$router.push('/login')
+                this.$router.push('/login')
             }
         },
         // 下一步
@@ -174,7 +174,18 @@ export default {
         getTable() {
           this.form.token = this.getToken;
           getMyFileInfoExcel(this.form).then(res => {
-            console.log(res)
+            let table = res.data.Table;
+            table.forEach(ele => {
+              if(ele.Status === 0) {
+                ele.statuStr = '未完成'
+              } else if(ele.Status === 1) {
+                ele.statuStr = '正在生成'
+              } else {
+                ele.statuStr = '已完成'
+              }  
+            })
+            this.tbData = table;
+            
           })
         }
     },
@@ -256,6 +267,14 @@ export default {
   flex-direction: column;
   justify-content: center;
   align-items: center;
+  .m1 {
+   width: 80px; 
+   height: 80px;
+  }
+  .s1 {
+    display: block;
+    margin-top: 12px;
+  }
 }
 /deep/ .ant-table-body {
     height: 600px;