Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!168 打卡接口sql优化

Browse Source 
Merge pull request !168 from 德仔/xzj
This commit is contained in:
德仔
2021-03-24 19:04:33 +08:00
committed by Gitee
parent 7cd539e8a4 63ab5bdc85
commit 0546388916
7 changed files with 461 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stdiet-ui/src/components/PhysicalSignsDialog/index.vue
View File

@ -785,7 +785,8 @@ export default {
})
.then((response) => {
if (response.code == 200 && response.path != null) {
this.download(response.path);
//文件路径、获取下载文件名称
this.download(response.path, response.downReportFileName);
}
})
.catch(function () {});

4
stdiet-ui/src/utils/ruoyi.js
View File

@ -98,8 +98,8 @@ export function selectDictLabels(datas, value, separator) {
}
// 通用下载方法（导出Excel,下载之后删除）
export function download(fileName) {
window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
export function download(fileName, downFileName) {
window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true + "&downFileName=" + (downFileName != undefined ? encodeURI(downFileName) : "");
}
// 通用下载本地资源方法

712
stdiet-ui/src/views/custom/wxUserLog/index.vue
View File

@ -1,8 +1,19 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="微信应用" prop="appid">
<el-select v-model="queryParams.appid" placeholder="请选择微信应用" clearable size="small">
<el-select
v-model="queryParams.appid"
placeholder="请选择微信应用"
clearable
size="small"
>
<el-option
v-for="dict in appidOptions"
:key="dict.dictValue"
@ -20,9 +31,27 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="营养师" prop="nutritionistId">
<el-select v-model="queryParams.nutritionistId" clearable filterable placeholder="请选择">
<el-option
v-for="dict in nutritionistIdOptions.slice(1)"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="cyan"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
@ -37,84 +66,139 @@
>新增
</el-button>
</el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['custom:wxUserLog:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['custom:wxUserLog:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['custom:wxUserLog:export']"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['custom:wxUserLog:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['custom:wxUserLog:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['custom:wxUserLog:export']"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="wxUserLogList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="wxUserLogList"
@selection-change="handleSelectionChange"
>
<el-table-column label="用户头像" align="center" prop="avatarUrl">
<template slot-scope="scope">
<el-image :src="scope.row.avatarUrl" style="width: 32px; height: 32px; border-radius: 50%"/>
<el-image
:src="scope.row.avatarUrl"
style="width: 32px; height: 32px; border-radius: 50%"
/>
</template>
</el-table-column>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="微信openid" align="center" prop="openid" />-->
<el-table-column label="当天体重" align="center" prop="weight">
<template slot-scope="scope">
<span>{{`${scope.row.weight} 斤` }}</span>
<span>{{ `${scope.row.weight} 斤` }}</span>
</template>
</el-table-column>
<el-table-column label="微信应用" align="center" prop="appid" width="120" :formatter="appidFormat"/>
<el-table-column label="姓名" align="center" prop="customerName"/>
<el-table-column
label="微信应用"
align="center"
prop="appid"
width="120"
:formatter="appidFormat"
/>
<el-table-column label="姓名" align="center" prop="customerName" />
<el-table-column label="手机号" align="center" prop="phone" width="180"/>
<el-table-column label="营养师" align="center" prop="nutritionist"/>
<el-table-column label="打卡日期" align="center" prop="logTime" width="120">
<el-table-column label="手机号" align="center" prop="phone" width="180" />
<el-table-column label="营养师" align="center" prop="nutritionist" />
<el-table-column
label="打卡日期"
align="center"
prop="logTime"
width="120"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.logTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.logTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="睡觉时间" align="center" prop="sleepTime" width="120">
<el-table-column
label="睡觉时间"
align="center"
prop="sleepTime"
width="120"
>
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.sleepTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="起床时间" align="center" prop="wakeupTime" width="120">
<el-table-column
label="起床时间"
align="center"
prop="wakeupTime"
width="120"
>
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.wakeupTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="运动锻炼" align="center" prop="sport" :formatter="sportFormat"/>
<el-table-column label="按食谱" align="center" prop="diet" :formatter="dietFormat"/>
<el-table-column label="熬夜失眠" align="center" prop="insomnia" :formatter="insomniaFormat"/>
<el-table-column label="起床排便" align="center" prop="defecation" :formatter="defecationFormat"/>
<el-table-column
label="运动锻炼"
align="center"
prop="sport"
:formatter="sportFormat"
/>
<el-table-column
label="按食谱"
align="center"
prop="diet"
:formatter="dietFormat"
/>
<el-table-column
label="熬夜失眠"
align="center"
prop="insomnia"
:formatter="insomniaFormat"
/>
<el-table-column
label="起床排便"
align="center"
prop="defecation"
:formatter="defecationFormat"
/>
<el-table-column label="饮水量" align="center" prop="water">
<template slot-scope="scope">
<span>{{`${scope.row.water} ml`}}</span>
<span>{{ `${scope.row.water} ml` }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
@ -122,7 +206,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['custom:wxUserLog:edit']"
>修改
>修改
</el-button>
<el-button
size="mini"
@ -130,14 +214,14 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['custom:wxUserLog:remove']"
>删除
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -150,44 +234,56 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="12">
<el-form-item label="体重" prop="weight">
<el-input v-model="form.weight" placeholder="请输入体重"/>
<el-input v-model="form.weight" placeholder="请输入体重" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="打卡日期" prop="logTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.logTime"
type="date"
value-format="yyyy-MM-dd"
:picker-options="logTimePickerOptions"
placeholder="选择睡觉时间">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.logTime"
type="date"
value-format="yyyy-MM-dd"
:picker-options="logTimePickerOptions"
placeholder="选择睡觉时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="睡觉时间" prop="sleepTime">
<el-time-select clearable size="small" style="width: 200px"
v-model="form.sleepTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45'
}"
placeholder="选择睡觉时间">
<el-time-select
clearable
size="small"
style="width: 200px"
v-model="form.sleepTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45',
}"
placeholder="选择睡觉时间"
>
</el-time-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起床时间" prop="wakeupTime">
<el-time-select clearable size="small" style="width: 200px"
v-model="form.wakeupTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45'
}"
placeholder="选择睡觉时间">
<el-time-select
clearable
size="small"
style="width: 200px"
v-model="form.wakeupTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45',
}"
placeholder="选择睡觉时间"
>
</el-time-select>
</el-form-item>
</el-col>
@ -241,13 +337,17 @@
</el-col>
<el-col>
<el-form-item label="饮水量" prop="water">
<el-input v-model="form.water" placeholder="请输入饮水量"/>
<el-input v-model="form.water" placeholder="请输入饮水量" />
</el-form-item>
</el-col>
<el-col>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-form>
@ -261,231 +361,251 @@
</template>
<script>
import {
addWxUserLog,
delWxUserLog,
exportWxUserLog,
getWxUserLog,
listWxUserLog,
updateWxUserLog
} from "@/api/custom/wxUserLog";
import {
addWxUserLog,
delWxUserLog,
exportWxUserLog,
getWxUserLog,
listWxUserLog,
updateWxUserLog,
} from "@/api/custom/wxUserLog";
import { mapGetters } from "vuex";
export default {
name: "WxUserLog",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 微信用户记录表格数据
wxUserLogList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 微信appid字典
appidOptions: [],
// 运动情况字典
sportOptions: [],
// 饮食情况字典
dietOptions: [],
// 熬夜失眠字典
insomniaOptions: [],
// 排便情况字典
defecationOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
appid: null,
phone: null,
},
// 表单参数
form: {},
// 表单校验
rules: {},
logTimePickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
export default {
name: "WxUserLog",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 微信用户记录表格数据
wxUserLogList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 微信appid字典
appidOptions: [],
// 运动情况字典
sportOptions: [],
// 饮食情况字典
dietOptions: [],
// 熬夜失眠字典
insomniaOptions: [],
// 排便情况字典
defecationOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
appid: null,
phone: null,
nutritionistId: null
},
// 表单参数
form: {},
// 表单校验
rules: {},
logTimePickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
};
},
created() {
this.getList();
this.getDicts("cus_wx_app").then((response) => {
this.appidOptions = response.data;
});
this.getDicts("sys_yes_no").then((response) => {
this.sportOptions = response.data;
});
this.getDicts("sys_yes_no").then((response) => {
this.dietOptions = response.data;
});
this.getDicts("sys_yes_no").then((response) => {
this.insomniaOptions = response.data;
});
this.getDicts("sys_yes_no").then((response) => {
this.defecationOptions = response.data;
});
},
computed: {
...mapGetters([
// 售后字典
"afterSaleIdOptions",
// 主营养师字典
"nutritionistIdOptions"
]),
},
methods: {
/** 查询微信用户记录列表 */
getList() {
this.loading = true;
listWxUserLog(this.queryParams).then((response) => {
this.wxUserLogList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 微信appid字典翻译
appidFormat(row, column) {
return this.selectDictLabel(this.appidOptions, row.appid);
},
// 运动情况字典翻译
sportFormat(row, column) {
return this.selectDictLabel(this.sportOptions, row.sport);
},
// 饮食情况字典翻译
dietFormat(row, column) {
return this.selectDictLabel(this.dietOptions, row.diet);
},
// 熬夜失眠字典翻译
insomniaFormat(row, column) {
return this.selectDictLabel(this.insomniaOptions, row.insomnia);
},
// 排便情况字典翻译
defecationFormat(row, column) {
return this.selectDictLabel(this.defecationOptions, row.defecation);
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
const defaultAppidType = this.appidOptions.find(
(opt) => opt.remark === "default"
);
this.form = {
id: null,
openid: null,
weight: null,
appid: defaultAppidType ? defaultAppidType.dictValue : null,
phone: null,
sleepTime: null,
wakeupTime: null,
sport: null,
avatarUrl: null,
diet: null,
insomnia: null,
defecation: null,
water: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null,
logTime: null,
};
this.resetForm("form");
},
created() {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.getDicts("cus_wx_app").then(response => {
this.appidOptions = response.data;
});
this.getDicts("sys_yes_no").then(response => {
this.sportOptions = response.data;
});
this.getDicts("sys_yes_no").then(response => {
this.dietOptions = response.data;
});
this.getDicts("sys_yes_no").then(response => {
this.insomniaOptions = response.data;
});
this.getDicts("sys_yes_no").then(response => {
this.defecationOptions = response.data;
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.openid);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加微信用户记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getWxUserLog(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改微信用户记录";
});
},
methods: {
/** 查询微信用户记录列表 */
getList() {
this.loading = true;
listWxUserLog(this.queryParams).then(response => {
this.wxUserLogList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 微信appid字典翻译
appidFormat(row, column) {
return this.selectDictLabel(this.appidOptions, row.appid);
},
// 运动情况字典翻译
sportFormat(row, column) {
return this.selectDictLabel(this.sportOptions, row.sport);
},
// 饮食情况字典翻译
dietFormat(row, column) {
return this.selectDictLabel(this.dietOptions, row.diet);
},
// 熬夜失眠字典翻译
insomniaFormat(row, column) {
return this.selectDictLabel(this.insomniaOptions, row.insomnia);
},
// 排便情况字典翻译
defecationFormat(row, column) {
return this.selectDictLabel(this.defecationOptions, row.defecation);
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
const defaultAppidType = this.appidOptions.find(opt => opt.remark === 'default');
this.form = {
id: null,
openid: null,
weight: null,
appid: defaultAppidType ? defaultAppidType.dictValue : null,
phone: null,
sleepTime: null,
wakeupTime: null,
sport: null,
avatarUrl: null,
diet: null,
insomnia: null,
defecation: null,
water: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null,
logTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.openid)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加微信用户记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getWxUserLog(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改微信用户记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
// console.log(this.form)
if (this.form.id != null) {
updateWxUserLog(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addWxUserLog(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
// console.log(this.form)
if (this.form.id != null) {
updateWxUserLog(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addWxUserLog(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除微信用户记录编号为"' + ids + '"的数据项?', "警告", {
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除微信用户记录编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function () {
type: "warning",
}
)
.then(function () {
return delWxUserLog(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function () {
});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有微信用户记录数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function () {
})
.catch(function () {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有微信用户记录数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return exportWxUserLog(queryParams);
}).then(response => {
})
.then((response) => {
this.download(response.msg);
}).catch(function () {
});
}
}
};
})
.catch(function () {});
},
},
};
</script>