Skip to content

C
cloud-platform-ui
Commit 9d461f5c authored by lixy's avatar lixy
Browse files
Options

标识管理

parent 1335609a
Hide whitespace changes
Inline Side-by-side
Showing with 386 additions and 16 deletions
src/api/appManagement/version.js
View file @ 9d461f5c
......@@ -46,3 +46,49 @@ export function getOne(id) {
method: 'get',
});
}
/**
* 标识管理列表
*/
export function getMarkList(query) {
return fetch({
url: '/api/app/version/mark/findAllByQuery',
method: 'get',
params: query
});
}
/**
* 新增标识
*/
export function appMarkVersionAdd(query) {
return fetch({
url: '/api/app/version/mark/appMarkVersionAdd',
method: 'post',
data: query
});
}
/**
* 编辑/删除标识
*/
export function appMarkVersionUpdate(query) {
return fetch({
url: '/api/app/version/mark/updAppMark',
method: 'post',
data: query
});
}
/**
* 终端删选
*/
export function listMark(query) {
return fetch({
url: '/api/app/version/mark/find/listMark',
method: 'get',
params: query
});
}
src/router/index.js
View file @ 9d461f5c
......@@ -571,6 +571,12 @@ export const asyncRouterMap = [{
name: 'app版本管理',
authority: 'appVersion'
},
{
path: 'appVersionMark',
component: _import('appManagement/appVersionMark'),
name: '标识管理',
authority: 'appVersionMark'
},
{
path: 'modalManagement',
component: _import('appManagement/modalManagement/index'),
......
src/views/appManagement/appVersionMark.vue 0 → 100644
View file @ 9d461f5c
<template>
<div class="app-container calendar-list-container">
<div class="filter-container">
<el-button class="filter-item" style="margin-bottom: 10px;" @click="handleCreate"
type="primary" icon="edit">新增
</el-button>
</div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
style="width: 100%">
<el-table-column align="center" label="序号">
<template scope="scope">
<span>{{scope.row.id}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="标识名称">
<template scope="scope">
<span>{{scope.row.markName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="标识">
<template scope="scope">
<span> {{scope.row.mark}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="描述">
<template scope="scope">
<span>{{scope.row.markRemark}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="创建时间">
<template scope="scope">
<span>{{scope.row.crtTime}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="130" fixed="right">
<template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="compileAppUpload(scope.row)">编辑
</el-button>
<el-button class="el-button el-button--text el-button--small" style="color:red" size="small" @click="deleteApp(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="query.page" :page-sizes="[10,20,30, 50]" :page-size="query.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
<el-dialog :title="modalTitle" :visible.sync="versionPopup" :before-close="handleDialogClose">
<el-form :model="form" ref="appVersion" label-width="150px">
<el-row>
<el-col :span="12">
<el-form-item label="标识名称" prop="sysType">
<el-input type="text" v-model="form.markName" placeholder="请输入标识名称"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="标识描述" prop="version">
<el-input type="textarea" v-model="form.markRemark" :rows=5 placeholder="请输入标识描述"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="modalTitle=='编辑'">
<el-col :span="12">
<el-form-item label="标识" prop="version">
<el-input type="text" v-model="form.mark" disabled placeholder="请输入标识描述"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSetAppVersion()">取消</el-button>
<el-button type="primary" v-if="modalTitle=='创建'" @click="insertAppVersion()">确 定</el-button>
<el-button type="primary" v-else @click="updateAppVersion()">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {mapGetters} from 'vuex';
import {getToken} from 'src/utils/auth';
import {
getMarkList,
appMarkVersionAdd,
appMarkVersionUpdate
} from 'src/api/appManagement/version'
import {timestamp2Date} from 'src/utils/dateUtils';
export default {
name: 'appUpload',
components: {
},
data() {
return {
fileList: [],
multipleb: false,
BASE_API: process.env.BASE_API,
form: {
id: undefined,
markRemark: '',
markName: '',
mark:''
},
versionPopup: false,
modalTitle: '创建',
list: [],
listLoading: true,
tableKey: 0,
query: {
limit: 10,
page: 1,
mark: undefined
},
total: null,
}
},
created() {
this.getList();
}
,
computed: {
...
mapGetters([
'elements'
]),
/**
* 获取token
*/
getHeaderWithToken() {
return {Authorization: getToken()};
},
},
methods: {
/**
* 新增
* */
handleCreate() {
this.template();
this.modalTitle = '创建';
this.versionPopup = true;
},
/**
* 获取 标识列表
* */
getList() {
getMarkList(this.query).then(
res => {
this.traverse(res.data.list);
this.list = res.data.list;
this.total = res.data.total;
this.listLoading = false;
}
)
},
traverse(list) {
for (let key of list) {
key.crtTime = key.crtTime ? timestamp2Date(key.crtTime) : null
}
},
handleSizeChange(val) {
this.query.limit = val;
this.getList();
}
,
handleCurrentChange(val) {
this.query.page = val;
this.getList();
},
handleFilter() {
this.getList()
},
/**
* 编辑窗口
*/
compileAppUpload(row) {
this.template();
this.modalTitle = '编辑';
this.versionPopup = true;
this.form.markName = row.markName;
this.form.markRemark = row.markRemark;
this.form.id = row.id;
this.form.mark = row.mark;
},
/**
* 点击 X 关闭对话框的回调
**/
handleDialogClose() {
this.template();
this.versionPopup = false;
},
/**
* 取消保存
*/
cancelSetAppVersion() {
this.template();
this.versionPopup = false;
},
/**
* 添加
*/
insertAppVersion() {
appMarkVersionAdd(this.form).then(res => {
if (res.status === 200) {
this.$notify({
title: '成功',
message: '添加成功',
type: 'success',
duration: 2000
});
this.template();
this.getList();
} else {
this.$notify({
title: '失败',
message: '添加失败！',
type: 'error',
duration: 2000
});
}
this.versionPopup = false;
})
},
/**
* 编辑、删除
*/
updateAppVersion() {
let params = {
id: this.form.id,
markName: this.form.markName,
markRemark: this.form.markRemark,
changeMark: 1,//1：修改2：删除
};
appMarkVersionUpdate( params ).then(res=>{
if (res.status === 200) {
this.$notify({
title: '成功',
message: '修改成功',
type: 'success',
duration: 2000
});
this.getList();
} else {
this.$notify({
title: '失败',
message: '修改失败！',
type: 'error',
duration: 2000
});
}
this.versionPopup = false
})
},
/**
* 删除标识
* @param row
*/
deleteApp(row){
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: row.id,
markName: row.markName,
markRemark: row.markRemark,
changeMark: 2,//1：修改2：删除
};
appMarkVersionUpdate(params).then(res=>{
if (res.status==200) {
this.$notify.success({
title: '删除成功',
message: `success`
})
} else {
this.$notify.warning({
title: '删除失败',
message: `failed`
})
}
this.getList();
})
})
},
template() {
this.form = {
id: undefined,
mark: undefined,
markRemark: '',
markName: '',
};
}
}
}
</script>
<style>
.v-modal{
z-index: 1000 !important;
}
.el-dialog__wrapper{
z-index: 1008 !important;
}
</style>
src/views/userManagement/userList/index.vue
View file @ 9d461f5c
......@@ -10,10 +10,10 @@
<el-input v-model.number="listQuery.realName" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="注册终端">
<el-select class="filter-item" v-model="listQuery.channel" placeholder="请选注册终端">
<el-select class="filter-item" v-model="listQuery.registerSource" placeholder="请选注册终端">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option v-for="(val,index) in mobileList " :key="index" :label="val.name"
:value="val.id"></el-option>
<el-option v-for="(val,index) in mobileList" :key="index" :label="val.markName"
:value="val.mark"></el-option>
</el-select>
</el-form-item>
<el-form-item label="会员类型">
......@@ -92,9 +92,7 @@
</el-table-column>
<el-table-column width="110" align="center" label="注册终端">
<template scope="scope">
<span v-if="scope.row.channel == 1">安卓</span>
<span v-else-if="scope.row.channel == 2">小程序</span>
<span v-else-if="scope.row.channel == 3">ios</span>
<span>{{scope.row.markName}}</span>
</template>
</el-table-column>
<el-table-column width="90" align="center" label="来源">
......@@ -570,6 +568,8 @@
import {formatDate} from "../../../utils/dateFormattor";
import {getMembers,setBind} from "src/api/admin/member/index"
import tourOrderDetailModal from "src/views/userManagement/model/tourOrderDetailModal";//旅游订单
listMark
import { listMark } from 'src/api/appManagement/version'
import rentOrderDetailModal from "src/views/userManagement/model/rentOrderDetailModal";//租车订单详情
import memberOrderDetailModal from "src/views/userManagement/model/memberOrderDetailModal";//会员订单详情
......@@ -608,7 +608,7 @@
saveUserId: undefined,
validityType: '无',
userOrderMessage: {},
mobileList: [{id: 1, name: 'app'}, {id: 2, name: "小程序"}],
mobileList: [],
queryMemberLevelList: [{id: -1, name: '全部会员'}],
postionStatelList: [
{
......@@ -775,11 +775,12 @@
listQuery: {
page: 1,
limit: 20,
registerSource: undefined,
mobileList: undefined,
mobile: undefined,
memberLevel: undefined,
source: undefined,
channel: undefined,
// channel: undefined,
registrationTimeEnd: undefined,
registrationTimeBegin: undefined,
postionState: undefined,
......@@ -874,8 +875,8 @@
if(queryJson.source){
t.listQuery.source = queryJson.source;
}
if(queryJson.channel){
t.listQuery.channel = queryJson.channel;
if(queryJson.registerSource){
t.listQuery.registerSource = queryJson.registerSource;
}
if(queryJson.registrationTimeEnd){
t.listQuery.registrationTimeEnd = queryJson.registrationTimeEnd;
......@@ -887,6 +888,7 @@
t.listQuery.postionState = queryJson.postionState;
}
}
this.getMarkList();//获取注册终端
this.getList();
this.getMembersLevel();
}
......@@ -907,16 +909,26 @@
},
methods: {
/**
* 获取注册终端列表
* */
getMarkList(){
listMark().then(res=>{
if (res.status == 200) {
this.mobileList = res.data
}
})
},
//设置上级弹窗
setHigher(val){
setHigher(val){
this.setPop = true;
this.activeId = val.userId;
},
//时间戳转换
timestamp(now) {
var year=now.getFullYear();
var month=now.getMonth()+1;
var date=now.getDate();
timestamp(now) {
var year=now.getFullYear();
var month=now.getMonth()+1;
var date=now.getDate();
var Hours = now.getHours();
var Minutes = now.getMinutes();
var Seconds = now.getSeconds();
......@@ -1114,7 +1126,6 @@
appPage(query)
.then(response => {
for (let listKey of response.data.list) {
listKey = this.getListKey(listKey)
}
this.list = response.data.list;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment