页面问题修改
This commit is contained in:
parent
d40d76d5b9
commit
3d5003c927
|
|
@ -302,9 +302,9 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
canteenName: undefined,
|
||||
areaNameStr: undefined,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
deviceNetworkState: null
|
||||
},
|
||||
activeName:"1",
|
||||
// 表单参数
|
||||
|
|
@ -387,13 +387,19 @@ export default {
|
|||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
deviceNetworkState: null
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
handleTabClick(tab, event) {
|
||||
console.log(tab.name,tab.label)
|
||||
|
|
|
|||
|
|
@ -159,8 +159,7 @@ export default {
|
|||
pageSize: 10,
|
||||
areaId: undefined,
|
||||
canteenId: undefined,
|
||||
},
|
||||
|
||||
},
|
||||
activeName:"1",
|
||||
// 表单参数
|
||||
form: {},
|
||||
|
|
@ -207,6 +206,12 @@ export default {
|
|||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.canteenOptions= []
|
||||
this.queryParams={
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
areaId: undefined,
|
||||
canteenId: undefined,
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -81,9 +81,9 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
deviceType: undefined,
|
||||
keyWord: undefined
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
deviceType: null
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -111,6 +111,12 @@ export default {
|
|||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
deviceType: null
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -85,7 +85,10 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
pageSize: 10,
|
||||
searchValue:undefined,
|
||||
deviceType5:undefined,
|
||||
deviceType6:undefined,
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -106,6 +109,13 @@ export default {
|
|||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this. queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue:undefined,
|
||||
deviceType5:undefined,
|
||||
deviceType6:undefined,
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -86,9 +86,9 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
canteenName: undefined,
|
||||
areaNameStr: undefined,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
envSensorResultTypeList: [],
|
||||
},
|
||||
dialogVisible:false,//图片弹窗
|
||||
dialogImageUrl:"",//图片弹窗
|
||||
|
|
@ -105,8 +105,14 @@ export default {
|
|||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
envSensorResultTypeList: [],
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
/** 查询列表 */
|
||||
getList() {
|
||||
|
|
|
|||
|
|
@ -140,9 +140,13 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
canteenName: undefined,
|
||||
areaNameStr: undefined,
|
||||
pageSize: 10, //
|
||||
searchValue: undefined,
|
||||
canteenId: undefined,
|
||||
stallId: undefined,
|
||||
weightStandard: undefined,
|
||||
durationStandard: undefined,
|
||||
saveStatus: undefined
|
||||
},
|
||||
activeName:"1",
|
||||
dialogVisible:false,//图片弹窗
|
||||
|
|
@ -178,6 +182,16 @@ export default {
|
|||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.queryParams={
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
canteenId: undefined,
|
||||
stallId: undefined,
|
||||
weightStandard: undefined,
|
||||
durationStandard: undefined,
|
||||
saveStatus: undefined
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -78,9 +78,10 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
canteenName: undefined,
|
||||
areaNameStr: undefined,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
staffName: undefined,
|
||||
actionType: undefined
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -94,7 +95,14 @@ export default {
|
|||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
resetQuery() {
|
||||
this.queryParams={
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
staffName: undefined,
|
||||
actionType: undefined
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -92,7 +92,10 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
pageSize: 10,
|
||||
searchValue:undefined,
|
||||
postName:undefined,
|
||||
checkStatus:undefined
|
||||
},
|
||||
dialogVisible:false,//图片弹窗
|
||||
dialogImageUrl:"",//图片弹窗
|
||||
|
|
@ -116,6 +119,13 @@ export default {
|
|||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.queryParams={
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue:undefined,
|
||||
postName:undefined,
|
||||
checkStatus:undefined
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -723,13 +723,13 @@ export default {
|
|||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
sex: undefined,
|
||||
postName: undefined,
|
||||
faceState: undefined,
|
||||
healthCertStatus: undefined,
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
sex: undefined,
|
||||
postName: undefined,
|
||||
faceState: undefined,
|
||||
healthCertStatus: undefined,
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="关键字" prop="searchValue">
|
||||
<el-input v-model="queryParams.searchValue" placeholder="请输入员工姓名,编号" maxlength="20" clearable style="width: 240px"/>
|
||||
</el-form-item>
|
||||
</el-form-item>
|
||||
<el-form-item label="违规内容" prop="alarmType">
|
||||
<el-select v-model="queryParams.alarmType" style="width: 240px" clearable>
|
||||
<el-option label="未戴口罩" value="1"></el-option>
|
||||
|
|
@ -87,9 +87,9 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
canteenName: undefined,
|
||||
areaNameStr: undefined,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
alarmType: undefined,
|
||||
},
|
||||
dialogVisible:false,//图片弹窗
|
||||
dialogImageUrl:"",//图片弹窗
|
||||
|
|
@ -106,8 +106,14 @@ export default {
|
|||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
searchValue: undefined,
|
||||
alarmType: undefined,
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
/** 查询列表 */
|
||||
getList() {
|
||||
|
|
|
|||
|
|
@ -97,8 +97,7 @@ export default {
|
|||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
canteenName: undefined,
|
||||
areaNameStr: undefined,
|
||||
mealtimeType: undefined
|
||||
},
|
||||
dateRange:[],
|
||||
pickerOptions: {
|
||||
|
|
@ -144,6 +143,11 @@ export default {
|
|||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.dateRange=[]
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
mealtimeType: undefined
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -276,8 +276,7 @@ export default {
|
|||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
canteenName: undefined,
|
||||
areaNameStr: undefined,
|
||||
mealtimeType: undefined
|
||||
},
|
||||
dateRange:[],
|
||||
pickerOptions: {
|
||||
|
|
@ -393,6 +392,11 @@ export default {
|
|||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.dateRange=[]
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
mealtimeType: undefined
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -180,6 +180,11 @@ export default {
|
|||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.dateRange=[]
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
mealtimeType: undefined
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ import { decrypt, encrypt } from '@/utils/jsencrypt'
|
|||
import dingding from '@/assets/images/dingding.svg'
|
||||
import wx from '@/assets/images/wx.svg'
|
||||
import qq from '@/assets/images/QQ.svg'
|
||||
|
||||
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
|
||||
export default {
|
||||
name: 'Login',
|
||||
data() {
|
||||
|
|
@ -282,8 +282,13 @@ export default {
|
|||
})
|
||||
},
|
||||
IsAdmin() {
|
||||
this.loginForm.loginMethod = this.loginMethod
|
||||
this.$store.dispatch('IsAdmin', this.loginForm).then(res => {
|
||||
this.loginForm.loginMethod = this.loginMethod;
|
||||
let param = {
|
||||
...this.loginForm
|
||||
}
|
||||
param.username = encryptWithSM4(this.loginForm.username)
|
||||
param.password = encryptWithSM4(this.loginForm.password)
|
||||
this.$store.dispatch('IsAdmin', param).then(res => {
|
||||
if (res.data) {
|
||||
this.isAdmin = res.data
|
||||
this.$message.success('检测到您是超级管理账号,需进行手机检验')
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ module.exports = {
|
|||
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
||||
[process.env.VUE_APP_BASE_API]: {
|
||||
// target: `http://192.168.2.75:48380`,//旭
|
||||
// target: `http://192.168.0.244:48380`,//测试
|
||||
target: `http://192.168.0.176:48380`,//刘鑫
|
||||
target: `http://192.168.0.244:48380`,//测试
|
||||
// target: `http://192.168.0.176:48380`,//刘鑫
|
||||
// target: `http://192.168.0.44:48380`,//测试
|
||||
// target: `http://192.168.0.176:48380`,//
|
||||
changeOrigin: true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue