diff --git a/sf-ui/src/layout/components/index.js b/sf-ui/src/layout/components/index.js index 9d2424c..d60f9ef 100644 --- a/sf-ui/src/layout/components/index.js +++ b/sf-ui/src/layout/components/index.js @@ -1,6 +1,6 @@ export { default as AppMain } from './AppMain' export { default as Navbar } from './Navbar' -export { default as NavbarNew } from './NavbarNew' +// export { default as NavbarNew } from './NavbarNew' export { default as Settings } from './Settings' export { default as Sidebar } from './Sidebar/index.vue' export { default as TagsView } from './TagsView/index.vue' diff --git a/sf-ui/src/views/FDS/installationList/add.vue b/sf-ui/src/views/FDS/installationList/add.vue index 5fb726f..c7c6eb9 100644 --- a/sf-ui/src/views/FDS/installationList/add.vue +++ b/sf-ui/src/views/FDS/installationList/add.vue @@ -8,55 +8,57 @@
- - - + + {{ item.label }} - - + + - - + + + + + + - - - - - - + 上传文件 - - + + - - - + + {{ item.label }} - - - - - + + + + + + + + + + 提交 重置 @@ -73,7 +75,7 @@ import { addINFO, updateINFO } from '@/api/FDS/installList' export default { name: 'InstallAdd', - dicts: ['sys_yes_no'], + dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'], data() { return { formData: { @@ -87,56 +89,34 @@ export default { field108: undefined }, rules: { - field102: [{ - required: true, - message: '上传方式不能为空', - trigger: 'change' - }], - field103: [{ - required: true, - message: '请输入安装包名称', - trigger: 'blur' - }], - field107: [{ - required: true, - message: '请输入模块包名称', - trigger: 'blur' - }], - field105: [], - field106: [] + uploadingType: [ + { required: true, message: '上传类型不能为空', trigger: 'change' } + ], + sysApkName: [ + { required: true, message: '安装包名称不能为空', trigger: 'blur' } + ], + version: [ + { required: true, message: '版本号不能为空', trigger: 'blur' } + ], + sysType: [ + { required: true, message: '安装包类型不能为空', trigger: 'change' } + ] }, field101Action: 'https://jsonplaceholder.typicode.com/posts/', field101fileList: [], - field102Options: [{ - 'label': '在线上传', - 'value': 1 - }, { - 'label': '离线上传', - 'value': 2 - }], - field106Options: [{ - 'label': 'Android', - 'value': 'Android' - }, { - 'label': 'IOS', - 'value': 'IOS' - }, { - 'label': '鸿蒙', - 'value': 'HarmonyOS' - }], activeTabs: '1' } }, computed: {}, mounted() { - this.activeTabs = this.$route.params.activeTabs + this.activeTabs = this.$route.query.activeTabs }, methods: { /** 提交按钮 */ submitForm() { this.$refs['elForm'].validate(valid => { if (valid) { - if (this.form.configId != undefined) { + if (this.form.id != undefined) { updateINFO(this.form).then(response => { this.$modal.msgSuccess('修改成功') this.closeModal() diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue index 6d6546b..24aa39f 100644 --- a/sf-ui/src/views/FDS/installationList/index.vue +++ b/sf-ui/src/views/FDS/installationList/index.vue @@ -183,7 +183,7 @@ import { delINFO, listINFO } from '@/api/FDS/installList' export default { name: 'InstallationList', - dicts: ['sys_yes_no'], + dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'], data() { return { // 遮罩层