From 408b27f9586786aa64ae3cd5cf5eecf32fd5dcc2 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Wed, 16 Dec 2020 16:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=80=E9=83=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/form/home.scss |  1 -
 src/views/account/login.vue      |  2 +-
 src/views/form/ProjectForm.vue   | 21 +++++----------
 src/views/form/publish.vue       | 11 +++++++-
 src/views/project/MyProject.vue  | 45 +++++++++++++++++++++++++++-----
 5 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/src/assets/styles/form/home.scss b/src/assets/styles/form/home.scss
index 02acc58..ecddcca 100644
--- a/src/assets/styles/form/home.scss
+++ b/src/assets/styles/form/home.scss
@@ -260,7 +260,6 @@ $lighterBlue: #4aa0fa;
 .form-name-text {
     padding: 6px 10px;
     border: 1px dashed transparent;
-    width: 80%;
     line-height: 30px;
     margin: 0;
 }
diff --git a/src/views/account/login.vue b/src/views/account/login.vue
index 9687b6b..e576055 100644
--- a/src/views/account/login.vue
+++ b/src/views/account/login.vue
@@ -86,7 +86,7 @@
                                         </el-link>
                                     </el-col>
                                     <el-col :span="6" :offset="1">
-                                        <el-link :underline="false" type="primary" class="protocol-tip">
+                                        <el-link :underline="false" type="primary" class="protocol-tip" @click="toForgetPwdHandle">
                                             忘记密码？
                                         </el-link>
                                     </el-col>
diff --git a/src/views/form/ProjectForm.vue b/src/views/form/ProjectForm.vue
index 1cb2635..1796222 100644
--- a/src/views/form/ProjectForm.vue
+++ b/src/views/form/ProjectForm.vue
@@ -12,19 +12,12 @@
                 :src="projectTheme.headImgUrl"
                 style="width: 100%"
                 fit="scale-down"></el-image>
-            <el-row v-if="projectTheme.showTitle" type="flex" justify="center" align="middle">
-                <el-col  style="text-align: center">
-                    <h4 class="form-name-text">
-                        {{ formConf.title }}</h4>
-                </el-col>
-            </el-row>
-            <el-row v-if="projectTheme.showDescribe" type="flex" justify="center" align="middle">
-                <el-col style="text-align: center">
-                    <p class="form-name-text">
-                        {{ formConf.description }}
-                    </p>
-                </el-col>
-            </el-row>
+            <h4 class="form-name-text" v-if="projectTheme.showTitle" style="text-align: center">
+                {{ formConf.title }}
+            </h4>
+            <p class="form-name-text" v-if="projectTheme.showDescribe" style="text-align: center">
+                {{ formConf.description }}
+            </p>
             <el-divider>
             </el-divider>
             <parser v-if="formConf.fields.length" :form-conf="formConf" @submit="submitForm"/>
@@ -96,7 +89,7 @@ export default {
         if (this.projectConfig && this.projectConfig.projectKey) {
             this.projectKey = this.projectConfig.projectKey
             // this.formConf.formBtns = this.projectConfig.showBtns
-            //不存去路由中尝试获取 ifreme
+            //不存去路由中尝试获取 iframe
         } else if (this.$route.query.key) {
             this.projectKey = this.$route.query.key
             this.formConf.formBtns = true
diff --git a/src/views/form/publish.vue b/src/views/form/publish.vue
index 7ebf1e3..c284ebc 100644
--- a/src/views/form/publish.vue
+++ b/src/views/form/publish.vue
@@ -30,7 +30,10 @@
                                 </el-button>
                             </el-col>
                             <el-col :span="6">
-                                <el-button type="warning">查看反馈</el-button>
+                                <el-button
+                                    @click="toFeedbackPageHandle"
+                                    type="warning">查看反馈
+                                </el-button>
                             </el-col>
                         </el-row>
                     </el-col>
@@ -55,6 +58,7 @@
 
 <script>
 import VueQr from 'vue-qr'
+import {getCurrentDomain} from '@/utils'
 
 export default {
     name: 'projectPublish',
@@ -113,6 +117,11 @@ export default {
                 uInt8Array[i] = raw.charCodeAt(i)
             }
             return new Blob([uInt8Array], {type: contentType})
+        },
+        toFeedbackPageHandle() {
+            let currentDomain = getCurrentDomain()
+            let url = `${currentDomain}/project/form?key=${this.projectKey}&active=5`
+            window.location.href = url
         }
     }
 
diff --git a/src/views/project/MyProject.vue b/src/views/project/MyProject.vue
index 648890c..2428dfb 100644
--- a/src/views/project/MyProject.vue
+++ b/src/views/project/MyProject.vue
@@ -1,5 +1,11 @@
 <template>
     <div class="my-project-container">
+        <div class="back-view">
+            <el-button size="mini" round @click="$router.back(-1)">
+                <i class="el-icon-arrow-left" />
+                返回
+            </el-button>
+        </div>
         <div class="filter-view">
             <div>
                 <span @click="switchDataShowTypeHandle('gird')">
@@ -48,7 +54,11 @@
                     </el-button>
                 </el-form-item>
                 <el-form-item label="项目状态">
-                    <el-radio-group v-model="queryParams.status" size="small" @change="queryProjectPage">
+                    <el-radio-group v-model="queryParams.status" size="small" @change="()=>{
+                        this.queryParams.current=0
+                        this.queryProjectPage()
+                    }"
+                    >
                         <el-radio-button v-for="status in projectStatusList" :key="status.code" :label="status.code">
                             {{ status.name }}
                         </el-radio-button>
@@ -81,10 +91,17 @@
                     >
                     <p class="project-grid-view-time">创建时间：2020/12/8</p>
                     <div class="gird-operating-btns">
-                        <el-button type="text" @click="toEditHandle(p.key)">
+                        <el-button type="text" @click="toProjectHandle(p.key,1)">
                             <i class="el-icon-edit" />
                             编辑
                         </el-button>
+                        <el-button
+                            v-if="p.status!=1"
+                            type="text" @click="toProjectHandle(p.key,5)"
+                        >
+                            <i class="el-icon-data-analysis" />
+                            统计
+                        </el-button>
                     </div>
                 </div>
             </div>
@@ -142,10 +159,18 @@
                     <template slot-scope="scope">
                         <el-link type="primary"
                                  style="margin: 2px;"
-                                 @click="toEditHandle(scope.row.key)"
+                                 @click="toProjectHandle(scope.row.key,1)"
                         >
                             编辑
                         </el-link>
+                        <el-link
+                            v-if="scope.row.status!=1"
+                            type="success"
+                            style="margin: 2px;"
+                            @click="toProjectHandle(scope.row.key,5)"
+                        >
+                            统计
+                        </el-link>
                         <el-link type="danger" style="margin: 2px;">
                             删除
                         </el-link>
@@ -210,8 +235,8 @@ export default {
         switchDataShowTypeHandle(type) {
             this.dataShowType = type
         },
-        toEditHandle(key) {
-            this.$router.push({path: '/project/form', query: {key: key, active: 1}})
+        toProjectHandle(key, type) {
+            this.$router.push({path: '/project/form', query: {key: key, active: type}})
         },
         queryProjectPage() {
             this.$api.get('/user/project/page', {
@@ -231,13 +256,19 @@ export default {
 .my-project-container {
     display: flex;
     width: 100%;
+    height: 100%;
     flex-direction: column;
     align-items: center;
     align-content: center;
-    justify-content: center;
+}
+.back-view {
+    display: flex;
+    width: 80%;
+    align-content: flex-start;
+    margin: 10px;
 }
 .filter-view {
-    margin-top: 40px;
+    margin-top: 20px;
     display: flex;
     flex-direction: row;
 }