From c08e182cb4978ad8eff5d8bfe0be2354c98225fa Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 7 Sep 2023 12:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6query=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                 |  2 +-
 .gitignore                       |  1 -
 src/store/modules/user.js        |  7 +++++
 src/views/form/publish/index.vue |  2 ++
 src/views/form/write/index.vue   | 49 ++++++++++++++++++++++++++------
 5 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index fe2591b..4885e45 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ VUE_APP_TITLE = 问卷调查开发环境
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VUE_APP_API_ROOT_TDUCK = /tduck-api
 #VUE_APP_API_ROOT = http://localhost:8116/
-VUE_APP_API_ROOT = http://192.168.1.140/api
+VUE_APP_API_ROOT = http://192.168.1.144/api
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VUE_APP_DEBUG_TOOL =
 # 高德地图key 暂时没有用到
diff --git a/.gitignore b/.gitignore
index 7ac9edd..dce01c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ node_modules
 /src/assets/sprites/*.*
 !/src/assets/sprites/.gitkeep
 /questionnaire
-
 # local env files
 .env.local
 .env.*.local
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 137d5a6..20c0db4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -54,6 +54,10 @@ const actions = {
     setTokens(context, token) {
         console.log('setToekns', token)
         context.commit('setToken', token)
+    },
+    setAgencyId(context, agencyId) {
+        console.log('setAgencyId', agencyId)
+        context.commit('AgencyId', agencyId)
     }
 }
 
@@ -72,6 +76,9 @@ const mutations = {
     },
     setToken(state, token) {
         state.token = token
+    },
+    setAgencyId(state, token) {
+        state.agencyId = token
     }
 }
 
diff --git a/src/views/form/publish/index.vue b/src/views/form/publish/index.vue
index 9e6308f..84e254c 100644
--- a/src/views/form/publish/index.vue
+++ b/src/views/form/publish/index.vue
@@ -133,7 +133,9 @@ export default {
   },
   mounted () {
     this.projectKey = this.$route.query.key
+    this.agencyId = this.$route.query.agencyId
     let url = window.location.protocol + '//' + window.location.host
+    console.log(this.agencyId);
     this.writeLink = `${url}/${process.env.VUE_APP_PUBLIC_PATH}/s/${this.projectKey}`
     this.getProjectStatus()
   },
diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue
index 3b65377..01ccd02 100644
--- a/src/views/form/write/index.vue
+++ b/src/views/form/write/index.vue
@@ -1,3 +1,12 @@
+<!--
+ * @Author: mk 2403457699@qq.com
+ * @Date: 2023-09-05 19:39:02
+ * @LastEditors: mk 2403457699@qq.com
+ * @LastEditTime: 2023-09-06 13:35:51
+ * @Description: 介绍一下改动了什么
+ * 
+ * 
+-->
 <template>
   <div class="write-container">
     <h1 id="inActiveTime"
@@ -85,7 +94,8 @@ export default {
       orgName: '',//人员所属组织名【组织-组织，组织-部门，组织-网格】	
       orgType: '',//人员所属类型(组织:agency;部门:dept;网格:grid)	
       realName: '',//填写人姓名	
-      accessKey: ''
+      accessKey: '',
+      anonymous:''
     }
   },
   metaInfo: {
@@ -107,8 +117,12 @@ export default {
 
     console.log('微信传入token')
     const token = this.$route.query.token
+    const agencyId = this.$route.query.agencyId
+    this.anonymous = this.$route.query.anonymous
+    console.log('anonymous',this.anonymous);
     if (token) {
       this.$store.dispatch('user/setTokens', token)
+      this.$store.dispatch('user/setAgencyId', agencyId)
     }
 
 
@@ -297,10 +311,11 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(255, 255, 255, 0.5)'
       })
-
+      console.log('提交获取agencyId',this.$store.state.agencyId);
       // 完成时间
       let inActiveTime = document.getElementById('inActiveTime').innerText
-      await this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/result/create?access_key=${this.accessKey}`, {
+      let url = this.anonymous == '1'?`/user/project/result/createAnonymously?`:`/user/project/result/create?access_key=${this.accessKey}&`
+      await this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}${url}agencyId=${this.$route.query.agencyId}`, {
         'completeTime': inActiveTime,
         'projectKey': this.projectConfig.projectKey,
         'submitOs': ua.os.name,
@@ -317,17 +332,33 @@ export default {
         'realName': this.realName,//填写人姓名	
         //'accessKey':this.accessKey
       }).then((res) => {
-
-        this.writeStatus = 2
+        if(res.code==0){
+          this.writeStatus = 2
+    
+        }else{
+          console.log('不等于0',res.msg);
+          this.$message(
+          {
+            message: res.msg,
+            type: 'warning'
+          }
+        )
+        }
         if (this.userProjectSetting.submitJumpUrl) {
           setTimeout(() => {
-            window.location.replace(this.userProjectSetting.submitJumpUrl)
-          }, 1000)
+              window.location.replace(this.userProjectSetting.submitJumpUrl)
+            }, 1000)
         }
-
+      
       },
-        (msg) => {
+        (err) => {
           // debugger
+          this.$message(
+          {
+            message: err.msg,
+            type: 'warning'
+          }
+        )
         })
       // debugger
       loading.close()