🐛 fix数据类型不匹配

This commit is contained in:
不做码农 2023-08-04 20:02:58 +08:00
parent 2ab26786ba
commit a525adc4df
7 changed files with 49 additions and 27 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

@ -1,5 +1,6 @@
<template> <template>
<div class="app-container home"> <div class="app-container home">
<el-alert title="当前Vue2项目已不再更新新内容请升级至Vue3体验更丰富的内容" type="error"> </el-alert>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :sm="24" :lg="24"> <el-col :sm="24" :lg="24">
<blockquote class="text-warning" style="font-size: 14px"> <blockquote class="text-warning" style="font-size: 14px">
@ -72,13 +73,13 @@
<el-col :span="10"> <el-col :span="10">
<h4>后端技术</h4> <h4>后端技术</h4>
<ul> <ul>
<li>NET5</li> <li>NET7</li>
<li>JWT</li> <li>JWT</li>
<li>SqlSugar</li> <li>SqlSugar</li>
<li>Quartz.Net</li> <li>Quartz.Net</li>
<li>MySql</li> <li>MySql</li>
<li>Mapster</li> <li>Mapster</li>
<li>Epplus</li> <li>MiniExcel</li>
<li>Signalr</li> <li>Signalr</li>
<li>...</li> <li>...</li>
</ul> </ul>
@ -100,7 +101,7 @@
</el-row> </el-row>
<el-divider /> <el-divider />
<el-row :gutter="20" class="mt10"> <el-row :gutter="20" class="mt10">
<el-col :sm="24" :lg="8"> <el-col :sm="24" :lg="6">
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>联系信息</span> <span>联系信息</span>
@ -133,12 +134,32 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="10"> <el-col :sm="24" :lg="10">
<!-- <el-card> <el-card>
<div slot="header" class="clearfix"> <template #header>
<span></span> <span>
移动端体验
<span style="color: red">如有需要联系作者</span>
</span>
</template>
<div class="body">
<table style="width: 100%; text-align: center">
<tr>
<td>微信小程序</td>
<td>H5</td>
</tr>
<tr>
<td>
<img src="@/assets/image/qrcode.jpg" alt="donate" style="width: 160px" />
</td>
<td>
<img src="@/assets/image/qrcodeH5.png" alt="donate" style="width: 160px" />
</td>
</tr>
</table>
</div> </div>
</el-card> --> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-divider /> <el-divider />

View File

@ -15,7 +15,8 @@
<div class="user-item-right overflow"> <div class="user-item-right overflow">
<el-row> <el-row>
<el-col :xs="24" :md="24" class="right-title mb20 one-text-overflow"> <el-col :xs="24" :md="24" class="right-title mb20 one-text-overflow">
{{ userInfo.welcomeMessage }}{{ userInfo.nickName }}{{ userInfo.welcomeContent }}</el-col> {{ userInfo.welcomeMessage }}{{ userInfo.nickName }}{{ userInfo.welcomeContent }}</el-col
>
<el-col :xs="24" :sm="24" :md="24"> <el-col :xs="24" :sm="24" :md="24">
<el-col :xs="24" :md="8" class="right-l-v"> <el-col :xs="24" :md="8" class="right-l-v">
<div class="right-label">昵称</div> <div class="right-label">昵称</div>
@ -70,7 +71,7 @@
</el-row> </el-row>
<panel-group @handleSetLineChartData="handleSetLineChartData" /> <panel-group @handleSetLineChartData="handleSetLineChartData" />
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;"> <el-row style="background: #fff; padding: 16px 16px 0; margin-bottom: 32px">
<line-chart :chart-data="lineChartData" /> <line-chart :chart-data="lineChartData" />
</el-row> </el-row>
@ -106,20 +107,20 @@ import { listNewArticle } from '@/api/system/article.js'
const lineChartData = { const lineChartData = {
newVisitis: { newVisitis: {
expectedData: [100, 120, 161, 134, 105, 160, 165], expectedData: [100, 120, 161, 134, 105, 160, 165],
actualData: [120, 82, 91, 154, 162, 140, 145] actualData: [120, 82, 91, 154, 162, 140, 145],
}, },
messages: { messages: {
expectedData: [200, 192, 120, 144, 160, 130, 140], expectedData: [200, 192, 120, 144, 160, 130, 140],
actualData: [180, 160, 151, 106, 145, 150, 130] actualData: [180, 160, 151, 106, 145, 150, 130],
}, },
purchases: { purchases: {
expectedData: [80, 100, 121, 104, 105, 90, 100], expectedData: [80, 100, 121, 104, 105, 90, 100],
actualData: [120, 90, 100, 138, 142, 130, 130] actualData: [120, 90, 100, 138, 142, 130, 130],
}, },
shoppings: { shoppings: {
expectedData: [130, 140, 141, 142, 145, 150, 160], expectedData: [130, 140, 141, 142, 145, 150, 160],
actualData: [120, 82, 91, 154, 162, 140, 130] actualData: [120, 82, 91, 154, 162, 140, 130],
} },
} }
export default { export default {
name: 'Index', name: 'Index',
@ -129,7 +130,7 @@ export default {
RaddarChart, RaddarChart,
PieChart, PieChart,
BarChart, BarChart,
Scroll Scroll,
}, },
computed: { computed: {
photo() { photo() {
@ -150,14 +151,14 @@ export default {
openWatch: true, // dom openWatch: true, // dom
singleHeight: 0, // (0) direction => 0/1 singleHeight: 0, // (0) direction => 0/1
singleWidth: 0, // (0) direction => 2/3 singleWidth: 0, // (0) direction => 2/3
waitTime: 1000 // (1000ms) waitTime: 1000, // (1000ms)
} }
} },
}, },
data() { data() {
return { return {
lineChartData: lineChartData.newVisitis, lineChartData: lineChartData.newVisitis,
newArticleList: [] newArticleList: [],
} }
}, },
created() { created() {
@ -169,8 +170,8 @@ export default {
handleSetLineChartData(type) { handleSetLineChartData(type) {
this.lineChartData = lineChartData[type] this.lineChartData = lineChartData[type]
}, },
onOpenGitee() {} onOpenGitee() {},
} },
} }
</script> </script>

View File

@ -219,7 +219,7 @@ export default {
leader: undefined, leader: undefined,
phone: undefined, phone: undefined,
email: undefined, email: undefined,
status: '0', status: 0,
} }
this.resetForm('form') this.resetForm('form')
}, },

View File

@ -330,7 +330,7 @@ export default {
}, },
// //
handleStatusChange(row) { handleStatusChange(row) {
const text = row.status === '0' ? '启用' : '停用' const text = row.status == 0 ? '启用' : '停用'
console.log(JSON.stringify(row), text) console.log(JSON.stringify(row), text)
this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', { this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', {
@ -345,7 +345,7 @@ export default {
this.msgSuccess(text + '成功') this.msgSuccess(text + '成功')
}) })
.catch(function () { .catch(function () {
row.status = row.status === '0' ? '1' : '0' row.status = row.status == 0 ? 1 : 0
}) })
}, },
// //

View File

@ -51,7 +51,7 @@
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px"> <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
<el-option label="全部" :value="-1" /> <el-option label="全部" :value="-1" />
<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" /> <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
@ -418,7 +418,7 @@ export default {
}, },
// //
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === '0' ? '启用' : '停用' let text = row.status == 0 ? '启用' : '停用'
this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', '警告', { this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -431,7 +431,7 @@ export default {
this.msgSuccess(text + '成功') this.msgSuccess(text + '成功')
}) })
.catch(function () { .catch(function () {
row.status = row.status === '0' ? '1' : '0' row.status = row.status == 0 ? 1 : 0
}) })
}, },
// //