Skip to content

Commit

Permalink
6/1
Browse files Browse the repository at this point in the history
  • Loading branch information
VCCICCV committed Jun 1, 2023
1 parent 0e74a99 commit a3e57ff
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 86 deletions.
28 changes: 28 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"dependencies": {
"axios": "^1.3.5",
"core-js": "^3.8.3",
"echarts": "^5.4.2",
"element-ui": "^2.15.13",
"js-cookie": "^3.0.1",
"node": "^19.8.1",
Expand Down
35 changes: 20 additions & 15 deletions src/views/borrow/Add.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="图书名称" prop="name">
<el-form-item label="图书名称" prop="bookName">
<el-input v-model="form.bookName" placeholder="图书名称" disabled></el-input>
</el-form-item>
<el-form-item label="所需积分" prop="score">
Expand All @@ -20,7 +20,7 @@
:value="item.username"></el-option>
</el-select>
</el-form-item>
<el-form-item label="用户名" prop="username">
<el-form-item label="用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名" disabled></el-input>
</el-form-item>
<el-form-item label="用户联系方式" prop="userPhone">
Expand All @@ -46,7 +46,7 @@ export default {
data() {
return {
admin: Cookies.get('admin') ? JSON.parse(Cookies.get('admin')) : {},
form: { days: 1 },
form: {},
books: [],
users: [],
rules: {
Expand All @@ -64,7 +64,8 @@ export default {
this.books = res.data
})
request.get('/user/list').then(res => {
this.users = res.data.filter(v => v.status)
this.users = res.data
// .filter(v => v.status)
})
},
methods: {
Expand All @@ -77,7 +78,7 @@ export default {
save() {
this.$refs["ruleForm"].validate((valid) => {
if (valid) {
request.post("/book/save", this.form).then((res) => {
request.post("/borrow/save", this.form).then((res) => {
if (res.code === "200") {
this.$notify.success("新增成功");
this.$refs["ruleForm"].resetFields();
Expand All @@ -93,20 +94,24 @@ export default {
},
selBook() {
const book = this.books.find(v => v.bookNo === this.form.bookNo)
request.get('/book/' + book.id).then(res => {
this.$set(this.form, 'bookName', res.data.name)
this.form.score = res.data.score
this.form.nums = res.data.nums
})
// request.get('/book/' + book.id).then(res => {
this.form.bookName = book.name
this.form.score = book.score
// this.$set(this.form, 'bookName', res.data.name)
// this.form.score = res.data.score
// this.form.nums = res.data.nums
// })
},
selUser() {
const user = this.users.find(v => v.username === this.form.userNo)
request.get('/user/' + user.id).then(res => {
this.$set(this.form, 'username', res.data.name)
this.form.userName = res.data.name
this.form.userPhone = res.data.phone
// request.get('/user/' + user.id).then(res => {
// this.$set(this.form, 'username', res.data.name)
this.form.userName = user.name
this.form.userPhone = user.phone
// this.form.userName = res.data.name
// this.form.userPhone = res.data.phone
// this.form.account = res.data.account
})
// })
},
},
Expand Down
13 changes: 7 additions & 6 deletions src/views/borrow/Edit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<el-form-item label="用户联系方式" prop="userPhone">
<el-input disabled v-model="form.userPhone"></el-input>
</el-form-item>
<el-form-item label="用户账户积分" prop="account">
<!-- <el-form-item label="用户账户积分" prop="account">
<el-input disabled v-model="form.account"></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="借出的天数" prop="days">
<el-input-number v-model="form.days" :min="1" :max="30" label="借出的天数"></el-input-number>
</el-form-item>
Expand All @@ -53,6 +53,7 @@ export default {
return {
admin: Cookies.get('admin') ? JSON.parse(Cookies.get('admin')) : {},
form: {},
users,
books: [],
rules: {
bookNo: [
Expand Down Expand Up @@ -91,19 +92,19 @@ export default {
},
selBook() {
const book = this.books.find(v => v.bookNo === this.form.bookNo)
request.get('/book/' + book.id).then(res => {
// request.get('/book/' + book.id).then(res => {
this.form.bookName = res.data.name
this.form.score = res.data.score
this.form.nums = res.data.nums
})
// })
},
selUser() {
const user = this.users.find(v => v.username === this.form.userNo)
request.get('/user/' + user.id).then(res => {
// request.get('/user/' + user.id).then(res => {
this.form.userName = res.data.name
this.form.userPhone = res.data.phone
this.form.account = res.data.account
})
// })
}
}
}
Expand Down
142 changes: 77 additions & 65 deletions src/views/home/HomeView.vue
Original file line number Diff line number Diff line change
@@ -1,85 +1,97 @@
<template>
<div>
<div>主页</div>
<!-- 搜索表单
<div style="margin-bottom: 1%">
<el-input style="width: 240px" placeholder="请输入" v-model="params.name"></el-input>
<el-input style="width: 240px;margin-left: 1%;" placeholder="请输入联系方式" v-model="params.phone"></el-input>
<el-button style="margin-left: 1%" type="primary" @click="load"><i class="el-icon-search"></i>搜索</el-button>
<el-button style="margin-left: 1%" type="warning" @click="reset"><i class="el-icon-refresh"></i>重置</el-button>
</div>
<el-table :data="tableData" stripe>
<el-table-column prop="name" lable="name"></el-table-column>
<el-table-column prop="age" lable="年龄"></el-table-column>
<el-table-column prop="address" lable="地址"></el-table-column>
<el-table-column prop="phone" lable="电话"></el-table-column>
<el-table-column prop="sex" lable="性别"></el-table-column>
</el-table> -->
<!-- 分页 -->
<!-- <div style="margin-top: 2%">
<el-pagination background
:page-size="params.pageSize"
:current-page="params.pageNum"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
</el-pagination>
</div> -->
<el-card>
<div id="line" style="width:100%;height: 400px;"></div>
</el-card>
</div>
</template>

<script>
// @ is an alias to /src
import * as echarts from 'echarts';
import request from '@/utils/request';
export default {
name: "HomeView",
components: {
// HelloWorld
},
data() {
return {
tableData: [],
total: 0,
params: {
pageNum: 1,
pageSize: 10,
name: '',
phone: ''
}
};
data(){
return{
lineBox:null,
timeRange:'week',
options:[
{label:'最近一周',value:'week'},
{label:'最近一个月',value:'month'},
{label:'最近两个月',value:'month2'},
{label:'最近三个月',value:'month3'},
]
}
},
created() {
// 初始化完后执行
mounted(){
this.load()
},
methods: {
load() {
// fetch('http://localhost:9090/user/list').then(res => res.json()).then(res => {
// console.log(res)
// this.tableData = res
// })
request.get('/user/page',{
params: this.params
}).then(res => {
if (res.code === '200') {
this.tableData = res.data.list
this.total = res.data.total
}
})
},
reset() {
this.params = {
pageNum: 1,
pageSize: 10,
name: '',
phone: ''
methods:{
load(){
if(!this.lineBox0){
this.lineBox = echarts.init(document.getElementById('line'))//初始化容器
}
this.load()
//从后台获取数据
request.get('/borrow.lineCharts/'+this,timeRange).then(res =>{
option.xAxis[0].data = res.data.borrow
option.series[1].data = res.data.return
this.lineBox.setOption(option)//设置容器属性值
})
}
}
};
option = {
title: {
text: '借还书'
},
tooltip: {
trigger: 'axis'
},
legend: {
data: ['借书', '还书']
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
toolbox: {
feature: {
saveAsImage: {}
}
},
xAxis: {
type: '日期',
boundaryGap: false,
data: []
},
yAxis: {
type: 'value'
},
series: [
{
name: '借书数量',
type: 'line',
stack: 'Total',
smooth:true,
data: []
},
handleCurrentChange(pageNum) {
// 点击分页
this.params.pageNum = pageNum
this.load()
{
name: '还数数量',
type: 'line',
stack: 'Total',
smooth:true,
data: []
},
}
]
};
</script>

0 comments on commit a3e57ff

Please sign in to comment.