elink-star
/
tduck-front
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并冲突

old
jiangyy 4 years ago
parent
0e046a1b48 2dd5e2ae13
commit
b45ecf4e15
7 changed files with 383 additions and 287 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      package.json
  2. 2
      src/api/index.js
  3. 165
      src/views/form/statistics/analysis.vue
  4. 104
      src/views/form/statistics/chart.vue
  5. 4
      src/views/form/statistics/index.vue
  6. 64
      src/views/form/statistics/list.vue
  7. 4
      vue.config.js

5
package.json
View File

@ -65,10 +65,7 @@
"not ie <= 8"
],
"lint-staged": {
"src/**/*.{js,vue}": [
"eslint --fix",
"git add"
]
},
"husky": {
"hooks": {

2
src/api/index.js
View File

@ -33,6 +33,8 @@ api.interceptors.request.use(
*/
if (store.getters['user/isLogin']) {
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
}
signRequest(request)
return request

165
src/views/form/statistics/analysis.vue
View File

@ -5,25 +5,63 @@
:key="index">
<div class="content">
<div class="title">
<span style="font-size: 16px">Q：{{ item.label }}（{{ item.type }}）</span>
<span style="font-size: 16px; font-weight: bold;">Q{{ index + 1 }} ：{{ item.label }}（{{ item.type }}）</span>
<div>
<!-- <div>
<span>图表类型：</span>
<el-select v-model="item.chartType"
placeholder="请选择">
<el-option v-for="subItem in options"
<el-select v-model="item.chartType" placeholder="请选择">
<el-option
v-for="subItem in options"
:key="subItem.value"
:label="subItem.label"
:value="subItem.value" />
:value="subItem.value"
/>
</el-select>
</div> -->
</div>
<!-- <line-chart
class="chart"
:chart-option="getCharData(item)"
:width="'90vw'"
/> -->
<div v-if="computedCount(item.type)"
class="cell-type">
<span>共收集 {{ item.detail.collectionTotal }} 条，</span>
<span>有效 {{ item.detail.validTotal }} 条</span>
<span v-if="item.type === 'NUMBER_INPUT'">，总计 {{ item.detail.sumTotal }} </span>
<span v-if="item.type === 'SWITCH'">，开 {{ item.detail.openTotal }} 条，关 {{ item.detail.closedTotal }} 条</span>
</div>
<div v-else-if="item.type === 'RADIO' || item.type === 'CHECKBOX' || item.type === 'SELECT'"
class="cell-wrapper">
<div v-for="(n, i) in item.detail.options"
:key="i"
class="cell">
<div class="cell-label">{{ n.label }}</div>
<div class="cell-value">
<div class="cell-progress">
<el-progress :stroke-width="20"
:show-text="false"
:percentage="computedPercent(n.currentCount, item.detail.totalCount)" />
</div>
<div class="cell-percent">
{{ computedPercent(n.currentCount, item.detail.totalCount).toFixed(2) }}%
</div>
<div class="cell-num">{{ n.currentCount }}次</div>
</div>
</div>
</div>
</div>
<el-divider />
</div>
</div>
<line-chart class="chart"
:chart-option="getCharData(item)"
:width="'90vw'" />
</div>
<el-divider />
</div>
<data-empty v-else
style="padding: 20px"
desc="暂无数据分析" />
</div>
<data-empty v-else
style="padding: 20px"
@ -116,16 +154,20 @@ export default {
this.list = res.data
})
},
getCharData (data) {
const config = {
tooltip: {
backgroundColor: 'rgba(255,255,255,0.8)', // 通过设置rgba调节背景颜色与透明度
color: 'black',
borderWidth: '1',
borderColor: 'rgb(156,209,255)',
textStyle: {
color: 'black'
}
mounted () {
this.getData()
},
methods: {
getData () {
// `${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/report/analysis`
// params: { projectKey: this.$route.query.key }
this.$api
.post('/data/aggregator/questionnaire/analysisreport', {
projectKey: this.$route.query.key
})
.then(res => {
this.list = res.data
})
},
grid: {
left: '3%',
@ -139,24 +181,14 @@ export default {
axisTick: {
alignWithLabel: true
}
}
],
yAxis: [
{
type: 'value'
}
],
series: [
{
name: '数量',
type: 'pie',
barWidth: '40%'
}
]
}
if (['bar', 'line'].includes(data.chartType)) {
config.tooltip.axisPointer = {
type: 'line'
return config
},
computedCount(type) {
const arr = ['PROVINCE_CITY', 'NUMBER_INPUT', 'SWITCH', 'INPUT', 'TEXTAREA', 'INPUT_MAP', 'TIME', 'DATE_RANGE', 'DATE', 'TIME_RANGE']
return arr.includes(type)
},
computedPercent(num, count) {
return ((num * 100) / count)
}
config.tooltip.trigger = 'axis'
config.xAxis[0].data = data.fieldName
@ -165,18 +197,18 @@ export default {
} else {
// 环形图暂时不用 无法切换到饼图
/* if ("ring" === data.chartType) {
config.series[0].radius = ["40%", "70%"];
config.series[0].radius = ["40%", "70%"];
config.series[0].emphasis = {
config.series[0].emphasis = {
label: {
show: true,
fontSize: '25',
fontWeight: 'bold'
}
}
}
}else{
delete config.series[0].radius
delete config.series[0].label
delete config.series[0].radius
delete config.series[0].label
} */
config.series[0].data = []
Object.keys(data.map).forEach(key => {
@ -185,7 +217,7 @@ export default {
// config.series[0].data = data.map
}
return config
}
}
}
}
</script>
@ -199,7 +231,7 @@ export default {
width: 100%;
.title {
font-size: 14px;
padding: 0 30px;
// padding: 0 30px;
height: 54px;
line-height: 54px;
width: 100%;
@ -212,3 +244,50 @@ export default {
}
}
</style>
<style lang="scss" scoped>
.cell-type {
padding-left: 10px;
font-size: 14px;
}
.cell-wrapper {
width: 100%;
border: 1px solid #eee;
.cell,
.cell-value {
widows: 100%;
display: flex;
align-items: center;
}
.cell {
justify-content: space-between;
padding: 10px 0;
font-size: 14px;
border-bottom: 1px solid #eee;
.cell-label {
width: 60%;
box-sizing: border-box;
padding-left: 10px;
}
.cell-value {
width: 40%;
.cell-progress {
// flex: 1;
width: 180px;
}
.cell-percent {
margin-left: 10px;
}
.cell-num {
width: 40%;
flex-shrink: 0;
text-align: center;
}
}
}
.cell:last-child {
border-bottom: 0;
}
}
</style>

104
src/views/form/statistics/chart.vue
View File

@ -186,79 +186,6 @@ export default {
type: 'shadow'
}
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: {
type: 'value',
interval: 1,
boundaryGap: [0, 0.01]
},
yAxis: {
type: 'category',
data: [0]
},
series: [
{
barWidth: 30,
name: '数量',
type: 'bar',
data: [0]
}
]
},
pieChartOptionData: {
tooltip: {
trigger: 'item',
backgroundColor: 'rgba(255,255,255,0.8)', // 通过设置rgba调节背景颜色与透明度
color: 'black',
borderWidth: '1',
borderColor: 'rgb(156,209,255)',
textStyle: {
color: 'black'
}
},
series: [
{
name: '设备类型',
type: 'pie',
radius: ['50%', '70%'],
avoidLabelOverlap: false,
label: {
show: false,
position: 'center'
},
emphasis: {
label: {
show: true,
fontSize: '30',
fontWeight: 'bold'
}
},
labelLine: {
show: false
},
data: [0]
}
]
}
}
},
created () {
this.activeProjectKey = this.$route.query.key
this.projectChangeHandle()
}, methods: {
projectChangeHandle () {
this.getProjectStats()
this.getProjectSituation()
this.getProjectSubmitPosition()
this.getProjectSubmitDevice()
this.getProjectSubmitSource()
},
getProjectStats () {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/report/stats`, { params: { projectKey: this.activeProjectKey } }).then(res => {
this.projectStats = res.data
@ -329,6 +256,37 @@ export default {
})
},
getProjectSubmitDevice () {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/report/device`, { params: { projectKey: this.activeProjectKey } }).then(res => {
if (res.data && res.data.length) {
this.pieChartOptionData.series[0].data = res.data.map(item => {
return { value: item.count, name: item.osName ? item.osName : '其他' }
})
}
})
}
]
})
},
getProjectSubmitSource() {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/report/source`, { params: { projectKey: this.activeProjectKey } }).then(res => {
if (res.data && res.data.length) {
this.barChartOptionData.yAxis.data = res.data.map(item => {
return item.browserName ? item.browserName : '其他'
})
this.barChartOptionData.series = [
{
barWidth: 30,
name: '数量',
type: 'bar',
data: res.data.map(item => {
return item.count
})
}
]
}
})
},
getProjectSubmitDevice() {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/report/device'`, { params: { projectKey: this.activeProjectKey } }).then(res => {
if (res.data && res.data.length) {
this.pieChartOptionData.series[0].data = res.data.map(item => {

4
src/views/form/statistics/index.vue
View File

@ -4,9 +4,9 @@
<el-tab-pane label="列表视图" name="list">
<list />
</el-tab-pane>
<el-tab-pane label="统计视图" name="chart">
<!-- <el-tab-pane label="统计视图" name="chart">
<chart />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="数据分析" name="analysis">
<analysis />
</el-tab-pane>

64
src/views/form/statistics/list.vue
View File

@ -45,6 +45,14 @@
</template>
</el-table-column>
<el-table-column label="填写人"
prop="realName" />
<el-table-column label="组织/部门/网格"
prop="orgName" />
<el-table-column label="来源"
prop="clientType" />
<!-- <el-table-column label="填写时间" prop="createdTime" /> -->
<el-table-column v-for="col in otherCustomColumns"
:key="col"
:label="projectItemColumns[col]"
@ -61,9 +69,8 @@
{{ scope.row[col] }}
</template>
</el-table-column>
<el-table-column :render-header="renderHeader"
fixed="right"
<!-- :render-header="renderHeader" -->
<el-table-column fixed="right"
width="50">
<template slot-scope="scope">
<el-button size="small"
@ -81,6 +88,28 @@
class="clearfix">
<span>提交详情</span>
</div>
<div>
<div v-for="item in projectItemList"
:key="item.id">
<h4>{{ item.label }}</h4>
<result-item :field-item-id="Number(item.formItemId)"
:project-item-data="item"
:result-data="activeResultRow" />
<el-divider />
</div>
</div>
</el-card>
</el-scrollbar>
</el-drawer>
<div style="display: flex; justify-content: center; margin-top: 10px;">
<el-pagination v-if="total>10"
:current-page.sync="queryConditions.current"
:page-size.sync="queryConditions.size"
:total="total"
background
layout="total, prev, pager, next"
@current-change="queryProjectResult" />
</div>
<div>
<div v-for="item in projectItemList"
:key="item.id">
@ -219,6 +248,29 @@ export default {
this.queryProjectItems()
this.queryProject()
}, methods: {
renderHeader () {
return (
<i class="el-icon-setting" style="color:currentColor"
onClick={() => this.customColumnDialogVisible = true}></i>
)
},
openDetailDrawerHandle (row) {
this.activeResultRow = row
this.detailDrawer = true
},
queryProject () {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/${this.projectKey}`).then(res => {
this.projectData = res.data
})
},
mounted () {
this.projectKey = this.$route.query.key
this.queryConditions.projectKey = this.projectKey
this.queryProjectResult()
this.queryProjectItems()
this.queryProject()
},
methods: {
renderHeader () {
return (
<i class="el-icon-setting" style="color:currentColor"
@ -299,7 +351,7 @@ export default {
this.$message.error('无表单有效反馈结果，无法导出')
return
}
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}user/project/result/export`, {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/result/export`, {
params: this.queryConditions,
responseType: 'blob'
}).then(res => {
@ -325,7 +377,11 @@ export default {
this.getDbCheckedColumns()
})
}
this.projectItemList = res.data
this.getDbCheckedColumns()
})
}
}
}
</script>

4
vue.config.js
View File

@ -15,6 +15,10 @@ module.exports = {
open: true,
port: 8888,
// 开发环境默认开启反向代理，如果不需要请自行注释
// "src/**/*.{js,vue}": [ 校验提交
// "eslint --fix",
// "git add"
// ]
// proxy: {
// '/tduck-api': {
// //target: 'http://localhost:8080/api/',

Write Preview
Loading…
Cancel
Save