chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改发布列表的数据，修改加密上传反了的问题

Browse Source
This commit is contained in:
张洋川 2024-04-24 10:54:31 +08:00
parent 2ea25e19ac
commit 31cc16d921
6 changed files with 728 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sf-ui/src/views/FDS/installationList/add.vue
View File

@ -39,7 +39,6 @@
<el-radio-group v-model="formData.sysType" size="medium"> <el-radio-group v-model="formData.sysType" size="medium">
<el-radio v-for="(item, index) in dict.type.sys_apk_type" :key="index" :disabled="item.disabled" <el-radio v-for="(item, index) in dict.type.sys_apk_type" :key="index" :disabled="item.disabled"
:label="item.value" :label="item.value"
:uploadFileUrl="item.uploadingType==='OffLineUploading'?'/system/oss/zip/upload':'/system/oss/upload'"
>{{ item.label }} >{{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>

493
sf-ui/src/views/FDS/installationList/index.vue
View File

@ -1,67 +1,58 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <el-tabs v-model="activeTabs" type="card" @tab-click="handleClickTabs">--> <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small">
<!-- <el-tab-pane-->
<!-- v-for="item in packTabs"-->
<!-- :key="item.name"-->
<!-- :label="item.title"-->
<!-- :name="item.name"-->
<!-- >-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
<!-- <el-form-item label="上传类型" prop="uploadingType">--> <!-- <el-form-item label="上传类型" prop="uploadingType">-->
<!-- <el-select v-model="queryParams.uploadingType" clearable placeholder="请选择上传类型">--> <!-- <el-select v-model="queryParams.uploadingType" placeholder="请选择上传类型" clearable>-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="dict in dict.type.sys_apk_uploading_type"--> <!-- v-for="dict in dict.type.sys_apk_uploading_type"-->
<!-- :key="dict.value"--> <!-- :key="dict.value"-->
<!-- :label="dict.label"--> <!-- :label="dict.label"-->
<!-- :value="dict.value"--> <!-- :value="dict.value"-->
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="安装包名称" prop="sysApkName"> <el-form-item label="安装包名称" prop="sysApkName">
<el-input <el-input
v-model="queryParams.sysApkName" v-model="queryParams.sysApkName"
clearable clearable
placeholder="请输入安装包名称" placeholder="请输入安装包名称"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label="版本号" prop="version">
<el-input <el-input
v-model="queryParams.version" v-model="queryParams.version"
clearable clearable
placeholder="请输入版本号" placeholder="请输入版本号"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="安装包类型" prop="sysType"> <el-form-item label="安装包类型" prop="sysType">
<el-select v-model="queryParams.sysType" clearable placeholder="请选择安装包类型"> <el-select v-model="queryParams.sysType" clearable placeholder="请选择安装包类型">
<el-option <el-option
v-for="dict in dict.type.sys_apk_type" v-for="dict in dict.type.sys_apk_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="上传状态" prop="uploadingStatus">--> <!-- <el-form-item label="上传状态" prop="uploadingStatus">-->
<!-- <el-select v-model="queryParams.uploadingStatus" clearable placeholder="请选择上传状态">--> <!-- <el-select v-model="queryParams.uploadingStatus" clearable placeholder="请选择上传状态">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="dict in dict.type.uploading_status"--> <!-- v-for="dict in dict.type.uploading_status"-->
<!-- :key="dict.value"--> <!-- :key="dict.value"-->
<!-- :label="dict.label"--> <!-- :label="dict.label"-->
<!-- :value="dict.value"--> <!-- :value="dict.value"-->
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="创建人" prop="created"> <el-form-item label="创建人" prop="created">
<el-input <el-input
v-model="queryParams.created" v-model="queryParams.created"
clearable clearable
placeholder="请输入创建人" placeholder="请输入创建人"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -73,119 +64,219 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:config:add']" v-hasPermi="['deploy:INFO:add']"
icon="el-icon-plus" icon="el-icon-plus"
plain plain
size="mini" size="mini"
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
>新建 >新增
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['deploy:INFO:edit']"-->
<!-- :disabled="single"-->
<!-- icon="el-icon-edit"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- @click="handleUpdate"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:config:delete']" v-hasPermi="['deploy:INFO:remove']"
:disabled="multiple" :disabled="multiple"
icon="el-icon-plus" icon="el-icon-delete"
plain plain
size="mini" size="mini"
type="info" type="danger"
@click="handleDelete" @click="handleDelete"
>批量删除 >批量删除
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['deploy:INFO:export']"-->
<!-- icon="el-icon-download"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="warning"-->
<!-- @click="handleExport"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="INFOList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="INFOList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/> <el-table-column align="center" type="selection" width="55"/>
<template v-if="activeTabs=='1'"> <!-- <el-table-column align="center" label="主键" prop="id"/>-->
<!-- <el-table-column align="center" label="上传类型" prop="uploadingType">--> <!-- <el-table-column align="center" label="上传类型" prop="uploadingType">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.sys_apk_uploading_type" :value="scope.row.uploadingType"/>--> <!-- <dict-tag :options="dict.type.sys_apk_uploading_type" :value="scope.row.uploadingType"/>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column align="center" label="安装包名称" prop="sysApkName"/> <el-table-column align="center" label="安装包名称" prop="sysApkName"/>
<el-table-column align="center" label="版本号" prop="version"/> <el-table-column align="center" label="版本号" prop="version"/>
<el-table-column align="center" label="安装包" prop="sysApk"/> <el-table-column align="center" label="安装包" prop="sysApk"/>
<el-table-column align="center" label="安装包大小" prop="sysApkSize"/> <el-table-column align="center" label="安装包大小" prop="sysApkSize"/>
<el-table-column align="center" label="安装包类型" prop="sysType"> <el-table-column align="center" label="安装包类型" prop="sysType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_apk_type" :value="scope.row.sysType"/> <dict-tag :options="dict.type.sys_apk_type" :value="scope.row.sysType"/>
</template>
</el-table-column>
<el-table-column align="center" label="创建人" prop="created"/>
</template>
<template v-if="activeTabs=='2'">
<el-table-column align="center" label="安装包名称" prop="configId"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="安装包大小" prop="sys_apk_size"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="上传方式" prop="uploading_type"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="创建人" prop="created"/>
<el-table-column align="center" label="创建时间" prop="create_time" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</template>
<el-table-column align="center" label="状态" prop="uploading_status">
<template slot-scope="scopeA">
<dict-tag :options="dict.type.uploading_status" :value="scopeA.row.uploadingStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="250"> <el-table-column align="center" label="创建人" prop="created"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-hasPermi="['system:config:dowmload']" icon="el-icon-download"
icon="el-icon-download" size="mini"
size="mini" type="text"
type="text" @click="handleDownload(scope.row)"
@click="handleDownload(scope.row)"
>下载安装包 >下载安装包
</el-button> </el-button>
<el-button <el-button
v-hasPermi="['system:config:edit']" v-hasPermi="['deploy:INFO:edit']"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
type="text" type="text"
@click="handleEdit(scope.row)" @click="handleUpdate(scope.row)"
>编辑 >修改
</el-button> </el-button>
<el-button <el-button
v-hasPermi="['system:config:detail']" icon="el-icon-view"
icon="el-icon-view" size="mini"
size="mini" type="text"
type="text" @click="handleDetail(scope.row)"
@click="handleDetail(scope.row)"
>详情 >详情
</el-button> </el-button>
<el-button <el-button
v-hasPermi="['system:config:delete']" v-hasPermi="['deploy:INFO:remove']"
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:total="total" :total="total"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改安装包管理（新）对话框 -->
<el-dialog :title="title" :visible.sync="open" append-to-body width="700px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="上传类型" prop="uploadingType">-->
<!-- <el-select v-model="form.uploadingType" placeholder="请选择上传类型">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.sys_apk_uploading_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="安装包名称" prop="sysApkName">
<el-input v-model="form.sysApkName" placeholder="请输入安装包名称"/>
</el-form-item>
<el-form-item label="版本号" prop="version">
<el-input v-model="form.version" placeholder="请输入版本号"/>
</el-form-item>
<el-form-item label="安装包" prop="sysApk">
<file-upload v-model="form.sysApk" :fileSize="50" :fileType="['apk','hap','iap','zip']" :limit="1"
uploadFileUrl="/system/oss/upload"
@getSize="getSize"
/>
<!-- <file-upload v-model="form.sysApk"/>-->
</el-form-item>
<el-form-item label="安装包大小" prop="sysApkSize">
<el-input v-model="form.sysApkSize" placeholder="请输入安装包大小" readonly/>
</el-form-item>
<el-form-item label="安装包类型" prop="sysType">
<el-select v-model="form.sysType" placeholder="请选择安装包类型">
<el-option
v-for="dict in dict.type.sys_apk_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="openDetail" append-to-body width="700px">
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="安装包名称" prop="moduleName">
{{ form.sysApkName }}
</el-form-item>
<el-form-item label="版本号" prop="version">
{{ form.version }}
</el-form-item>
<el-form-item label="安装包" prop="moduleUrl">
{{ form.sysApk }}
</el-form-item>
<el-form-item label="安装包大小" prop="moduleSize">
{{ form.sysApkSize }}
</el-form-item>
<el-form-item label="系统类型" prop="sysType">
{{ form.sysType }}
</el-form-item>
<el-form-item label="下载地址：">
<el-input v-model="form.sysApk" class="input-with-select" readonly>
<el-button slot="append" @click="copyIt(form.sysApk)">复制</el-button>
</el-input>
</el-form-item>
<el-form-item label="上传时间：">{{ form.createTime }}</el-form-item>
<el-form-item label="上传人员：">{{ form.created }}</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelDetail">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { delINFO, listINFO } from '@/api/FDS/installList' import { addINFO, delINFO, getINFO, listINFO, updateINFO } from '@/api/FDS/installList'
export default { export default {
name: 'InstallationList', name: 'INFO',
dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'], dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
data() { data() {
return { return {
form: {
uploadingType: 'OnLineUploading',
sysApkName: undefined,
version: undefined,
sysApk: null,
sysApkSize: undefined,
sysType: '',
appCode: '000000'
},
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -200,15 +291,11 @@ export default {
total: 0, total: 0,
// 安装包管理（新）表格数据 // 安装包管理（新）表格数据
INFOList: [], INFOList: [],
packTabs: [{ // 弹出层标题
name: '1', title: '',
title: 'APP安装包' // 是否显示弹出层
}, { open: false,
name: '2', openDetail: false,
title: 'H5模块包'
}],
// 日期范围
create_time: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -220,15 +307,24 @@ export default {
uploadingStatus: null, uploadingStatus: null,
created: null created: null
}, },
// 表单参数
form: {},
activeTabs: '1'
// 表单校验 // 表单校验
} rules: {
}, uploadingType: [
watch: { { required: true, message: '上传类型不能为空', trigger: 'change' }
$route(to, from) { ],
if (to) this.getList() sysApkName: [
{ required: true, message: '安装包名称不能为空', trigger: 'blur' }
],
version: [
{ required: true, message: '版本号不能为空', trigger: 'blur' }
],
sysType: [
{ required: true, message: '安装包类型不能为空', trigger: 'change' }
],
sysApk: [
{ required: true, message: '安装包不能为空', trigger: 'change' }
]
}
} }
}, },
created() { created() {
@ -237,13 +333,31 @@ export default {
methods: { methods: {
/** 查询安装包管理（新）列表 */ /** 查询安装包管理（新）列表 */
getList() { getList() {
this.loading = false this.loading = true
listINFO(this.queryParams).then(response => { listINFO(this.queryParams).then(response => {
this.INFOList = response.rows this.INFOList = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
}) })
}, },
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
uploadingType: 'OnLineUploading',
sysApkName: undefined,
version: undefined,
sysApk: null,
sysApkSize: undefined,
sysType: '',
appCode: '000000'
}
this.resetForm('form')
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
@ -251,77 +365,98 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.create_time = []
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
}, },
/** 新增按钮操作 */
handleAdd() {
const query = {
activeTabs: this.activeTabs
}
this.$router.push({
path: '/build/install/add/',
query: query
})
// this.$tab.openPage('新增安装包', '/build/install/add/', params)
},
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length != 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加安装包管理'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getINFO(id).then(response => {
this.form = response.data
this.open = true
this.title = '修改安装包管理'
})
},
/** 详情按钮操作 */
handleDetail(row) {
this.reset()
const id = row.id || this.ids
getINFO(id).then(response => {
this.form = response.data
this.openDetail = true
this.title = '安装包详情'
this.type = 'detail'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
let data = Object.assign({}, this.form)
delete data.explain
updateINFO(data).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addINFO(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const configIds = row.id || this.ids const ids = row.id || this.ids
this.$modal.confirm('是否确认删除编号为"' + configIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除安装包管理编号为"' + ids + '"的数据项？').then(function() {
return delINFO(configIds) return delINFO(ids)
}).then(() => { }).then(() => {
this.getList() this.getList()
this.$modal.msgSuccess('删除成功') this.$modal.msgSuccess('删除成功')
}).catch(() => { }).catch(() => {
}) })
}, },
/** 修改按钮操作 */ getSize(e) {
handleEdit(row) { this.form.sysApkSize = e[0].size + 'kb'
const query = {
activeTabs: this.activeTabs,
id: row.id
}
this.$router.push({
path: '/build/install/edit/',
query: query
})
// this.$tab.openPage('编辑安装包', '/build/install/add/', params)
}, },
/** 查看详情弹窗 **/ // /** 导出按钮操作 */
handleDetail(row) { // handleExport() {
// this.download('deploy/INFO/export', {
// ...this.queryParams
// }, `INFO_${new Date().getTime()}.xlsx`)
// },
const params = { /**下载安装包*/
id: row.id
}
this.$tab.openPage('安装包详情', '/build/install/detail/', params)
},
/** 切换TAB触发的事件 */
handleClickTabs() {
this.getList()
},
/** 下载按钮 */
handleDownload(row) { handleDownload(row) {
const configIds = row.id || this.ids window.open(row.sysApk)
this.$modal.confirm('是否确认下载编号为"' + configIds + '"的数据项？').then(function() { },
return delConfig(configIds) cancelDetail() {
}).then(() => { this.openDetail = false
this.getList() this.reset()
this.$modal.msgSuccess('下载成功') },
}).catch(() => { copyIt(url) {
}) navigator.clipboard.writeText(url)
this.$message.success('复制成功')
} }
} }
} }

328
sf-ui/src/views/FDS/installationList/index111.vue Normal file
View File

@ -0,0 +1,328 @@
<template>
<div class="app-container">
<!-- <el-tabs v-model="activeTabs" type="card" @tab-click="handleClickTabs">-->
<!-- <el-tab-pane-->
<!-- v-for="item in packTabs"-->
<!-- :key="item.name"-->
<!-- :label="item.title"-->
<!-- :name="item.name"-->
<!-- >-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
<!-- <el-form-item label="上传类型" prop="uploadingType">-->
<!-- <el-select v-model="queryParams.uploadingType" clearable placeholder="请选择上传类型">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.sys_apk_uploading_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="安装包名称" prop="sysApkName">
<el-input
v-model="queryParams.sysApkName"
clearable
placeholder="请输入安装包名称"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="版本号" prop="version">
<el-input
v-model="queryParams.version"
clearable
placeholder="请输入版本号"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="安装包类型" prop="sysType">
<el-select v-model="queryParams.sysType" clearable placeholder="请选择安装包类型">
<el-option
v-for="dict in dict.type.sys_apk_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="上传状态" prop="uploadingStatus">-->
<!-- <el-select v-model="queryParams.uploadingStatus" clearable placeholder="请选择上传状态">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.uploading_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="创建人" prop="created">
<el-input
v-model="queryParams.created"
clearable
placeholder="请输入创建人"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:config:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAdd"
>新建
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:config:delete']"
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handleDelete"
>批量删除
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="INFOList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<template v-if="activeTabs=='1'">
<!-- <el-table-column align="center" label="上传类型" prop="uploadingType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.sys_apk_uploading_type" :value="scope.row.uploadingType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="安装包名称" prop="sysApkName"/>
<el-table-column align="center" label="版本号" prop="version"/>
<el-table-column align="center" label="安装包" prop="sysApk"/>
<el-table-column align="center" label="安装包大小" prop="sysApkSize"/>
<el-table-column align="center" label="安装包类型" prop="sysType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_apk_type" :value="scope.row.sysType"/>
</template>
</el-table-column>
<el-table-column align="center" label="创建人" prop="created"/>
</template>
<template v-if="activeTabs=='2'">
<el-table-column align="center" label="安装包名称" prop="configId"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="安装包大小" prop="sys_apk_size"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="上传方式" prop="uploading_type"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="创建人" prop="created"/>
<el-table-column align="center" label="创建时间" prop="create_time" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</template>
<el-table-column align="center" label="状态" prop="uploading_status">
<template slot-scope="scopeA">
<dict-tag :options="dict.type.uploading_status" :value="scopeA.row.uploadingStatus"/>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="250">
<template slot-scope="scope">
<el-button
v-hasPermi="['system:config:dowmload']"
icon="el-icon-download"
size="mini"
type="text"
@click="handleDownload(scope.row)"
>下载安装包
</el-button>
<el-button
v-hasPermi="['system:config:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleEdit(scope.row)"
>编辑
</el-button>
<el-button
v-hasPermi="['system:config:detail']"
icon="el-icon-view"
size="mini"
type="text"
@click="handleDetail(scope.row)"
>详情
</el-button>
<el-button
v-hasPermi="['system:config:delete']"
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
</div>
</template>
<script>
import { delINFO, listINFO } from '@/api/FDS/installList'
export default {
name: 'InstallationList',
dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 安装包管理（新）表格数据
INFOList: [],
packTabs: [{
name: '1',
title: 'APP安装包'
}, {
name: '2',
title: 'H5模块包'
}],
// 日期范围
create_time: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
uploadingType: null,
sysApkName: null,
version: null,
sysType: null,
uploadingStatus: null,
created: null
},
// 表单参数
form: {},
activeTabs: '1'
// 表单校验
}
},
watch: {
$route(to, from) {
if (to) this.getList()
}
},
created() {
this.getList()
},
methods: {
/** 查询安装包管理（新）列表 */
getList() {
this.loading = false
listINFO(this.queryParams).then(response => {
this.INFOList = response.rows
this.total = response.total
this.loading = false
})
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.create_time = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
const query = {
activeTabs: this.activeTabs
}
this.$router.push({
path: '/build/install/add/',
query: query
})
// this.$tab.openPage('新增安装包', '/build/install/add/', params)
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 删除按钮操作 */
handleDelete(row) {
const configIds = row.id || this.ids
this.$modal.confirm('是否确认删除编号为"' + configIds + '"的数据项？').then(function() {
return delINFO(configIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 修改按钮操作 */
handleEdit(row) {
const query = {
activeTabs: this.activeTabs,
id: row.id
}
this.$router.push({
path: '/build/install/edit/',
query: query
})
// this.$tab.openPage('编辑安装包', '/build/install/add/', params)
},
/** 查看详情弹窗 **/
handleDetail(row) {
const params = {
id: row.id
}
this.$tab.openPage('安装包详情', '/build/install/detail/', params)
},
/** 切换TAB触发的事件 */
handleClickTabs() {
this.getList()
},
/** 下载按钮 */
handleDownload(row) {
const configIds = row.id || this.ids
this.$modal.confirm('是否确认下载编号为"' + configIds + '"的数据项？').then(function() {
return delConfig(configIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('下载成功')
}).catch(() => {
})
}
}
}
</script>

134
sf-ui/src/views/deployment/module/index.vue
View File

@ -3,18 +3,18 @@
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small"> <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small">
<el-form-item label="模块包名称名称" prop="moduleName"> <el-form-item label="模块包名称名称" prop="moduleName">
<el-input <el-input
v-model="queryParams.moduleName" v-model="queryParams.moduleName"
clearable clearable
placeholder="请输入模块包名称名称" placeholder="请输入模块包名称名称"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="版本号" prop="version"> <el-form-item label="版本号" prop="version">
<el-input <el-input
v-model="queryParams.version" v-model="queryParams.version"
clearable clearable
placeholder="请输入版本号" placeholder="请输入版本号"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
@ -35,47 +35,47 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['deployment:module:add']" v-hasPermi="['deployment:module:add']"
icon="el-icon-plus" icon="el-icon-plus"
plain plain
size="mini" size="mini"
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
>新增 >新增
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['deployment:module:edit']" v-hasPermi="['deployment:module:edit']"
:disabled="single" :disabled="single"
icon="el-icon-edit" icon="el-icon-edit"
plain plain
size="mini" size="mini"
type="success" type="success"
@click="handleUpdate" @click="handleUpdate"
>修改 >修改
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['deployment:module:remove']" v-hasPermi="['deployment:module:remove']"
:disabled="multiple" :disabled="multiple"
icon="el-icon-delete" icon="el-icon-delete"
plain plain
size="mini" size="mini"
type="danger" type="danger"
@click="handleDelete" @click="handleDelete"
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['deployment:module:export']" v-hasPermi="['deployment:module:export']"
icon="el-icon-download" icon="el-icon-download"
plain plain
size="mini" size="mini"
type="warning" type="warning"
@click="handleExport" @click="handleExport"
>导出 >导出
</el-button> </el-button>
</el-col> </el-col>
@ -103,36 +103,36 @@
<el-table-column align="center" class-name="small-padding fixed-width" label="操作"> <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
type="text" type="text"
@click="handleDownLoad(scope.row)" @click="handleDownLoad(scope.row)"
>下载安装包 >下载安装包
</el-button> </el-button>
<el-button <el-button
v-hasPermi="['deployment:module:edit']" v-hasPermi="['deployment:module:edit']"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改 >修改
</el-button> </el-button>
<el-button <el-button
icon="el-icon-detail" icon="el-icon-detail"
size="mini" size="mini"
type="text" type="text"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"
>详情 >详情
</el-button> </el-button>
<el-button <el-button
v-hasPermi="['deployment:module:remove']" v-hasPermi="['deployment:module:remove']"
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
</template> </template>
@ -140,11 +140,11 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:total="total" :total="total"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改H5模块包对话框 --> <!-- 添加或修改H5模块包对话框 -->
@ -160,30 +160,30 @@
<file-upload v-model="form.moduleUrl" :fileSize="20" :fileType="['zip']" <file-upload v-model="form.moduleUrl" :fileSize="20" :fileType="['zip']"
:limit="1" :limit="1"
uploadFileUrl="/system/oss/upload"
@getSize="getSize" @getSize="getSize"
/> />
</el-form-item> </el-form-item>
<el-form-item label="安装包大小" prop="moduleSize"> <el-form-item label="安装包大小" prop="moduleSize">system/oss/upload
<el-input v-model="form.moduleSize" placeholder="请输入安装包大小" readonly/> <el-input v-model="form.moduleSize" placeholder="请输入安装包大小" readonly/>
</el-form-item> </el-form-item>
<el-form-item label="系统类型" prop="sysType"> <el-form-item label="系统类型" prop="sysType">
<el-select v-model="form.sysType" placeholder="请选择系统类型"> <el-select v-model="form.sysType" placeholder="请选择系统类型">
<el-option <el-option
v-for="dict in dict.type.sys_apk_type" v-for="dict in dict.type.sys_apk_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="模块类型" prop="moduleType"> <el-form-item label="模块类型" prop="moduleType">
<el-select v-model="form.moduleType" placeholder="请选择模块类型"> <el-select v-model="form.moduleType" placeholder="请选择模块类型">
<el-option <el-option
v-for="dict in dict.type.module_type" v-for="dict in dict.type.module_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

11
sf-ui/src/views/deployment/publish/component/detail.vue
View File

@ -128,10 +128,19 @@
<el-button slot="append" @click="copyIt(form.moduleUrl)">复制</el-button> <el-button slot="append" @click="copyIt(form.moduleUrl)">复制</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="发布状态">
<dict-tag :options="dict.type.release_status" :value="form.status"/>
</el-form-item>
<el-form-item label="创建人" prop="created"> <el-form-item label="创建人" prop="created">
{{ form.created }} {{ form.created }}
</el-form-item> </el-form-item>
<el-form-item label="发布时间" prop="validityStartTime">
{{ form.updateTime }}
</el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
</template> </template>
@ -142,7 +151,7 @@ import { listEnvironment } from '@/api/deployment/environment'
export default { export default {
name: 'AddPack', name: 'AddPack',
dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type'], dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status'],
props: { props: {
detailId: { detailId: {
type: String | Number, type: String | Number,

14
sf-ui/src/views/deployment/publish/index.vue
View File

@ -69,10 +69,10 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
:disabled="multiple" :disabled="multiple"
icon="el-icon-delete" icon="el-icon-top"
plain plain
size="mini" size="mini"
type="danger" type="info"
@click="handleDelete" @click="handleDelete"
>批量发布 >批量发布
</el-button> </el-button>
@ -121,7 +121,10 @@
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="environmentList" :value="scope.row.publishEnvironment"/> <div v-for="item in environmentList" :key="item.id">
<div v-if="item.id===scope.row.publishEnvironment">{{ item.name }}</div>
</div>
<!-- <dict-tag :options="environmentList" :value="scope.row.publishEnvironment"/>-->
</template> </template>
</el-table-column> </el-table-column>
@ -193,7 +196,7 @@
</el-button> </el-button>
<el-button <el-button
v-if="scope.row.status==2 || scope.row.status==0" v-if="scope.row.status==2 || scope.row.status==0"
icon="el-icon-edit" icon="el-icon-top"
size="mini" size="mini"
type="text" type="text"
@click="handlePublish(scope.row)" @click="handlePublish(scope.row)"
@ -201,7 +204,7 @@
</el-button> </el-button>
<el-button <el-button
icon="el-icon-edit" icon="el-icon-view"
size="mini" size="mini"
type="text" type="text"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"
@ -484,6 +487,7 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.getEnvironmentList()
}, },
methods: { methods: {
/** 查询发布列表列表 */ /** 查询发布列表列表 */