Compare commits

...

3 Commits

Author SHA1 Message Date
guoyuepeng 300c387e83 1.修改消防检查二维码 2024-09-20 15:51:11 +08:00
guoyuepeng 1ac1777da3 Merge branch 'dev' into pet 2024-09-20 15:48:11 +08:00
guoyuepeng 60591eab21 `1.点位二维码 2024-09-19 17:20:51 +08:00
2 changed files with 8 additions and 36 deletions

View File

@ -5,7 +5,7 @@
"author": "", "author": "",
"private": true, "private": true,
"scripts": { "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", "start": "npm run dev",
"unit": "jest --config test/unit/jest.conf.js --coverage", "unit": "jest --config test/unit/jest.conf.js --coverage",
"e2e": "node test/e2e/runner.js", "e2e": "node test/e2e/runner.js",

View File

@ -186,11 +186,11 @@
<div class="row"> <div class="row">
<div class="title">检查码</div> <div class="title">检查码</div>
<div class="qr"> <div class="qr">
<vue-qr :text="qrcodeStr" :margin="0" :size="280" color-dark="#000" color-light="#fff"/> <vue-qr :text="qrcodeStr_jianchama" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
</div> </div>
<div class="title">查询码</div> <div class="title">查询码</div>
<div class="qr"> <div class="qr">
<vue-qr :text="qrcodeStr1" :margin="0" :size="280" color-dark="#000" color-light="#fff"/> <vue-qr :text="qrcodeStr_chaxunma" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
</div> </div>
</div> </div>
</div> </div>
@ -210,13 +210,13 @@
<div class="row"> <div class="row">
<div class="title">检查码</div> <div class="title">检查码</div>
<div class="qr"> <div class="qr">
<vue-qr :text="qrcodeStr" :margin="0" :size="280" color-dark="#000" color-light="#fff"/> <vue-qr :text="qrcodeStr_jianchama" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="title">查询码</div> <div class="title">查询码</div>
<div class="qr"> <div class="qr">
<vue-qr :text="qrcodeStr1" :margin="0" :size="280" color-dark="#000" color-light="#fff"/> <vue-qr :text="qrcodeStr_chaxunma" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
</div> </div>
</div> </div>
</div> </div>
@ -287,8 +287,8 @@ export default {
listLoading: true, listLoading: true,
dialogFormShow: false, dialogFormShow: false,
dialogRecordFormShow: false, dialogRecordFormShow: false,
qrcodeStr: '', qrcodeStr_jianchama: '',
qrcodeStr1: '', qrcodeStr_chaxunma: '',
tabsActive: 'horizontal', tabsActive: 'horizontal',
recordQrcodeStr: '', recordQrcodeStr: '',
qrInfo: {}, qrInfo: {},
@ -352,34 +352,6 @@ export default {
this.getTreeData() this.getTreeData()
}, },
methods: { 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) { handleShowNotificationCard(ROW) {
this.dialogFormShow = true this.dialogFormShow = true
this.qrInfo = ROW this.qrInfo = ROW
@ -391,7 +363,7 @@ export default {
FIRE_POINT_ID: ROW.FIRE_POINT_ID FIRE_POINT_ID: ROW.FIRE_POINT_ID
}) })
// //
this.qrcodeStr1 = JSON.stringify({ this.qrcodeStr_jianchama = JSON.stringify({
MANAGER_TYPE: 'fireListManager', MANAGER_TYPE: 'fireListManager',
FIRE_POINT_ID: ROW.FIRE_POINT_ID FIRE_POINT_ID: ROW.FIRE_POINT_ID
}) })