Browse Source

Merge branch 'dev_ljj' of http://git.elinkit.com.cn:7070/r/tduck-front into dev_ljj

old
13176889840 4 years ago
parent
commit
b8aa57bdbd
  1. 6
      src/views/form/preview/ProjectForm.vue
  2. 2
      src/views/form/setting/index.vue

6
src/views/form/preview/ProjectForm.vue

@ -58,7 +58,7 @@ export default {
return: {
projectKey: '',
showBtns: true,
// 1 2
// 1 2
projectKind: 1
}
@ -124,6 +124,7 @@ export default {
created () {
if (this.projectConfig && this.projectConfig.projectKey) {
this.formConf.projectKey = this.projectConfig.projectKey
if (this.projectConfig.projectKind) {
this.formConf.projectKind = this.projectConfig.projectKind
}
@ -138,7 +139,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}?access_key=${this.accessKey}`
let url = `${process.env.VUE_APP_API_ROOT_TDUCK}/user/project/details/${this.formConf.projectKey}`
if (this.formConf.projectKind == 2) {
url = `${process.env.VUE_APP_API_ROOT_TDUCK}/project/template/details/${this.formConf.projectKey}`
}

2
src/views/form/setting/index.vue

@ -355,7 +355,7 @@
@change="saveUserProjectSetting" />
</el-col>
</el-row>
<el-row v-if="userProjectSettingData.everyoneWriteOnceByUId||userProjectSettingData.everyoneWriteOnceByIp||userProjectSettingData.everyoneWriteOnce"
<el-row v-if="userProjectSettingData.everyoneWriteOnceByUId||userProjectSettingData.everyoneWriteOnceByIp||userProjectSettingData.everyoneDayWriteOnce"
align="middle"
type="flex">
<el-col :span="8">

Loading…
Cancel
Save