Browse Source

merge master

haojianlong 5 years ago
parent
commit
4551c172ba

+ 17 - 3
src/components/business_space/business/handsontable.vue

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

+ 1 - 1
src/components/business_space/table/equipTable.vue

@@ -335,7 +335,7 @@
                 this.iframeSrc = this.iframeSrc =
                     // "http://172.16.0.181:8889/#/details?perjectId=" +
                     process.env.BASE_URL + ":8889/#/details?perjectId=" +
-                    this.perjectId +
+                    this.projectId +
                     "&secret=" +
                     this.secret +
                     "&FmId=" +

+ 4 - 4
src/utils/handsontable/notShow.js

@@ -394,7 +394,7 @@ const showTools = {
                     }
                 }
 
-                if (item.InfoPointCode == "EquipQRCode") {
+                if (item.InfoPointCode == "EquipQRCode" || item.InfoPointCode == "RoomQRCode") {
                     return {
                         data: "infos." + item.InfoPointCode,
                         renderer: text.lookQRCode,
@@ -602,24 +602,24 @@ const showTools = {
                         }
                     }
     
-                    if (item.InputMode == "D1" || item.InputMode == "D2") {
+                    if (item.InputMode == "D1" || item.InputMode == "E1") {//单选
                         return {
                             data: item.InfoPointCode,
                             renderer: tools.customDropdownRenderer,
                             editor: "chosen",
                             readOnly: onlyRead,
                             chosenOptions: {
-                                multiple: true, //多选
                                 data: item.DataSource? tools.formatDataSource(item.DataSource): ""
                             }
                         };
-                    } else if (item.InputMode == "E1") {//单选
+                    } else if (item.InputMode == "D2") {
                         return {
                             data: item.InfoPointCode,
                             renderer: tools.customDropdownRenderer,
                             editor: "chosen",
                             readOnly: onlyRead,
                             chosenOptions: {
+                                multiple: true, //多选
                                 data: item.DataSource? tools.formatDataSource(item.DataSource): ""
                             }
                         };

+ 4 - 4
src/utils/scan/tools.js

@@ -453,12 +453,12 @@ tools.formatDataSource = function (data) {
     try{
         options = JSON.parse(data)
         if(options) {
-            for(var key in options) {
+            options.forEach((item) =>{
                 arr.push({
-                    Code: key,
-                    Name: options[key]
+                    Code: item.id,
+                    Name: item.name
                 }) 
-            }
+            })
             return arr
         } else {
             return arr

+ 6 - 1
src/views/data_admin/buildAssets/NoMap.vue

@@ -15,7 +15,7 @@
                     <span>{{scope.row.Infos.EquipLocalID || scope.row.Infos.EquipID || '--'}}</span>
                 </template>
             </el-table-column>
-            <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='LocalName' label='本地名称'></el-table-column>
             <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='300'>
                 <template slot-scope='scope'>
                     <el-button type='primary' plain size='mini' @click='look(scope.row)'>&nbsp;&nbsp;&nbsp;查看&nbsp;&nbsp;&nbsp;</el-button>
@@ -144,12 +144,17 @@ export default {
                     this.loading = false
                     let list = res.data.FmList
                     list.forEach((ele, index) => {
+                        ele.LocalName = ele.LocalName? ele.LocalName: ele.FmName
                         ele.floorName = this.floorsObj[ele.FloorId] || '--'
                     })
                     this.tableData = list
                     this.total = res.data.Count
                     console.log("nomap")
                     console.log(this.tableData)
+                } else {
+                    this.tableData = []
+                    this.total = 0
+                    this.loading = false
                 }
             })
         }

+ 7 - 2
src/views/data_admin/buildAssets/Nofind.vue

@@ -16,7 +16,7 @@
                         
                     </template>
                 </el-table-column>
-                <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='LocalName' label='本地名称'></el-table-column>
                 <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='150'>
                     <template slot-scope='scope'>
                         <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
@@ -127,10 +127,15 @@ export default {
                     this.loading = false
                     let list = res.data.FmList
                     list.forEach((ele, index) => {
+                        ele.LocalName = ele.LocalName? ele.LocalName: ele.FmName
                         ele.floorName = this.floorsObj[ele.FloorId] || '--'
                     })
                     this.tableData = list
-                     this.total = res.data.Count
+                    this.total = res.data.Count
+                } else {
+                    this.tableData = []
+                    this.total = 0
+                    this.loading = false
                 }
             })
         }

+ 7 - 2
src/views/data_admin/buildAssets/Nopaint.vue

@@ -15,7 +15,7 @@
                         <span>{{scope.row.Infos.EquipLocalID || scope.row.Infos.EquipID || '--'}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='LocalName' label='本地名称'></el-table-column>
                 <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='150'>
                     <template slot-scope='scope'>
                         <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
@@ -126,10 +126,15 @@ export default {
                     this.loading = false
                     let list = res.data.FmList
                     list.forEach((ele, index) => {
+                        ele.LocalName = ele.LocalName? ele.LocalName: ele.FmName
                         ele.floorName = this.floorsObj[ele.FloorId] || '--'
                     })
                     this.tableData = list
-                     this.total = res.data.Count
+                    this.total = res.data.Count
+                } else {
+                    this.tableData = []
+                    this.total = 0
+                    this.loading = false
                 }
             })
         }

+ 7 - 2
src/views/data_admin/buildAssets/Noverify.vue

@@ -21,7 +21,7 @@
                     <span>{{scope.row.Infos.EquipLocalID || scope.row.Infos.EquipID || '--'}}</span>
                 </template>
             </el-table-column>
-            <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='LocalName' label='本地名称'></el-table-column>
             <el-table-column header-align='center' align='center' prop='spaceName' label='所在元空间'></el-table-column>
             <el-table-column header-align='center' align='center' prop='eq' label='对应设备类'></el-table-column>
             <el-table-column header-align='center' align='center' prop='bimXY' label='BIM模型中坐标'></el-table-column>
@@ -185,6 +185,7 @@ export default {
                 if (res.data.Result == 'success') {                    
                     let list = res.data.FmList
                     list.forEach((ele, index) => {
+                        ele.LocalName = ele.LocalName? ele.LocalName: ele.FmName
                         ele.floorName = this.floorsObj[ele.FloorId] || '--'
                         let x = ''
                         let y = ''
@@ -205,6 +206,10 @@ export default {
                     await this.getEq(list)
                     await this.getSp(list)
                     this.loading = false
+                } else {
+                    this.tableData = []
+                    this.total = 0
+                    this.loading = false
                 }
             })
         },
@@ -317,7 +322,7 @@ export default {
 </script>
 
 <style scoped lang='less'>
-.data-table {
+#page-main #page-container #page-content-wrapper .page-table-template > .data-table {
     height: calc(100% - 94px);
 }
 .btn-box {

+ 3 - 2
src/views/data_admin/buildData/index.vue

@@ -488,9 +488,10 @@
                     } else {
                         this.$message.error("请求错误:" + res.data.ResultMsg)
                     }
-                }).catch(_ => {
-                    this.$message.error("请求错误")
                 })
+                // .catch(_ => {
+                //     this.$message.error("请求错误")
+                // })
             },
             //删除图片
             delPic(index) {

+ 1 - 0
src/views/point/config_point/steps/step2.vue

@@ -179,6 +179,7 @@
             //关闭人工智能弹窗
             aiClose(){
                 this.aiDialog = false
+                clearInterval(this.timer)
             },
             //刷新
             reset() {

+ 2 - 1
src/views/project_setting/collection_setting/index.vue

@@ -846,7 +846,8 @@
     }
     #page-main .el-tabs__content{
         height: 100%;
-        overflow-y: auto;
+        // overflow-y: auto;
+        overflow: hidden;
     }
 </style>
 

+ 5 - 1
src/views/rent/rentlist/index.vue

@@ -364,7 +364,11 @@ export default {
       }
       //点击关联的元空间
       if (val === "RoomCount") {
-        this.roomId = infos.RoomID
+        if(infos && infos.LeaseInfo && infos.LeaseInfo.RoomID) {
+          this.roomId = infos.LeaseInfo.RoomID
+        } else {
+          this.roomId = ""
+        }
         this.isTableRightShow = true;
       }
     },