From 3d5003c927ae5905747faa2d47940d49383ce2a3 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 28 Jul 2025 09:54:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devicesManage/deviesInfo/index.vue | 20 ++++++++++++------- .../devicesManage/deviesPlace/index.vue | 9 +++++++-- .../devicesManage/deviesRecord/index.vue | 12 ++++++++--- .../kitchen/environment/alarmRecord/index.vue | 12 ++++++++++- .../environment/environmentMonitor/index.vue | 16 ++++++++++----- .../kitchen/foodSafety/sampleManage/index.vue | 20 ++++++++++++++++--- .../kitchen/foodSafety/sampleRecord/index.vue | 16 +++++++++++---- .../staffManage/morningCheck/index.vue | 12 ++++++++++- src/views/kitchen/staffManage/staff/index.vue | 14 ++++++------- .../kitchen/staffManage/violation/index.vue | 18 +++++++++++------ .../wasteManage/wasteDetails/index.vue | 8 ++++++-- .../wasteManage/wasteGarbage/index.vue | 8 ++++++-- .../wasteManage/wasteSummary/index.vue | 5 +++++ src/views/login1.vue | 11 +++++++--- vue.config.js | 4 ++-- 15 files changed, 137 insertions(+), 48 deletions(-) diff --git a/src/views/kitchen/devicesManage/deviesInfo/index.vue b/src/views/kitchen/devicesManage/deviesInfo/index.vue index fbfae03a..20053042 100644 --- a/src/views/kitchen/devicesManage/deviesInfo/index.vue +++ b/src/views/kitchen/devicesManage/deviesInfo/index.vue @@ -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) diff --git a/src/views/kitchen/devicesManage/deviesPlace/index.vue b/src/views/kitchen/devicesManage/deviesPlace/index.vue index 6d5c16ca..b80bfb05 100644 --- a/src/views/kitchen/devicesManage/deviesPlace/index.vue +++ b/src/views/kitchen/devicesManage/deviesPlace/index.vue @@ -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(); }, diff --git a/src/views/kitchen/devicesManage/deviesRecord/index.vue b/src/views/kitchen/devicesManage/deviesRecord/index.vue index 954323ce..62dadaf6 100644 --- a/src/views/kitchen/devicesManage/deviesRecord/index.vue +++ b/src/views/kitchen/devicesManage/deviesRecord/index.vue @@ -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(); }, diff --git a/src/views/kitchen/environment/alarmRecord/index.vue b/src/views/kitchen/environment/alarmRecord/index.vue index 7e0b3148..32c59aec 100644 --- a/src/views/kitchen/environment/alarmRecord/index.vue +++ b/src/views/kitchen/environment/alarmRecord/index.vue @@ -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(); }, diff --git a/src/views/kitchen/environment/environmentMonitor/index.vue b/src/views/kitchen/environment/environmentMonitor/index.vue index 7d5a51a7..62e8ff86 100644 --- a/src/views/kitchen/environment/environmentMonitor/index.vue +++ b/src/views/kitchen/environment/environmentMonitor/index.vue @@ -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() { diff --git a/src/views/kitchen/foodSafety/sampleManage/index.vue b/src/views/kitchen/foodSafety/sampleManage/index.vue index 8ac26f90..d6cecdef 100644 --- a/src/views/kitchen/foodSafety/sampleManage/index.vue +++ b/src/views/kitchen/foodSafety/sampleManage/index.vue @@ -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(); }, diff --git a/src/views/kitchen/foodSafety/sampleRecord/index.vue b/src/views/kitchen/foodSafety/sampleRecord/index.vue index 78f8a1f7..2931871e 100644 --- a/src/views/kitchen/foodSafety/sampleRecord/index.vue +++ b/src/views/kitchen/foodSafety/sampleRecord/index.vue @@ -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(); }, diff --git a/src/views/kitchen/staffManage/morningCheck/index.vue b/src/views/kitchen/staffManage/morningCheck/index.vue index 6a28d12a..e75bc561 100644 --- a/src/views/kitchen/staffManage/morningCheck/index.vue +++ b/src/views/kitchen/staffManage/morningCheck/index.vue @@ -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(); }, diff --git a/src/views/kitchen/staffManage/staff/index.vue b/src/views/kitchen/staffManage/staff/index.vue index 6adce5dc..98a09fde 100644 --- a/src/views/kitchen/staffManage/staff/index.vue +++ b/src/views/kitchen/staffManage/staff/index.vue @@ -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(); diff --git a/src/views/kitchen/staffManage/violation/index.vue b/src/views/kitchen/staffManage/violation/index.vue index 4041e92b..0f4f2c01 100644 --- a/src/views/kitchen/staffManage/violation/index.vue +++ b/src/views/kitchen/staffManage/violation/index.vue @@ -3,7 +3,7 @@ - + @@ -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() { diff --git a/src/views/kitchen/wasteManage/wasteDetails/index.vue b/src/views/kitchen/wasteManage/wasteDetails/index.vue index 73553296..2fa58dcf 100644 --- a/src/views/kitchen/wasteManage/wasteDetails/index.vue +++ b/src/views/kitchen/wasteManage/wasteDetails/index.vue @@ -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(); }, diff --git a/src/views/kitchen/wasteManage/wasteGarbage/index.vue b/src/views/kitchen/wasteManage/wasteGarbage/index.vue index f947c1f3..b772ce40 100644 --- a/src/views/kitchen/wasteManage/wasteGarbage/index.vue +++ b/src/views/kitchen/wasteManage/wasteGarbage/index.vue @@ -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(); }, diff --git a/src/views/kitchen/wasteManage/wasteSummary/index.vue b/src/views/kitchen/wasteManage/wasteSummary/index.vue index c7aa6762..c965a583 100644 --- a/src/views/kitchen/wasteManage/wasteSummary/index.vue +++ b/src/views/kitchen/wasteManage/wasteSummary/index.vue @@ -180,6 +180,11 @@ export default { /** 重置按钮操作 */ resetQuery() { this.dateRange=[] + this.queryParams = { + pageNum: 1, + pageSize: 10, + mealtimeType: undefined + } this.resetForm("queryForm"); this.handleQuery(); }, diff --git a/src/views/login1.vue b/src/views/login1.vue index 879a6736..0a0cc0aa 100644 --- a/src/views/login1.vue +++ b/src/views/login1.vue @@ -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('检测到您是超级管理账号,需进行手机检验') diff --git a/vue.config.js b/vue.config.js index 3ceb2128..d7c3df52 100644 --- a/vue.config.js +++ b/vue.config.js @@ -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,