fix: 抽离白名单页面的组件,把新增白名单,白名单配置的弹窗以组建方式生成,按照新版的原型图,优化发布页面的逻辑,优化排版,解决部分BUG

This commit is contained in:
张洋川 2024-04-09 17:55:01 +08:00
parent 97cf321b57
commit f7727ac37f
9 changed files with 883 additions and 514 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 B

View File

@ -2,60 +2,60 @@
<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"
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="installpackName">
<el-input
v-model="queryParams.installpackName"
clearable
placeholder="请输入安装包名称"
style="width: 240px"
@keyup.enter.native="handleQuery"
v-model="queryParams.installpackName"
clearable
placeholder="请输入安装包名称"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="版本" prop="versions">
<el-input
v-model="queryParams.versions"
clearable
placeholder="请输入版本"
style="width: 240px"
@keyup.enter.native="handleQuery"
v-model="queryParams.versions"
clearable
placeholder="请输入版本"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上传方式" prop="uploadMode">
<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"
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-date-picker
v-model="dateRange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
v-model="dateRange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="configType">
<el-select v-model="queryParams.status" clearable placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
@ -68,24 +68,24 @@
<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"
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"
v-hasPermi="['system:config:delete']"
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handleDelete"
>批量删除
</el-button>
</el-col>
@ -94,7 +94,6 @@
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<template v-if="activeTabs=='1'">
<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"/>
@ -120,46 +119,46 @@
<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-edit"
size="mini"
type="text"
@click="handleDownload(scope.row)"
v-hasPermi="['system:config:dowmload']"
icon="el-icon-edit"
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)"
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-edit"
size="mini"
type="text"
@click="handleDetail(scope.row)"
v-hasPermi="['system:config:detail']"
icon="el-icon-edit"
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)"
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"
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
<!-- 上传APP安装包的弹窗 -->
@ -168,13 +167,13 @@
<el-form-item label="上传方式" prop="debug">
<el-radio-group v-model="form.debug">
<el-radio
:key="1"
label="1"
:key="1"
label="1"
>在线上传
</el-radio>
<el-radio
:key="2"
label="2"
:key="2"
label="2"
>离线上传
</el-radio>
</el-radio-group>
@ -187,17 +186,17 @@
</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"
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>
@ -208,18 +207,18 @@
<el-form-item label="适用系统">
<el-radio-group v-model="form.platform">
<el-radio
:key="1"
label="Android"
:key="1"
label="Android"
>Android
</el-radio>
<el-radio
:key="2"
label="鸿蒙"
:key="2"
label="鸿蒙"
>鸿蒙
</el-radio>
<el-radio
:key="3"
label="IOS"
:key="3"
label="IOS"
>IOS
</el-radio>
</el-radio-group>
@ -227,10 +226,10 @@
<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"
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
@ -248,7 +247,7 @@
<el-col :span="24">
<el-form-item label="上传方式:">离线上传</el-form-item>
<el-form-item
label="安装包名称:"
label="安装包名称:"
>安装包11111
</el-form-item>
<el-form-item label="安装包文件名称:">安装包1111.excel</el-form-item>
@ -344,10 +343,10 @@ export default {
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.dataList = response.rows
this.total = response.total
this.loading = false
}
this.dataList = response.rows
this.total = response.total
this.loading = false
}
)
},
@ -355,10 +354,10 @@ 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
}
this.configList = response.rows
this.total = response.total
this.loading = false
}
)
},

View File

@ -4,32 +4,32 @@
<el-form-item label="选择APP" prop="configName">
<el-select v-model="queryParams.configType" clearable placeholder="请选择APP">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
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="版本号" prop="version">
<el-input
v-model="queryParams.version"
clearable
placeholder="请输入版本号"
style="width: 240px"
@keyup.enter.native="handleQuery"
v-model="queryParams.version"
clearable
placeholder="请输入版本号"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="公开时间">
<el-date-picker
v-model="dateRange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
v-model="dateRange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@ -37,10 +37,10 @@
<el-form-item label="状态" prop="configType">
<el-select v-model="queryParams.configType" clearable placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
@ -53,35 +53,35 @@
<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"
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
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handlePublish"
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handlePublish"
>批量发布
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:config:add']"
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handleDelete"
v-hasPermi="['system:config:add']"
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handleDelete"
>批量删除
</el-button>
</el-col>
@ -95,9 +95,9 @@
<el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="子版本号" prop="configValue"/>
<el-table-column
label="系统"
min-width="80"
prop="platform"
label="系统"
min-width="80"
prop="platform"
>
<template scope="scope">
<div>{{ scope.row.platform === '0' ? '安卓' : 'IOS' }}</div>
@ -120,10 +120,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" label="发布环境" prop="configValue"/>
<el-table-column align="center" label="发布状态" prop="configType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.configType"/>
@ -138,42 +135,49 @@
<el-table-column :show-overflow-tooltip="true" align="center" label="更新说明" prop="remark"/>
<el-table-column
align="center"
label="二维码"
min-width="80"
align="center"
label="二维码"
min-width="80"
>
<template slot-scope="scope">
<el-popover
v-if="scope.row.qrCode && scopeC.row.status !== '20'"
ref="popver"
trigger="click"
width="200"
<el-image
:preview-src-list="srcList"
:src="url"
style="width: 80px; height: 80px"
>
<div class="table-img">
<img :src="'data:image/jpg;base64,'+ scope.row.qrCode">
<p v-if="scopeC.row.verifyCode">密码:{{ scope.row.verifyCode }}</p>
</div>
<!-- <img slot="reference" src="@/assets/code.png" class="table-qr">-->
</el-popover>
<div v-else>-</div>
</el-image>
<!-- <el-popover-->
<!-- v-if="scope.row.qrCode && scopeC.row.status !== '20'"-->
<!-- ref="popver"-->
<!-- trigger="click"-->
<!-- width="200"-->
<!-- >-->
<!-- <div class="table-img">-->
<!-- <img :src="'data:image/jpg;base64,'+ scope.row.qrCode">-->
<!-- <p v-if="scopeC.row.verifyCode">密码:{{ scope.row.verifyCode }}</p>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- <div v-else>-</div>-->
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="150">
<template slot-scope="scope">
<el-button
v-hasPermi="['system:config:edit']"
icon="el-icon-bottom"
size="mini"
type="text"
@click="handleDown(scope.row)"
v-hasPermi="['system:config:edit']"
icon="el-icon-bottom"
size="mini"
type="text"
@click="handleDown(scope.row)"
>下架
</el-button>
<el-button
v-hasPermi="['system:config:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleEdit(scope.row)"
v-hasPermi="['system:config:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleEdit(scope.row)"
>修改
</el-button>
<el-dropdown size="mini"
@ -202,67 +206,218 @@
</el-table>
<pagination
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
<!-- 新增白名单弹出框 -->
<!-- <el-dialog :title="title" :visible.sync="addOpen" append-to-body width="500px">-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="白名单名称" prop="configName">-->
<!-- <el-input v-model="form.configName" placeholder="请输入参数名称"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="白名单类型" prop="configKey">-->
<!-- <el-input v-model="form.configKey" placeholder="请输入参数键名"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="remark">-->
<!-- <el-input v-model="form.remark" placeholder="请输入内容" 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 :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-dialog :title="title" :visible.sync="configOpen" append-to-body width="500px">-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="添加方式" prop="configName">-->
<!-- <el-radio-group v-model="form.debug">-->
<!-- <el-radio-->
<!-- :key="1"-->
<!-- :label="手动添加"-->
<!-- >手动添加-->
<!-- </el-radio>-->
<!-- <el-radio-->
<!-- :key="2"-->
<!-- :label="批量添加"-->
<!-- >批量添加-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="白名单类型" prop="configKey">-->
<!-- <el-input v-model="form.configKey" placeholder="请选择白名单类型"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="白名单ID" prop="configName">-->
<!-- <el-input v-model="form.configName" placeholder="输入用户ID"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="remark">-->
<!-- <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm(2)"> </el-button>-->
<!-- <el-button @click="cancel(2)"> </el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<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>
@ -294,6 +449,9 @@ export default {
addOpen: false,
//
configOpen: false,
packOpen: false,
//
dateRange: [],
//
@ -306,6 +464,42 @@ export default {
},
//
form: {},
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: [
@ -328,10 +522,10 @@ export default {
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.configList = response.rows
this.total = response.total
this.loading = false
}
this.configList = response.rows
this.total = response.total
this.loading = false
}
)
},
//
@ -371,10 +565,7 @@ export default {
this.reset()
// 使ES6+
this.reset()
const type = 'add'
this.$router.push({
name: 'PublishAdd'
})
this.addOpen = true
},
//
@ -428,7 +619,7 @@ export default {
},
/**查看详情*/
handleDetail() {
this.configOpen = true
},
/**下载安装包*/
handleDownload() {
@ -443,7 +634,32 @@ export default {
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) {
switch (command) {
@ -460,8 +676,25 @@ 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>

View File

@ -3,18 +3,18 @@
<el-container>
<el-header>
<div>新增文件</div>
<el-divider />
<el-divider/>
</el-header>
<el-main>
<div class="form-main">
<el-form ref="formAdd" v-loading="$store.state.app.isLoading" :model="list" :label-width="'120px'" :rules="rules">
<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-input v-model="list.AppName" placeholder="输入APP名称"/>
</el-form-item>
<el-form-item label="上传类型" prop="">
<el-input v-model="list.AppName" placeholder="输入APP名称" />
<el-input v-model="list.AppName" placeholder="输入APP名称"/>
</el-form-item>
<el-form-item label="发布类型" prop="grayFlag">
@ -26,7 +26,9 @@
<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" maxlength="50" show-word-limit class="remark-input" type="textarea" placeholder="请输入升级描述" />
<el-input v-model="list.upgradeDesp" class="remark-input" maxlength="50" placeholder="请输入升级描述" show-word-limit
type="textarea"
/>
</el-form-item>
<template v-if="list.grayFlag =='0'">
<el-form-item label="发布条件" prop="releaseDestType">
@ -35,17 +37,21 @@
</el-form-item>
<el-form-item v-if="list.releaseDestType =='0'" label="白名单" prop="whiteListId">
<template>
<el-cascader v-model="list.whiteListId" :options="whiteOptions" :show-all-levels="false" clearable />
<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" maxlength="500" show-word-limit class="remark-input" placeholder="输入版本号" />
<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" maxlength="500" show-word-limit class="remark-input" type="textarea" placeholder="输入版本描述" />
<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>
@ -77,8 +83,11 @@
<el-form-item v-if="list.releaseDestType =='1'" label="下载验证">
<span slot="label">
下载验证
<el-tooltip class="item-tooltip" effect="dark" content="当验证开关开启时为发布包生成下载二维码的同时也会生成一个6位验证码扫描二维码后需经过验证码才可下载发布." placement="right">
<i class="el-icon-question" />
<el-tooltip class="item-tooltip" content="当验证开关开启时为发布包生成下载二维码的同时也会生成一个6位验证码扫描二维码后需经过验证码才可下载发布."
effect="dark"
placement="right"
>
<i class="el-icon-question"/>
</el-tooltip>
</span>
<el-switch
@ -96,18 +105,20 @@
<div class="block">
<el-date-picker
v-model="list.expiryTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
</div>
</template>
</el-form-item>
<el-form-item label="备注" prop="desp">
<el-input v-model="list.desp" maxlength="50" show-word-limit class="remark-input" type="textarea" placeholder="请输入备注" />
<el-input v-model="list.desp" class="remark-input" maxlength="50" placeholder="请输入备注" show-word-limit
type="textarea"
/>
</el-form-item>
</template>
</el-form>
@ -121,8 +132,7 @@
// import { getWhiteList, getReleaseRuleList, getDictionaryList, getInstallTaskAdd, getTypeList } from '@/api/FDS'
export default {
name: 'InstallationAdd',
components: {
},
components: {},
data() {
var checkHeader = (rule, value, callback) => {
if (this.list.rule.customRule) {
@ -174,10 +184,10 @@ export default {
releaseRuleId: '', //
// deviceListId: '', //
whiteListId: '',// id
enableVerify:false, //
imprint:'', //
versionNumber:'',
AppName:'', //APP
enableVerify: false, //
imprint: '', //
versionNumber: '',
AppName: '' //APP
},
whiteOptions: [],
releaseOptions: [],
@ -214,8 +224,7 @@ export default {
}
}
},
computed: {
},
computed: {},
watch: {
'list.rule.regularRule'(newR, oldR) { //
if (this.list.rule.customRule && newR) {
@ -370,27 +379,32 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container{
.app-container {
background: #ffffff;
margin: 24px;
}
.form-main{
.form-main {
width: 700px;
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;
}
::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;
}
.addRow {
width:100px;
width: 100px;
}
.remark-input {
width: 400px;
}

View File

@ -3,7 +3,7 @@
<el-container>
<el-header>
<div>发布详情</div>
<el-divider />
<el-divider/>
</el-header>
<el-main>
<div class="form-main">
@ -24,9 +24,6 @@
<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>
@ -93,8 +90,7 @@
<script>
export default {
name: 'InstallationPackDetail',
components: {
},
components: {},
data() {
return {
disabledFlag: true,
@ -187,31 +183,36 @@ export default {
}
}
},
methods: {
}
methods: {}
}
</script>
<style lang="scss" scoped>
.app-container{
.app-container {
background: #ffffff;
margin: 24px;
}
.form-main{
.form-main {
width: 700px;
margin: 0 auto;
}
.form-row {
margin-top: 20px;
}
::v-deep .el-input.is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner{
::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;
}
.addRow {
width:100px;
width: 100px;
}
.remark-input {
width: 400px;
}

View File

@ -0,0 +1,107 @@
<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="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
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>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAddForm()"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</template>
<script>
import { addConfig, updateConfig } from '@/api/system/config'
export default {
name: 'Add',
dicts: ['sys_yes_no'],
props: {
//
title: {
type: String,
default: '添加白名单'
}
},
data() {
return {
configName: undefined,
form: {},
//
rules: {
whiteListName: [
{ required: true, message: '白名单名称不能为空', trigger: 'blur' }
],
whiteListType: [
{ required: true, message: '白名单类型不能为空', trigger: 'change' }
]
}
}
},
methods: {
/** 提交按钮 */
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()
})
}
}
})
},
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>

View File

@ -0,0 +1,156 @@
<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>

View File

@ -3,40 +3,40 @@
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
<el-form-item label="名单类型" prop="whiteListType">
<el-input
v-model="queryParams.whiteListType"
clearable
placeholder="请输入名单类型"
style="width: 240px"
@keyup.enter.native="handleQuery"
v-model="queryParams.whiteListType"
clearable
placeholder="请输入名单类型"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="名称" prop="whiteListName">
<el-input
v-model="queryParams.whiteListName"
clearable
placeholder="请输入名称"
style="width: 240px"
@keyup.enter.native="handleQuery"
v-model="queryParams.whiteListName"
clearable
placeholder="请输入名称"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
v-model="dateRange"
end-placeholder="结束日期"
range-separator="-"
start-placeholder="开始日期"
style="width: 240px"
type="daterange"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="configType">
<el-select v-model="queryParams.status" clearable placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
@ -49,34 +49,34 @@
<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"
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
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handlePublish"
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handlePublish"
>批量发布
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handleDelete"
:disabled="multiple"
icon="el-icon-plus"
plain
size="mini"
type="info"
@click="handleDelete"
>批量删除
</el-button>
</el-col>
@ -104,49 +104,49 @@
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope">
<el-button
icon="el-icon-edit"
size="mini"
type="text"
@click="handleDown(scope.row)"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleDown(scope.row)"
>下架
</el-button>
<el-button
icon="el-icon-edit"
size="mini"
type="text"
@click="handleView(scope.row)"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleView(scope.row)"
>预览
</el-button>
<el-button
icon="el-icon-edit"
size="mini"
type="text"
@click="handlePublish(scope.row)"
icon="el-icon-edit"
size="mini"
type="text"
@click="handlePublish(scope.row)"
>发布
</el-button>
<el-button
icon="el-icon-edit"
size="mini"
type="text"
@click="handleConfig(scope.row)"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleConfig(scope.row)"
>名单配置
</el-button>
<el-button
v-hasPermi="['system:config:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleEdit(scope.row)"
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:remove']"
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)"
v-hasPermi="['system:config:remove']"
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
@ -154,94 +154,28 @@
</el-table>
<pagination
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
v-show="total>0"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
<!-- 新增白名单弹出框 -->
<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="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
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>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAddForm()"> </el-button>
<el-button @click="cancel(1)"> </el-button>
</div>
</el-dialog>
<!-- 白名单配置弹出框 -->
<el-dialog :title="title" :visible.sync="configOpen" append-to-body width="500px">
<el-form ref="form" :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>
<add-modal :title="title" :visible.sync="addOpen" @close="closeAdd"/>
<add-config :title="title" :visible.sync="configOpen" @close="closeAddConfig"/>
</div>
</template>
<script>
import { addConfig, delConfig, getConfig, listConfig, updateConfig } from '@/api/system/config'
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 {
//
@ -282,28 +216,6 @@ export default {
whiteListType: undefined,
whitelistIds: undefined,
remark: undefined
},
//
rules: {
whiteListName: [
{ required: true, message: '白名单名称不能为空', trigger: 'blur' }
],
whiteListType: [
{ required: true, message: '白名单类型不能为空', trigger: 'change' }
]
},
//
configRules: {
addMode: [
{ required: true, message: '添加方式不能为空', trigger: 'change' }
],
whiteListType: [
{ required: true, message: '白名单类型不能为空', trigger: 'change' }
],
whitelistIds: [
{ required: true, message: '白名单名称不能为空', trigger: 'blur' }
]
}
}
},
@ -315,10 +227,10 @@ export default {
getList() {
this.loading = true
listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.configList = response.rows
this.total = response.total
this.loading = false
}
this.configList = response.rows
this.total = response.total
this.loading = false
}
)
},
//
@ -375,46 +287,12 @@ export default {
this.title = '修改白名单'
})
},
/** 提交按钮 */
submitAddForm: 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()
})
}
}
})
},
/** 白名单配置提交 **/
submitConfigForm: function() {
this.$refs['configForm'].validate(valid => {
if (valid) {
addConfig(this.configForm).then(response => {
this.$modal.msgSuccess('新增成功')
this.configOpen = false
this.getList()
})
}
})
},
/** 白名单配置弹窗 **/
handleConfig(row) {
this.reset()
const configId = row.configId || this.ids
getConfig(configId).then(response => {
this.configForm = response.data
this.configForm.addMode = 1
this.configOpen = true
this.title = '白名单配置'
@ -437,7 +315,6 @@ export default {
handlePublish() {
const configIds = row.configId || this.ids
this.$modal.confirm('是否确认发布编号为"' + configIds + '"的数据项?').then(function() {
//
return delConfig(configIds)
}).then(() => {
@ -472,33 +349,15 @@ export default {
})
},
/** 在上传之前进行校验 */
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
/** 关闭新增弹出框*/
closeAdd() {
this.addOpen = false
this.getList()
},
/** 上传文件 */
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}`)
closeAddConfig() {
this.configOpen = false
this.getList()
}
}
}
</script>