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/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index 3fa86e8..21765ab 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@@ -139,11 +139,11 @@
-
-
+
* 图像分辨率:大于32×32像素,小于4096×4096像素,
人脸占比不低于64×64像素。
+
(如无合适照片请该人员登陆曹港APP中进行人脸照片采集)
@@ -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/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue
index 4a827d6..a213840 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,34 +352,6 @@ 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
@@ -391,7 +363,7 @@ export default {
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
})