ZhangBin
/
datang-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-admin

master
song 3 years ago
parent
1447e0e232 7258fdd059
commit
e4e5e844dd
3 changed files with 107 additions and 142 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/main.js
  2. 7
      src/views/lists/form.vue
  3. 239
      src/views/lists/index.vue

3
src/main.js
View File

@ -10,6 +10,7 @@ Vue.use(VueDND)
import VueVideoPlayer from 'vue-video-player'
import 'video.js/dist/video-js.css'
import moment from 'moment'; //导入文件
Vue.use(VueVideoPlayer, /* {
options: global default options,
@ -17,6 +18,8 @@ Vue.use(VueVideoPlayer, /* {
} */)
import Cookies from 'js-cookie'
Vue.prototype.$moment = moment; //赋值使用
Vue.use(Element, {
size: Cookies.get('size') || 'medium', // set element-ui default size
// i18n: (key, value) => i18n.t(key, value)

7
src/views/lists/form.vue
View File

@ -9,7 +9,7 @@
</el-select>
</el-form-item>
<el-form-item label="描述">
<el-input v-model="formInline.distribution" placeholder="描述" />
<el-input v-model="formInline.description" placeholder="描述" />
</el-form-item>
<el-form-item style="padding-left:30px">
<el-button type="primary" @click="onSubmit">查询</el-button>
@ -26,9 +26,10 @@
return {
formInline: {
locationId: '',
distribution: '',
description: '',
},
locationId: ''
locationId: '',
description: '',
}
},
methods: {

239
src/views/lists/index.vue
View File

@ -1,60 +1,72 @@
<template>
<div>
<form-container @submit="submitForm" @resetForm="resetForm"></form-container>
<form-container @submit="submitForm"></form-container>
<div class="table">
<el-table
:data="lists"
style="width: 100%">
<el-table-column
prop="name"
label="场地图片">
<el-table :data="lists" style="width: 100%">
<el-table-column prop="code" label="类型">
<template slot-scope="lists">
<img :src="lists.row.image" width="70" height="70" alt="">
<span v-if="lists.row.code === 'piaochuang'">漂浮窗</span>
<span v-else-if="lists.row.code === 'otherLink'">其他链接</span>
<span v-else>其他</span>
</template>
</el-table-column>
<el-table-column prop="name" label="名称">
<el-table-column prop="startTime" label="开始时间">
<template slot-scope="lists">
<span v-if="lists.row.startTime-0">
{{ $moment(lists.row.startTime-0).format("YYYY-MM-DD HH:mm") }}
</span>
<span v-else>
暂无
</span>
</template>
</el-table-column>
<el-table-column prop="locationName" label="场地地址">
<el-table-column prop="endTime" label="结束时间">
<template slot-scope="lists">
<span v-if="lists.row.endTime-0">
{{ $moment(lists.row.endTime-0).format("YYYY-MM-DD HH:mm") }}
</span>
<span v-else>
暂无
</span>
</template>
</el-table-column>
<el-table-column prop="users" label="分润人数">
<el-table-column prop="description" label="常量值">
<template slot-scope="lists">
<div v-for="(item,index) in getValue(lists.row.value)" :key="index">
<div>{{ item.title }}</div>
<template v-if="Array.isArray(item.value)">
<div v-for="(itemA,indexA) in item.value" :key="indexA">{{ itemA }}</div>
</template>
<template v-else>
<div>{{ item.value }}</div>
</template>
</div>
</template>
</el-table-column>
<el-table-column prop="stateText" label="状态">
<el-table-column prop="description" label="描述">
<template slot-scope="lists">
<span> {{ lists.row.description }} </span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作">
<el-table-column prop="modifyName" label="最后修改人登录名">
<template slot-scope="lists">
<span
type="text"
size="small"
class="option-span"
@click="suspensionOfRelease(lists.row.id,lists.row.enabled)"
>
<span>{{lists.row.enabled==true?"暂停":"发布"}}</span>
</span>
<span
type="text"
size="small"
style="margin: 0 5px;"
class="option-span"
@click="editModal(lists.row.id)"
>
<span>编辑</span>
</span>
<span> {{ lists.row.modifyName }} </span>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination
background
:page-size="params.size"
:page-size="params.pageSize"
layout="prev, pager, next"
:total="count"
:total="dataList.total - 0"
@current-change="currentChange"
>
</el-pagination>
</div>
</div>
<el-dialog
<!-- <el-dialog
width="400px"
:show-close="false"
:visible.sync="isEdit"
@ -64,7 +76,7 @@
<el-button @click="isEdit = false">取消</el-button>
<el-button type="primary" @click="determine('ruleForm')">确定</el-button>
</div>
</el-dialog>
</el-dialog> -->
</div>
</template>
@ -84,10 +96,12 @@
id: '',
isEdit: false,
lists: [],
dataList: {},
params: {
from: 0,
size: pageSize,
locationId: ''
locationId: '',
description: '',
pageNum: 1,
pageSize: 10,
}
}
},
@ -99,33 +113,64 @@
DetailsOfDistribution
},
methods: {
// 搜索查询按钮
submitForm(res) {
this.params = {
...this.params,
locationId: res.locationId,
pageNum: 1,
description: res.description,
locationId: res.locationId,
};
this.getList()
},
resetForm() {
this.params = {
from: 0,
size: pageSize,
locationId: ''
};
this.getList()
},
getList() {
GET_LIST(this.params).then(res => {
console.log('res: ', res);
// res.map((item) => {
// item.stateText = item.enabled ? '生效中' : '失效中';
// item.locationName = item.province + item.city + item.district + item.name;
// return item
// });
// this.lists = res
// 获取数组
async getList() {
await GET_LIST(this.params).then(res => {
const { code,msg,data } = res
if(code === 200) {
this.lists = data.list
this.dataList = data
} else {
Alert(msg)
}
});
},
// 将常量值JSON字符串解析
getValue(value) {
const arr = JSON.parse(value)
let itemList = []
if(Array.isArray(arr)) {
for(let i = 0; i < arr.length; i++) {
const item = arr[i]
for(let key in item) {
if(Array.isArray(item[key])) {
const obj = {
title: key,
value: item[key]
}
itemList.push(obj)
} else {
const obj = {
title: item.content,
value: item.url
}
itemList.push(obj)
break
}
}
}
} else {
for(let key in arr) {
const obj = {
title: key,
value: arr[key]
}
itemList.push(obj)
}
}
console.log('itemList',itemList)
return itemList
},
/**
* 分页
@ -144,90 +189,6 @@
this.id = id;
},
/**
* 状态操作
*/
suspensionOfRelease(id, enabled) {
if (enabled) {
this.PUBLISHED(id)
} else {
this.PAUSEDANDPENDING(id)
}
},
/**
* 已发布
* @constructor
*/
PUBLISHED(id) {
let params = {
id
};
DISABLE_FIELD_LIST(params).then((res) => {
let lists = [];
this.lists.map((item) => {
if (item.id == id) {
item.stateText = '失效中';
item.enabled = false;
}
lists.push(item);
return item;
});
this.lists = lists;
Alert.success("已失效");
});
},
/**
* 已暂停或者待发布
* @constructor
*/
PAUSEDANDPENDING(id) {
let params = {
id
};
ENABLE_FIELD_LIST(params).then((res) => {
let lists = [];
this.lists.map((item) => {
if (item.id == id) {
item.stateText = '生效中';
item.enabled = true;
}
lists.push(item);
return item;
});
this.lists = lists;
Alert.success("已生效");
});
},
determine() {
let that = this;
let child = this.$refs.distribution.lists;
let params = {
id: this.id,
items: child
};
for (let index in child) {
if (!child[index].rate || !child[index].userId) {
Alert.fail("值不能为空");
return false;
}
}
for (let i = 0; i < child.length; i++) {
for (let j = i + 1; j < child.length; j++) {
if (child[i].userId == child[j].userId) {
Alert.fail("分润对象不能一样");
return false;
}
}
}
POST_FIELD_LIST(params).then(res => {
Alert.success("添加成功");
that.isEdit = false;
that.getList();
});
}
}
}
</script>

Write Preview
Loading…
Cancel
Save