From ec8ece308e4902f928e32f5b7ced45aba99b738d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Sep 2021 15:01:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=AB=98=E5=BE=B7key=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=94=A8=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- .env.production | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index a52e127..49f730e 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,10 @@ VUE_APP_TITLE = 问卷调查测试环境 # 接口请求地址，会设置到 axios 的 baseURL 参数上 VUE_APP_API_ROOT_TDUCK = /tduck-api -VUE_APP_API_ROOT = http://192.168.1.140/api +VUE_APP_API_ROOT = http://localhost:8116 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 -VUE_APP_DEBUG_TOOL = -# 高德地图key +VUE_APP_DEBUG_TOOL = +# 高德地图key 暂时没有用到 VUE_APP_MAP_KEY = f2200337d0d08538e78729572749882d # 微信功能开关 开启设置 ON，关闭设置 OFF VUE_APP_WX = OFF diff --git a/.env.production b/.env.production index d07c3d6..a54e590 100644 --- a/.env.production +++ b/.env.production @@ -4,7 +4,7 @@ VUE_APP_TITLE = 问卷调查 VUE_APP_API_ROOT = /tduck-api # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VUE_APP_DEBUG_TOOL = -# 高德地图key +# 高德地图key 暂时没有用到 VUE_APP_MAP_KEY = f2200337d0d08538e78729572749882d # 微信功能开关 开启设置 ON，关闭设置 OFF VUE_APP_WX = ON From 8ff34a40c9aa6f7618cfc875cf86fe75852bb501 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Sep 2021 16:18:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 49f730e..c85949c 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,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.158.1.140/api # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VUE_APP_DEBUG_TOOL = # 高德地图key 暂时没有用到 From 1838527d5d1100a5dba64979b2134523060c5a0c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Sep 2021 16:48:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AFcode=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA8000=20=E7=BB=9F=E4=B8=80=E4=B8=8B=20?= =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index ea1922a..5c66f46 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -32,7 +32,7 @@ api.interceptors.request.use( * 以下代码为示例，在登录状态下，分别对 post 和 get 请求加上 token 参数 */ if (store.getters['user/isLogin']) { - request.headers.token = store.state.user.token + request.headers.token = store.state.user.token // request.headers.token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJhcHAiOiJnb3YiLCJjbGllbnQiOiJ3ZWIiLCJleHAiOjE2MzI5NjYwODEsInVzZXJJZCI6Ijg0ODg3ZDQzMjEzN2EzMGI3YWJhYWM1MDY5ODZkNDYxIiwiaWF0IjoxNjMyMzYxMjgxfQ.CDYJNfuF7gRRDwwmB9dJQjVOj_t_3xdrgwMqxHNAleZuQHkPMu9fI32at2aPjprhN4yBc_KT_3_Yhh30SF7YzA' // request.headers.Authorization = store.state.user.token } @@ -66,7 +66,7 @@ api.interceptors.response.use( * 请求出错时 msg 会返回错误信息 * 则代码如下 */ - let errCodes = [500, 405, 403] + let errCodes = [8000, 405, 403] const res = response.data if (res.code === 200) { return Promise.resolve(res) From 03930127edc7503ed1d8885db8012788152b71eb Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 23 Sep 2021 16:51:00 +0800 Subject: [PATCH 4/5] dd --- src/components/form/ProvinceCity/index.vue | 1 + src/views/form/statistics/analysis.vue | 472 ++++++++++++--------- 2 files changed, 274 insertions(+), 199 deletions(-) diff --git a/src/components/form/ProvinceCity/index.vue b/src/components/form/ProvinceCity/index.vue index f93adc1..7b7122d 100644 --- a/src/components/form/ProvinceCity/index.vue +++ b/src/components/form/ProvinceCity/index.vue @@ -16,6 +16,7 @@ export default { name: 'ProvinceCity', data() { return { + value: '', options: city, props: { label: 'n', diff --git a/src/views/form/statistics/analysis.vue b/src/views/form/statistics/analysis.vue index 3fd20e3..1e5de56 100644 --- a/src/views/form/statistics/analysis.vue +++ b/src/views/form/statistics/analysis.vue @@ -1,12 +1,14 @@ @@ -275,7 +350,8 @@ export default { .cell-wrapper { width: 100%; border: 1px solid #eee; - .cell, .cell-value { + .cell, + .cell-value { widows: 100%; display: flex; align-items: center; @@ -289,7 +365,6 @@ export default { width: 60%; box-sizing: border-box; padding-left: 10px; - } .cell-value { width: 40%; @@ -325,6 +400,5 @@ export default { font-size: 14rpx; } } - From 9333c944401847fc00df2ce03a210f48520bf680 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 23 Sep 2021 17:25:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/statistics/analysis.vue | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/views/form/statistics/analysis.vue b/src/views/form/statistics/analysis.vue index 1e5de56..e8d164e 100644 --- a/src/views/form/statistics/analysis.vue +++ b/src/views/form/statistics/analysis.vue @@ -268,7 +268,7 @@ export default { } return config }, - getDetail(id, type) { + getInputList(id, type) { this.$api .post('/data/aggregator/questionnaire/itemresdetail-list', { @@ -284,11 +284,28 @@ export default { }) }) }, + getConcatList() { + + this.$api + .post('/data/aggregator/questionnaire/itemresdetail-concat', { + projectKey: this.$route.query.key + }) + .then((res) => { + this.dialogData = res.data.dataMap + this.dialogHeader = res.data.tableHeaderList + }) + }, async handleOpen(item) { if (item.type === 'SWITCH' || item.type === 'NUMBER_INPUT') return false + this.dialogTitle = item.label - this.dialogHeader.push(item) - await this.getDetail(item.formItemId, item.type) + if (item.moduleType && item.moduleType === 'concat') { + await this.getConcatList() + } else { + this.dialogHeader.push(item) + await this.getInputList(item.formItemId, item.type) + } + this.dialogTableVisible = true }, handleClose() {