guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into pet

hyx_2024-9-25_tongbu
guoyuepeng 2024-09-20 15:48:11 +08:00
parent 5163d5ca32 60591eab21
commit 1ac1777da3
2 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

44
src/views/firefighting/points/components/list.vue
View File

@ -186,11 +186,11 @@
<div class="row">
<div class="title">检查码</div>
<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 class="title">查询码</div>
<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>
@ -210,13 +210,13 @@
<div class="row">
<div class="title">检查码</div>
<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="row">
<div class="title">查询码</div>
<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>
@ -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
})