diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue index 4aa0ee1..e356451 100644 --- a/sf-ui/src/views/FDS/installationList/index.vue +++ b/sf-ui/src/views/FDS/installationList/index.vue @@ -12,29 +12,14 @@ - + - + - + @@ -48,12 +33,7 @@ - + 搜索 @@ -63,14 +43,8 @@ - 新增 + 新增 @@ -86,23 +60,16 @@ - 批量删除 + 批量删除 - - - + + + 安装包 @@ -115,89 +82,56 @@ 复制 - + - + - + - 下载安装包 + 下载安装包 - 修改 + 修改 - 详情 + 详情 - 删除 + 删除 - + - + - + - + - + - + @@ -249,7 +183,7 @@ import Cookies from 'js-cookie' export default { name: 'INFO', dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'], - data() { + data () { return { form: { @@ -259,7 +193,7 @@ export default { sysApk: null, sysApkSize: undefined, sysType: '', - appCode: Cookies.get('Admin-Application-Id') + appCode: Cookies.get('Admin-Application-appCode') }, // 遮罩层 @@ -312,12 +246,12 @@ export default { } } }, - created() { + created () { this.getList() }, methods: { /** 查询安装包管理(新)列表 */ - getList() { + getList () { this.loading = true listINFO(this.queryParams).then(response => { this.INFOList = response.rows @@ -326,12 +260,12 @@ export default { }) }, // 取消按钮 - cancel() { + cancel () { this.open = false this.reset() }, // 表单重置 - reset() { + reset () { this.form = { uploadingType: 'OnLineUploading', sysApkName: undefined, @@ -339,34 +273,34 @@ export default { sysApk: null, sysApkSize: undefined, sysType: '', - appCode: Cookies.get('Admin-Application-Id') + appCode: Cookies.get('Admin-Application-appCode') } this.resetForm('form') }, /** 搜索按钮操作 */ - handleQuery() { + handleQuery () { this.queryParams.pageNum = 1 this.getList() }, /** 重置按钮操作 */ - resetQuery() { + resetQuery () { this.resetForm('queryForm') this.handleQuery() }, // 多选框选中数据 - handleSelectionChange(selection) { + handleSelectionChange (selection) { this.ids = selection.map(item => item.id) this.single = selection.length !== 1 this.multiple = !selection.length }, /** 新增按钮操作 */ - handleAdd() { + handleAdd () { this.reset() this.open = true this.title = '添加安装包管理' }, /** 修改按钮操作 */ - handleUpdate(row) { + handleUpdate (row) { this.reset() const id = row.id || this.ids getINFO(id).then(response => { @@ -377,7 +311,7 @@ export default { }, /** 详情按钮操作 */ - handleDetail(row) { + handleDetail (row) { this.reset() const id = row.id || this.ids getINFO(id).then(response => { @@ -389,13 +323,13 @@ export default { }, /** 提交按钮 */ - submitForm() { + submitForm () { this.$refs['form'].validate(valid => { if (valid) { if (this.form.id != null) { let data = Object.assign({}, this.form) - data.appCode = Cookies.get('Admin-Application-Id'), - delete data.explain + data.appCode = Cookies.get('Admin-Application-appCode') + delete data.explain updateINFO(data).then(response => { this.$modal.msgSuccess('修改成功') this.open = false @@ -412,9 +346,9 @@ export default { }) }, /** 删除按钮操作 */ - handleDelete(row) { + handleDelete (row) { const ids = row.id || this.ids - this.$modal.confirm('是否确认删除安装包管理编号为"' + ids + '"的数据项?').then(function() { + this.$modal.confirm('是否确认删除安装包管理编号为"' + ids + '"的数据项?').then(function () { return delINFO(ids) }).then(() => { this.getList() @@ -422,7 +356,7 @@ export default { }).catch(() => { }) }, - getSize(e) { + getSize (e) { this.form.sysApkSize = e[0].size + 'kb' }, // /** 导出按钮操作 */ @@ -433,14 +367,14 @@ export default { // }, /**下载安装包*/ - handleDownload(row) { + handleDownload (row) { window.open(row.sysApk) }, - cancelDetail() { + cancelDetail () { this.openDetail = false this.reset() }, - copyIt(url) { + copyIt (url) { navigator.clipboard.writeText(url) this.$message.success('复制成功') } diff --git a/sf-ui/src/views/FDS/publishList/components/addPack.vue b/sf-ui/src/views/FDS/publishList/components/addPack.vue index 980fdee..585d3d4 100644 --- a/sf-ui/src/views/FDS/publishList/components/addPack.vue +++ b/sf-ui/src/views/FDS/publishList/components/addPack.vue @@ -1,21 +1,10 @@ - + :visible.sync="open" v-bind="$attrs" width="700px" @close="onClose" @open="onOpen" v-on="$listeners"> + - + 搜索 @@ -23,10 +12,10 @@ - - - - + + + + @@ -34,9 +23,7 @@ - + @@ -56,7 +43,7 @@ export default { default: '' } }, - data() { + data () { return { // 遮罩层 title: '添加安装包', @@ -73,43 +60,43 @@ export default { pageNum: 1, pageSize: 10, sysApkName: null, - appCode: Cookies.get('Admin-Application-Id') + appCode: Cookies.get('Admin-Application-appCode') } } }, - created() { + created () { this.getList() }, methods: { /** 查询参数列表 */ - getList() { + getList () { this.loading = true listINFO( { ...this.queryParams, sysType: this.systemType }).then(response => { - this.moduleList = response.rows - this.total = response.total - this.loading = false - }) + this.moduleList = response.rows + this.total = response.total + this.loading = false + }) }, /** 搜索按钮操作 */ - handleQuery() { + handleQuery () { this.queryParams.pageNum = 1 this.getList() }, /** 重置按钮操作 */ - resetQuery() { + resetQuery () { this.dateRange = [] this.resetForm('queryForm') this.handleQuery() }, /** 新增当前包的按钮 */ - addPack(row) { + addPack (row) { this.$emit('addPack', { apkId: row.id, version: row.version, @@ -119,14 +106,14 @@ export default { }) }, - closeModal() { + closeModal () { this.$emit('close') }, - onOpen() { + onOpen () { this.active = this.current this.key = '' }, - onClose() { + onClose () { } } } diff --git a/sf-ui/src/views/FDS/publishList/index.vue b/sf-ui/src/views/FDS/publishList/index.vue index dc6b1c7..6102450 100644 --- a/sf-ui/src/views/FDS/publishList/index.vue +++ b/sf-ui/src/views/FDS/publishList/index.vue @@ -3,43 +3,21 @@ - + - + - + - + @@ -50,66 +28,42 @@ - 新增 + 新增 - 批量发布 + 批量发布 - 批量删除 + 批量删除 - - - - - - - + + + + + + + {{ scope.row.platform === '0' ? '安卓' : 'IOS' }} - + - + @@ -118,10 +72,10 @@ {{ parseTime(scope.row.createTime) }} - + - + @@ -131,19 +85,11 @@ - - + + - + @@ -162,39 +108,21 @@ - 下架 + 下架 - 修改 + 修改 - handleCommand(command, scope.row)" - > + handleCommand(command, scope.row)"> 更多 - 详情 + 详情 - 下载安装包 + 下载安装包 - 删除 + 删除 @@ -203,13 +131,8 @@ - + @@ -220,7 +143,7 @@ import { delConfig, listConfig } from '@/api/system/config' export default { name: 'PublishList', dicts: ['sys_yes_no'], - data() { + data () { return { // 遮罩层 loading: true, @@ -264,56 +187,56 @@ export default { } }, computed: { - applicationInfo: function() { + applicationInfo: function () { return this.$store.state.applicationInfo } }, - created() { + created () { this.getList() }, - mounted() { + mounted () { console.log(this.$store.getters.applicationId) console.log(this.applicationInfo) }, methods: { /** 查询参数列表 */ - getList() { + getList () { this.loading = true listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => { - this.configList = response.rows - this.total = response.total - this.loading = false - } + this.configList = response.rows + this.total = response.total + this.loading = false + } ) }, /** 搜索按钮操作 */ - handleQuery() { + handleQuery () { this.queryParams.pageNum = 1 this.getList() }, /** 重置按钮操作 */ - resetQuery() { + resetQuery () { this.dateRange = [] this.resetForm('queryForm') this.handleQuery() }, /** 新增按钮操作 */ - handleAdd() { + handleAdd () { const params = { type: 'add' } this.$tab.openPage('新增发布', '/build/publishList/add/', params) }, // 多选框选中数据 - handleSelectionChange(selection) { + handleSelectionChange (selection) { this.ids = selection.map(item => item.configId) this.single = selection.length != 1 this.multiple = !selection.length }, /** 删除按钮操作 */ - async handleDelete(row) { + async handleDelete (row) { const configIds = row.configId || this.ids try { await this.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项?') @@ -326,25 +249,25 @@ export default { } }, /**查看详情*/ - handleDetail() { + handleDetail () { this.$tab.openPage('发布详情', '/build/publishList/detail/', '') }, /**下载安装包*/ - handleDownload() { + handleDownload () { }, /**********编辑*******/ - handleEdit() { + handleEdit () { const params = { type: 'edit' } this.$tab.openPage('编辑发布', '/build/publishList/add/', params) }, /** 发布操作*/ - handlePublish() { + handlePublish () { }, // 更多操作触发 - handleCommand(command, row) { + handleCommand (command, row) { switch (command) { case 'handleDetail': this.handleDetail(row) diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue index 0c06322..97aab0f 100644 --- a/sf-ui/src/views/deployment/module/index.vue +++ b/sf-ui/src/views/deployment/module/index.vue @@ -2,28 +2,14 @@ - + - + - + @@ -34,157 +20,95 @@ - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - 导出 + 导出 - + - - - - + + + + - + - + - 下载安装包 + 下载安装包 - 修改 + 修改 - 详情 + 详情 - 删除 + 删除 - + - + - + - + - + - + - + @@ -229,7 +153,7 @@ - + @@ -273,7 +197,7 @@ import Cookies from 'js-cookie' export default { name: 'Module', dicts: ['module_type', 'sys_apk_type', 'uploading_status'], - data() { + data () { return { // 遮罩层 loading: true, @@ -325,12 +249,12 @@ export default { } } }, - created() { + created () { this.getList() }, methods: { /** 查询H5模块包列表 */ - getList() { + getList () { this.loading = true listModule(this.queryParams).then(response => { this.moduleList = response.rows @@ -339,18 +263,18 @@ export default { }) }, // 取消按钮 - cancel() { + cancel () { this.open = false this.reset() }, - cancelDetail() { + cancelDetail () { this.openDetail = false this.reset() }, // 表单重置 - reset() { + reset () { this.form = { id: null, appId: null, @@ -370,34 +294,34 @@ export default { modified: null, createTime: null, updateTime: null, - appCode: Cookies.get('Admin-Application-Id') + appCode: Cookies.get('Admin-Application-appCode') } this.resetForm('form') }, /** 搜索按钮操作 */ - handleQuery() { + handleQuery () { this.queryParams.pageNum = 1 this.getList() }, /** 重置按钮操作 */ - resetQuery() { + resetQuery () { this.resetForm('queryForm') this.handleQuery() }, // 多选框选中数据 - handleSelectionChange(selection) { + handleSelectionChange (selection) { this.ids = selection.map(item => item.id) this.single = selection.length !== 1 this.multiple = !selection.length }, /** 新增按钮操作 */ - handleAdd() { + handleAdd () { this.reset() this.open = true this.title = '添加H5模块包' }, /** 修改按钮操作 */ - handleUpdate(row) { + handleUpdate (row) { this.reset() const id = row.id || this.ids getModule(id).then(response => { @@ -408,7 +332,7 @@ export default { }) }, /** 详情按钮操作 */ - handleDetail(row) { + handleDetail (row) { this.reset() const id = row.id || this.ids getModule(id).then(response => { @@ -420,13 +344,13 @@ export default { }, /** 提交按钮 */ - submitForm() { + submitForm () { this.$refs['form'].validate(valid => { if (valid) { if (this.form.id != null) { let data = Object.assign({}, this.form) - data.appCode = Cookies.get('Admin-Application-Id'), - delete data.explain + data.appCode = Cookies.get('Admin-Application-appCode') + delete data.explain updateModule(data).then(response => { this.$modal.msgSuccess('修改成功') this.open = false @@ -443,9 +367,9 @@ export default { }) }, /** 删除按钮操作 */ - handleDelete(row) { + handleDelete (row) { const ids = row.id || this.ids - this.$modal.confirm('是否确认删除H5模块包编号为"' + ids + '"的数据项?').then(function() { + this.$modal.confirm('是否确认删除H5模块包编号为"' + ids + '"的数据项?').then(function () { return delModule(ids) }).then(() => { this.getList() @@ -454,22 +378,22 @@ export default { }) }, /** 导出按钮操作 */ - handleExport() { + handleExport () { this.download('deployment/module/export', { ...this.queryParams }, `module_${new Date().getTime()}.xlsx`) }, - getSize(e) { + getSize (e) { console.log(e) console.log(this.form) this.form.moduleSize = e[0].size + 'kb' }, - handleDownLoad(row) { + handleDownLoad (row) { window.open(row.moduleUrl) }, - copyIt(url) { + copyIt (url) { navigator.clipboard.writeText(url) this.$message.success('复制成功') } diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue index bd941a7..374c891 100644 --- a/sf-ui/src/views/deployment/publish/index.vue +++ b/sf-ui/src/views/deployment/publish/index.vue @@ -2,37 +2,19 @@ - + - + - + - + @@ -43,73 +25,44 @@ - 新增 + 新增 - 修改 + 修改 - 批量发布 + 批量发布 - 批量删除 + 批量删除 - - - - + + + + + disabled /> + disabled /> @@ -117,25 +70,23 @@ {{ parseTime(scope.row.updateTime) }} - + - {{ item.name }} + {{ item.name }} - + - + - - + + {{ parseTime(scope.row.createTime) }} @@ -143,26 +94,14 @@ - + - + - + @@ -184,88 +123,47 @@ - 下架 + 下架 - 发布 + 发布 - 详情 + 详情 - 下载安装包 + 下载安装包 - 修改 + 修改 - 删除 + 删除 - + - + - + - + @@ -273,7 +171,7 @@ - + @@ -283,65 +181,40 @@ - - + + - + - + - + - + - + - + - + - + @@ -356,32 +229,22 @@ - + - + - + @@ -419,7 +281,7 @@ export default { AddPack, DetailModal }, - data() { + data () { return { // 遮罩层 loading: true, @@ -462,7 +324,7 @@ export default { pageNum: 1, pageSize: 10, sysApkName: null, - appCode: Cookies.get('Admin-Application-Id') + appCode: Cookies.get('Admin-Application-appCode') }, // 表单校验 rules: { @@ -508,13 +370,13 @@ export default { } } }, - created() { + created () { this.getList() this.getEnvironmentList() }, methods: { /** 查询发布列表列表 */ - getList(type) { + getList (type) { this.loading = true listPublish(this.queryParams).then(response => { @@ -527,14 +389,14 @@ export default { } }, // 取消按钮 - cancel() { + cancel () { this.open = false this.loading = false this.reset() }, // 表单重置 - reset() { + reset () { this.form = { id: null, applyId: Cookies.get('Admin-Application-Id'), @@ -566,30 +428,30 @@ export default { this.resetForm('form') }, /** 搜索按钮操作 */ - handleQuery() { + handleQuery () { this.queryParams.pageNum = 1 this.getList() }, /** 重置按钮操作 */ - resetQuery() { + resetQuery () { this.resetForm('queryForm') this.handleQuery() }, // 多选框选中数据 - handleSelectionChange(selection) { + handleSelectionChange (selection) { this.ids = selection.map(item => item.id) this.single = selection.length !== 1 this.multiple = !selection.length }, /** 新增按钮操作 */ - handleAdd() { + handleAdd () { this.reset() this.open = true this.title = '添加发布列表' this.getEnvironmentList() }, /** 修改按钮操作 */ - handleUpdate(row) { + handleUpdate (row) { this.reset() this.getEnvironmentList() const id = row.id || this.ids @@ -601,7 +463,7 @@ export default { }, /** 查询参数列表 */ - getPackList(id) { + getPackList (id) { getINFO(id).then(response => { this.form.sysApkName = response.data.sysApkName this.open = true @@ -610,7 +472,7 @@ export default { }, /** 提交按钮 */ - submitForm() { + submitForm () { this.$refs['form'].validate(valid => { if (valid) { if (this.form.id != null) { @@ -637,7 +499,7 @@ export default { // 发布按钮 - pubLishForm() { + pubLishForm () { this.$refs['form'].validate(valid => { if (valid) { if (this.form.id != null) { @@ -663,9 +525,9 @@ export default { }, /** 删除按钮操作 */ - handleDelete(row) { + handleDelete (row) { const ids = row.id || this.ids - this.$modal.confirm('是否确认删除发布列表编号为"' + ids + '"的数据项?,请确定数据是已下架状态才能删除!').then(function() { + this.$modal.confirm('是否确认删除发布列表编号为"' + ids + '"的数据项?,请确定数据是已下架状态才能删除!').then(function () { return delPublish(ids) }).then(() => { this.getList() @@ -674,17 +536,17 @@ export default { }) }, /** 导出按钮操作 */ - handleExport() { + handleExport () { this.download('deployment/publish/export', { ...this.queryParams }, `publish_${new Date().getTime()}.xlsx`) }, /** 弹出包选择框*/ - handlePackOpen() { + handlePackOpen () { this.packOpen = true }, - addPack(e) { + addPack (e) { this.form.apkId = e.apkId this.form.version = e.version this.form.systemType = e.sysType @@ -695,20 +557,20 @@ export default { /** 关闭包选择框*/ - closeAddPack() { + closeAddPack () { this.packOpen = false }, /** 查询环境维护列表 */ - getEnvironmentList() { + getEnvironmentList () { listEnvironment(this.queryParamsEnvironment).then(response => { this.environmentList = response.rows }) }, // 选择系统做一些逻辑判断 - changeSys() { + changeSys () { // this.form.systemType = sysType this.form.apkId = null this.form.version = null @@ -718,29 +580,29 @@ export default { console.log(this.form, 99999999) }, /**下载安装包*/ - handleDownload() { + handleDownload () { }, /**下架*/ - handleDown(row) { + handleDown (row) { soldPublish(row.id).then(response => { this.$modal.msgSuccess('下架成功') this.getList() }) }, /**发布*/ - handlePublish(id) { + handlePublish (id) { publish(id).then(response => { this.$modal.msgSuccess('发布成功') this.getList() }) }, /**详情*/ - handleDetail(row) { + handleDetail (row) { this.detailId = row.id this.openDetail = true }, - closeDetailModal() { + closeDetailModal () { this.openDetail = false } @@ -755,7 +617,7 @@ export default { } } -.el-tag + .el-tag { +.el-tag+.el-tag { margin-left: 10px }