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-10 17:44:54 +08:00
parent f7727ac37f
commit bebf14ce79
17 changed files with 1773 additions and 1011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sf-ui/src/router/index.js
View File

@ -160,19 +160,6 @@ export const dynamicRoutes = [
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
}
]
},
{
path: '/publishLish/add',
component: Layout,
hidden: true,
children: [
{
path: 'index/:jobId(\\d+)',
component: () => import('@/views/monitor/job/log'),
name: 'PublishAdd',
meta: { title: '新建发布', activeMenu: '/FDS/publishList' }
}
]
}
]

315
sf-ui/src/views/FDS/publishList/setting/add.vue → sf-ui/src/views/FDS/hotfix/add.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-container>
<el-header>
<div>新增文件</div>
<div>安装包发布任务</div>
<el-divider/>
</el-header>
<el-main>
@ -10,13 +10,9 @@
<el-form ref="formAdd" v-loading="$store.state.app.isLoading" :label-width="'120px'" :model="list"
:rules="rules"
>
<el-form-item label="APP名称" prop="AppName">
<el-input v-model="list.AppName" placeholder="输入APP名称"/>
<el-form-item label="发布版本">
<span>{{ list.version }} ({{ list.platformName }})</span>
</el-form-item>
<el-form-item label="上传类型" prop="">
<el-input v-model="list.AppName" placeholder="输入APP名称"/>
</el-form-item>
<el-form-item label="发布类型" prop="grayFlag">
<el-radio v-model="list.grayFlag" label="0">灰度</el-radio>
<el-radio v-model="list.grayFlag" label="1">正式</el-radio>
@ -26,7 +22,8 @@
<el-radio v-model="list.upgradeMode" label="1">强制升级</el-radio>
</el-form-item>
<el-form-item label="升级描述" prop="upgradeDesp">
<el-input v-model="list.upgradeDesp" class="remark-input" maxlength="50" placeholder="请输入升级描述" show-word-limit
<el-input v-model="list.upgradeDesp" class="remark-input" maxlength="50" placeholder="请输入升级描述"
show-word-limit
type="textarea"
/>
</el-form-item>
@ -40,87 +37,120 @@
<el-cascader v-model="list.whiteListId" :options="whiteOptions" :show-all-levels="false" clearable/>
</template>
</el-form-item>
<el-form-item label="版本号" prop="versionNumber">
<el-input v-model="list.versionNumber" class="remark-input" maxlength="500" placeholder="输入版本号"
show-word-limit
/>
</el-form-item>
<el-form-item label="版本说明">
<el-input v-model="list.imprint" class="remark-input" maxlength="500" placeholder="输入版本描述" show-word-limit
type="textarea"
/>
</el-form-item>
<el-form-item label="发布环境" prop="releaseDestType">
<el-radio v-model="list.releaseDestType" label="0">开发环境</el-radio>
<el-radio v-model="list.releaseDestType" label="1">测试发布</el-radio>
<el-radio v-model="list.releaseDestType" label="2">生产发布</el-radio>
</el-form-item>
<el-form-item label="发布策略" prop="releaseDestType">
<el-radio v-model="list.releaseDestType" label="0">灰度发布</el-radio>
<el-radio v-model="list.releaseDestType" label="1">全量发布</el-radio>
<el-radio v-model="list.releaseDestType" label="2">回滚发布</el-radio>
</el-form-item>
<el-form-item v-if="list.releaseDestType =='1'" label="结果通知">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item v-if="list.releaseDestType =='1'" label="强制更新">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item v-if="list.releaseDestType =='1'" label="公开版">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item v-if="list.releaseDestType =='1'" label="下载验证">
<span slot="label">
下载验证
<el-tooltip class="item-tooltip" content="当验证开关开启时，为发布包生成下载二维码的同时，也会生成一个6位验证码，扫描二维码后需经过验证码才可下载发布."
effect="dark"
placement="right"
>
<i class="el-icon-question"/>
</el-tooltip>
</span>
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item v-if="list.releaseDestType =='1'" label="更新客群">
<el-radio v-model="list.numType" label="0">白名单客户</el-radio>
<el-radio v-model="list.numType" label="1">普通客户</el-radio>
</el-form-item>
<el-form-item v-if="list.releaseDestType =='1'" label="有效期" prop="expiryTime">
<el-form-item v-if="list.releaseDestType =='1'" label="结束日期" prop="expiryTime">
<template>
<div class="block">
<el-date-picker
v-model="list.expiryTime"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
v-model="list.expiryTime"
placeholder="选择日期时间"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
/>
</div>
</template>
</el-form-item>
<el-form-item v-if="list.releaseDestType =='1'" label="灰度人数">
<el-radio v-model="list.numType" label="0">无限制</el-radio>
<el-radio v-model="list.numType" label="1">限制</el-radio>
<el-input-number v-model="list.grayUserNum" :disabled="list.numType == '0'" :max="1000000000"
:min="1" controls-position="right" placeholder="请输入灰度人数"
/>
</el-form-item>
<el-form-item label="备注" prop="desp">
<el-input v-model="list.desp" class="remark-input" maxlength="50" placeholder="请输入备注" show-word-limit
<el-input v-model="list.desp" class="remark-input" maxlength="50" placeholder="请输入备注"
show-word-limit
type="textarea"
/>
</el-form-item>
<el-form-item :prop="list.rule.regularRule? 'releaseRuleId': 'headerOperations'" label="高级规则">
<template>
<el-row>
<el-col :span="5">
<el-checkbox v-model="list.rule.regularRule">常用规则</el-checkbox>
</el-col>
<el-col :span="12">
<el-select v-model="list.releaseRuleId" :disabled="!list.rule.regularRule" filterable>
<el-option
v-for="item in releaseOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-col>
</el-row>
<el-row class="form-row">
<el-col :span="5">
<el-checkbox v-model="list.rule.customRule">自定义</el-checkbox>
</el-col>
</el-row>
<el-row v-if="list.rule.customRule" class="form-row">
<el-table
:data="list.headerOperations"
border
class="custom-table"
size="mini"
>
<el-table-column align="center" label="类型">
<template slot-scope="scope">
<el-select v-model="scope.row.type" :disabled="disabledCode" placeholder="请选择"
@change="value=>{dictionaryTypeChange(scope.$index,scope.row.type)}"
>
<el-option
v-for="item in typeList"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="条件">
<template slot-scope="scope">
<el-select v-model="scope.row.operType" :disabled="disabledCode" placeholder="请选择">
<el-option label="包含" value="1"/>
<el-option label="不包含" value="0"/>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="发布条件">
<template slot-scope="scope">
<el-select v-model="scope.row.value" :disabled="disabledCode" placeholder="请选择">
<el-option v-for="item in scope.row.dictionaryList" :key="item.value" :label="item.value"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" border label="操作" width="80">
<template slot-scope="scope">
<el-button :disabled="disabledCode" round size="mini" type="danger"
@click="deleteHeaderOption(scope.$index)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<div v-if="!disabledCode" class="addRow" @click="addHeaderOption()">
<i class="el-icon-circle-plus-outline"/>
<a class="color-3B77FF">新增一行</a>
</div>
</el-row>
</template>
</el-form-item>
</template>
<template v-if="list.grayFlag =='1'">
<el-form-item label="备注" prop="desp">
<el-input v-model="list.desp" class="remark-input" maxlength="50" placeholder="请输入备注"
show-word-limit
type="textarea"
/>
</el-form-item>
</template>
<el-form-item>
<el-button type="primary" @click="addNew()">新增发布任务</el-button>
</el-form-item>
</el-form>
</div>
</el-main>
@ -129,9 +159,10 @@
</template>
<script>
// import { getWhiteList, getReleaseRuleList, getDictionaryList, getInstallTaskAdd, getTypeList } from '@/api/FDS'
// import { getDictionaryList, getInstallTaskAdd, getReleaseRuleList, getTypeList, getWhiteList } from '@/api/FDS'
export default {
name: 'InstallationAdd',
name: 'InstallationPackTask',
components: {},
data() {
var checkHeader = (rule, value, callback) => {
@ -183,11 +214,7 @@ export default {
desp: '',
releaseRuleId: '', // 常用规则
// deviceListId: '', // 设备白名单
whiteListId: '',// 用户白名单id
enableVerify: false, //是否开启下载验证
imprint: '', //版本说明
versionNumber: '',
AppName: '' //APP名称
whiteListId: ''// 用户白名单id
},
whiteOptions: [],
releaseOptions: [],
@ -255,50 +282,50 @@ export default {
label: '设备',
children: []
}]
// getTypeList({
// 'beginPage': '1',
// 'pageSize': '999'
// }).then(res => {
// this.typeList = res.context.list
// this.typeList.forEach(res => {
// res.platform = this.list.platformName
// })
// console.log(275, this.typeList)
// })
// getWhiteList({ type: 0 }).then(res => {
// if (res.code === '00') {
// const list = res.context.list
// list.forEach(i => {
// this.whiteOptions[0].children.push({
// value: i.id,
// label: i.name
// })
// })
// }
// })
// getWhiteList({ type: 1 }).then(res => {
// if (res.code === '00') {
// const list = res.context.list
// list.forEach(i => {
// this.whiteOptions[1].children.push({
// value: i.id,
// label: i.name
// })
// })
// }
// })
// getReleaseRuleList({}).then(res => {
// if (res.code === '00') {
// const list = res.context.list
// list.forEach(i => {
// this.releaseOptions.push({
// value: i.id,
// label: i.name
// })
// console.log(this.releaseOptions)
// })
// }
// })
getTypeList({
'beginPage': '1',
'pageSize': '999'
}).then(res => {
this.typeList = res.context.list
this.typeList.forEach(res => {
res.platform = this.list.platformName
})
console.log(275, this.typeList)
})
getWhiteList({ type: 0 }).then(res => {
if (res.code === '00') {
const list = res.context.list
list.forEach(i => {
this.whiteOptions[0].children.push({
value: i.id,
label: i.name
})
})
}
})
getWhiteList({ type: 1 }).then(res => {
if (res.code === '00') {
const list = res.context.list
list.forEach(i => {
this.whiteOptions[1].children.push({
value: i.id,
label: i.name
})
})
}
})
getReleaseRuleList({}).then(res => {
if (res.code === '00') {
const list = res.context.list
list.forEach(i => {
this.releaseOptions.push({
value: i.id,
label: i.name
})
console.log(this.releaseOptions)
})
}
})
},
mounted() {
if (this.$route.query.data) {
@ -326,11 +353,11 @@ export default {
if (value !== 'city') {
params.notPlatform = this.list.platformName === '0' ? 'IOS' : 'Android'
}
// getDictionaryList(params).then(res => {
// if (res.code === '00') {
// this.list.headerOperations[index].dictionaryList = res.context.list
// }
// })
getDictionaryList(params).then(res => {
if (res.code === '00') {
this.list.headerOperations[index].dictionaryList = res.context.list
}
})
},
addNew() {
console.log(this.list)
@ -361,15 +388,15 @@ export default {
}
this.$refs.formAdd.validate((valid) => {
if (valid) {
// getInstallTaskAdd(params).then(res => {
// if (res.code === '00') {
// this.$message({
// message: '新增发布任务成功！',
// type: 'success'
// })
// this.$router.go(-1)
// }
// })
getInstallTaskAdd(params).then(res => {
if (res.code === '00') {
this.$message({
message: '新增发布任务成功！',
type: 'success'
})
this.$router.go(-1)
}
})
} else {
return false
}
@ -393,7 +420,7 @@ export default {
margin-top: 20px;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
.el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
border: 1px solid #E4E7ED !important;
}

204
sf-ui/src/views/FDS/installationList/add.vue Normal file
View File

@ -0,0 +1,204 @@
<template>
<div class="app-container">
<el-container>
<el-header>
<div>新增文件</div>
<el-divider/>
</el-header>
<el-main>
<div class="form-main">
<el-form ref="formAdd" v-loading="$store.state.app.isLoading" :model="form" :rules="rules"
label-width="120px"
>
<el-form-item label="上传方式" prop="debug">
<el-radio-group v-model="form.debug">
<el-radio
:key="1"
label="1"
>在线上传
</el-radio>
<el-radio
:key="2"
label="2"
>离线上传
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="activeTabs=='1'?'安装包名称':'模块包名称'" prop="configKey">
<el-input v-model="form.configKey" :placeholder="activeTabs=='1'?'请输入安装包名称':'请输入模块包名称'"/>
</el-form-item>
<el-form-item label="版本号">
<el-input v-model="form.configName" placeholder="请输入版本号"/>
</el-form-item>
<el-form-item label="安装包文件">
<el-upload
ref="whiteListFiles"
:auto-upload="true"
:before-remove="beforeRemove"
:before-upload="beforeAvatarUpload"
:file-list="fileList"
:headers="{tokenId: tokenId}"
:multiple="false"
:on-success="handleSuccess"
accept=".zip"
action="https://jsonplaceholder.typicode.com/posts/"
class="upload"
limit="1"
>
<el-button slot="trigger" size="small" type="primary">上传文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="安装包大小">
<el-input v-model="form.configName" placeholder="请输入安装包版本号"/>
</el-form-item>
<el-form-item label="适用系统">
<el-radio-group v-model="form.platform">
<el-radio
:key="1"
label="Android"
>Android
</el-radio>
<el-radio
:key="2"
label="鸿蒙"
>鸿蒙
</el-radio>
<el-radio
:key="3"
label="IOS"
>IOS
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="activeTabs!='1'" label="适用模块" prop="configName">
<el-select v-model="form.uploadMode" clearable placeholder="请选择对应的模块">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAddForm()">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-main>
<!--安装包弹窗-->
</el-container>
</div>
</template>
<script>
import { addConfig, updateConfig } from '@/api/system/config'
export default {
name: 'InstallAdd',
dicts: ['sys_yes_no'],
data() {
return {
form: {},
tokenId: '',
// 文件存放的路径
fileList: [],
rules: {
configName: [
{ required: true, message: '上传方式不能为空', trigger: 'change' }
],
configKey: [
{ required: true, message: '安装包名称不能为空', trigger: 'blur' }
]
},
activeTabs: '1'
}
},
computed: {},
methods: {
reset() {
this.form = {
whiteListType: undefined,
whiteListName: undefined,
remark: undefined
}
this.resetForm('form')
},
/** 提交按钮 */
submitAddForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.configId != undefined) {
updateConfig(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.closeModal()
})
} else {
addConfig(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.closeModal()
})
}
}
})
},
/** 在上传之前进行校验 */
beforeAvatarUpload(file) {
const formatList = file.name.split('.')
const isFormat = file.type === 'text/plain' || formatList[formatList.length - 1] === 'txt'
if (!isFormat) {
this.$message.error(`上传格式只能是名称后缀为.txt的文本文件!`)
}
const isLt2M = file.size / 1024 / 1024 < 5
if (!isLt2M) {
this.$message.error(`上传文件大小不能超过5M!`)
}
return isLt2M && isFormat
},
/** 上传文件 */
handleSuccess(file) {
this.fileList = []
const nameList = file.context.path.split('/')
this.fileList.push({
name: file.context.name || nameList[nameList.length - 1],
url: file.context.path
})
this.addFormData.path = file.context.path
},
beforeRemove(files, filesList) {
return this.$confirm(`确定要移除${files.name}？`)
},
cancel() {
this.history.back()
}
}
}
</script>
<style lang="scss" scoped>
.app-container {
background: #ffffff;
margin: 24px;
}
.form-main {
width: 700px;
margin: 0 auto;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
border: 1px solid #E4E7ED !important;
}
.tag-group {
.el-tag {
cursor: pointer;
}
}
.el-tag + .el-tag {
margin-left: 10px
}
</style>

77
sf-ui/src/views/FDS/installationList/detail.vue Normal file
View File

@ -0,0 +1,77 @@
<template>
<div class="app-container">
<el-container>
<el-header>
<div>安装包详情</div>
<el-divider/>
</el-header>
<el-main>
<div class="form-main">
<el-form ref="form" :model="form" label-width="150px" size="mini">
<el-row>
<el-col :span="24">
<el-form-item label="上传方式：">离线上传</el-form-item>
<el-form-item
label="安装包名称："
>安装包11111
</el-form-item>
<el-form-item label="安装包文件名称：">安装包1111.excel</el-form-item>
<el-form-item label="安装包大小：">58.1kb</el-form-item>
<el-form-item label="适用系统：">安卓</el-form-item>
<el-form-item v-if="activeTabs!='1'" label="适用模块：">登录模块</el-form-item>
<el-form-item label="上传时间：">上传时间2024-04-07 17：43</el-form-item>
<el-form-item label="上传状态：">已上传</el-form-item>
<el-form-item label="上传人员：">刮刮乐</el-form-item>
<el-form-item label="上传日志：">日志日志</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</el-main>
</el-container>
</div>
</template>
<script>
export default {
name: 'InstallDetail',
dicts: ['sys_yes_no'],
data() {
return {
form: {},
tokenId: '',
// 文件存放的路径
activeTabs: '1'
}
},
methods: {}
}
</script>
<style lang="scss" scoped>
.app-container {
background: #ffffff;
margin: 24px;
}
.form-main {
width: 700px;
margin: 0 auto;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
border: 1px solid #E4E7ED !important;
}
.tag-group {
.el-tag {
cursor: pointer;
}
}
.el-tag + .el-tag {
margin-left: 10px
}
</style>

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

@ -160,118 +160,13 @@
:total="total"
@pagination="getList"
/>
<!-- 上传APP安装包的弹窗 -->
<el-dialog :title="title" :visible.sync="addOpen" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="上传方式" prop="debug">
<el-radio-group v-model="form.debug">
<el-radio
:key="1"
label="1"
>在线上传
</el-radio>
<el-radio
:key="2"
label="2"
>离线上传
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="activeTabs=='1'?'安装包名称':'模块包名称'" prop="configKey">
<el-input v-model="form.configKey" :placeholder="activeTabs=='1'?'请输入安装包名称':'请输入模块包名称'"/>
</el-form-item>
<el-form-item label="版本号">
<el-input v-model="form.configName" placeholder="请输入版本号"/>
</el-form-item>
<el-form-item label="安装包文件">
<el-upload
ref="whiteListFiles"
:auto-upload="true"
:before-remove="beforeRemove"
:before-upload="beforeAvatarUpload"
:file-list="fileList"
:headers="{tokenId: tokenId}"
:multiple="false"
:on-success="handleSuccess"
accept=".zip"
action="https://jsonplaceholder.typicode.com/posts/"
class="upload"
>
<el-button slot="trigger" size="small" type="primary">上传文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="安装包大小">
<el-input v-model="form.configName" placeholder="请输入安装包版本号"/>
</el-form-item>
<el-form-item label="适用系统">
<el-radio-group v-model="form.platform">
<el-radio
:key="1"
label="Android"
>Android
</el-radio>
<el-radio
:key="2"
label="鸿蒙"
>鸿蒙
</el-radio>
<el-radio
:key="3"
label="IOS"
>IOS
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="activeTabs!='1'" label="适用模块" prop="configName">
<el-select v-model="queryParams.uploadMode" clearable placeholder="请选择对应的模块">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm(2)">保 存</el-button>
<el-button @click="addOpen = false">取 消</el-button>
</div>
</el-dialog>
<!-- 安装包详情弹窗 -->
<el-dialog :visible.sync="detailOpen" append-to-body title="安装包详情" width="700px">
<el-form ref="form" :model="form" label-width="150px" size="mini">
<el-row>
<el-col :span="24">
<el-form-item label="上传方式：">离线上传</el-form-item>
<el-form-item
label="安装包名称："
>安装包11111
</el-form-item>
<el-form-item label="安装包文件名称：">安装包1111.excel</el-form-item>
<el-form-item label="安装包大小：">58.1kb</el-form-item>
<el-form-item label="适用系统：">安卓</el-form-item>
<el-form-item v-if="activeTabs!='1'" label="适用模块：">登录模块</el-form-item>
<el-form-item label="上传时间：">上传时间2024-04-07 17：43</el-form-item>
<el-form-item label="上传状态：">已上传</el-form-item>
<el-form-item label="上传人员：">刮刮乐</el-form-item>
<el-form-item label="上传日志：">日志日志</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="detailOpen = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { addConfig, delConfig, getConfig, listConfig, updateConfig } from '@/api/system/config'
import { delConfig, getConfig, listConfig } from '@/api/system/config'
export default {
name: 'installationList',
name: 'InstallationList',
dicts: ['sys_yes_no'],
data() {
return {
@ -301,7 +196,13 @@ export default {
tokenId: '',
// 文件存放的路径
fileList: [],
packTabs: [{
name: '1',
title: 'APP安装包'
}, {
name: '2',
title: 'H5模块包'
}],
// 日期范围
dateRange: [],
// 查询参数
@ -314,25 +215,8 @@ export default {
},
// 表单参数
form: {},
activeTabs: '1'
// 表单校验
rules: {
configName: [
{ required: true, message: '上传方式不能为空', trigger: 'change' }
],
configKey: [
{ required: true, message: '安装包名称不能为空', trigger: 'blur' }
]
},
// 当前选中的安装包方式 1=APP安装包，2=H5模块包
activeTabs: '1',
packTabs: [{
name: '1',
title: 'APP安装包'
}, {
name: '2',
title: 'H5模块包'
}]
}
},
created() {
@ -350,17 +234,6 @@ export default {
)
},
/** 查询参数列表 */
getConfigList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.configList = response.rows
this.total = response.total
this.loading = false
}
)
},
// 取消按钮
cancel(type) {
if (type === 1) {
@ -396,8 +269,14 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.addOpen = true
this.title = '上传安装包'
this.$router.push({
path: 'install/add',
params: {
type: 'add',
activeTabs: this.activeTabs
}
})
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -405,26 +284,7 @@ export default {
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 提交按钮 */
submitForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.configId != undefined) {
updateConfig(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.addOpen = false
this.getList()
})
} else {
addConfig(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.addOpen = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const configIds = row.configId || this.ids
@ -443,39 +303,27 @@ export default {
const configId = row.configId || this.ids
getConfig(configId).then(response => {
this.form = response.data
this.addOpen = true
this.title = '修改安装包'
this.$router.push({
path: 'install/add',
params: {
type: 'edit',
activeTabs: this.activeTabs
}
})
})
},
/** 查看详情弹窗 **/
handleDetail() {
this.detailOpen = true
},
/** 在上传之前进行校验 */
beforeAvatarUpload(file) {
const formatList = file.name.split('.')
const isFormat = formatList[formatList.length - 1] === 'zip'
if (!isFormat) {
this.$message.error(`上传格式只能是名称后缀为.zip的压缩文件!`)
}
},
/** 上传文件 */
handleSuccess(file) {
this.fileList = []
const nameList = file.context.path.split('/')
this.fileList.push({
name: file.context.name || nameList[nameList.length - 1],
url: file.context.path
this.$router.push({
path: 'install/detail',
params: {
activeTabs: this.activeTabs
}
})
this.addFormData.path = file.context.path
},
beforeRemove(files, filesList) {
return this.$confirm(`确定要移除${files.name}？`)
},
/** 切换TAB触发的事件 */
handleClickTabs(e) {
handleClickTabs() {
this.getList()
},
@ -489,7 +337,14 @@ export default {
this.$modal.msgSuccess('下载成功')
}).catch(() => {
})
},
/** 关闭新增弹出框*/
closeAdd() {
this.addOpen = false
this.getList()
},
closeAddConfig() {
this.detailOpen = false
}
}

301
sf-ui/src/views/FDS/publishList/add.vue Normal file
View File

@ -0,0 +1,301 @@
<template>
<div class="app-container">
<el-container>
<el-header>
<div>新增文件</div>
<el-divider/>
</el-header>
<el-main>
<div class="form-main">
<el-form ref="formAdd" v-loading="$store.state.app.isLoading" :label-width="'120px'" :model="list"
:rules="rules"
>
<el-form-item label="APP名称" prop="AppName">
<el-input v-model="list.AppName" placeholder="输入APP名称"/>
</el-form-item>
<el-form-item label="上传类型" prop="">
<el-input v-model="list.AppName" placeholder="请选择上传类型"/>
</el-form-item>
<el-form-item label="选择系统" prop="grayFlag">
<div class="tag-group">
<el-tag :type="list.platform=='android'?'':'info'" @click="list.platform='android'">安卓</el-tag>
<el-tag :type="list.platform=='IOS'?'':'info'" @click="list.platform='IOS'">IOS</el-tag>
<el-tag :type="list.platform=='HarmonyOS'?'':'info'" @click="list.platform='HarmonyOS'">鸿蒙</el-tag>
</div>
</el-form-item>
<el-form-item v-if="list.platform!=='IOS'" label="安装包" prop="upgradeMode">
<el-input v-model="list.packName" class="input-with-select" placeholder="请选择包" readonly>
<el-button slot="append" icon="el-icon-search" @click="handlePackOpen"></el-button>
</el-input>
</el-form-item>
<el-form-item v-else label="APP Store地址" prop="AppLink">
<el-input v-model="list.AppLink" placeholder="请输入APPStore地址"/>
</el-form-item>
<el-form-item label="版本号" prop="versionNumber">
<el-input v-model="list.versionNumber" class="remark-input" maxlength="500" placeholder="输入版本号"
show-word-limit
/>
</el-form-item>
<el-form-item label="版本说明">
<el-input v-model="list.imprint" class="remark-input" maxlength="500" placeholder="输入版本描述"
show-word-limit
type="textarea"
/>
</el-form-item>
<!-- 根据需求确认是否需要这些条件-->
<!-- <el-form-item label="发布环境" prop="releaseDestType">-->
<!-- <el-radio v-model="list.releaseDestType" label="0">开发环境</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="1">测试发布</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="2">生产发布</el-radio>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="发布策略" prop="releaseDestType">-->
<!-- <el-radio v-model="list.releaseDestType" label="0">灰度发布</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="1">全量发布</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="2">回滚发布</el-radio>-->
<!-- </el-form-item>-->
<el-form-item label="结果通知">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item label="强制更新">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item label="公开版">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item label="下载验证">
<span slot="label">
下载验证
<el-tooltip class="item-tooltip"
content="当验证开关开启时，为发布包生成下载二维码的同时，也会生成一个6位验证码，扫描二维码后需经过验证码才可下载发布."
effect="dark"
placement="right"
>
<i class="el-icon-question"/>
</el-tooltip>
</span>
<el-switch
v-model="list.downVerifi"
/>
</el-form-item>
<el-form-item label="更新客群">
<el-radio v-model="list.numType" label="0">白名单客户</el-radio>
<el-radio v-model="list.numType" label="1">普通客户</el-radio>
</el-form-item>
<el-form-item label="有效期">
<template>
<div class="block">
<el-date-picker
v-model="list.expiryTime"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
</div>
</template>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="list.desp" class="remark-input" maxlength="50" placeholder="请输入备注" show-word-limit
type="textarea"
/>
</el-form-item>
</el-form>
</div>
</el-main>
<!--安装包弹窗-->
<AddPack :visible.sync="packOpen" @close="closeAddPack"></AddPack>
</el-container>
</div>
</template>
<script>
import AddPack from '@/views/FDS/publishList/components/addPack.vue'
export default {
name: 'PublishAdd',
dicts: ['sys_yes_no'],
components: {
AddPack
},
data() {
// var checkHeader = (rule, value, callback) => {
// if (this.list.rule.customRule) {
// value.forEach(ele => {
// for (const key in ele) {
// if (Object.hasOwnProperty.call(ele, key)) {
// const item = ele[key]
// if (!item && key !== 'desp') {
// return callback(new Error('请输入自定义规则必填项'))
// }
// }
// }
// })
// }
// callback()
// }
// var checkRadix = (rule, value, callback) => {
// if (this.list.rule.regularRule && !value) {
// return callback(new Error('请选择常用规则'))
// }
// callback()
// }
return {
selectValue: 'code',
list: {
rule: {
regularRule: false,
customRule: false
},
// headerOperations: [],
packId: '', // 安装包ID
grayFlag: '0', // 发布类型: 0灰度 1正式
upgradeMode: '0', //
releaseDestType: '0', // 发布条件： 0白名单 1时间窗
headerOperations: [// 自定义规则
// {
// 'scope': '', // 范围：region地区 platform平台
// 'inclued': '', // 是否包含 1包含 2不包含
// 'condition': '', // 发布条件
// 'desp': ''// 备注
// }
],
grayUserNum: '', // 灰度人数
numType: '0',
expiryTime: '', // 灰度结束时间
desp: '',
releaseRuleId: '', // 常用规则
// deviceListId: '', // 设备白名单
whiteListId: '',// 用户白名单id
enableVerify: false, //是否开启下载验证
imprint: '', //版本说明
versionNumber: '',
AppName: '', //APP名称
platform: 'android' //系统
},
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
packOpen: false,
// 遮罩层
loading: true,
dataList: [],
rules: {
grayFlag: [
{ required: true }
],
upgradeMode: [
{ required: true }
],
upgradeDesp: [
{ required: true, message: '请输入升级描述', trigger: 'change' }
],
releaseDestType: [
{ required: true }
],
whiteListId: [
{ required: true, message: '请选择白名单', trigger: 'change' }
],
expiryTime: [
{ required: true, message: '请选择发布时间', trigger: 'blur' }
],
grayUserNum: [
{ required: true, message: '请输入灰度人数', trigger: 'blur' }
]
}
}
},
computed: {},
// mounted() {
// if (this.$route.query.data) {
// const params = JSON.parse(this.$route.query.data)
// this.list.packId = params.id
// this.list.version = params.version
// this.list.platformName = params.platform === '0' ? 'Android' : 'IOS'
// }
// },
methods: {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 在上传之前进行校验 */
beforeAvatarUpload(file) {
const formatList = file.name.split('.')
const isFormat = file.type === 'text/plain' || formatList[formatList.length - 1] === 'txt'
if (!isFormat) {
this.$message.error(`上传格式只能是名称后缀为.txt的文本文件!`)
}
const isLt2M = file.size / 1024 / 1024 < 5
if (!isLt2M) {
this.$message.error(`上传文件大小不能超过5M!`)
}
return isLt2M && isFormat
},
/** 上传文件 */
handleSuccess(file) {
this.fileList = []
const nameList = file.context.path.split('/')
this.fileList.push({
name: file.context.name || nameList[nameList.length - 1],
url: file.context.path
})
this.addFormData.path = file.context.path
},
beforeRemove(files, filesList) {
return this.$confirm(`确定要移除${files.name}？`)
},
/** 弹出包选择框*/
handlePackOpen() {
this.packOpen = true
},
/** 关闭包选择框*/
closeAddPack() {
this.packOpen = false
}
}
}
</script>
<style lang="scss" scoped>
.app-container {
background: #ffffff;
margin: 24px;
}
.form-main {
width: 700px;
margin: 0 auto;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
border: 1px solid #E4E7ED !important;
}
.tag-group {
.el-tag {
cursor: pointer;
}
}
.el-tag + .el-tag {
margin-left: 10px
}
</style>

128
sf-ui/src/views/FDS/publishList/components/addPack.vue Normal file
View File

@ -0,0 +1,128 @@
<template>
<el-dialog :modal-append-to-body="false" :title="title" v-bind="$attrs" width="700px"
@close="onClose"
@open="onOpen"
v-on="$listeners"
>
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px"
size="small"
>
<el-form-item label="安装包名称" prop="installpackName">
<el-input
v-model="queryParams.installpackName"
clearable
placeholder="请输入安装包名称"
style="width: 240px"
@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-table v-loading="loading" :data="dataList">
<el-table-column align="center" label="安装包名称" prop="configId"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="configName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="安装包大小" prop="configName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="适用系统" prop="configValue"/>
<el-table-column align="center" label="状态" prop="configType">
<template slot-scope="scopeA">
<dict-tag :options="dict.type.sys_yes_no" :value="scopeA.row.type"/>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="50">
<template slot-scope="scope">
<el-button circle icon="el-icon-plus" type="primary"
></el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAddForm()">确 定</el-button>
</div>
</el-dialog>
</template>
<script>
import { listConfig } from '@/api/system/config'
export default {
name: 'AddPack',
dicts: ['sys_yes_no'],
data() {
return {
// 遮罩层
title: '添加安装包',
loading: true,
configName: undefined,
form: {},
dataList: [],
// 显示搜索条件
showSearch: true,
total: 0,
// 白名单配置表单验证
queryParams: {
pageNum: 1,
pageSize: 10,
installpackName: undefined
}
}
},
created() {
this.getList()
},
methods: {
/** 查询参数列表 */
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.dataList = response.rows
this.total = response.total
this.loading = false
}
)
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm('queryForm')
this.handleQuery()
},
// 确定安装包
submitAddForm() {
},
reset() {
this.form = {
whiteListType: undefined,
whiteListName: undefined,
remark: undefined
}
this.resetForm('form')
},
// 取消按钮
cancel() {
this.reset()
this.closeModal()
},
closeModal() {
this.$emit('close')
},
onOpen() {
this.active = this.current
this.key = ''
},
onClose() {
}
}
}
</script>

166
sf-ui/src/views/FDS/publishList/setting/detail.vue → sf-ui/src/views/FDS/publishList/detail.vue
View File

@ -9,76 +9,55 @@
<div class="form-main">
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="APP名称："></el-form-item>
<el-form-item label="上传类型：">安装包11111</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="所选系统：">安装包1111.excel</el-form-item>
<el-form-item label="安装包名称：">58.1kb</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="版本号：">安卓</el-form-item>
<el-form-item label="子版本号：">登录模块</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="版本说明：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="发布环境：">发布环境</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="发布策略：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="结果通知：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="强制更新：">说明说明</el-form-item>
<el-form-item label="公开版：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="强制更新：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="下载验证：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="更新客群：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="有效期：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="下载地址：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="下载量：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="注册数：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="最后刷新：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="发布时间：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="创建人：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="发布状态：">说明说明</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="发布日志：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效期：">说明说明</el-form-item>
<el-form-item label="备注：">说明说明</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
@ -89,16 +68,12 @@
</template>
<script>
export default {
name: 'InstallationPackDetail',
name: 'PublishDetail',
dicts: ['sys_yes_no'],
components: {},
data() {
return {
disabledFlag: true,
selectValue: 'code',
checkList: ['Android'],
disabledCode: false,
ruleFlag: null,
ruleFlagList: null,
list: {
rule: {
regularRule: false,
@ -106,10 +81,9 @@ export default {
},
// headerOperations: [],
packId: '', // 安装包ID
grayFlag: JSON.parse(this.$route.query.params).list.grayFlag, // 发布类型: 0灰度 1正式
pattern: JSON.parse(this.$route.query.params).list.pattern, //
patternHint: JSON.parse(this.$route.query.params).list.patternHint,
deployType: JSON.parse(this.$route.query.params).list.deployType, // 发布条件： 0白名单 1时间窗
grayFlag: '0', // 发布类型: 0灰度 1正式
upgradeMode: '0', //
releaseDestType: '0', // 发布条件： 0白名单 1时间窗
headerOperations: [// 自定义规则
// {
// 'scope': '', // 范围：region地区 platform平台
@ -119,68 +93,25 @@ export default {
// }
],
grayUserNum: '', // 灰度人数
numType: '0',
expiryTime: '', // 灰度结束时间
desp: JSON.parse(this.$route.query.params).list.desp,
desp: '',
releaseRuleId: '', // 常用规则
// deviceListId: '', // 设备白名单
whiteListId: ''// 用户白名单id
whiteListId: '',// 用户白名单id
enableVerify: false, //是否开启下载验证
imprint: '', //版本说明
versionNumber: '',
AppName: '', //APP名称
platform: 'android' //系统
},
whiteOptions: [{
value: 'allLeader',
label: '所有领导'
}, {
value: 'allBanker',
label: '所有行员'
}, {
value: 'allBusimess',
label: '所有业务'
}],
releaseOptions: [],
fileList: [],
typeList: [],
rules: {
grayFlag: [
{ required: true }
],
pattern: [
{ required: true }
],
patternHint: [
{ required: true }
],
deployType: [
{ required: true }
],
whiteListId: [
{ required: true }
],
expiryTime: [
{ required: true }
],
grayUserNum: [
{ required: true }
]
}
}
},
mounted() {
if (JSON.parse(this.$route.query.params)) {
const dataParams = JSON.parse(this.$route.query.params)
dataParams.list.releaseRuleItemList = dataParams.list.releaseRuleItemList || []
dataParams.list.releaseRuleResponseMode = dataParams.list.releaseRuleResponseMode || {}
this.list = dataParams.list
this.list.desp = this.list.desp || '无'
this.list.whiteListIdName = this.list.whiteListIdName ? (this.list.whiteListType === '0' ? '用户' : '设备') + '/' + this.list.whiteListIdName : '无'
if (this.list.releaseRuleResponseMode.id) {
this.ruleFlag = true
} else {
this.ruleFlag = false
}
if (this.list.releaseRuleItemList.length === 0) {
this.ruleFlagList = false
} else {
this.ruleFlagList = true
}
// 显示搜索条件
// 总条数
packOpen: false,
// 遮罩层
loading: true,
dataList: [],
form: {}
}
},
methods: {}
@ -193,28 +124,21 @@ export default {
}
.form-main {
width: 700px;
width: 900px;
margin: 0 auto;
}
.form-row {
margin-top: 20px;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
border: 1px solid #E4E7ED !important;
}
.custom-table {
font-size: 12px;
.tag-group {
.el-tag {
cursor: pointer;
}
}
.addRow {
width: 100px;
.el-tag + .el-tag {
margin-left: 10px
}
.remark-input {
width: 400px;
}
</style>

351
sf-ui/src/views/FDS/publishList/index.vue
View File

@ -32,8 +32,6 @@
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="configType">
<el-select v-model="queryParams.configType" clearable placeholder="请选择状态">
<el-option
@ -213,219 +211,14 @@
@pagination="getList"
/>
<!-- 新增白名单弹出框 -->
<el-dialog :title="title" :visible.sync="addOpen" append-to-body width="700px">
<el-form ref="formAdd" v-loading="$store.state.app.isLoading" :label-width="'120px'" :model="list"
:rules="rules"
>
<el-form-item label="APP名称" prop="AppName">
<el-input v-model="list.AppName" placeholder="输入APP名称"/>
</el-form-item>
<el-form-item label="上传类型" prop="">
<el-input v-model="list.AppName" placeholder="请选择上传类型"/>
</el-form-item>
<el-form-item label="选择系统" prop="grayFlag">
<div class="tag-group">
<el-tag :type="list.platform=='android'?'':'info'" @click="list.platform='android'">安卓</el-tag>
<el-tag :type="list.platform=='IOS'?'':'info'" @click="list.platform='IOS'">IOS</el-tag>
<el-tag :type="list.platform=='HarmonyOS'?'':'info'" @click="list.platform='HarmonyOS'">鸿蒙</el-tag>
</div>
</el-form-item>
<el-form-item v-if="list.platform!=='IOS'" label="安装包" prop="upgradeMode">
<el-input v-model="list.packName" class="input-with-select" placeholder="请选择包" readonly>
<el-button slot="append" icon="el-icon-search" @click="handlePackOpen"></el-button>
</el-input>
</el-form-item>
<el-form-item v-else label="APP Store地址" prop="AppLink">
<el-input v-model="list.AppLink" placeholder="请输入APPStore地址"/>
</el-form-item>
<el-form-item label="版本号" prop="versionNumber">
<el-input v-model="list.versionNumber" class="remark-input" maxlength="500" placeholder="输入版本号"
show-word-limit
/>
</el-form-item>
<el-form-item label="版本说明">
<el-input v-model="list.imprint" class="remark-input" maxlength="500" placeholder="输入版本描述"
show-word-limit
type="textarea"
/>
</el-form-item>
<!-- 根据需求确认是否需要这些条件-->
<!-- <el-form-item label="发布环境" prop="releaseDestType">-->
<!-- <el-radio v-model="list.releaseDestType" label="0">开发环境</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="1">测试发布</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="2">生产发布</el-radio>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="发布策略" prop="releaseDestType">-->
<!-- <el-radio v-model="list.releaseDestType" label="0">灰度发布</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="1">全量发布</el-radio>-->
<!-- <el-radio v-model="list.releaseDestType" label="2">回滚发布</el-radio>-->
<!-- </el-form-item>-->
<el-form-item label="结果通知">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item label="强制更新">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item label="公开版">
<el-switch
v-model="list.enableVerify"
/>
</el-form-item>
<el-form-item label="下载验证">
<span slot="label">
下载验证
<el-tooltip class="item-tooltip"
content="当验证开关开启时，为发布包生成下载二维码的同时，也会生成一个6位验证码，扫描二维码后需经过验证码才可下载发布."
effect="dark"
placement="right"
>
<i class="el-icon-question"/>
</el-tooltip>
</span>
<el-switch
v-model="list.downVerifi"
/>
</el-form-item>
<el-form-item label="更新客群">
<el-radio v-model="list.numType" label="0">白名单客户</el-radio>
<el-radio v-model="list.numType" label="1">普通客户</el-radio>
</el-form-item>
<el-form-item label="有效期">
<template>
<div class="block">
<el-date-picker
v-model="list.expiryTime"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
</div>
</template>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="list.desp" class="remark-input" maxlength="50" placeholder="请输入备注" show-word-limit
type="textarea"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm(1)">保 存</el-button>
<el-button @click="cancel(1)">取 消</el-button>
</div>
</el-dialog>
<!-- 发布详情 -->
<el-dialog :visible.sync="configOpen" append-to-body title="发布详情" width="900px">
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
<el-form-item label="APP名称："></el-form-item>
<el-form-item label="上传类型：">安装包11111</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所选系统：">安装包1111.excel</el-form-item>
<el-form-item label="安装包名称：">58.1kb</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="版本号：">安卓</el-form-item>
<el-form-item label="子版本号：">登录模块</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="版本说明：">说明说明</el-form-item>
<el-form-item label="发布环境：">发布环境</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发布策略：">说明说明</el-form-item>
<el-form-item label="结果通知：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="强制更新：">说明说明</el-form-item>
<el-form-item label="公开版：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下载验证：">说明说明</el-form-item>
<el-form-item label="更新客群：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下载地址：">说明说明</el-form-item>
<el-form-item label="下载量：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="注册数：">说明说明</el-form-item>
<el-form-item label="最后刷新：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发布时间：">说明说明</el-form-item>
<el-form-item label="创建人：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发布状态：">说明说明</el-form-item>
<el-form-item label="发布日志：">说明说明</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效期：">说明说明</el-form-item>
<el-form-item label="备注：">说明说明</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel(2)">关 闭</el-button>
</div>
</el-dialog>
<!--安装包弹窗-->
<el-dialog :visible.sync="packOpen" append-to-body title="添加安装包" width="900px">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
<el-form-item label="安装包名称" prop="installpackName">
<el-input
v-model="queryParams.installpackName"
clearable
placeholder="请输入安装包名称"
style="width: 240px"
@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-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column align="center" label="安装包名称" prop="configId"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="configName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="安装包大小" prop="configName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="适用系统" prop="configValue"/>
<el-table-column align="center" label="状态" prop="configType">
<template slot-scope="scopeA">
<dict-tag :options="dict.type.sys_yes_no" :value="scopeA.row.type"/>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="250">
<template slot-scope="scope">
<el-button circle icon="el-icon-plus" type="primary"
></el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="packOpen=false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { addConfig, delConfig, getConfig, listConfig, updateConfig } from '@/api/system/config'
import { delConfig, listConfig } from '@/api/system/config'
export default {
name: 'Config',
name: 'PublishList',
dicts: ['sys_yes_no'],
data() {
return {
@ -467,51 +260,7 @@ export default {
url: require('@/assets/images/code.png'),
srcList: [
require('@/assets/images/code.png')
],
list: {
rule: {
regularRule: false,
customRule: false
},
// headerOperations: [],
packId: '', // 安装包ID
grayFlag: '0', // 发布类型: 0灰度 1正式
upgradeMode: '0', //
releaseDestType: '0', // 发布条件： 0白名单 1时间窗
headerOperations: [// 自定义规则
// {
// 'scope': '', // 范围：region地区 platform平台
// 'inclued': '', // 是否包含 1包含 2不包含
// 'condition': '', // 发布条件
// 'desp': ''// 备注
// }
],
grayUserNum: '', // 灰度人数
numType: '0',
expiryTime: '', // 灰度结束时间
desp: '',
releaseRuleId: '', // 常用规则
// deviceListId: '', // 设备白名单
whiteListId: '',// 用户白名单id
enableVerify: false, //是否开启下载验证
imprint: '', //版本说明
versionNumber: '',
AppName: '', //APP名称
platform: 'android' //系统
},
whiteOptions: [],
// 表单校验
rules: {
configName: [
{ required: true, message: '参数名称不能为空', trigger: 'blur' }
],
configKey: [
{ required: true, message: '参数键名不能为空', trigger: 'blur' }
],
configValue: [
{ required: true, message: '参数键值不能为空', trigger: 'blur' }
]
}
]
}
},
created() {
@ -528,15 +277,6 @@ export default {
}
)
},
// 取消按钮
cancel(type) {
if (type === 1) {
this.addOpen = false
} else {
this.configOpen = false
}
this.reset()
},
// 表单重置
reset() {
this.form = {
@ -565,8 +305,9 @@ export default {
this.reset()
// 使用ES6+语法
this.reset()
this.addOpen = true
this.$router.push({
path: 'publist/add'
})
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -574,36 +315,7 @@ export default {
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const configId = row.configId || this.ids
getConfig(configId).then(response => {
this.form = response.data
this.addOpen = true
this.title = '修改白名单'
})
},
/** 提交按钮 */
submitForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.configId != undefined) {
updateConfig(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.addOpen = false
this.getList()
})
} else {
addConfig(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.addOpen = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
async handleDelete(row) {
const configIds = row.configId || this.ids
@ -619,7 +331,9 @@ export default {
},
/**查看详情*/
handleDetail() {
this.configOpen = true
this.$router.push({
path: 'publish/detail'
})
},
/**下载安装包*/
handleDownload() {
@ -629,36 +343,8 @@ export default {
handleEdit() {
},
/** 发布操作*/
handlePublish() {
},
/** 在上传之前进行校验 */
beforeAvatarUpload(file) {
const formatList = file.name.split('.')
const isFormat = file.type === 'text/plain' || formatList[formatList.length - 1] === 'txt'
if (!isFormat) {
this.$message.error(`上传格式只能是名称后缀为.txt的文本文件!`)
}
const isLt2M = file.size / 1024 / 1024 < 5
if (!isLt2M) {
this.$message.error(`上传文件大小不能超过5M!`)
}
return isLt2M && isFormat
},
/** 上传文件 */
handleSuccess(file) {
this.fileList = []
const nameList = file.context.path.split('/')
this.fileList.push({
name: file.context.name || nameList[nameList.length - 1],
url: file.context.path
})
this.addFormData.path = file.context.path
},
beforeRemove(files, filesList) {
return this.$confirm(`确定要移除${files.name}？`)
},
// 更多操作触发
handleCommand(command, row) {
@ -676,25 +362,8 @@ export default {
default:
break
}
},
/** 弹出包选择框*/
handlePackOpen() {
this.packOpen = true
}
}
}
</script>
<style lang="scss" scoped>
.tag-group {
.el-tag {
cursor: pointer;
}
}
.el-tag + .el-tag {
margin-left: 10px
}
</style>

123
sf-ui/src/views/FDS/whiteListManagement/add.vue Normal file
View File

@ -0,0 +1,123 @@
<template>
<div class="app-container">
<el-container>
<el-header>
<div>新增文件</div>
<el-divider/>
</el-header>
<el-main>
<div class="form-main">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="白名单名称" prop="whiteListName">
<el-input v-model="form.whiteListName" placeholder="请输入白名单名称"/>
</el-form-item>
<el-form-item label="白名单类型" prop="whiteListType">
<el-select v-model="form.whiteListType" clearable placeholder="请选择白名单类型">
<el-option label="白名单人员" value="0"/>
<el-option label="白名单设备" value="1"/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
</el-form>
</div>
<div class="page-footer">
<el-button type="primary" @click="submitAddForm()">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-main>
</el-container>
</div>
</template>
<script>
import { addConfig, updateConfig } from '@/api/system/config'
export default {
name: 'WhiteAdd',
dicts: ['sys_yes_no'],
data() {
return {
form: {},
tokenId: '',
// 文件存放的路径
fileList: [],
rules: {
configName: [
{ required: true, message: '上传方式不能为空', trigger: 'change' }
],
configKey: [
{ required: true, message: '安装包名称不能为空', trigger: 'blur' }
]
},
activeTabs: '1'
}
},
computed: {},
methods: {
reset() {
this.form = {
whiteListType: undefined,
whiteListName: undefined,
remark: undefined
}
this.resetForm('form')
},
/** 提交按钮 */
submitAddForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.configId != undefined) {
updateConfig(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
})
} else {
addConfig(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
})
}
}
})
},
cancel() {
this.history.back()
}
}
}
</script>
<style lang="scss" scoped>
.app-container {
background: #ffffff;
margin: 24px;
}
.form-main {
width: 700px;
margin: 0 auto;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
border: 1px solid #E4E7ED !important;
}
.tag-group {
.el-tag {
cursor: pointer;
}
}
.el-tag + .el-tag {
margin-left: 10px
}
.page-footer {
margin: 0 auto;
width: 700px;
justify-content: center;
display: flex;
}
</style>

194
sf-ui/src/views/FDS/whiteListManagement/addConfig.vue Normal file
View File

@ -0,0 +1,194 @@
、
<template>
<div class="app-container">
<el-container>
<el-header>
<div>白名单配置</div>
<el-divider/>
</el-header>
<el-main>
<div class="form-main">
<el-form ref="configForm" :model="configForm" :rules="configRules" label-width="120px">
<el-form-item label="添加方式" prop="configName">
<el-radio-group v-model="configForm.addMode">
<el-radio
:label="1"
>手动添加
</el-radio>
<el-radio
:label="2"
>批量添加
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="白名单类型" prop="whiteListType">
<el-select v-model="configForm.whiteListType" clearable placeholder="请选择白名单类型">
<el-option label="白名单人员" value="0"/>
<el-option label="白名单设备" value="1"/>
</el-select>
</el-form-item>
<template v-if="configForm.addMode==1">
<el-form-item v-if="configForm.whiteListType==0" label="白名单电话" prop="phone">
<el-input v-model="configForm.phone" placeholder="请输入电话号码"/>
</el-form-item>
<el-form-item v-if="configForm.whiteListType==0" label="姓名">
<el-input v-model="configForm.name" placeholder="请输入姓名"/>
</el-form-item>
<el-form-item v-if="configForm.whiteListType==1" label="白名单设备">
<el-input v-model="configForm.equepid" placeholder="请输入设备信息" type="textarea"/>
</el-form-item>
</template>
<el-form-item v-else-if="configForm.addMode==2" label="白名单文件">
<el-upload
ref="whiteListFiles"
:auto-upload="true"
:before-remove="beforeRemove"
:before-upload="beforeAvatarUpload"
:file-list="fileList"
:headers="{tokenId: tokenId}"
:multiple="false"
:on-success="handleSuccess"
accept=".txt"
action="https://jsonplaceholder.typicode.com/posts/"
class="upload"
>
<el-button slot="trigger" size="small" type="primary">上传文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="configForm.remark" placeholder="请输入备注" type="textarea"/>
</el-form-item>
</el-form>
</div>
<div class="page-footer">
<el-button type="primary" @click="submitAddForm()">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-main>
<!--安装包弹窗-->
</el-container>
</div>
</template>
<script>
import { addConfig, updateConfig } from '@/api/system/config'
export default {
name: 'WhiteAddConfig',
dicts: ['sys_yes_no'],
data() {
return {
form: {},
tokenId: '',
// 文件存放的路径
fileList: [],
configForm: {
addMode: 1,
whiteListType: '',
whitelistIds: '',
remark: '',
equepid: ''
},
configRules: {
addMode: [
{ required: true, message: '添加方式不能为空', trigger: 'change' }
],
whiteListType: [
{ required: true, message: '白名单类型不能为空', trigger: 'change' }
]
}
}
},
computed: {},
methods: {
reset() {
this.form = {
whiteListType: undefined,
whiteListName: undefined,
remark: undefined
}
this.resetForm('form')
},
/** 提交按钮 */
submitAddForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.configId != undefined) {
updateConfig(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
})
} else {
addConfig(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
})
}
}
})
},
/** 在上传之前进行校验 */
beforeAvatarUpload(file) {
const formatList = file.name.split('.')
const isFormat = file.type === 'text/plain' || formatList[formatList.length - 1] === 'txt'
if (!isFormat) {
this.$message.error(`上传格式只能是名称后缀为.txt的文本文件!`)
}
const isLt2M = file.size / 1024 / 1024 < 5
if (!isLt2M) {
this.$message.error(`上传文件大小不能超过5M!`)
}
return isLt2M && isFormat
},
/** 上传文件 */
handleSuccess(file) {
this.fileList = []
const nameList = file.context.path.split('/')
this.fileList.push({
name: file.context.name || nameList[nameList.length - 1],
url: file.context.path
})
this.addFormData.path = file.context.path
},
beforeRemove(files, filesList) {
return this.$confirm(`确定要移除${files.name}？`)
},
cancel() {
this.history.back()
}
}
}
</script>
<style lang="scss" scoped>
.app-container {
background: #ffffff;
margin: 24px;
}
.form-main {
width: 700px;
margin: 0 auto;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner {
border: 1px solid #E4E7ED !important;
}
.tag-group {
.el-tag {
cursor: pointer;
}
}
.el-tag + .el-tag {
margin-left: 10px
}
.page-footer {
margin: 0 auto;
width: 700px;
justify-content: center;
display: flex;
}
</style>

156
sf-ui/src/views/FDS/whiteListManagement/components/addConfig.vue
View File

@ -1,156 +0,0 @@
<template>
<el-dialog :modal-append-to-body="false" :title="title" v-bind="$attrs" width="500px"
@close="onClose"
@open="onOpen"
v-on="$listeners"
>
<el-form ref="configForm" :model="configForm" :rules="configRules" label-width="120px">
<el-form-item label="添加方式" prop="configName">
<el-radio-group v-model="configForm.addMode">
<el-radio
:label="1"
>手动添加
</el-radio>
<el-radio
:label="2"
>批量添加
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="白名单类型" prop="whiteListType">
<el-input v-model="configForm.whiteListType" placeholder="请选择白名单类型"/>
</el-form-item>
<el-form-item v-if="configForm.addMode==1" label="白名单ID" prop="whitelistIds">
<el-input v-model="configForm.whitelistIds" placeholder="请输入白名单ID" type="textarea"/>
</el-form-item>
<el-form-item v-else-if="configForm.addMode==2" label="白名单文件">
<el-upload
ref="whiteListFiles"
:auto-upload="true"
:before-remove="beforeRemove"
:before-upload="beforeAvatarUpload"
:file-list="fileList"
:headers="{tokenId: tokenId}"
:multiple="false"
:on-success="handleSuccess"
accept=".txt"
action="https://jsonplaceholder.typicode.com/posts/"
class="upload"
>
<el-button slot="trigger" size="small" type="primary">上传文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="configForm.remark" placeholder="请输入备注" type="textarea"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitConfigForm(2)">保 存</el-button>
<el-button @click="cancel(2)">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { addConfig } from '@/api/system/config'
export default {
name: 'Add',
dicts: ['sys_yes_no'],
props: {
// 图片数量限制
title: {
type: String,
default: '添加白名单'
}
},
data() {
return {
configName: undefined,
configForm: {},
fileList: [],
tokenId: '',
// 白名单配置表单验证
configRules: {
addMode: [
{ required: true, message: '添加方式不能为空', trigger: 'change' }
],
whiteListType: [
{ required: true, message: '白名单类型不能为空', trigger: 'change' }
],
whitelistIds: [
{ required: true, message: '白名单名称不能为空', trigger: 'blur' }
]
}
}
},
methods: {
/** 提交按钮 */
/** 白名单配置提交 **/
submitConfigForm: function() {
this.$refs['configForm'].validate(valid => {
if (valid) {
addConfig(this.configForm).then(response => {
this.$modal.msgSuccess('新增成功')
this.closeModal()
})
}
})
},
reset() {
this.form = {
configId: undefined,
configName: undefined,
configKey: undefined,
configValue: undefined,
configType: 'Y',
remark: undefined
}
this.resetForm('form')
},
// 取消按钮
cancel(type) {
this.reset()
this.closeModal()
},
closeModal() {
this.$emit('close')
},
onOpen() {
this.active = this.current
this.key = ''
},
onClose() {
},
/** 在上传之前进行校验 */
beforeAvatarUpload(file) {
const formatList = file.name.split('.')
const isFormat = file.type === 'text/plain' || formatList[formatList.length - 1] === 'txt'
if (!isFormat) {
this.$message.error(`上传格式只能是名称后缀为.txt的文本文件!`)
}
const isLt2M = file.size / 1024 / 1024 < 5
if (!isLt2M) {
this.$message.error(`上传文件大小不能超过5M!`)
}
return isLt2M && isFormat
},
/** 上传文件 */
handleSuccess(file) {
this.fileList = []
const nameList = file.context.path.split('/')
this.fileList.push({
name: file.context.name || nameList[nameList.length - 1],
url: file.context.path
})
this.addFormData.path = file.context.path
},
beforeRemove(files, filesList) {
return this.$confirm(`确定要移除${files.name}？`)
}
}
}
</script>

0
sf-ui/src/views/FDS/whiteListManagement/components/detail.vue
View File

24
sf-ui/src/views/FDS/whiteListManagement/components/add.vue → sf-ui/src/views/FDS/whiteListManagement/components/editWhiteList.vue
View File

@ -6,21 +6,11 @@
v-on="$listeners"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="白名单名称" prop="whiteListName">
<el-input v-model="form.whiteListName" placeholder="请输入白名单名称"/>
<el-form-item label="姓名" prop="name">
<el-input v-model="form.whiteListName" placeholder="请输入名称"/>
</el-form-item>
<el-form-item label="白名单类型" prop="whiteListType">
<el-select v-model="form.whiteListType" clearable placeholder="请选择白名单类型">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
<el-form-item label="电话" prop="phoneNumber">
<el-input v-model="form.phoneNumber" placeholder="请输入电话"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -30,11 +20,10 @@
</el-dialog>
</template>
<script>
import { addConfig, updateConfig } from '@/api/system/config'
export default {
name: 'Add',
name: 'EditWhiteList',
dicts: ['sys_yes_no'],
props: {
@ -51,7 +40,7 @@ export default {
// 白名单配置表单验证
rules: {
whiteListName: [
{ required: true, message: '白名单名称不能为空', trigger: 'blur' }
{ required: true, message: '名称不能为空', trigger: 'blur' }
],
whiteListType: [
{ required: true, message: '白名单类型不能为空', trigger: 'change' }
@ -91,7 +80,6 @@ export default {
cancel() {
this.reset()
this.closeModal()
},
closeModal() {
this.$emit('close')

220
sf-ui/src/views/FDS/whiteListManagement/detail.vue Normal file
View File

@ -0,0 +1,220 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
<el-form-item label="白名单信息" prop="phoneNumber">
<el-input
v-model="queryParams.phoneNumber"
clearable
placeholder="请输入电话号码"
style="width: 240px"
@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: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="dataList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="姓名" prop="configId"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="电话" prop="configName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="添加时间" prop="configKey"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="备注" prop="configValue"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="250">
<template slot-scope="scope">
<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: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 { delConfig, getConfig, listConfig } from '@/api/system/config'
export default {
name: 'WhiteListDetail',
dicts: ['sys_yes_no'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 参数表格数据
dataList: [],
configList: [],
// 弹出层标题
title: '',
// 是否显示安装包上传弹出框
addOpen: false,
// 是否显示安装包详情弹出框
detailOpen: false,
tokenId: '',
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
phoneNumber: undefined
},
// 表单参数
form: {}
}
},
created() {
this.getList()
},
methods: {
/** 查询参数列表 */
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.dataList = response.rows
this.total = response.total
this.loading = false
}
)
},
// 表单重置
reset() {
this.form = {
configId: undefined,
configName: undefined,
configKey: undefined,
configValue: undefined,
configType: 'Y',
remark: undefined
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.addOpen = true
this.title = '上传安装包'
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.configId)
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 删除按钮操作 */
handleDelete(row) {
const configIds = row.configId || this.ids
this.$modal.confirm('是否确认删除编号为"' + configIds + '"的数据项？').then(function() {
return delConfig(configIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 修改按钮操作 */
handleEdit(row) {
this.reset()
const configId = row.configId || this.ids
getConfig(configId).then(response => {
this.form = response.data
this.addOpen = true
this.title = '修改安装包'
})
},
/** 查看详情弹窗 **/
handleDetail() {
this.detailOpen = true
},
/** 切换TAB触发的事件 */
handleClickTabs() {
this.getList()
},
/** 下载按钮 */
handleDownload(row) {
const configIds = row.configId || this.ids
this.$modal.confirm('是否确认下载编号为"' + configIds + '"的数据项？').then(function() {
return delConfig(configIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('下载成功')
}).catch(() => {
})
},
/** 关闭新增弹出框*/
closeAdd() {
this.addOpen = false
this.getList()
},
closeAddConfig() {
this.detailOpen = false
}
}
}
</script>

219
sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue Normal file
View File

@ -0,0 +1,219 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
<el-form-item label="白名单信息" prop="phoneNumber">
<el-input
v-model="queryParams.phoneNumber"
clearable
placeholder="请输入设备号"
style="width: 240px"
@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: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="dataList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="设备号" prop="configId"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="添加时间" prop="configName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="备注" prop="configValue"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="250">
<template slot-scope="scope">
<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: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 { delConfig, getConfig, listConfig } from '@/api/system/config'
export default {
name: 'WhiteListEquepDetail',
dicts: ['sys_yes_no'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 参数表格数据
dataList: [],
configList: [],
// 弹出层标题
title: '',
// 是否显示安装包上传弹出框
addOpen: false,
// 是否显示安装包详情弹出框
detailOpen: false,
tokenId: '',
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
phoneNumber: undefined
},
// 表单参数
form: {}
}
},
created() {
this.getList()
},
methods: {
/** 查询参数列表 */
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.dataList = response.rows
this.total = response.total
this.loading = false
}
)
},
// 表单重置
reset() {
this.form = {
configId: undefined,
configName: undefined,
configKey: undefined,
configValue: undefined,
configType: 'Y',
remark: undefined
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.addOpen = true
this.title = '上传安装包'
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.configId)
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 删除按钮操作 */
handleDelete(row) {
const configIds = row.configId || this.ids
this.$modal.confirm('是否确认删除编号为"' + configIds + '"的数据项？').then(function() {
return delConfig(configIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 修改按钮操作 */
handleEdit(row) {
this.reset()
const configId = row.configId || this.ids
getConfig(configId).then(response => {
this.form = response.data
this.addOpen = true
this.title = '修改安装包'
})
},
/** 查看详情弹窗 **/
handleDetail() {
this.detailOpen = true
},
/** 切换TAB触发的事件 */
handleClickTabs() {
this.getList()
},
/** 下载按钮 */
handleDownload(row) {
const configIds = row.configId || this.ids
this.$modal.confirm('是否确认下载编号为"' + configIds + '"的数据项？').then(function() {
return delConfig(configIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('下载成功')
}).catch(() => {
})
},
/** 关闭新增弹出框*/
closeAdd() {
this.addOpen = false
this.getList()
},
closeAddConfig() {
this.detailOpen = false
}
}
}
</script>

66
sf-ui/src/views/FDS/whiteListManagement/index.vue
View File

@ -141,6 +141,16 @@
@click="handleEdit(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:config:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleDetail(scope.row)"
>详情
</el-button>
<el-button
v-hasPermi="['system:config:remove']"
icon="el-icon-delete"
@ -160,22 +170,15 @@
:total="total"
@pagination="getList"
/>
<add-modal :title="title" :visible.sync="addOpen" @close="closeAdd"/>
<add-config :title="title" :visible.sync="configOpen" @close="closeAddConfig"/>
</div>
</template>
<script>
import { delConfig, getConfig, listConfig } from '@/api/system/config'
import AddModal from './components/add.vue'
import AddConfig from './components/addConfig.vue'
export default {
name: 'WhiteList',
dicts: ['sys_yes_no'],
components: {
AddModal,
AddConfig
},
data() {
return {
// 遮罩层
@ -233,15 +236,6 @@ export default {
}
)
},
// 取消按钮
cancel(type) {
if (type === 1) {
this.addOpen = false
} else {
this.configOpen = false
}
this.reset()
},
// 表单重置
reset() {
this.form = {
@ -268,8 +262,10 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.addOpen = true
this.title = '新增白名单'
this.$router.push({
path: 'whiteList/add',
type: 'add'
})
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -283,8 +279,10 @@ export default {
const configId = row.configId || this.ids
getConfig(configId).then(response => {
this.form = response.data
this.addOpen = true
this.title = '修改白名单'
this.$router.push({
path: 'whiteList/add',
type: 'edit'
})
})
},
@ -293,9 +291,9 @@ export default {
this.reset()
const configId = row.configId || this.ids
getConfig(configId).then(response => {
this.configForm.addMode = 1
this.configOpen = true
this.title = '白名单配置'
this.$router.push({
path: 'whiteList/addConfig'
})
})
},
@ -349,15 +347,19 @@ export default {
})
},
/** 关闭新增弹出框*/
closeAdd() {
this.addOpen = false
this.getList()
},
closeAddConfig() {
this.configOpen = false
this.getList()
/** 查看详情按钮操作 */
handleDetail(row) {
if (row.type == 1) {
this.$router.push({
path: 'whiteList/detail'
})
} else {
this.$router.push({
path: 'whiteList/equepDetail'
})
}
}
}
}
</script>