소스 검색

租户修改

zhangyu 5 년 전
부모
커밋
47b428d05a

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

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

+ 2 - 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,6 +144,7 @@ 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

+ 2 - 1
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,6 +127,7 @@ 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

+ 2 - 1
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,6 +126,7 @@ 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

+ 2 - 1
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 = ''