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

调整menu和返回路由

old
jiangyy 4 years ago
parent
4f5ee33549
commit
65708eb377
3 changed files with 286 additions and 274 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/views/form/index.vue
  2. 52
      src/views/form/preview/ProjectForm.vue
  3. 8
      src/views/form/write/index.vue

22
src/views/form/index.vue
View File

@ -18,13 +18,16 @@
<el-menu :collapse="isCollapse" <el-menu :collapse="isCollapse"
:default-active="defaultActiveMenu" :default-active="defaultActiveMenu"
class="el-menu-vertical"> class="el-menu-vertical">
<el-menu-item v-for="menuItem in (publishStatus?menuItemList2:menuItemList)" <el-menu-item class="el-menu-item-per"
v-for="menuItem in (publishStatus?menuItemList2:menuItemList)"
:key="menuItem.key" :key="menuItem.key"
:index="menuItem.route" :index="menuItem.route"
@click="menuSelectHandle(menuItem.route,menuItem.key)"> @click="menuSelectHandle(menuItem.route,menuItem.key)">
<i :class="menuItem.icon" /> <i :class="menuItem.icon"
<span slot="title">{{ menuItem.title }}</span> style="margin-top:1px;align-items:center;" />
<span style="white-space:pre-wrap"
slot="title">{{ menuItem.title }}</span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
@ -36,6 +39,7 @@
@click="collapseHandle" /> @click="collapseHandle" />
</div> </div>
<div class="right-content-container"> <div class="right-content-container">
<router-view /> <router-view />
</div> </div>
</div> </div>
@ -105,7 +109,7 @@ export default {
}, },
{ {
key: 'save', key: 'save',
title: '保存', title: '存为模板',
icon: 'el-icon-folder-add' icon: 'el-icon-folder-add'
}, },
{ {
@ -170,7 +174,8 @@ export default {
} else if (key === 'save') { } else if (key === 'save') {
this.saveProjectAsTemplateHandle() this.saveProjectAsTemplateHandle()
} else if (key === 'back') { } else if (key === 'back') {
this.$router.back(-1) // this.$router.back(-1)
this.$router.push('/home')
} else { this.$router.replace({ path: route, query: { key: this.projectKey } }) } } else { this.$router.replace({ path: route, query: { key: this.projectKey } }) }
}, },
@ -253,11 +258,18 @@ export default {
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
border-right: solid 1px #e6e6e6; border-right: solid 1px #e6e6e6;
.el-menu-vertical {
margin-top: 20px;
}
.el-menu-vertical:not(.el-menu--collapse) { .el-menu-vertical:not(.el-menu--collapse) {
width: 100px; width: 100px;
min-height: 400px; min-height: 400px;
} }
.el-menu-item-per {
display: flex;
line-height: 20px;
}
.el-icon-d-arrow-left, .el-icon-d-arrow-left,
.el-icon-d-arrow-right { .el-icon-d-arrow-right {

52
src/views/form/preview/ProjectForm.vue
View File

@ -1,29 +1,24 @@
<template> <template>
<div class="project-form" <div class="project-form"
:style="{backgroundColor:projectTheme.backgroundColor, :style="{backgroundColor:projectTheme.backgroundColor,
background:projectTheme.backgroundImg?'url('+projectTheme.backgroundImg+') no-repeat center':''}" background:projectTheme.backgroundImg?'url('+projectTheme.backgroundImg+') no-repeat center':''}">
>
<div class=""> <div class="">
<div :style="{textAlign:projectTheme.logoPosition}"> <div :style="{textAlign:projectTheme.logoPosition}">
<img :src="projectTheme.logoImg" <img :src="projectTheme.logoImg"
class="logo-img" class="logo-img">
>
</div> </div>
<el-image v-if="projectTheme.headImgUrl" <el-image v-if="projectTheme.headImgUrl"
:src="projectTheme.headImgUrl" :src="projectTheme.headImgUrl"
style="width: 100%;" style="width: 100%;"
fit="scale-down" fit="scale-down" />
/>
<h4 v-if="projectTheme.showTitle" <h4 v-if="projectTheme.showTitle"
class="form-name-text" class="form-name-text"
style="text-align: center;" style="text-align: center;">
>
{{ formConf.title }} {{ formConf.title }}
</h4> </h4>
<div v-show="projectTheme.showDescribe" <div v-show="projectTheme.showDescribe"
class="form-name-text describe-html" class="form-name-text describe-html"
v-html="formConf.description" v-html="formConf.description" />
/>
<el-divider /> <el-divider />
<parser v-if="startParser" <parser v-if="startParser"
:key="parserKey" :key="parserKey"
@ -32,8 +27,7 @@
:form-conf="formConf" :form-conf="formConf"
@next="nextPage" @next="nextPage"
@prev="prevPage" @prev="prevPage"
@submit="submitForm" @submit="submitForm" />
/>
</div> </div>
</div> </div>
</template> </template>
@ -44,13 +38,13 @@ import { dbDataConvertForItemJson } from '@/utils/convert'
import { getExpression } from '@/utils/expression' import { getExpression } from '@/utils/expression'
import _ from 'lodash' import _ from 'lodash'
window.onload = function() { window.onload = function () {
document.addEventListener('touchstart', function(event) { document.addEventListener('touchstart', function (event) {
if (event.touches.length > 1) { if (event.touches.length > 1) {
event.preventDefault() event.preventDefault()
} }
}) })
document.addEventListener('gesturestart', function(event) { document.addEventListener('gesturestart', function (event) {
event.preventDefault() event.preventDefault()
}) })
} }
@ -78,7 +72,7 @@ export default {
} }
] ]
}, },
data() { data () {
return { return {
logicShowTriggerRule: {}, logicShowTriggerRule: {},
startParser: false, startParser: false,
@ -120,10 +114,10 @@ export default {
}, },
computed: {}, computed: {},
watch: {}, watch: {},
beforeCreate() { beforeCreate () {
document.querySelector('body').className = 'project-body' document.querySelector('body').className = 'project-body'
}, },
created() { created () {
if (this.projectConfig && this.projectConfig.projectKey) { if (this.projectConfig && this.projectConfig.projectKey) {
this.formConf.projectKey = this.projectConfig.projectKey this.formConf.projectKey = this.projectConfig.projectKey
if (this.projectConfig.projectKind) { if (this.projectConfig.projectKind) {
@ -139,8 +133,8 @@ export default {
} }
this.formConf.size = window.innerWidth < 480 ? 'medium' : 'small' this.formConf.size = window.innerWidth < 480 ? 'medium' : 'small'
}, },
async mounted() { async mounted () {
let url = `${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/details/${this.formConf.projectKey}` let url = `${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/details/${this.formConf.projectKey}?access_key=${this.accessKey}`
if (this.formConf.projectKind == 2) { if (this.formConf.projectKind == 2) {
url = `${process.env.VUE_APP_API_ROOT_TDUCK}/project/template/details/${this.formConf.projectKey}` url = `${process.env.VUE_APP_API_ROOT_TDUCK}/project/template/details/${this.formConf.projectKey}`
} }
@ -193,7 +187,7 @@ export default {
}, },
methods: { methods: {
// 分页显示数据处理 // 分页显示数据处理
pageShowHandle(allFields) { pageShowHandle (allFields) {
// 判断是否存在分页 // 判断是否存在分页
let index = allFields.findIndex(item => { let index = allFields.findIndex(item => {
return item.typeId === 'PAGINATION' return item.typeId === 'PAGINATION'
@ -236,9 +230,9 @@ export default {
this.perPageFields = perPageFields this.perPageFields = perPageFields
}, },
/** /**
* 处理逻辑显示数据 * 处理逻辑显示数据
*/ */
logicShowTriggerHandle(logicItem) { logicShowTriggerHandle (logicItem) {
if (!logicItem) { if (!logicItem) {
return return
} }
@ -260,7 +254,7 @@ export default {
}) })
}, },
// 统一处理axios请求 // 统一处理axios请求
queryLogicItemList() { queryLogicItemList () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/logic/list`, { params: { projectKey: this.formConf.projectKey } }) this.$api.get(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/logic/list`, { params: { projectKey: this.formConf.projectKey } })
.then(res => { .then(res => {
@ -270,13 +264,13 @@ export default {
}) })
}) })
}, },
prevPage(params) { prevPage (params) {
this.switchPage(params.page - 1, params) this.switchPage(params.page - 1, params)
}, },
nextPage(params) { nextPage (params) {
this.switchPage(params.page + 1, params) this.switchPage(params.page + 1, params)
}, },
switchPage(page, params) { switchPage (page, params) {
let { labelFormModel, formModel } = params let { labelFormModel, formModel } = params
this.formModel = formModel this.formModel = formModel
this.labelFormModel = labelFormModel this.labelFormModel = labelFormModel
@ -284,7 +278,7 @@ export default {
this.formConf.fields = _.get(this.perPageFields, page) this.formConf.fields = _.get(this.perPageFields, page)
this.parserKey = +new Date() this.parserKey = +new Date()
}, },
submitForm(data) { submitForm (data) {
this.$emit('submit', data) this.$emit('submit', data)
} }
} }

8
src/views/form/write/index.vue
View File

@ -15,6 +15,7 @@
<div v-if="writeStatus==1"> <div v-if="writeStatus==1">
<project-form v-if="projectConfig.projectKey" <project-form v-if="projectConfig.projectKey"
:project-config="projectConfig" :project-config="projectConfig"
:access-key="accessKey"
@submit="submitForm" /> @submit="submitForm" />
</div> </div>
<div v-if="writeStatus==2" <div v-if="writeStatus==2"
@ -83,6 +84,7 @@ export default {
orgName: '',//人员所属组织名【组织-组织，组织-部门，组织-网格】 orgName: '',//人员所属组织名【组织-组织，组织-部门，组织-网格】
orgType: '',//人员所属类型(组织:agency;部门:dept;网格:grid) orgType: '',//人员所属类型(组织:agency;部门:dept;网格:grid)
realName: '',//填写人姓名 realName: '',//填写人姓名
accessKey: ''
} }
}, },
metaInfo: { metaInfo: {
@ -99,6 +101,9 @@ export default {
this.orgName = this.$route.query.orgName this.orgName = this.$route.query.orgName
this.orgType = this.$route.query.orgType this.orgType = this.$route.query.orgType
this.realName = this.$route.query.realName this.realName = this.$route.query.realName
this.accessKey = this.$route.query.accessKey
// const token = this.$route.query.token
// this.$store.dispatch('user/setTokens', token)
let key = this.$route.query.key || this.$route.params.key let key = this.$route.query.key || this.$route.params.key
this.projectConfig.projectKey = key this.projectConfig.projectKey = key
@ -278,7 +283,7 @@ export default {
submitForm (data) { submitForm (data) {
// 完成时间 // 完成时间
let inActiveTime = document.getElementById('inActiveTime').innerText let inActiveTime = document.getElementById('inActiveTime').innerText
this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/result/create`, { this.$api.post(`${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/result/create?access_key=${this.accessKey}`, {
'completeTime': inActiveTime, 'completeTime': inActiveTime,
'projectKey': this.projectConfig.projectKey, 'projectKey': this.projectConfig.projectKey,
'submitOs': ua.os.name, 'submitOs': ua.os.name,
@ -293,6 +298,7 @@ export default {
'orgName': this.orgName,//人员所属组织名【组织-组织，组织-部门，组织-网格】 'orgName': this.orgName,//人员所属组织名【组织-组织，组织-部门，组织-网格】
'orgType': this.orgType,//人员所属类型(组织:agency;部门:dept;网格:grid) 'orgType': this.orgType,//人员所属类型(组织:agency;部门:dept;网格:grid)
'realName': this.realName,//填写人姓名 'realName': this.realName,//填写人姓名
//'accessKey':this.accessKey
}).then(() => { }).then(() => {
this.writeStatus = 2 this.writeStatus = 2
if (this.userProjectSetting.submitJumpUrl) { if (this.userProjectSetting.submitJumpUrl) {

Write Preview
Loading…
Cancel
Save