调整menu和返回路由

src/views/form/index.vue

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

src/views/form/preview/ProjectForm.vue

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

src/views/form/write/index.vue

@@ -15,6 +15,7 @@
     <div v-if="writeStatus==1">
       <project-form v-if="projectConfig.projectKey"
                     :project-config="projectConfig"
+                    :access-key="accessKey"
                     @submit="submitForm" />
     </div>
     <div v-if="writeStatus==2"
@@ -83,6 +84,7 @@ export default {
       orgName: '',//人员所属组织名【组织-组织，组织-部门，组织-网格】	
       orgType: '',//人员所属类型(组织:agency;部门:dept;网格:grid)	
       realName: '',//填写人姓名	
+      accessKey: ''
     }
   },
   metaInfo: {
@@ -99,6 +101,9 @@ export default {
     this.orgName = this.$route.query.orgName
     this.orgType = this.$route.query.orgType
     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
     this.projectConfig.projectKey = key
@@ -278,7 +283,7 @@ export default {
     submitForm (data) {
       // 完成时间
       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,
         'projectKey': this.projectConfig.projectKey,
         'submitOs': ua.os.name,
@@ -293,6 +298,7 @@ export default {
         'orgName': this.orgName,//人员所属组织名【组织-组织，组织-部门，组织-网格】	
         'orgType': this.orgType,//人员所属类型(组织:agency;部门:dept;网格:grid)	
         'realName': this.realName,//填写人姓名	
+        //'accessKey':this.accessKey
       }).then(() => {
         this.writeStatus = 2
         if (this.userProjectSetting.submitJumpUrl) {