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
})