|
@@ -14,6 +14,8 @@
|
|
|
<div class="right" v-show="main && main.length">
|
|
|
<my-pagination :page="page" @change="pageChange"></my-pagination>
|
|
|
</div>
|
|
|
+ <!-- 二维码弹窗 -->
|
|
|
+ <qrcode :dialog="dialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
@@ -27,6 +29,7 @@
|
|
|
import Handsontable from "handsontable-pro"
|
|
|
import 'handsontable-pro/dist/handsontable.full.css'
|
|
|
import zhCN from 'handsontable-pro/languages/zh-CN';
|
|
|
+ import qrcode from "@/components/ledger/lib/qrcode";
|
|
|
console.log(Handsontable,"Handsontable")
|
|
|
import {
|
|
|
updateBusiness,
|
|
@@ -46,6 +49,7 @@
|
|
|
}
|
|
|
},
|
|
|
components: {
|
|
|
+ qrcode, //二维码页面
|
|
|
myPagination,
|
|
|
addBusiness
|
|
|
},
|
|
@@ -59,8 +63,10 @@
|
|
|
data() {
|
|
|
return {
|
|
|
dialog: {
|
|
|
+ qrcode: false, //二维码弹窗
|
|
|
addDevice: false
|
|
|
},
|
|
|
+ qrcodeUrl: "",//二维码图片地址
|
|
|
headers: null,
|
|
|
main: null,
|
|
|
hot: null,
|
|
@@ -242,8 +248,16 @@
|
|
|
}
|
|
|
},
|
|
|
getInfors(infos, row) {
|
|
|
- if (row.col == 1) {
|
|
|
+ let val = this.hot.colToProp(row.col);
|
|
|
+ if (val == "point") {
|
|
|
this.$emit("lookEqu", infos);
|
|
|
+ } else if (val == "infos.RoomQRCode") {
|
|
|
+ this.qrcodeUrl = this.main[row.row].infos.RoomQRCode
|
|
|
+ if (!!this.qrcodeUrl) {
|
|
|
+ this.dialog.qrcode = true;
|
|
|
+ } else {
|
|
|
+ this.$message("此设备没有设备二维码")
|
|
|
+ }
|
|
|
} else {
|
|
|
return false;
|
|
|
}
|
|
@@ -460,7 +474,7 @@
|
|
|
delHeader(list) {
|
|
|
let arr = tools.copyArr(list)
|
|
|
// 如果不是只读状态,添加四大厂商选择
|
|
|
- let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2"]
|
|
|
+ let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2"]
|
|
|
if (!this.onlyRead) {
|
|
|
arr = showTools.arrToArr(arr)
|
|
|
readArr.push("Own")
|
|
@@ -478,7 +492,7 @@
|
|
|
*/
|
|
|
getType(list) {
|
|
|
let arr = tools.copyArr(list)
|
|
|
- let data = showTools.showTypes(arr, false, false, true, false, ["F1", "F2"])
|
|
|
+ let data = showTools.showTypes(arr, false, false, true, false)
|
|
|
data.unshift({
|
|
|
data: "hasSi",
|
|
|
renderer: this.myRenderer,
|