From e764e8a9455c3a692f0f5d07baada245cc261b13 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Fri, 6 Sep 2024 14:24:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/corpInfo/user/components/edit.vue | 2 +-
src/views/corpInfo/user/components/list.vue | 6 +++---
src/views/corpInfo/userCenter/components/list.vue | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index 7240fca..21765ab 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@@ -812,7 +812,7 @@ export default {
DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
NATION: [{ required: false, trigger: 'blur' }],
- SEX: [{ required: false, trigger: 'blur' }],
+ SEX: [{ required: false, trigger: 'blur' }], // / dsfsdfsd
POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue
index 5cf7dbb..de867a0 100644
--- a/src/views/corpInfo/user/components/list.vue
+++ b/src/views/corpInfo/user/components/list.vue
@@ -50,9 +50,9 @@
-
-
-
+
+
+
导出
diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue
index 5902be6..7a22021 100644
--- a/src/views/corpInfo/userCenter/components/list.vue
+++ b/src/views/corpInfo/userCenter/components/list.vue
@@ -48,10 +48,10 @@
一键密码重置
-
-
-
-
+
+
+
+
导出
From 60591eab2162253b44d5a2ca9f10a1f4ded3e43e Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 19 Sep 2024 17:20:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?`1.=E7=82=B9=E4=BD=8D=E4=BA=8C=E7=BB=B4?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
.../firefighting/points/components/list.vue | 44 ++++---------------
2 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/package.json b/package.json
index bd4efad..c5fb700 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"author": "",
"private": true,
"scripts": {
- "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.0.90",
+ "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.151.75",
"start": "npm run dev",
"unit": "jest --config test/unit/jest.conf.js --coverage",
"e2e": "node test/e2e/runner.js",
diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue
index 4a827d6..966cb81 100644
--- a/src/views/firefighting/points/components/list.vue
+++ b/src/views/firefighting/points/components/list.vue
@@ -186,11 +186,11 @@
@@ -210,13 +210,13 @@
@@ -287,8 +287,8 @@ export default {
listLoading: true,
dialogFormShow: false,
dialogRecordFormShow: false,
- qrcodeStr: '',
- qrcodeStr1: '',
+ qrcodeStr_jianchama: '',
+ qrcodeStr_chaxunma: '',
tabsActive: 'horizontal',
recordQrcodeStr: '',
qrInfo: {},
@@ -352,46 +352,18 @@ export default {
this.getTreeData()
},
methods: {
- handleShowQr(ROW) {
- this.dialogFormShow = true
- this.qrInfo = ROW
- this.qrcodeStr = JSON.stringify({
- MANAGER_TYPE: 'fireListManager',
- FIRE_POINT_ID: ROW.FIRE_POINT_ID
- })
- },
- handleShowRecordQr(ROW) {
- console.log(ROW)
- this.dialogFormShow = true
- // 确保qrInfo绑定了需要显示的数据字段
- this.qrInfo = {
- FIRE_REGION_NAME: ROW.FIRE_REGION_NAME, // 消防区域
- FIRE_POINT_NAME: ROW.FIRE_POINT_NAME, // 消防点位
- DEPARTMENT_NAME: ROW.DEPARTMENT_NAME, // 负责部门
- USERNAME: ROW.USERNAME // 负责人
- }
- const json = {
- MANAGER_TYPE: 'checkRecordManager',
- USER_ID: ROW.USER_ID,
- DEPARTMENT_ID: ROW.DEPARTMENT_ID,
- FIRE_POINT_ID: ROW.FIRE_POINT_ID
- }
- const jsonStr = JSON.stringify(json)
- this.qrcodeStr = jsonStr
- console.info(this.qrcodeStr)
- },
handleShowNotificationCard(ROW) {
this.dialogFormShow = true
this.qrInfo = ROW
// 检查码
- this.qrcodeStr = JSON.stringify({
+ this.qrcodeStr_chaxunma = JSON.stringify({
MANAGER_TYPE: 'checkRecordManager',
USER_ID: ROW.USER_ID,
DEPARTMENT_ID: ROW.DEPARTMENT_ID,
FIRE_POINT_ID: ROW.FIRE_POINT_ID
})
// 查询码
- this.qrcodeStr1 = JSON.stringify({
+ this.qrcodeStr_jianchama = JSON.stringify({
MANAGER_TYPE: 'fireListManager',
FIRE_POINT_ID: ROW.FIRE_POINT_ID
})
From 300c387e8344eb9269d903586f438e8236c2f017 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Fri, 20 Sep 2024 15:51:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B6=88=E9=98=B2?=
=?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/firefighting/points/components/list.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue
index 966cb81..a213840 100644
--- a/src/views/firefighting/points/components/list.vue
+++ b/src/views/firefighting/points/components/list.vue
@@ -356,7 +356,7 @@ export default {
this.dialogFormShow = true
this.qrInfo = ROW
// 检查码
- this.qrcodeStr_chaxunma = JSON.stringify({
+ this.qrcodeStr = JSON.stringify({
MANAGER_TYPE: 'checkRecordManager',
USER_ID: ROW.USER_ID,
DEPARTMENT_ID: ROW.DEPARTMENT_ID,