From 8877394125b08e98d3d1a6117b9259ab5665a9e0 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Thu, 18 Mar 2021 23:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/convert.js                |  6 ++++--
 src/views/form/statistics.vue       |  3 +--
 src/views/home/index.vue            |  6 +++---
 src/views/official/index.vue        |  5 -----
 src/views/official/introduction.vue |  2 +-
 src/views/project/MyProject.vue     | 28 ++++++++++++++++++++++------
 6 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/utils/convert.js b/src/utils/convert.js
index 1515516..2ba6dc3 100644
--- a/src/utils/convert.js
+++ b/src/utils/convert.js
@@ -124,8 +124,10 @@ let dataParams = {
         'filterable': 'filterable',
         'multiple': 'props.props.multiple'
     },
-    //单选框组
+    //多选框组
     8: {
+        'optionType': '__config__.optionType',
+        'size': 'size',
         'options': '__slot__.options',
         'max': 'max',
         'min': 'min'
@@ -139,7 +141,7 @@ let dataParams = {
     },//时间选择
     11: {},
     15: {
-        'max': 'max',
+        'max': 'max'
     },
     //文件上传
     17: {
diff --git a/src/views/form/statistics.vue b/src/views/form/statistics.vue
index ee3a2fb..740f0c5 100644
--- a/src/views/form/statistics.vue
+++ b/src/views/form/statistics.vue
@@ -226,12 +226,11 @@ export default {
                 params: this.queryConditions,
                 responseType: 'blob'
             }).then(res => {
-                console.log(res)
                 let blob = res
                 let downloadElement = document.createElement('a')
                 let href = window.URL.createObjectURL(blob) //创建下载的链接
                 downloadElement.href = href
-                downloadElement.download = this.projectData.name + '.xls' //下载后文件名
+                downloadElement.download = this.projectData.name +this.$dayjs().format('YYYYMMDDHHMM')+ '.xls' //下载后文件名
                 document.body.appendChild(downloadElement)
                 downloadElement.click() //点击下载
                 document.body.removeChild(downloadElement) //下载完成移除元素
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3f1bcab..6969cb0 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -24,18 +24,18 @@
                         </el-menu>
                     </el-col>
                     <el-col :span="1">
-                        <el-button round>升级</el-button>
+                        <!-- <el-button round>升级</el-button>-->
                     </el-col>
                     <el-col :span="1">
                         <div style="display: flex;
                         align-items: center;
                         justify-content: center;"
                         >
-                            <svg-icon name="loginWx" style="width: 24px; height: 24px;" />
+                            <!--     <svg-icon name="loginWx" style="width: 24px; height: 24px;" />-->
                         </div>
                     </el-col>
                     <el-col :span="1">
-                        <el-link href="https://element.eleme.io" target="_blank">帮助</el-link>
+                        <el-link href="https://gitee.com/TDuckApp/tduck-platform/wikis/%E6%9C%AC%E5%9C%B0%E8%BF%90%E8%A1%8C?sort_id=3681729" target="_blank">帮助</el-link>
                     </el-col>
                     <el-col :span="3">
                         <el-popover
diff --git a/src/views/official/index.vue b/src/views/official/index.vue
index 8aac1a2..dee07f3 100644
--- a/src/views/official/index.vue
+++ b/src/views/official/index.vue
@@ -59,12 +59,7 @@ export default {
                 {
                     routerPath: 'https://gitee.com/TDuckApp/tduck-platform?time=2',
                     title: '开源版本'
-                },
-                {
-                    routerPath: 'https://gitee.com/TDuckApp/tduck-platform?time=1',
-                    title: '企业部署'
                 }
-
             ]
         }
     },
diff --git a/src/views/official/introduction.vue b/src/views/official/introduction.vue
index 22cd751..b126d5d 100644
--- a/src/views/official/introduction.vue
+++ b/src/views/official/introduction.vue
@@ -13,7 +13,7 @@
                                 <p class="body-detail">简单易用，灵活的反馈数据筛选；统计图表一目了然</p>
                                 <div>
                                     <el-button class="body-btn primary" type="primary"
-                                               @click="$router.push({path:'/console'})"
+                                               @click="$router.push({path:'/login'})"
                                     >
                                         免费使用
                                     </el-button>
diff --git a/src/views/project/MyProject.vue b/src/views/project/MyProject.vue
index 73966df..9b8f348 100644
--- a/src/views/project/MyProject.vue
+++ b/src/views/project/MyProject.vue
@@ -44,10 +44,10 @@
                         style="width: 20%; margin-left: 20px;" type="text" placeholder="请输入项目名称"
                     />
                     <el-button style="margin-left: 20px;" type="primary" @click="queryProjectPage">查询</el-button>
-                    <el-button style="margin-left: 20px;">
-                        <font-icon class="fas fa-plus-square" />
-                        新建文件夹
-                    </el-button>
+                    <!--                    <el-button style="margin-left: 20px;">-->
+                    <!--                        <font-icon class="fas fa-plus-square" />-->
+                    <!--                        新建文件夹-->
+                    <!--                    </el-button>-->
                     <el-button style="margin-left: 10px;">
                         <font-icon class="fas fa-recycle" />
                         回收站
@@ -91,7 +91,7 @@
                     <img class="project-grid-view-preimg"
                          src="https://freebrio.oss-cn-shanghai.aliyuncs.com/t/pic%20(1).png"
                     >
-                    <p class="project-grid-view-time">创建时间：2020/12/8</p>
+                    <p class="project-grid-view-time">创建时间：{{ p.createTime | formatDate }}</p>
                     <div class="gird-operating-btns">
                         <el-button type="text" @click="toProjectHandle(p.key,1)">
                             <i class="el-icon-edit" />
@@ -173,7 +173,9 @@
                         >
                             统计
                         </el-link>
-                        <el-link type="danger" style="margin: 2px;">
+                        <el-link
+                            type="danger" style="margin: 2px;" @click="deleteProject(scope.row.key)"
+                        >
                             删除
                         </el-link>
                     </template>
@@ -195,6 +197,7 @@
 </template>
 <script>
 import DataEmpty from '@/components/DataEmpty'
+import dayjs from 'dayjs'
 
 let projectStatusList = [
     {code: 1, name: '未发布', color: '#006EFF'},
@@ -205,6 +208,11 @@ let projectStatusList = [
 export default {
     name: 'MyProject',
     components: {DataEmpty},
+    filters: {
+        formatDate(time) {
+            return  dayjs(time).format('YYYY/MM/DD')
+        }
+    },
     data() {
         return {
             dataShowType: 'gird',
@@ -243,6 +251,14 @@ export default {
         toProjectHandle(key, type) {
             this.$router.push({path: '/project/form', query: {key: key, active: type}})
         },
+        deleteProject(key) {
+
+            this.$api.post('/user/project/delete', {'key': key}).then(res => {
+                if (res.data) {
+                    this.msgSuccess('刪除成功')
+                }
+            })
+        },
         queryProjectPage() {
             this.$api.get('/user/project/page', {
                 params: this.queryParams