|
@@ -28,7 +28,7 @@
|
|
|
<!--二维码弹窗 -->
|
|
|
<qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
|
|
|
<!--上传图片-->
|
|
|
- <upload-img-dialog :read="false" @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog"/>
|
|
|
+ <upload-img-dialog :read="false" @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog" />
|
|
|
<!-- 不支持的输入方式 -->
|
|
|
<el-dialog title="临时维护信息点" :visible.sync="myDialog.update" @close="handleCloseUpdate" width="670px">
|
|
|
<el-row>
|
|
@@ -37,8 +37,7 @@
|
|
|
。
|
|
|
</el-row>
|
|
|
<el-row style="margin-top:20px;" v-show="updateInputShow">
|
|
|
- <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" placeholder="请输入内容"
|
|
|
- v-model="updateInput"></el-input>
|
|
|
+ <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" placeholder="请输入内容" v-model="updateInput"></el-input>
|
|
|
</el-row>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="myDialog.update = false">取 消</el-button>
|
|
@@ -75,9 +74,9 @@ export default {
|
|
|
addNum: 1,
|
|
|
onlyRead: false,
|
|
|
showTypes: [
|
|
|
- { value: "Visible", label: '只看采集信息' },
|
|
|
- { value: "all", label: '全部' }
|
|
|
- ],
|
|
|
+ { value: "Visible", label: '只看采集信息' },
|
|
|
+ { value: "all", label: '全部' }
|
|
|
+ ],
|
|
|
tableHeader: [],
|
|
|
tableData: session.get("spaceAddData")
|
|
|
? session.get("spaceAddData").length
|
|
@@ -119,7 +118,7 @@ export default {
|
|
|
return ""
|
|
|
} else if (buildFloorSelectd && buildFloorSelectd.length == 1) {
|
|
|
let build = buildFloorSelectd[0]
|
|
|
- if (build == 'all' && build == 'noKnow') {
|
|
|
+ if (build == 'all' || build == 'noKnow') {
|
|
|
return ""
|
|
|
} else {
|
|
|
return build
|
|
@@ -186,9 +185,13 @@ export default {
|
|
|
// 处理建筑-楼层
|
|
|
if (item.flowBuild) {
|
|
|
let bid = item.flowBuild.split("-");
|
|
|
- item.buildingId = item.flowBuild.split("-")[0]
|
|
|
- if (bid[1]) {
|
|
|
- item.floorId = item.flowBuild.split("-")[1]
|
|
|
+ if (bid[0] && bid[0] != 'all' && bid[0] != 'noKnow') {
|
|
|
+ item.buildingId = item.flowBuild.split("-")[0]
|
|
|
+ if (bid[1]) {
|
|
|
+ if (bid[1] != 'noKnow' && bid[1] != 'all') {
|
|
|
+ item.floorId = item.flowBuild.split("-")[1]
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
item.classCode = this.space.spaceType;
|