From 6dbdef9aa061e59534dd50e0a7782d55e5d652bf Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Mon, 25 Oct 2021 09:38:00 +0800
Subject: [PATCH] cxw-010203

---
 src/assets/images/Index/img_xgcg.png  | Bin 0 -> 3808 bytes
 src/permission.js                     |   7 ++--
 src/views/MarketingAnalysis/index.vue |  23 ++++++++++++
 src/views/Myself/index.vue            |  49 ++++++++++++++++++--------
 4 files changed, 61 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/images/Index/img_xgcg.png
 create mode 100644 src/views/MarketingAnalysis/index.vue

diff --git a/src/assets/images/Index/img_xgcg.png b/src/assets/images/Index/img_xgcg.png
new file mode 100644
index 0000000000000000000000000000000000000000..76d6c26c2b0b809a12cc0d1f8c93ba174157827d
GIT binary patch
literal 3808
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
W7XtE4MYw4I0000<MNUMnLSTYd#E0Vm

literal 0
HcmV?d00001

diff --git a/src/permission.js b/src/permission.js
index 10ae497..9392fc4 100644
--- a/src/permission.js
+++ b/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()
     }
    
diff --git a/src/views/MarketingAnalysis/index.vue b/src/views/MarketingAnalysis/index.vue
new file mode 100644
index 0000000..231914c
--- /dev/null
+++ b/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>
diff --git a/src/views/Myself/index.vue b/src/views/Myself/index.vue
index abb6874..3a57cb4 100644
--- a/src/views/Myself/index.vue
+++ b/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;