Browse Source

恢复统计

old
13176889840 4 years ago
parent
commit
bd05f97801
  1. 1
      src/router/index.js
  2. 6
      src/views/form/editor/RightPanel.vue
  3. 57
      src/views/form/index.vue
  4. 178
      src/views/form/publish/index.vue
  5. 48
      src/views/form/statistics/public.vue

1
src/router/index.js

@ -52,6 +52,7 @@ router.beforeEach((to, from, next) => {
console.log('ro.query', to.query)
localStorage.setItem('loginSource', 'epmet')
localStorage.setItem('customerId', to.query.customerId)
store.dispatch('user/getUserInfo', to.query.token)
store.dispatch('user/setTokens', to.query.token)
next()

6
src/views/form/editor/RightPanel.vue

@ -971,6 +971,7 @@ export default {
loading: null,
currentTab: "field",
currentNode: null,
currentPID: Number,
dialogVisible: false,
iconsVisible: false,
currentIconModel: null,
@ -1215,6 +1216,7 @@ export default {
},
addTreeItem () {
++this.idGlobal;
this.currentPID = 0
this.dialogVisible = true;
this.currentNode = this.activeData.options;
},
@ -1238,10 +1240,12 @@ export default {
);
},
append (data) {
if (!data.children) {
this.$set(data, "children", []);
}
this.dialogVisible = true;
this.currentPID = data.id
this.currentNode = data.children;
},
remove (node, data) {
@ -1252,6 +1256,8 @@ export default {
children.splice(index, 1);
},
addNode (data) {
debugger
data.pid = this.currentPID
this.currentNode.push(data);
},
setOptionValue (item, val) {

57
src/views/form/index.vue

@ -17,25 +17,23 @@
<div class="left-menu-container">
<el-menu :collapse="isCollapse"
:default-active="defaultActiveMenu"
class="el-menu-vertical"
>
<el-menu-item v-for="menuItem in menuItemList"
class="el-menu-vertical">
<el-menu-item v-for="menuItem in (publishStatus? menuItemList2:menuItemList)"
:key="menuItem.key"
:index="menuItem.route"
@click="menuSelectHandle(menuItem.route,menuItem.key)"
>
@click="menuSelectHandle(menuItem.route,menuItem.key)">
<i :class="menuItem.icon" />
<span slot="title">{{ menuItem.title }}</span>
</el-menu-item>
</el-menu>
<i v-if="!isCollapse"
class="el-icon-d-arrow-left"
@click="collapseHandle"
/>
@click="collapseHandle" />
<i v-else
class="el-icon-d-arrow-right"
@click="collapseHandle"
/>
@click="collapseHandle" />
</div>
<div class="right-content-container">
<router-view />
@ -43,11 +41,9 @@
</div>
<el-dialog :visible.sync="previewDialogVisible"
destroy-on-close
fullscreen
>
fullscreen>
<pre-view :key="previewKey"
:preview-qrcode="true"
/>
:preview-qrcode="true" />
</el-dialog>
</div>
</template>
@ -61,7 +57,7 @@ export default {
components: { PreView },
data () {
return {
publishStatus: false,
previewKey: +new Date(),
previewDialogVisible: false,
defaultActiveMenu: '',
@ -117,17 +113,50 @@ export default {
title: '返回',
icon: 'el-icon-edit'
}
],
menuItemList2: [
{
key: 'static',
title: '统计',
icon: 'el-icon-data-line',
route: '/project/form/statistics'
},
{
key: 'preview',
title: '预览',
icon: 'el-icon-view'
},
{
key: 'back',
title: '返回',
icon: 'el-icon-edit'
}
]
}
},
async created () {
this.projectKey = this.$route.query.key
this.defaultActiveMenu = this.$route.path
this.isCollapse = this.$store.state.form.isCollapse
this.getProjectStatus()
},
methods: {
getProjectStatus () {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/${this.projectKey}`).then(res => {
if (res.data.status == 1) {
this.publishStatus = false
} else {
this.publishStatus = true
}
})
},
menuSelectHandle (route, key) {
if (key === 'preview') {

178
src/views/form/publish/index.vue

@ -4,34 +4,40 @@
<div v-if="!publishStatus"
class="publish-btn-view">
<div>
<el-form label-width="90px">
<el-form label-width="150px">
<el-form-item label="小程序端">
<el-radio-group v-model="clientType">
<el-radio-button label="resi">居民端</el-radio-button>
<el-radio-button label="work">工作端</el-radio-button>
<el-radio-group class="form_item"
@change="clientChange"
v-model="clientType">
<el-radio label="resi">居民端</el-radio>
<el-radio label="gov">工作端</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="发布范围">
<el-tree ref="tree"
<el-tree class="form_item"
ref="tree"
style="background-color:#f7f7f7"
:props="props"
:data="data"
show-checkbox
:default-expand-all="true"
@node-click="nodeClick"
@check="check"
@check-change="handleCheckChange" />
:default-expand-all="true" />
</el-form-item>
</el-form>
</div>
<div style="text-align:center">
<div style="text-align:left;margin-left:200px;margin-top:50px">
<el-button class="publish-btn"
size="medium"
type="primary"
@click="publishProject">
<i class="el-icon-document-checked el-icon--right">开始发布</i>
</el-button>
<!-- <el-button class="publish-btn"
size="medium"
type="primary"
@click="resolveAgency">
<i class="el-icon-document-checked el-icon--right">获取组织</i>
</el-button> -->
</div>
</div>
<div v-if="publishStatus"
@ -64,19 +70,19 @@
<div>
<p class="success-title">恭喜您发布成功</p>
</div>
<!-- <div>
<div>
<p class="link-text"> {{ writeLink }}</p>
</div> -->
</div>
<el-row>
<!-- <el-col :offset="2"
<el-col :offset="2"
:span="6">
<el-button v-clipboard:copy="writeLink"
<!-- <el-button v-clipboard:copy="writeLink"
v-clipboard:error="()=>{this.msgError('复制失败')}"
v-clipboard:success="()=>{this.msgSuccess('复制成功')}" type="primary"
>
v-clipboard:success="()=>{this.msgSuccess('复制成功')}"
type="primary">
复制链接
</el-button>
</el-col> -->
</el-button> -->
</el-col>
<el-col :span="12">
<el-button type="danger"
@click="stopPublishProject">
@ -115,71 +121,112 @@ export default {
clientType: 'resi',
props: {
// label: 'name',
// children: 'zones'
label: 'orgName',
children: 'subOrgList'
},
count: 1,
data: [{
id: 1,
label: '一级 1',
children: [{
id: 4,
label: '二级 1-1',
children: [{
id: 9,
label: '三级 1-1-1'
orgId: 1,
orgName: '一级 1',
subOrgList: [{
orgId: 4,
orgName: '二级 1-1',
subOrgList: [{
orgId: 9,
orgName: '三级 1-1-1'
}, {
id: 10,
label: '三级 1-1-2'
orgId: 10,
orgName: '三级 1-1-2'
}]
}]
}, {
id: 2,
label: '一级 2',
children: [{
id: 5,
label: '二级 2-1'
orgId: 2,
orgName: '一级 2',
subOrgList: [{
orgId: 5,
orgName: '二级 2-1'
}, {
id: 6,
label: '二级 2-2'
orgId: 6,
orgName: '二级 2-2'
}]
}, {
id: 3,
label: '一级 3',
children: [{
id: 7,
label: '二级 3-1'
orgId: 3,
orgName: '一级 3',
subOrgList: [{
orgId: 7,
orgName: '二级 3-1'
}, {
id: 8,
label: '二级 3-2'
}]
orgId: 8,
orgName: '二级 3-2'
}]
}],
selAgencyList: [],
agencyArrayCopy: []
}
},
mounted () {
this.projectKey = this.$route.query.key
let url = window.location.protocol + '//' + window.location.host
this.writeLink = `${url}/s/${this.projectKey}`
this.getProjectStatus()
},
methods: {
currentChange (data, node) {
console.log(data, node)
},
check () {
clientChange (label) {
this.clientType = label
this.loadAgencyList()
},
handleCheckChange (data, checked, indeterminate) {
data.select = true
console.log(data, checked, indeterminate)
// console.log('');
// console.log(this.data)
loadAgencyList () {
const customerId = localStorage.getItem('customerId')
let params = {
client: this.clientType,
agencyId: customerId
}
this.$api.post(`/data/aggregator/org/agencytree`, params).then((res) => {
debugger
})
},
nodeClick (a, b, c) {
console.log(a, b, c)
//
resolveAgency () {
let selAll = this.$refs.tree.getCheckedNodes(false, false)
// console.log(selAll)
this.selAgencyList = []
this.agencyArrayCopy = JSON.parse(JSON.stringify(this.data))
selAll.forEach(element => {
// debugger
let orgId = element.orgId
this.resursionTree(this.agencyArrayCopy, orgId)
});
console.log(this.selAgencyList)
},
handleNodeClick (data) {
// console.log(data);
//
resursionTree (orgArray, orgId) {
for (let i = 0; i < orgArray.length; i++) {
let item = orgArray[i]
// debugger
if (item && item.orgId === orgId) {
// debugger
this.selAgencyList.push(orgArray[i])
orgArray[i] = {}
break
} else if (item.subOrgList && item.subOrgList.length > 0) {
// debugger
this.resursionTree(item.subOrgList, orgId)
}
}
// console.log(this.agencyArrayCopy)
},
getProjectStatus () {
@ -188,16 +235,16 @@ export default {
this.publishStatus = true
} else {
this.publishStatus = false
this.loadAgencyList()
}
})
},
publishProject () {
const aaa = this.$refs.tree.getCheckedNodes(false, false)
console.log(aaa)
// this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/publish`, { key: this.projectKey }).then(() => {
// this.publishStatus = true
// this.msgSuccess('')
// })
this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/publish`, { key: this.projectKey }).then(() => {
this.publishStatus = true
this.msgSuccess('发布成功')
})
},
stopPublishProject () {
this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/stop`, { 'key': this.projectKey }).then(res => {
@ -284,4 +331,7 @@ export default {
font-size: 14px;
}
}
.form_item {
padding-left: 20px;
}
</style>

48
src/views/form/statistics/public.vue

@ -2,36 +2,32 @@
<el-container>
<el-header class="el-page-header">
<h5 v-if="projectData">{{ projectData.name }}</h5>
<el-button type="primary" @click="openFormHandle">访问表单</el-button>
<el-button type="primary"
@click="openFormHandle">访问表单</el-button>
</el-header>
<el-main>
<el-table
:data="projectResultList"
class="public-result-table"
>
<el-table :data="projectResultList"
class="public-result-table">
<el-table-column type="expand">
<template slot-scope="props">
<el-form class="public-table-expand" label-position="left">
<el-form-item v-for="item in projectItemList" :key="item.id" :label="item.label">
<result-item :field-item-id="item.formItemId" :project-item-data="item"
:result-data="props.row"
/>
<el-form class="public-table-expand"
label-position="left">
<el-form-item v-for="item in projectItemList"
:key="item.id"
:label="item.label">
<result-item :field-item-id="item.formItemId"
:project-item-data="item"
:result-data="props.row" />
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column
label="提交序号"
prop="serialNumber"
/>
<el-table-column
label="提交地址"
prop="submitAddress"
/>
<el-table-column
label="提交时间"
prop="createdTime"
/>
<el-table-column label="提交序号"
prop="serialNumber" />
<el-table-column label="提交地址"
prop="submitAddress" />
<el-table-column label="提交时间"
prop="createdTime" />
</el-table>
</el-main>
</el-container>
@ -117,12 +113,12 @@ export default {
this.$router.replace({ path: `/s/${this.projectKey}` })
},
queryProject () {
this.$api.get(`/user/project/${this.projectKey}`).then(res => {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/${this.projectKey}`).then(res => {
this.projectData = res.data
})
},
queryProjectResult () {
this.$api.get('/user/project/result/public/page', {params: this.queryConditions}).then(res => {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/result/public/page`, { params: this.queryConditions }).then(res => {
let { records, total, size } = res.data
this.projectResultList = records
this.total = total
@ -130,7 +126,7 @@ export default {
})
},
queryProjectItems () {
this.$api.get('/user/project/item/list', {params: {key: this.projectKey, displayType: true}}).then(res => {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/item/list`, { params: { key: this.projectKey, displayType: true } }).then(res => {
if (res.data) {
res.data.map(item => {
_.set(this.projectItemColumns, `field${item.formItemId}`, item.label)
@ -143,7 +139,6 @@ export default {
}
</script>
<style lang="scss" scoped>
.el-header {
display: flex;
flex-direction: row;
@ -181,5 +176,4 @@ export default {
width: 50%;
}
}
</style>

Loading…
Cancel
Save