Kaynağa Gözat

adm:feat > 台账相关接口字段调整

shaun-sheep 4 yıl önce
ebeveyn
işleme
3e2939adaf
45 değiştirilmiş dosya ile 1972 ekleme ve 1856 silme
  1. 4 1
      config/index.js
  2. 8 8
      src/api/scan/config.js
  3. 17 9
      src/api/scan/request.js
  4. 1 1
      src/components/business_space/newAddDialogs/addEquipDialog.vue
  5. 1 1
      src/components/business_space/newGraphy/unRelateBSP.vue
  6. 47 35
      src/components/data_admin/buildTask/dialog/modelTaskDialog.vue
  7. 1 1
      src/components/dialogs/changeRea.vue
  8. 11 10
      src/components/dialogs/list/systemType.vue
  9. 117 114
      src/components/ledger/details/detail/exhibitionBaseInformation.vue
  10. 23 19
      src/components/ledger/handsontables/device.vue
  11. 2 2
      src/components/ledger/handsontables/system.vue
  12. 5 0
      src/components/ledger/lib/assets.vue
  13. 266 259
      src/components/ledger/lib/bimDialog.vue
  14. 1 1
      src/components/ledger/lib/buildfloorCascader.vue
  15. 11 3
      src/components/ledger/lib/cascader.vue
  16. 9 9
      src/components/ledger/lib/cenoteType.vue
  17. 17 16
      src/components/ledger/lib/linkassets.vue
  18. 1 1
      src/components/ledger/lib/noAllDataFloor.vue
  19. 22 13
      src/components/ledger/lib/system.vue
  20. 1 1
      src/components/ledger/rentList/roomCountDrawer.vue
  21. 1 1
      src/components/ledger/report/dataexport.vue
  22. 7 5
      src/components/ledger/system/lib/equipType.vue
  23. 8 8
      src/components/ledger/system/table/cenoteTable.vue
  24. 17 12
      src/components/ledger/system/table/deviceTable.vue
  25. 18 11
      src/components/ledger/system/table/spaceTable.vue
  26. 5 5
      src/components/point/dynamicdata/delRelationDialog.vue
  27. 7 7
      src/components/point/dynamicdata/systemRules.vue
  28. 6 6
      src/components/point/report/objectInstance.vue
  29. 1 1
      src/components/ready/buildfloor/buildfloorCascader.vue
  30. 1175 1175
      src/utils/handsontable/notShow.js
  31. 1 1
      src/views/business_space/dataUtil/index.vue
  32. 1 1
      src/views/data_admin/buildGraphy/index.vue
  33. 10 10
      src/views/ledger/cenotelist/index.vue
  34. 32 30
      src/views/ledger/facility/addfacility.vue
  35. 2 0
      src/views/ledger/facility/details/index.vue
  36. 14 8
      src/views/ledger/facility/index.vue
  37. 2 0
      src/views/ledger/property/addproperty.vue
  38. 17 14
      src/views/ledger/property/index.vue
  39. 11 11
      src/views/ledger/rentlist/index.vue
  40. 60 34
      src/views/ledger/rentlist/manageTenantZone.vue
  41. 2 2
      src/views/ledger/report/index.vue
  42. 1 1
      src/views/ledger/system/index.vue
  43. 3 3
      src/views/ledger/system/systemDetail/index.vue
  44. 5 5
      src/views/point/dynamicdata/addRelation/systemRela/index.vue
  45. 1 1
      src/views/relation/overview/detail/index.vue

+ 4 - 1
config/index.js

@@ -260,7 +260,10 @@ module.exports = {
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
-        changeOrigin: false
+        changeOrigin: false,
+        pathRewrite: {
+          "^/venders": "/dp-auxiliary/venders/"
+        }
       },
       '/ScanBuilding': {
         // 目标 API 地址

+ 8 - 8
src/api/scan/config.js

@@ -12,12 +12,12 @@ export const zone = {
   LightingZone: 'zone-lighting', //照明分区
   AirConditioningZone: 'metaspace', //空调分区
   TenantZone: 'zone-tenant', //租赁分区
-  HeatingZone:'zone-heating', //采暖分区
-  CleanZone:'zone-clean', //洁净分区
-  DomesticWaterSupplyZone:'zone-domestic-water', //生活给水分区
-  NetworkZone:'zone-network', //网络分区
-  FunctionZone:'zone-function', //功能分区
-  FireZone:'zone-fire', //防火分区
-  SecurityZone:'zone-security', //安防分区
-  Ispace:'ispace', //元空间
+  HeatingZone: 'zone-heating', //采暖分区
+  CleanZone: 'zone-clean', //洁净分区
+  DomesticWaterSupplyZone: 'zone-domestic-water', //生活给水分区
+  NetworkZone: 'zone-network', //网络分区
+  FunctionZone: 'zone-function', //功能分区
+  FireZone: 'zone-fire', //防火分区
+  SecurityZone: 'zone-security', //安防分区
+  Ispace: 'ispace', //元空间
 }

+ 17 - 9
src/api/scan/request.js

@@ -846,7 +846,8 @@ export function ShaftRelationBusinessSpace(param, success) {
 
 //获取竖井类型
 export function getCenoteType(param, success) {
-  let url = `${baseUrl}/datacenter/shaft/query-shaft-functype`
+  // let url = `${baseUrl}/datacenter/shaft/query-shaft-functype`
+  let url = `${baseUrl}/datacenter/object/shaft/query-shaft-functype`
   http.postJson(url, param, success)
 }
 
@@ -858,7 +859,8 @@ export function getCenoteTableData(param, success) {
 
 //查询竖井信息
 export function queryCenoteTableData(param, success) {
-  let url = `${baseUrl}/datacenter/shaft/query`
+  // let url = `${baseUrl}/datacenter/shaft/query`
+  let url = `${baseUrl}/datacenter/object/shaft/query`
   http.postJson(url, param, success)
 }
 
@@ -947,7 +949,8 @@ export function queryTenantCompletion(param, success) {
 
 //创建租户信息
 export function queryRentTableData(param, success) {
-  let url = `${baseUrl}/datacenter/tenant/query`
+  // let url = `${baseUrl}/datacenter/tenant/query`
+  let url = `${baseUrl}/datacenter/object/tenant/query`
   http.postJson(url, param, success)
 }
 
@@ -1007,8 +1010,9 @@ export function delTnRelateZone(param, success) {
 
 //查询租户关联的业务空间所在的建筑楼层
 export function queryTnRelateFloor(param, success) {
-  let url = `${baseUrl}/equip-component/tenant/tenant-building-floor?objectType=${param.objectType}&tenantId=${param.tenantId}`
-  http.postJson(url, {}, success)
+  // let url = `${baseUrl}/equip-component/tenant/tenant-building-floor?objectType=${param.objectType}&tenantId=${param.tenantId}`
+  let url = `${baseUrl}/equip-componnet/tenant/tenant-building-floor`
+  http.postJson(url, param, success)
 }
 
 //关联分区空间
@@ -1208,7 +1212,8 @@ export function createEquipAndProperty(param, success) {
 
 //设备清单 - 更新设备
 export function updateEquip(param, success) {
-  let url = `${baseUrl}/datacenter/equip/update`;
+  // let url = `${baseUrl}/datacenter/equip/update`;
+  let url = `${baseUrl}/datacenter/object/equip/update`;
   http.postJson(url, param, success)
 }
 
@@ -1220,7 +1225,8 @@ export function deleteEquip(param, success) {
 
 //设备清单 - 查询系统关联专业 - 查询系统信息 - 查询系统所属专业类型
 export function queryLinkSys(param, success) {
-  let url = `${baseUrl}/datacenter/general-system/query`;
+  // let url = `${baseUrl}/datacenter/general-system/query`;
+  let url = `${baseUrl}/datacenter/object/general-system/query`;
   http.postJson(url, param, success)
 }
 
@@ -1440,7 +1446,8 @@ export function systemInfoPoint(param, success) {
 
 //根据条件查询统计数量
 export function countGeneralSys(param, success) {
-  let url = `${baseUrl}/datacenter/general-system/count`;
+  // let url = `${baseUrl}/datacenter/general-system/count`;
+  let url = `${baseUrl}/datacenter/object/general-system/count`;
   http.postJson(url, param, success)
 }
 
@@ -2226,7 +2233,8 @@ export function notSyncRelationData(param, success) {
 
 // 不能同步到物理世界的对象
 export function notSyncObject(param, success) {
-  let url = `${baseUrl}/equip-component/dict-custom/data-count`
+  // let url = `${baseUrl}/equip-component/dict-custom/data-count`
+  let url = `${baseUrl}/equip-componnet/dict/data-count`
   http.postJson(url, param, success)
 }
 

+ 1 - 1
src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -106,7 +106,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'sequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

+ 1 - 1
src/components/business_space/newGraphy/unRelateBSP.vue

@@ -109,7 +109,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'sequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

+ 47 - 35
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -1,15 +1,18 @@
 <template>
   <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="900px" id="addEqDialog">
     <div class="table-box">
-      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle" ref="multipleTable"
-        @selection-change="handleSelectionChange">
+      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle"
+                ref="multipleTable"
+                @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="expand">
           <template slot-scope="props">
-            <p v-if="props.row.ComponentCount && props.row.ComponentCount.length" style="color:#99a9bf;line-height:32px;font-size:14px;">包含的部件:</p>
+            <p v-if="props.row.ComponentCount && props.row.ComponentCount.length"
+               style="color:#99a9bf;line-height:32px;font-size:14px;">包含的部件:</p>
             <el-form label-position="left" label-width="auto" inline class="demo-table-expand"
-              v-if="props.row.ComponentCount && props.row.ComponentCount.length">
-              <el-form-item v-for="item in props.row.ComponentCount?props.row.ComponentCount:[]" :key="item.code" :label="`${item.name}:`">
+                     v-if="props.row.ComponentCount && props.row.ComponentCount.length">
+              <el-form-item v-for="item in props.row.ComponentCount?props.row.ComponentCount:[]" :key="item.code"
+                            :label="`${item.name}:`">
                 <span>{{ item.count }}</span>
               </el-form-item>
             </el-form>
@@ -20,7 +23,7 @@
         <el-table-column label="设备本地名称" show-overflow-tooltip width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.EquipLocalName}}
+              {{ scope.row.EquipLocalName }}
               <el-badge v-if="scope.row.Component&&scope.row.Component.length?true:false"
                         :value="scope.row.Component&&scope.row.Component.length?scope.row.Component.length:0"
                         class="item" type="warning">
@@ -46,9 +49,11 @@
         </template>
       </el-table>
       <!-- 分页 -->
-      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="page.total"></el-pagination>
+      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange"
+                     @current-change="handleCurrentChange"
+                     :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     :total="page.total"></el-pagination>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="$emit('update:dialogVisible',false)">返回重选</el-button>
@@ -58,30 +63,30 @@
 </template>
 
 <script>
-  import { queryEquip } from "@/api/object/equip";
-  import {createModelTask, queryModelDiglog} from "@/api/data_admin/buildTaskApi"
-  import {mapGetters} from "vuex"
+import { queryEquip } from "@/api/object/equip";
+import { createModelTask, queryModelDiglog } from "@/api/data_admin/buildTaskApi"
+import { mapGetters } from "vuex"
 
-  export default {
-    components: {},
-    computed: {
-      ...mapGetters("layout", ["projectId"])
-    },
-    data() {
-      return {
-        title: "确认创建任务",
-        options: [{//方案
-          value: '1',
-          label: '极简'
-        }, {
-          value: '2',
-          label: '标准'
-        }],
-        tableData: [],
-        loading: false,
-        selections: [], // 选中项
-        page: {
-          pageSize: 50,
+export default {
+  components: {},
+  computed: {
+    ...mapGetters("layout", ["projectId"])
+  },
+  data() {
+    return {
+      title: "确认创建任务",
+      options: [{//方案
+        value: '1',
+        label: '极简'
+      }, {
+        value: '2',
+        label: '标准'
+      }],
+      tableData: [],
+      loading: false,
+      selections: [], // 选中项
+      page: {
+        pageSize: 50,
         pageSizes: [10, 20, 50, 100],
         pageNumber: 1,
         total: 0
@@ -154,8 +159,8 @@
         let param = {
           ModelId: this.params.CurrentModelId,
           IdList: arr,
-          Category:this.params.device || '',
-         // Filters : `Category='${this.params.device || ''}'`,
+          Category: this.params.device || '',
+          filters: `classCode='${this.params.device || ''}'`,
           PageNumber: this.page.pageNumber,
           PageSize: this.page.pageSize
         }
@@ -181,7 +186,9 @@
           item.ComponentCount = []
           item.Component.map(parts => {
             if (parts.EquipCategory && parts.EquipCategory.EquipCode && parts.EquipCategory.EquipName) {
-              let index = item.ComponentCount.findIndex(c => { return c.code == parts.EquipCategory.EquipCode })
+              let index = item.ComponentCount.findIndex(c => {
+                return c.code == parts.EquipCategory.EquipCode
+              })
               if (index != -1) {
                 item.ComponentCount[index].count++
               } else {
@@ -272,12 +279,15 @@
 #addEqDialog {
   .filters {
     margin-bottom: 10px;
+
     /deep/ .el-input__inner {
       vertical-align: baseline;
     }
   }
+
   .table-box {
     height: 370px;
+
     .fr {
       margin-top: 10px;
     }
@@ -289,10 +299,12 @@
 .demo-table-expand {
   font-size: 0;
 }
+
 .demo-table-expand label {
   width: 90px;
   color: #99a9bf;
 }
+
 .demo-table-expand .el-form-item {
   margin-right: 0;
   margin-bottom: 0;

+ 1 - 1
src/components/dialogs/changeRea.vue

@@ -135,7 +135,7 @@ export default {
         cascade: [
           {
             name: "equipFamilyList",
-            projection: [ "Family", "FamilyName" ]
+            projection: [ "family", "familyName" ]
           },
           {
             name: "building",

+ 11 - 10
src/components/dialogs/list/systemType.vue

@@ -23,10 +23,10 @@
         <el-table class='data-table' border :data="type == 'read'?linkSystemData:tableData" @selection-change="handleSelectionChange" style="width: 100%" ref="multipleTable">
           <el-table-column v-if="type != 'read' " type="selection" :reserve-selection="true" :disabled="true" width="55"></el-table-column>
           <el-table-column label="系统名称" header-align='center'>
-            <template slot-scope="scope">{{scope.row.SysLocalName || scope.row.SysName}}</template>
+            <template slot-scope="scope">{{scope.row.localName || scope.row.name}}</template>
           </el-table-column>
           <el-table-column label="本地编码" header-align='center'>
-            <template slot-scope="scope">{{scope.row.SysLocalID || '--'}}</template>
+            <template slot-scope="scope">{{scope.row.localId || '--'}}</template>
           </el-table-column>
           <el-table-column label="专业" prop="MajorName" header-align='center'></el-table-column>
           <el-table-column label="详情" header-align='center' width="100" align="center">
@@ -152,6 +152,7 @@ export default {
     },
     //设置默认
     toggleSelection(rows) {
+      debugger
       this.$refs.multipleTable.clearSelection();
       if (rows.length&&this.list.length) {
         rows.map(row => {
@@ -188,23 +189,23 @@ export default {
     //根据设备类型-查询系统关联专业
     getTableData() {
       let param = {
-        Filters: `category="${this.device.deviceId.substring(0, 2)}"`,
-        PageNumber: 1,
-        PageSize: 1000
+        filters: `classCode="${this.device.deviceId.substring(0, 2)}"`,
+        pageNumber: 1,
+        pageSize: 1000
       }
       //建筑id
       if (this.buildId == "noKnow") {
-        param.Filters += `;buildingId isNull`
+        param.filters += `;buildingId isNull`
       } else if (this.buildId && this.buildId != "all") {
-        param.Filters += `;buildingId='${this.buildId}'`
+        param.filters += `;buildingId='${this.buildId}'`
       }
       //输入的查询条件
       if (this.search) {
-        param.Filters += `;SysLocalName contain "${this.search}" or SysLocalID contain "${this.search}"`
+        param.filters += `;localName contain "${this.search}" or localId contain "${this.search}"`
       }
       queryLinkSys(param, res => {
-        this.tableData = res.Content
-        this.toggleSelection(res.Content)
+        this.tableData = res.content
+        this.toggleSelection(res.content)
       })
     },
     //获取关联的系统

+ 117 - 114
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -1,48 +1,48 @@
 <template>
-<div class="exhibition-baseInformation">
-  <section v-for="(val,key,i) in exhibitionBaseInformation.information">
-    <h4 class="base">{{key || '信息'}}</h4>
-    <div class="infoPoint-item" v-for="(value,keys,index) in val.paths">
-      <span> {{value.InfoPointName}}:</span>
-      <el-popover
-        v-if="value.Path == 'EquipQRCode' || value.Path == 'RoomQRCode' || value.Path == 'ShaftQRCode'"
-        placement="right"
-        width="360"
-        trigger="hover">
-        <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{value.InfoPointName}}</p>
-        <div style="overflow:hidden;">
-          <div style="float:left;width: 60%" v-if="value.Value">
-            <img
-              style="width:200px;height:200px;"
-              :src="'/image-service/common/file_get/'+ value.Value +'?systemId=dataPlatform'"
-              alt="二维码"
-            >
+  <div class="exhibition-baseInformation">
+    <section v-for="(val,key,i) in exhibitionBaseInformation.information">
+      <h4 class="base">{{ key || '信息' }}</h4>
+      <div class="infoPoint-item" v-for="(value,keys,index) in val.paths">
+        <span> {{ value.InfoPointName }}:</span>
+        <el-popover
+          v-if="value.Path == 'EquipQRCode' || value.Path == 'RoomQRCode' || value.Path == 'ShaftQRCode'"
+          placement="right"
+          width="360"
+          trigger="hover">
+          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ value.InfoPointName }}</p>
+          <div style="overflow:hidden;">
+            <div style="float:left;width: 60%" v-if="value.Value">
+              <img
+                style="width:200px;height:200px;"
+                :src="'/image-service/common/file_get/'+ value.Value +'?systemId=dataPlatform'"
+                alt="二维码"
+              >
+            </div>
+            <div v-else style="width: 100%;text-align: center;padding-top: 10px">数据暂无</div>
+            <div style="float:right;width: 40%;margin-top: 30px">
+              <span>{{ value.Value }}</span>
+            </div>
           </div>
-          <div v-else style="width: 100%;text-align: center;padding-top: 10px">数据暂无</div>
-          <div style="float:right;width: 40%;margin-top: 30px">
-            <span>{{value.Value}}</span>
+          <div style="text-align: center; margin: 0">
+            <el-button
+              type="text"
+              size="mini"
+              v-if="value.Value &&value.InputMode != 'F2'&& value.InputMode!='N2' "
+              @click="handleCopy(value.Value)">复制
+            </el-button>
           </div>
-        </div>
-        <div style="text-align: center; margin: 0">
-          <el-button
-            type="text"
-            size="mini"
-            v-if="value.Value &&value.InputMode != 'F2'&& value.InputMode!='N2' "
-            @click="handleCopy(value.Value)">复制
-          </el-button>
-        </div>
-<!--        <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>-->
-        <el-button slot="reference" type="text">有</el-button>
-      </el-popover>
-      <span  v-else-if="Array.isArray(value.Value) && value.InputMode== 'F2' ">
+          <!--        <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>-->
+          <el-button slot="reference" type="text">有</el-button>
+        </el-popover>
+        <span v-else-if="Array.isArray(value.Value) && value.InputMode== 'F2' ">
         <el-popover
           v-if="value.Value.length "
           placement="right"
           width="250"
           trigger="hover">
-          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{value.InfoPointName}}</p>
+          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ value.InfoPointName }}</p>
           <div v-for="(pic,index) in value.Value">
-            <div>图纸名称:{{pic.Name}}
+            <div>图纸名称:{{ pic.Name }}
               <!--              <el-button style="" type="text" size="mini" @click="downloadFile(pic.Key)">下载</el-button>-->
               <a
                 style="cursor: pointer;color: #409eff"
@@ -51,103 +51,106 @@
               >下载</a>
             </div>
           </div>
-<!--          <el-button slot="reference" type="text">{{value.Value.length >0 ? '有':'-'}}</el-button>-->
+          <!--          <el-button slot="reference" type="text">{{value.Value.length >0 ? '有':'-'}}</el-button>-->
           <el-button slot="reference" type="text">有</el-button>
         </el-popover>
         <span v-else>-</span>
       </span>
 
-      <el-popover
-        v-else-if="Array.isArray(value.Value) && value.InputMode=='N2'"
-        placement="right"
-        width="400"
-        trigger="hover">
-        <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{value.InfoPointName}}</p>
-        <p style="height: 250px;overflow: auto">{{value.Value}}</p>
-        <div style="text-align: center; margin: 0">
-          <el-button type="text" size="mini" @click="handleCopy(value.Value)">复制</el-button>
-        </div>
-<!--        <el-button slot="reference" type="text">{{value.Value.length >0  ? '有' :'-'}}</el-button>-->
-        <el-button slot="reference" type="text">有</el-button>
-      </el-popover>
-      <el-popover
-        v-else-if="value.Value && value.Value.length  && `${value.InfoPointName}:${value.Value}`.length>21 "
-        placement="right"
-        width="160"
-        trigger="hover">
-        <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{value.InfoPointName}}</p>
-        <p>{{value.Value}}</p>
-        <div style="text-align: center; margin: 0">
-          <el-button type="text" size="mini" @click="handleCopy(value.Value)">复制</el-button>
-        </div>
-        <el-button slot="reference" type="text">{{handleName(value.InfoPointName, value.Value)}}</el-button>
-      </el-popover>
-      <span v-else>{{value.Value}}</span>
-    </div>
-  </section>
-</div>
+        <el-popover
+          v-else-if="Array.isArray(value.Value) && value.InputMode=='N2'"
+          placement="right"
+          width="400"
+          trigger="hover">
+          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ value.InfoPointName }}</p>
+          <p style="height: 250px;overflow: auto">{{ value.Value }}</p>
+          <div style="text-align: center; margin: 0">
+            <el-button type="text" size="mini" @click="handleCopy(value.Value)">复制</el-button>
+          </div>
+          <!--        <el-button slot="reference" type="text">{{value.Value.length >0  ? '有' :'-'}}</el-button>-->
+          <el-button slot="reference" type="text">有</el-button>
+        </el-popover>
+        <el-popover
+          v-else-if="value.Value && value.Value.length  && `${value.InfoPointName}:${value.Value}`.length>21 "
+          placement="right"
+          width="160"
+          trigger="hover">
+          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ value.InfoPointName }}</p>
+          <p>{{ value.Value }}</p>
+          <div style="text-align: center; margin: 0">
+            <el-button type="text" size="mini" @click="handleCopy(value.Value)">复制</el-button>
+          </div>
+          <el-button slot="reference" type="text">{{ handleName(value.InfoPointName, value.Value) }}</el-button>
+        </el-popover>
+        <span v-else>{{ value.Value }}</span>
+      </div>
+    </section>
+  </div>
 </template>
 
 <script>
-  export default {
-    name: "exhibition-baseInformation",
-    props: ['exhibitionBaseInformation'],
-    data() {
-      return {}
+export default {
+  name: "exhibition-baseInformation",
+  props: ['exhibitionBaseInformation'],
+  data() {
+    return {}
+  },
+  created() {
+    console.log(this.exhibitionBaseInformation, 'exhibitionBaseInformation')
+  },
+  methods: {
+    downloadFile(key) {
+      window.open("/image-service/common/file_get/" + key + "?systemId=dataPlatform")
     },
-    methods: {
-      downloadFile(key) {
-        window.open("/image-service/common/file_get/" + key + "?systemId=dataPlatform")
-      },
-      handleCopy(data) {
-        let oInput = document.createElement('input')
-        if(typeof data != 'string') {
-          data = JSON.stringify(data)
-        }
-        oInput.value = data
-        document.body.appendChild(oInput)
-        oInput.select()
-        document.execCommand('Copy')
-        this.$message.success('复制成功')
-        oInput.remove()
-      },
-      handleName(infoPoint, val) {
-        let text = `${infoPoint}:${val}`;
-        return text.length > 21 ? val.substring(0, 21-`${infoPoint}:`.length) + '...' : val;
+    handleCopy(data) {
+      let oInput = document.createElement('input')
+      if (typeof data != 'string') {
+        data = JSON.stringify(data)
       }
+      oInput.value = data
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('Copy')
+      this.$message.success('复制成功')
+      oInput.remove()
+    },
+    handleName(infoPoint, val) {
+      let text = `${infoPoint}:${val}`;
+      return text.length > 21 ? val.substring(0, 21 - `${infoPoint}:`.length) + '...' : val;
     }
   }
+}
 </script>
 
 <style scoped lang="less">
-  .exhibition-baseInformation {
-    section {
-      /*border: 1px solid #eeeeee;*/
-      /*margin: 10px;*/
+.exhibition-baseInformation {
+  section {
+    /*border: 1px solid #eeeeee;*/
+    /*margin: 10px;*/
 
-      .base {
-        margin: 10px;
-        font-weight: 600;
-        /*text-indent: 10px;*/
-        border-bottom: 1px dashed #eee;
-      }
-
-      /deep/ .el-button--text {
-        color: #555 !important;
-        font-size: 14px;
-      }
+    .base {
+      margin: 10px;
+      font-weight: 600;
+      /*text-indent: 10px;*/
+      border-bottom: 1px dashed #eee;
     }
 
-    .ml-10 {
-      margin-left: 10px;
-      text-indent: 10px;
+    /deep/ .el-button--text {
+      color: #555 !important;
+      font-size: 14px;
     }
+  }
 
-    .infoPoint-item {
-      width: 315px;
-      display: inline-block;
-      margin-left: 20px;
-      vertical-align: text-top;
-    }
+  .ml-10 {
+    margin-left: 10px;
+    text-indent: 10px;
+  }
+
+  .infoPoint-item {
+    width: 315px;
+    display: inline-block;
+    margin-left: 20px;
+    vertical-align: text-top;
   }
+}
 </style>

+ 23 - 19
src/components/ledger/handsontables/device.vue

@@ -585,7 +585,7 @@ export default {
         });
       }
     },
-    //获取所主体数据---用于维护信息
+    //获取所主体数据---用于维护信息
     getAllData() {
       if (!!this.mess.deviceId) {
         //   查询step2
@@ -895,6 +895,7 @@ export default {
         this.hot.destroy();
         this.hot = null;
       }
+
       this.hot = new Handsontable(container, {
         data: this.tableData,
         fixedColumnsLeft: this.showParts ? 6 : 5,
@@ -1039,46 +1040,46 @@ export default {
     // 更新
     updateBusiness(data, change) {
       let param = {
-          Content: [],
-          Projection: []
+          content: [],
+          projection: []
         },
         keyList = [];
       //生成要修改字段列表
       change.map(item => {
         let key = item[1].split(".")[0];
         if (key == "flowBuild" && keyList.indexOf(key) == -1) {
-          keyList.push("BuildingId", "FloorId");
-          param.Projection.push("BuildingId", "FloorId");
+          keyList.push("buildingId", "floorId");
+          param.projection.push("buildingId", "floorId");
         }
-        if (item[1] && keyList.indexOf(key) == -1 && item[1] != "PropertyId") {
+        if (item[1] && keyList.indexOf(key) == -1 && item[1] != "propertyId") {
           keyList.push(key);
         }
         if (
           item[1] &&
           item[3] == "" &&
-          param.Projection.indexOf(key) == -1 &&
-          item[1] != "PropertyId"
+          param.projection.indexOf(key) == -1 &&
+          item[1] != "propertyId"
         ) {
-          param.Projection.push(key);
+          param.projection.push(key);
         }
       });
       //生成对应修改数据
       data.map((item, index) => {
         keyList.map(value => {
-          if (value == "BuildingId") {
+          if (value == "buildingId") {
             let itemData = tools.dataForKey(item, "flowBuild");
             if (itemData == "") {
-              tools.setDataForKey(item, "BuildingId", null);
-              tools.setDataForKey(item, "FloorId", null);
+              tools.setDataForKey(item, "buildingId", null);
+              tools.setDataForKey(item, "floorId", null);
             } else {
               let BuildingId = itemData.split("-")[0];
               let FloorId = itemData.split("-")[1];
               if (BuildingId && FloorId) {
-                tools.setDataForKey(item, "BuildingId", BuildingId);
-                tools.setDataForKey(item, "FloorId", FloorId);
+                tools.setDataForKey(item, "buildingId", BuildingId);
+                tools.setDataForKey(item, "floorId", FloorId);
               } else if (BuildingId && !FloorId) {
-                tools.setDataForKey(item, "BuildingId", BuildingId);
-                tools.setDataForKey(item, "FloorId", null);
+                tools.setDataForKey(item, "buildingId", BuildingId);
+                tools.setDataForKey(item, "floorId", null);
               }
             }
           } else {
@@ -1086,7 +1087,7 @@ export default {
             tools.setDataForKey(item, value, itemData == "" ? null : itemData);
           }
         });
-        param.Content.push(item);
+        param.content.push(item);
       });
       updateEquip(param, res => {
       });
@@ -1268,6 +1269,7 @@ export default {
       }
     },
     getInfors(infos, row, el) {
+      console.log(infos, row, el)
       let val = this.hot.colToProp(row.col);
       let inputData = this.inputMap[val];
       this.row = row.row;
@@ -1277,6 +1279,7 @@ export default {
         path: this.$route.path,
         data: { equip: infos }
       });
+      console.log(val, '=================================')
       switch (val) {
         //操作
         case "caozuo":
@@ -1307,7 +1310,8 @@ export default {
           });
           return false;
         //设备二维码图片(infos.defaultQRCode)
-        case "infos.defaultQRCode":
+        // case "infos.defaultQRCode":
+        case "defaultQRCode":
           this.qrcodeUrl = this.tableData[row.row][val];
           if (this.qrcodeUrl) {
             this.myDialog.qrcode = true;
@@ -1767,7 +1771,7 @@ export default {
       this.$refs.batchDialogs.batchDialog = true;
     },
     upDataDevice(type, data1, data2) {
-      let param = { Content: data1 };
+      let param = { content: data1 };
       let param1 = { Content: data2 };
       if (type === 1) {
         //增量

+ 2 - 2
src/components/ledger/handsontables/system.vue

@@ -276,8 +276,8 @@ export default {
     },
     //选择设备类型-添加设备
     changeAddType(val) {
-      this.addData.Category = val.Category;
-      this.addData.CategoryName = val.CategoryName;
+      this.addData.Category = val.code;
+      this.addData.CategoryName = val.name;
       this.addData.showType = this.showType;
     },
     //格式化表头

+ 5 - 0
src/components/ledger/lib/assets.vue

@@ -52,6 +52,7 @@ export default {
     };
   },
   created() {
+    debugger
     this.getData();
   },
   watch: {
@@ -75,6 +76,7 @@ export default {
       this.$emit("change", value)
     },
     getData() {
+      debugger
       let _this = this
       let param1 = {
         data: {
@@ -102,6 +104,7 @@ export default {
         })
       })
       Promise.all([promise1, promise2]).then((res) => {
+        debugger
         let allData = res[0], data = res[1]
         _this.options = _this.changeArr(allData.content)
         if (_this.value) {
@@ -132,8 +135,10 @@ export default {
       //     this.changeList()
       //   }
       // })
+      console.log(this.options,'=========================')
     },
     changeArr(arr) {
+      debugger
       let data = [];
       arr.map(item => {
         data.push({ code: item.family, facility: item.familyName, disabled: false })

+ 266 - 259
src/components/ledger/lib/bimDialog.vue

@@ -1,285 +1,292 @@
 <template>
-    <el-dialog
-        title='修改BIM模型中的坐标'
-        v-if='dialog.bimcode'
-        custom-class='custom-dialog'
-        :visible.sync='dialog.bimcode'
-        width='900px'
-        @close='handleClose'
-    >
-        <div id='bim-code' v-if='Object.keys(bimcodeobj).length>0'>
-            <div class='eq'>
-                <span class='eq-name'>设备名称 &nbsp;&nbsp;</span>
-                {{bimcodeobj.EquipLocalName || bimcodeobj.EquipName|| '--'}}
-            </div>
-            <div>
-                <noAllDataFloor @change='changeFloor' ref='floors' @getFloorMap='getFloorMap'></noAllDataFloor>
-                <span v-if='isShow' class='errMsg'>请选择设备所属建筑楼层</span>
-            </div>
-            <div class='canvas-box' v-loading='canvasLoading'>
-                <canvas v-show='isdata' :id='`floorCanvas${id}`' :width='cadWidth' :height='cadHeight' ref='canvas' tabindex='0'></canvas>
-                <p v-show='!isdata'>当前楼层暂无平面图,请前往“建筑楼层管理”中给楼层添加平面图</p>
-            </div>
-        </div>
-        <div slot='footer' class='footer'>
-            <el-button @click='handleClose'>取 消</el-button>
-            <el-button type='primary' @click='save'>确 定</el-button>
-        </div>
-    </el-dialog>
+  <el-dialog
+    title='修改BIM模型中的坐标'
+    v-if='dialog.bimcode'
+    custom-class='custom-dialog'
+    :visible.sync='dialog.bimcode'
+    width='900px'
+    @close='handleClose'
+  >
+    <div id='bim-code' v-if='Object.keys(bimcodeobj).length>0'>
+      <div class='eq'>
+        <span class='eq-name'>设备名称 &nbsp;&nbsp;</span>
+        {{ bimcodeobj.EquipLocalName || bimcodeobj.EquipName || '--' }}
+      </div>
+      <div>
+        <noAllDataFloor @change='changeFloor' ref='floors' @getFloorMap='getFloorMap'></noAllDataFloor>
+        <span v-if='isShow' class='errMsg'>请选择设备所属建筑楼层</span>
+      </div>
+      <div class='canvas-box' v-loading='canvasLoading'>
+        <canvas v-show='isdata' :id='`floorCanvas${id}`' :width='cadWidth' :height='cadHeight' ref='canvas'
+                tabindex='0'></canvas>
+        <p v-show='!isdata'>当前楼层暂无平面图,请前往“建筑楼层管理”中给楼层添加平面图</p>
+      </div>
+    </div>
+    <div slot='footer' class='footer'>
+      <el-button @click='handleClose'>取 消</el-button>
+      <el-button type='primary' @click='save'>确 定</el-button>
+    </div>
+  </el-dialog>
 </template>
 <script>
-  import noAllDataFloor from './noAllDataFloor'
-  import {FloorView, LocationPointScene} from '@saga-web/cad-engine/lib'
-  import {SPoint} from '@saga-web/draw/lib'
-  import {updateEquip} from '@/api/scan/request'
-  import {SGraphyItem} from '@saga-web/graphy/lib'
+import noAllDataFloor from './noAllDataFloor'
+import { FloorView, LocationPointScene } from '@saga-web/cad-engine/lib'
+import { SPoint } from '@saga-web/draw/lib'
+import { updateEquip } from '@/api/scan/request'
+import { SGraphyItem } from '@saga-web/graphy/lib'
 
-  export default {
-    components: {
-      noAllDataFloor,
+export default {
+  components: {
+    noAllDataFloor,
+  },
+  props: {
+    dialog: {
+      type: Object,
+      default: function () {
+        return {
+          bimcode: false,
+        }
+      },
     },
-    props: {
-      dialog: {
-        type: Object,
-        default: function () {
-          return {
-            bimcode: false,
-          }
-            },
-        },
-        bimcodeobj: {
-            default: {},
-        },
+    bimcodeobj: {
+      default: {},
     },
-    data() {
-        return {
-            cadWidth: 800,
-            cadHeight: 400,
-            Buildfloor: '',
-            value: [],
-            isdata: true,
-            floorData: {},
-            canvasLoading: false,
-            isShow: false,
-            id: 'ty',
-            view: '',
-            drawMainScene: '',
-            floorToMap: {},
+  },
+  data() {
+    return {
+      cadWidth: 800,
+      cadHeight: 400,
+      Buildfloor: '',
+      value: [],
+      isdata: true,
+      floorData: {},
+      canvasLoading: false,
+      isShow: false,
+      id: 'ty',
+      view: '',
+      drawMainScene: '',
+      floorToMap: {},
+    }
+  },
+  created() {
+  },
+  mounted() {
+    console.log(this.bimcodeobj)
+    this.init()
+  },
+  methods: {
+    init() {
+      this.isShow = true
+      this.$nextTick(function () {
+        if (this.bimcodeobj.FloorId) {
+          this.isShow = false
         }
+        if (this.$refs.floors) {
+          this.$refs.floors.setValue([this.bimcodeobj.BuildingId, this.bimcodeobj.FloorId])
+        }
+      })
     },
-    created() {},
-    mounted() {
-        console.log(this.bimcodeobj)
-        this.init()
+    //切换楼层
+    changeFloor(value) {
+      this.Buildfloor = value
+      this.isShow = true
+      if (value.length > 1) {
+        this.isShow = false
+        this.floorData = this.floorToMap[value[1]]
+      } else {
+        this.isShow = false
+        this.floorData = {}
+      }
+      this.getFloorData()
     },
-    methods: {
-        init() {
-            this.isShow = true
-            this.$nextTick(function () {
-                if (this.bimcodeobj.FloorId) {
-                    this.isShow = false
-                }
-                if (this.$refs.floors) {
-                    this.$refs.floors.setValue([this.bimcodeobj.BuildingId, this.bimcodeobj.FloorId])
-                }
-            })
-        },
-        //切换楼层
-        changeFloor(value) {
-            this.Buildfloor = value
-            this.isShow = true
-            if (value.length > 1) {
-                this.isShow = false
-                this.floorData = this.floorToMap[value[1]]
-            } else {
-                this.isShow = false
-                this.floorData = {}
-            }
-            this.getFloorData()
-        },
-        // 初始化canvas
-        initGraphy(Id, type) {
-            // type=1 => id:模型id 这里不需要
-            // type=2 => id:floormap jsonz格式
-            // type = 3 => id:floormap png或者jpg格式
-            let that = this
-            that.clearGraphy()
-            that.drawMainScene = new LocationPointScene()
-            that.canvasLoading = true
-            if (type == 2) {
-                that.drawMainScene.loadUrl(`/image-service/common/file_get?systemId=revit&key=${Id}`).then((res) => {
-                    that.getGraphtSuc(res)
-                })
-            } else if (type == 3) {
-                that.drawMainScene.loadImg(`/image-service/common/image_get?systemId=dataPlatform&key=${Id}`, (res) => {
-                    that.getGraphtSuc(res)
-                })
-            }
-        },
-        // 获取底图成功
-        getGraphtSuc(res) {
-          this.canvasLoading = false
-          if (res == 'error') {
-            this.FloorMap = ''
-            this.$message.warning('数据解析异常')
-            return
-          }
-          if (res.Result == 'failure') {
-            this.showTools = false
-            this.$message.warning(res.Message)
-            return
-          }
-          this.view.scene = this.drawMainScene
-          if (this.bimcodeobj.LocationJson) {
-            let obj = {
-              X: this.bimcodeobj.LocationJson.X,
-              Y: -this.bimcodeobj.LocationJson.Y,
-            }
-            //回写编辑
-            this.drawMainScene.addMarker(obj)
+    // 初始化canvas
+    initGraphy(Id, type) {
+      // type=1 => id:模型id 这里不需要
+      // type=2 => id:floormap jsonz格式
+      // type = 3 => id:floormap png或者jpg格式
+      let that = this
+      that.clearGraphy()
+      that.drawMainScene = new LocationPointScene()
+      that.canvasLoading = true
+      if (type == 2) {
+        that.drawMainScene.loadUrl(`/image-service/common/file_get?systemId=revit&key=${Id}`).then((res) => {
+          that.getGraphtSuc(res)
+        })
+      } else if (type == 3) {
+        that.drawMainScene.loadImg(`/image-service/common/image_get?systemId=dataPlatform&key=${Id}`, (res) => {
+          that.getGraphtSuc(res)
+        })
+      }
+    },
+    // 获取底图成功
+    getGraphtSuc(res) {
+      this.canvasLoading = false
+      if (res == 'error') {
+        this.FloorMap = ''
+        this.$message.warning('数据解析异常')
+        return
+      }
+      if (res.Result == 'failure') {
+        this.showTools = false
+        this.$message.warning(res.Message)
+        return
+      }
+      this.view.scene = this.drawMainScene
+      if (this.bimcodeobj.LocationJson) {
+        let obj = {
+          X: this.bimcodeobj.LocationJson.X,
+          Y: -this.bimcodeobj.LocationJson.Y,
+        }
+        //回写编辑
+        this.drawMainScene.addMarker(obj)
+      }
+      this.view.fitSceneToView()
+      this.drawMainScene.isSpaceSelectable = false
+      this.drawMainScene.spaceClick(this, this.canvasClick) //锚点触发
+      if (this.floorData.Outline && this.floorData.Outline.length) {
+        let newArr = this.floorData.Outline.map((t) => {
+          return new SPoint(t.X, t.Y)
+        })
+        this.drawMainScene.addSceneMark(newArr)
+      }
+    },
+    //获取楼层数据
+    getFloorData() {
+      console.log(this.floorData)
+      if (this.floorData && this.floorData.StructureInfo && this.floorData.StructureInfo.FloorMap) {
+        this.isdata = true
+        let floorMap = this.floorData.StructureInfo.FloorMap
+        if (floorMap.split('.')[1].toString() == 'png' || floorMap.split('.')[1].toString() == 'jpg') {
+          this.initGraphy(floorMap, 3)
+        } else {
+          this.initGraphy(floorMap, 2)
+        }
+      } else {
+        //暂无数据
+        this.isdata = false
+        this.clearGraphy()
+      }
+    },
+    //关闭弹窗
+    handleClose(val) {
+      this.view = ''
+      this.drawMainScene = ''
+      this.$emit('closeBIM', val)
+    },
+    //保存事件
+    save() {
+      if (this.drawMainScene) {
+        if (this.drawMainScene.markerList.length) {
+          let obj = this.drawMainScene.markerList[0], BIMLocation;
+
+          if (this.bimcodeobj.BIMLocation && this.bimcodeobj.BIMLocation.split(',')[2]) {
+            BIMLocation = `${obj.x.toFixed(2)},${(obj.y * -1).toFixed(2)},${this.bimcodeobj.BIMLocation.split(',')[2]}`
+          } else {
+            BIMLocation = `${obj.x.toFixed(2)},${(obj.y * -1).toFixed(2)},0`
           }
-          this.view.fitSceneToView()
-          this.drawMainScene.isSpaceSelectable = false
-          this.drawMainScene.spaceClick(this, this.canvasClick) //锚点触发
-          if (this.floorData.Outline && this.floorData.Outline.length) {
-            let newArr = this.floorData.Outline.map((t) => {
-              return new SPoint(t.X, t.Y)
-            })
-            this.drawMainScene.addSceneMark(newArr)
+          let param = {
+            content: [
+              {
+                equipId: this.bimcodeobj.EquipID,
+                buildingId: this.Buildfloor[0],
+                floorId: this.Buildfloor[1],
+                bimLocation: BIMLocation
+              },
+            ],
+            projection: ['bimLocation', 'buildingId', 'floorId'],
           }
-        },
-        //获取楼层数据
-        getFloorData() {
-            console.log(this.floorData)
-            if (this.floorData && this.floorData.StructureInfo && this.floorData.StructureInfo.FloorMap) {
-                this.isdata = true
-                let floorMap = this.floorData.StructureInfo.FloorMap
-                if (floorMap.split('.')[1].toString() == 'png' || floorMap.split('.')[1].toString() == 'jpg') {
-                  this.initGraphy(floorMap, 3)
-                } else {
-                  this.initGraphy(floorMap, 2)
-                }
-            } else {
-              //暂无数据
-              this.isdata = false
-              this.clearGraphy()
-            }
-        },
-      //关闭弹窗
-      handleClose(val) {
-        this.view = ''
-        this.drawMainScene = ''
-        this.$emit('closeBIM', val)
-      },
-      //保存事件
-      save() {
-        if (this.drawMainScene) {
-          if (this.drawMainScene.markerList.length) {
-            let obj = this.drawMainScene.markerList[0], BIMLocation;
-
-            if (this.bimcodeobj.BIMLocation && this.bimcodeobj.BIMLocation.split(',')[2]) {
-              BIMLocation = `${obj.x.toFixed(2)},${(obj.y * -1).toFixed(2)},${this.bimcodeobj.BIMLocation.split(',')[2]}`
-            } else {
-              BIMLocation = `${obj.x.toFixed(2)},${(obj.y * -1).toFixed(2)},0`
-            }
-            let param = {
-              Content: [
-                {
-                  EquipID: this.bimcodeobj.EquipID,
-                  BuildingId: this.Buildfloor[0],
-                  FloorId: this.Buildfloor[1],
-                  BIMLocation
-                },
-              ],
-              Projection: ['BIMLocation', 'BuildingId', 'FloorId'],
+          updateEquip(param, (res) => {
+            if (res.result == 'success') {
+              this.$message.success('保存成功')
+              this.handleClose('update')
             }
-            updateEquip(param, (res) => {
-              if (res.Result == 'success') {
-                this.$message.success('保存成功')
-                this.handleClose('update')
-              }
-            })
-          }
-        }
-      },
-      // 清空平面图
-      clearGraphy() {
-        if (this.view) {
-          this.view.scene = null
-          return
+          })
         }
-        let id = `floorCanvas${this.id}`
-        this.view = new FloorView(id)
-      },
-      //得到floormap
-      getFloorMap(val) {
-        this.floorToMap = val
-        this.floorData = this.floorToMap[this.bimcodeobj.FloorId]
-        this.getFloorData()
-      },
-      // canvas点击事件
-      canvasClick(item, event) {
-        if (item instanceof SGraphyItem) {
-          this.clearMark()
-          let obj = {
-            X: event[0].x,
-            Y: event[0].y,
-          }
-          this.drawMainScene.addMarker(obj)
-          this.view.fitSceneToView()
+      }
+    },
+    // 清空平面图
+    clearGraphy() {
+      if (this.view) {
+        this.view.scene = null
+        return
+      }
+      let id = `floorCanvas${this.id}`
+      this.view = new FloorView(id)
+    },
+    //得到floormap
+    getFloorMap(val) {
+      this.floorToMap = val
+      this.floorData = this.floorToMap[this.bimcodeobj.FloorId]
+      this.getFloorData()
+    },
+    // canvas点击事件
+    canvasClick(item, event) {
+      if (item instanceof SGraphyItem) {
+        this.clearMark()
+        let obj = {
+          X: event[0].x,
+          Y: event[0].y,
         }
-      },
-      //清空标记
-        clearMark() {
-            if (this.drawMainScene) {
-                this.drawMainScene.markerList.forEach((t) => {
-                    this.drawMainScene.removeItem(t)
-                })
-                this.drawMainScene.markerList = []
-            }
-        },
+        this.drawMainScene.addMarker(obj)
+        this.view.fitSceneToView()
+      }
     },
-    watch: {
-        bimcodeobj: {
-            immediate: true,
-            handler(val) {
-                this.init()
-            },
-        },
+    //清空标记
+    clearMark() {
+      if (this.drawMainScene) {
+        this.drawMainScene.markerList.forEach((t) => {
+          this.drawMainScene.removeItem(t)
+        })
+        this.drawMainScene.markerList = []
+      }
     },
+  },
+  watch: {
+    bimcodeobj: {
+      immediate: true,
+      handler(val) {
+        this.init()
+      },
+    },
+  },
 }
 </script>
 <style lang="less" scoped>
 #bim-code {
-    height: 500px;
-    .eq {
-        padding-bottom: 10px;
-        .eq-name {
-            color: #999999;
-            padding-left: 10px;
-        }
-    }
-    .errMsg {
-        color: red;
-        padding-left: 10px;
-    }
-    #buildFloor {
-        clear: both;
-        margin-bottom: 10px;
-    }
-    .canvas-box {
-        border: 1px solid #ccc;
-        clear: both;
-        width: 800px;
-        height: 400px;
-        margin-left: 10px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+  height: 500px;
+
+  .eq {
+    padding-bottom: 10px;
+
+    .eq-name {
+      color: #999999;
+      padding-left: 10px;
     }
+  }
+
+  .errMsg {
+    color: red;
+    padding-left: 10px;
+  }
+
+  #buildFloor {
+    clear: both;
+    margin-bottom: 10px;
+  }
+
+  .canvas-box {
+    border: 1px solid #ccc;
+    clear: both;
+    width: 800px;
+    height: 400px;
+    margin-left: 10px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 }
 </style>
-<style lang="less" >
+<style lang="less">
 #bim-code {
 }
 </style>

+ 1 - 1
src/components/ledger/lib/buildfloorCascader.vue

@@ -29,7 +29,7 @@ export default {
     getCascader() {
       let param = {
         cascade: [
-          { name: "floor", orders: "floorSequenceID desc" }
+          { name: "floor", orders: "floorSequenceId desc" }
         ],
         orders: "localName asc",
         pageNumber: 1,

+ 11 - 3
src/components/ledger/lib/cascader.vue

@@ -1,8 +1,9 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
-    <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
-      @change="changeVal">
+    <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable
+               :style="isWidth ? '' : 'width:160px;'" size="small"
+               @change="changeVal">
       <el-option v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
@@ -13,6 +14,7 @@
 import { mapGetters } from 'vuex';
 import { queryEquip } from "@/api/object/equip";
 import { queryPhysicsAllType } from "@/api/dict";
+
 export default {
   name: "getCode",
   props: {
@@ -72,6 +74,11 @@ export default {
     },
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
     getData() {
+
+      // params.filters += `;buildingId isNull`;
+
+
+      // params.filters += `;buildingId isNull`;
       let param2 = {
         distinct: true,
         pageNumber: 1,
@@ -113,7 +120,7 @@ export default {
       arr.map(t => {
         let temp = {};
         temp.code = t.code;
-        temp.facility = t.name === t.aliasName?t.name:`${t.name}(${t.aliasName})`;
+        temp.facility = t.name === t.aliasName ? t.name : `${t.name}(${t.aliasName})`;
         data.push(temp)
       })
       return data;
@@ -133,6 +140,7 @@ export default {
 #cascaderMap {
   float: left;
   margin-left: 10px;
+
   .buildFloor {
     color: #999999;
     font-size: 14px;

+ 9 - 9
src/components/ledger/lib/cenoteType.vue

@@ -4,9 +4,9 @@
     <el-select v-model="id" @change="changeVal">
     <el-option
       v-for="item in options"
-      :key="item.Id"
-      :label="item.Name"
-      :value="item.Id">
+      :key="item.id"
+      :label="item.name"
+      :value="item.id">
     </el-option>
   </el-select>
   </div>
@@ -32,7 +32,7 @@ export default {
     projectId() {
       this.getData()
       if (this.options.length) {
-        this.changeVal(this.options[0].Id)
+        this.changeVal(this.options[0].id)
       }
     }
   },
@@ -41,7 +41,7 @@ export default {
     changeVal(val) {
       let value = {};
       this.options.map(item => {
-        if (item.Id == val) {
+        if (item.id == val) {
           value = item;
         }
       });
@@ -50,13 +50,13 @@ export default {
     },
     async getData() {
       let param = {
-        ProjectId: this.projectId
+        projectId: this.projectId
       }
       await getCenoteType (param, res => {
-        var data = res.Content;
+        let data = res.content;
         data.unshift({
-          Id: "",
-          Name: "全部"
+          id: "",
+          name: "全部"
         });
         this.options = data;
         this.id = "";

+ 17 - 16
src/components/ledger/lib/linkassets.vue

@@ -3,12 +3,14 @@
     <el-row>
       <span class="condition-title">设备类型:</span>
       <el-select v-model="deviceType" filterable size="small" @change="handleChangeDevice" style="width:350px;">
-        <el-option v-for="item in deviceTypeList" :key="item.Category" :label="item.CategoryName" :value="item.Category"></el-option>
+        <el-option v-for="item in deviceTypeList" :key="item.classCode" :label="item.name"
+                   :value="item.classCode"></el-option>
       </el-select>
     </el-row>
     <el-row style="margin-top:30px;">
       <span class="condition-title">建筑楼层:</span>
-      <el-cascader :options="bfoptions" v-model="buildFloor" filterable size="small" @change="handleChangeBf" style="width:350px;"></el-cascader>
+      <el-cascader :options="bfoptions" v-model="buildFloor" filterable size="small" @change="handleChangeBf"
+                   style="width:350px;"></el-cascader>
     </el-row>
     <el-row style="margin-top:30px;" v-show="spaceShow">
       <span class="condition-title">分区类型:</span>
@@ -37,6 +39,7 @@ import { buildingQuery } from '@/api/object/build'
 import { floorQuery } from '@/api/object/floor'
 
 import { mapGetters } from "vuex"
+
 export default {
   props: {
     dialog: {
@@ -69,7 +72,8 @@ export default {
     this.getBuildFloorData() //获取建筑楼层数据
     this.getSpaceData() //获取分区类型数据
   },
-  mounted() { },
+  mounted() {
+  },
   methods: {
     //打开弹窗回调,初始化选择
     handleOpenReset() {
@@ -81,11 +85,9 @@ export default {
     },
     //获取未关联资产的设备或部件类型
     getPartsDieType() {
+      let _this = this
       TypePartsDie(res => {
-        debugger
-        this.deviceTypeList = res.Content.filter(item => {
-          return item.CategoryName
-        })
+        _this.deviceTypeList = res.content
       })
     },
     //获取建筑楼层数据
@@ -95,18 +97,18 @@ export default {
         pageSize: 1000,
         orders: "localName asc",
         projection: [
-            "id",
-            "localName"
+          "id",
+          "localName"
         ]
       }, floorParams = {
         orders: "floorSequenceId desc",
         pageNumber: 1,
         pageSize: 1000,
         projection: [
-            "buildingId",
-            "id",
-            "localName",
-            "floorSequenceId"
+          "buildingId",
+          "id",
+          "localName",
+          "floorSequenceId"
         ]
       }
       let promise1 = new Promise((resolve, reject) => {
@@ -299,9 +301,7 @@ export default {
       })
     }
   },
-  watch: {
-
-  }
+  watch: {}
 };
 </script>
 
@@ -316,6 +316,7 @@ export default {
   font-size: 14px;
   vertical-align: top;
 }
+
 /deep/ .el-dialog__body {
   max-height: 420px;
   overflow-y: auto;

+ 1 - 1
src/components/ledger/lib/noAllDataFloor.vue

@@ -74,7 +74,7 @@ export default {
           "localName"
         ]
       }, floorParams = {
-        orders: "floorSequenceID desc",
+        orders: "floorSequenceId desc",
         pageNumber: 1,
         pageSize: 1000
       }

+ 22 - 13
src/components/ledger/lib/system.vue

@@ -1,8 +1,10 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
-    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
-      <el-option v-for="item in options" :key="item.Category" :label="item.CategoryName" :value="item.Category"></el-option>
+    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'"
+               size="small" @change="changeVal">
+      <el-option v-for="item in options" :key="item.code" :label="item.name"
+                 :value="item.code"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
       @change="changeVal" change-on-select></el-cascader> -->
@@ -10,7 +12,10 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { queryLinkSys, queryPhysicsAllType } from "@/api/scan/request";
+import { queryLinkSys } from "@/api/scan/request";
+import { queryPhysicsAllType } from "@/api/dict";
+
+
 export default {
   name: "getCode",
   props: {
@@ -61,7 +66,7 @@ export default {
     changeVal(val) {
       let value = {}
       this.options.map(item => {
-        if (item.Category == val) {
+        if (item.code == val) {
           value = item
         }
       })
@@ -70,23 +75,26 @@ export default {
     },
     getData() {
       let param = {
-        Distinct: true,
-        PageNumber: 1,
-        PageSize: 1000,
-        Projection: [
-          "Category", "CategoryName"
+        distinct: true,
+        pageNumber: 1,
+        pageSize: 1000,
+        projection: [
+          "classCode", "name"
         ]
       }
       queryLinkSys(param, res => {
-        this.options = res.Content;
+        this.options = res.content;
         if (this.value) {
           this.changeVal(this.value)
         }
       })
     },
     getAllData() {
-      queryPhysicsAllType('System', res => {
-        this.options = this.changeArr(res.Content)
+      let param = {
+        type: 'system'
+      }
+      queryPhysicsAllType(param, res => {
+        this.options = this.changeArr(res.content)
         if (this.value) {
           this.changeVal(this.value)
         }
@@ -95,7 +103,7 @@ export default {
     changeArr(arr) {
       let data = [];
       arr.forEach(item => {
-        data.push({ Category: item.Code, CategoryName: item.Name });
+        data.push({ code: item.code, name: item.name });
       });
       return data;
     }
@@ -106,6 +114,7 @@ export default {
 #cascaderMap {
   float: left;
   margin-left: 10px;
+
   .buildFloor {
     color: #999999;
     font-size: 14px;

+ 1 - 1
src/components/ledger/rentList/roomCountDrawer.vue

@@ -104,7 +104,7 @@ export default {
     },
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'floorSequenceID desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
         order: 'localName asc'
       }
       //todo 检测所有大小写

+ 1 - 1
src/components/ledger/report/dataexport.vue

@@ -276,7 +276,7 @@ export default {
         orders: "createTime desc, equipID asc",
         pageNumber: pageNum,
         pageSize: 1000,
-        projection: [ "buildingId", "floorId", "family", "equipLocalName", "equipLocalID", "equipID", "createTime", "codeType", "infos"]
+        projection: [ "buildingId", "floorId", "family", "equipLocalName", "equipLocalId", "equipId", "createTime", "codeType", "infos"]
       }
       queryProperty(params, res => {
         this.dataList = this.dataList.concat(res.content.map((item) => {

+ 7 - 5
src/components/ledger/system/lib/equipType.vue

@@ -8,7 +8,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { queryPhysicsAllType } from "@/api/scan/request";
+import { queryPhysicsAllType } from "@/api/dict";
+
 import { queryEquip } from "@/api/object/equip";
 
 export default {
@@ -74,7 +75,7 @@ export default {
           "classCode"
         ]
       }
-      let param1 = 'Equipment'
+      let param1 = 'equipment'
       let promise2 = new Promise((resolve, reject) => {
         queryEquip(param2, res => {
           resolve(res)
@@ -82,10 +83,11 @@ export default {
       })
       let promise1 = new Promise((resolve, reject) => {
         queryPhysicsAllType(param1, res => {
-          let tempArr = res.Content;
+          let tempArr = res.content;
           if (this.params.SysType) {
-            tempArr = res.Content.filter(t => {
-              return t.ParentId == `${this.params.SysType}`
+            tempArr = res.content.filter(t => {
+              // todo parentId 这个字段后台没有返回
+              return t.parentId == `${this.params.SysType}`
             })
           }
           resolve(tempArr)

+ 8 - 8
src/components/ledger/system/table/cenoteTable.vue

@@ -19,7 +19,7 @@
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.StructureInfo.ShaftFuncType}}
+              {{scope.row.structureInfo.shaftFuncType}}
             </div>
           </template>
         </el-table-column>
@@ -83,18 +83,18 @@ export default {
     // 获取列表数据
     getTableData() {
       let params = {
-        Filters: `SysID='${this.params.SysID}'`,
-        Cascade: [
+        filters: `id='${this.params.SysID}'`,
+        cascade: [
           {
-            Name: 'shaftList',
+            name: 'shaftList',
           }
         ]
       }
       queryLinkSys(params, res => {
-        this.tableData = res.Content[0].Shaft || []
+        this.tableData = res.content[0].shaft || []
         this.tableData.forEach(item => {
-          if (item.StructureInfo && item.StructureInfo.ShaftFuncType) {
-            item.StructureInfo.ShaftFuncType = this.shaftType[item.StructureInfo.ShaftFuncType]
+          if (item.structureInfo && item.structureInfo.shaftFuncType) {
+            item.structureInfo.shaftFuncType = this.shaftType[item.structureInfo.shaftFuncType]
           }
         })
       })
@@ -153,4 +153,4 @@ export default {
     height: calc(100% - 50px);
   }
 }
-</style>
+</style>

+ 17 - 12
src/components/ledger/system/table/deviceTable.vue

@@ -1,31 +1,34 @@
 <template>
   <div id="eqInSp">
     <el-row>
-      <el-button type="primary" @click="add">添加{{inSpaceType}}</el-button>
+      <el-button type="primary" @click="add">添加{{ inSpaceType }}</el-button>
       <!-- <el-tooltip class="item" effect="dark" content="可前往“全部关系总览”中计算竖井内设备" placement="right">
         <el-button>按空间计算</el-button>
       </el-tooltip> -->
     </el-row>
     <div class="table-box">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading"
+                :header-cell-style="headerStyle">
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.EquipLocalName||scope.row.EquipName||''}}
+              {{ scope.row.localName || scope.row.name || '' }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
+                         min-width="100"></el-table-column>
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.EquipCategory.EquipName}}
+              {{ scope.row.equipCategory.name }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
-            <el-button title="删除关系" size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain icon="el-icon-delete"></el-button>
+            <el-button title="删除关系" size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain
+                       icon="el-icon-delete"></el-button>
           </template>
         </el-table-column>
         <template slot="empty">
@@ -45,6 +48,7 @@
 import { queryLinkSys, eqInSysUnlink } from "@/api/scan/request";
 import { mapGetters } from "vuex";
 import addEquipDialog from "@/components/ledger/system/dialog/addEquipDialog"
+
 export default {
   components: {
     addEquipDialog
@@ -75,16 +79,16 @@ export default {
     // 获取列表数据
     getTableData() {
       let params = {
-        Filters: `SysID='${this.params.SysID}'`,
-        Cascade: [
+        filters: `id='${this.params.SysID}'`,
+        cascade: [
           {
-            Name: 'equipmentList',
-            Cascade: [{ Name: 'equipCategory' }]
+            name: 'equipmentList',
+            cascade: [{ name: 'equipCategory' }]
           }
         ]
       }
       queryLinkSys(params, res => {
-        this.tableData = res.Content[0].Equipment || []
+        this.tableData = res.content[0].equipment || []
       })
     },
     // 删除关系
@@ -136,9 +140,10 @@ export default {
 <style lang="less" scoped>
 #eqInSp {
   height: 100%;
+
   .table-box {
     margin-top: 10px;
     height: calc(100% - 50px);
   }
 }
-</style>
+</style>

+ 18 - 11
src/components/ledger/system/table/spaceTable.vue

@@ -1,28 +1,31 @@
 <template>
   <div id="eqInSp">
     <el-row>
-      <el-button type="primary" @click="add">添加{{inSpaceType}}</el-button>
+      <el-button type="primary" @click="add">添加{{ inSpaceType }}</el-button>
       <el-tooltip class="item" effect="dark" content="可前往“全部关系总览”中,按系统内包含的设备与空间关系计算" placement="right">
         <el-button>按系统内设备与业务空间关系计算</el-button>
       </el-tooltip>
     </el-row>
     <div class="table-box">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading"
+                :header-cell-style="headerStyle">
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            <div>{{ scope.row.RoomLocalName || scope.row.RoomName||''}}</div>
+            <div>{{ scope.row.RoomLocalName || scope.row.RoomName || '' }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="RoomLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="RoomLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
+                         min-width="100"></el-table-column>
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            <div>{{ spaceType[scope.row.ObjectType]}}</div>
+            <div>{{ spaceType[scope.row.ObjectType] }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="删除关系" placement="left">
-              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain icon="el-icon-delete"></el-button>
+              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain
+                         icon="el-icon-delete"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -35,8 +38,9 @@
       </el-table>
     </div>
     <!-- 添加空间弹窗 -->
-    <addSpaceDialog :dialogVisible.sync="dialogVisible" ref="addSpaceDialog" @refresh="refresh" :params="params" :spaceType="spaceType"
-      :floorType="floorType"></addSpaceDialog>
+    <addSpaceDialog :dialogVisible.sync="dialogVisible" ref="addSpaceDialog" @refresh="refresh" :params="params"
+                    :spaceType="spaceType"
+                    :floorType="floorType"></addSpaceDialog>
   </div>
 </template>
 
@@ -44,6 +48,7 @@
 import { queryLinkSys, spaceInSysUnlink } from "@/api/scan/request";
 import { mapGetters } from "vuex";
 import addSpaceDialog from "@/components/ledger/system/dialog/addSpaceDialog";
+
 export default {
   components: {
     addSpaceDialog
@@ -77,7 +82,7 @@ export default {
     // 获取列表数据
     getTableData() {
       let params = {
-        Filters: `SysID='${this.params.SysID}'`,
+        Filters: `id='${this.params.SysID}'`,
         Cascade: [
           {
             Name: "zoneSpaceBaseTableList"
@@ -85,7 +90,8 @@ export default {
         ]
       };
       queryLinkSys(params, res => {
-        this.tableData = res.Content[0].ZoneSpaceBaseTable || [];
+        // todo 这个字段是个啥???
+        this.tableData = res.content[0].zoneSpaceBaseTable || [];
       });
     },
     // 删除关系
@@ -148,9 +154,10 @@ export default {
 <style lang="less" scoped>
 #eqInSp {
   height: 100%;
+
   .table-box {
     margin-top: 10px;
     height: calc(100% - 50px);
   }
 }
-</style>
+</style>

+ 5 - 5
src/components/point/dynamicdata/delRelationDialog.vue

@@ -273,14 +273,14 @@ export default {
             }).filter(item => item);
             if (tempArr.length) {
               queryLinkSys({
-                PageSize: 500,
-                Filters: `SysID in ${JSON.stringify(tempArr)}`
+                pageSize: 500,
+                filters: `id in ${JSON.stringify(tempArr)}`
               }, response => {
-                let Data = response.Content;
+                let Data = response.content;
                 dyData.forEach(item => {
                   Data.forEach(t => {
                     if (t.SysID == item.SysID) {
-                      item.ObjectLocalName = t.SysLocalName;
+                      item.ObjectLocalName = t.localName;
                     }
                   })
                 })
@@ -329,7 +329,7 @@ export default {
             if (tempArr.length) {
               buildingQuery({
                 PageSize: 500,
-                Filters: `BuildID in ${JSON.stringify(tempArr)}`
+                Filters: `id in ${JSON.stringify(tempArr)}`
               }, response => {
                 let Data = response.Content;
                 dyData.forEach(item => {

+ 7 - 7
src/components/point/dynamicdata/systemRules.vue

@@ -210,17 +210,17 @@ export default {
         }).filter(item => item);
         if (tempArr.length) {
           queryLinkSys({
-            PageSize: this.page.pageSize,
-            Filters: `SysID in ${JSON.stringify(tempArr)}`
+            pageSize: this.page.pageSize,
+            filters: `id in ${JSON.stringify(tempArr)}`
           }, response => {
-            let Data = response.Content;
+            let Data = response.content;
             dyData.forEach(item => {
               Data.forEach(t => {
                 if (t.SysID == item.SysID) {
-                  if (t.SysLocalName && t.SysLocalID) {
-                    item.ObjectLocalName = t.SysLocalName + '/' + t.SysLocalID;
-                  } else if (t.SysLocalName || t.SysLocalID) {
-                    item.ObjectLocalName = t.SysLocalName || t.SysLocalID;
+                  if (t.localName && t.localId) {
+                    item.ObjectLocalName = t.localName + '/' + t.localId;
+                  } else if (t.localName || t.localId) {
+                    item.ObjectLocalName = t.localName || t.localId;
                   }
                 }
               })

+ 6 - 6
src/components/point/report/objectInstance.vue

@@ -179,15 +179,15 @@ export default {
               })
             } else if (item.TypeCode == 'Sy') {
               queryLinkSys({
-                Filters: `SysID='${item.TypeCode + item.ProjectId + item.ObjectID}'`
+                filters: `id='${item.TypeCode + item.ProjectId + item.ObjectID}'`
               }, res => {
-                if (res.Content.length) {
-                  that.forms[key].ObjectLocalName = res.Content[0].SysLocalName
-                  that.forms[key].ObjectLocalCode = res.Content[0].SysLocalID
-                  if (item.InfoList.length && res.Content[0].Category) {
+                if (res.content.length) {
+                  that.forms[key].ObjectLocalName = res.content[0].localName
+                  that.forms[key].ObjectLocalCode = res.content[0].localId
+                  if (item.InfoList.length && res.content[0].classCode) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: res.Content[0].Category
+                      type: res.content[0].classCode
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');

+ 1 - 1
src/components/ready/buildfloor/buildfloorCascader.vue

@@ -30,7 +30,7 @@ export default {
       let param = {
         cascade: [
           // { Name: "floor", Orders: "FloorSequenceID desc" }
-          {name: "floor", orders: "floorSequenceID desc"}
+          {name: "floor", orders: "floorSequenceId desc"}
         ],
         // Orders: "BuildLocalName asc",
         pageNumber: 1,

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1175 - 1175
src/utils/handsontable/notShow.js


+ 1 - 1
src/views/business_space/dataUtil/index.vue

@@ -449,7 +449,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'sequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {

+ 1 - 1
src/views/data_admin/buildGraphy/index.vue

@@ -113,7 +113,7 @@ export default {
     getList() {
       let param = {
         cascade: [
-          { name: "floor", orders: "floorSequenceID desc", }
+          { name: "floor", orders: "floorSequenceId desc", }
         ],
         pageNumber: 1,
         pageSize: 50

+ 10 - 10
src/views/ledger/cenotelist/index.vue

@@ -164,20 +164,20 @@ export default {
     },
     async getTableData() {//获取表格数据
       let params = {
-        Cascade: [{ Name: 'spaceList' }],
-        Filters: this.cenoteId ? `ProjectId='${this.projectId}';structureInfo.ShaftFuncType='${this.cenoteId}'` : `ProjectId='${this.projectId}'`,
-        Orders: "createTime desc, ShaftLocalName desc, ShaftLocalID desc, ShaftID asc",
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        cascade: [{ name: 'spaceList' }],
+        filters: this.cenoteId ? `projectId='${this.projectId}';structureInfo.shaftFuncType='${this.cenoteId}'` : `projectId='${this.projectId}'`,
+        orders: "createTime desc, localName desc, localId desc, id asc",
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize
       }
       await queryCenoteTableData(params, (res) => {
-        this.tableData = res.Content
-        this.copyTableData = tools.deepCopy(res.Content)
-        this.page.pageNumber = res.PageNumber
-        this.page.total = res.Total
+        this.tableData = res.content
+        this.copyTableData = tools.deepCopy(res.content)
+        this.page.pageNumber = res.pageNumber
+        this.page.total = res.total
         if (this.tableData && this.tableData.length) {
           if (this.onlyRead) {
-            this.getBatch(res.Content)
+            this.getBatch(res.content)
           }
           this.initTable()
         }

+ 32 - 30
src/views/ledger/facility/addfacility.vue

@@ -225,6 +225,7 @@ export default {
     },
     // 创建设备数据
     async handleCreateTableData() {
+      debugger
       let newData = this.tableData.filter(item => {
         let keys = Object.keys(item);
         keys.map(key => {
@@ -244,7 +245,7 @@ export default {
       }
       let flag = false;
       newData.map(item => {
-        if (item.Checked && !item.EquipLocalName) {
+        if (item.Checked && !item.localName) {
           flag = true;
         }
         // 处理建筑-楼层
@@ -431,28 +432,28 @@ export default {
       tools.setDataForKey(this.tableData[this.row], "DPManufacturerID", data.venderId)//生产商ID
       tools.setDataForKey(this.tableData[this.row], "DPBrandID", data.brandId)//品牌ID
       tools.setDataForKey(this.tableData[this.row], "DPSpecificationID", data.specificationId)//型号ID
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Manufacturer", data.venderName)
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Brand", data.brandName)
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Specification", data.name)
+      tools.setDataForKey(this.tableData[this.row], "infos.manufacturer", data.venderName)
+      tools.setDataForKey(this.tableData[this.row], "infos.brand", data.brandName)
+      tools.setDataForKey(this.tableData[this.row], "infos.specification", data.name)
     },
     supplyChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierContractID", { id: data });
+      tools.setDataForKey(this.tableData[this.row], "infos.supplierContractID", { id: data });
     },
     //如果选择供应商之后
     supplierChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.Supplier", data.name)
+      tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name)
       tools.setDataForKey(this.tableData[this.row], "DPSupplierID", data.venderId)
     },
     //保险合同
     guaranteeChange(data) {
       for (let key in data) {
-        this.utilToKey(key, "insuranceNo", data, "InsuranceNum");
+        this.utilToKey(key, "insuranceNo", data, "insuranceNum");
         if (key == "contractFile") {
           if (!!data[key]) {
             data[key] = [data[key]];
           }
         }
-        this.utilToKey(key, "contractFile", data, "InsuranceFile");
+        this.utilToKey(key, "contractFile", data, "insuranceFile");
       }
     },
     //上传文件弹窗触发事件
@@ -465,12 +466,12 @@ export default {
     },
     //维修商变更
     changeMaintainer(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.Maintainer", data.name)
+      tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name)
       tools.setDataForKey(this.tableData[this.row], "DPMaintainerID", data.venderId)
     },
     //保险商变更
     changeInsurer(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.Insurer", data.name)
+      tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name)
       tools.setDataForKey(this.tableData[this.row], "DPInsurerID", data.venderId)
     },
     //设备图片弹窗改变事件
@@ -526,6 +527,7 @@ export default {
       return dataArr || [];
     },
     getInfors(infos, row) {
+      console.log(infos, row)
       let val = this.tableExample.colToProp(row.col);
       switch (val) {
         //操作
@@ -580,7 +582,7 @@ export default {
           }
           break;
         //供应合同编号
-        case 'LedgerParam.SupplyPurchase.SupplierContractID':
+        case 'infos.supplierContractID':
           if (!this.onlyRead) {
             let ContractIDflag = null;
             let DPSdata = this.tableData[row.row].DPSupplierID;
@@ -596,7 +598,7 @@ export default {
           }
           break;
         //保险单号
-        case 'LedgerParam.InsuranceDoc.InsuranceNum':
+        case 'infos.insuranceNum':
           if (!this.onlyRead) {
             let DPInsurerIDflag = null;
             let DPIdata = this.tableData[row.row].DPInsurerID;
@@ -612,39 +614,39 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
-        case 'LedgerParam.PhotoDoc.Archive': //设备文档
-        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
-        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
-        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
-        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
-        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
-        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
-        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
-        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
-        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
-        case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
-        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
-        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+        case 'infos.insuranceFile': //保险文件
+        case 'infos.archive': //设备文档
+        case 'infos.checkReport': //安装质检报告
+        case 'infos.maintainManual': //维修保养手册
+        case 'infos.approachingAcceptance': //进场验收单
+        case 'infos.acceptanceReport': //验收报告
+        case 'infos.operationManual': //操作说明书
+        case 'infos.originalCertificate': //原厂证明
+        case 'infos.testReport': //检测报告
+        case 'infos.productCertification': //产品合格证
+        case 'infos.installInstruction': //安装说明书
+        case 'infos.supplierContract': //供应合同
+        case 'infos.drawing': //设备图纸
+        case 'infos.installDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
         //安装照片--设备铭牌照片
-        case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.PhotoDoc.Nameplate':
+        case 'infos.installPic':
+        case 'infos.nameplate':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;
           break;
         //设备照片
-        case 'LedgerParam.PhotoDoc.Pic':
+        case 'infos.pic':
           let Pdata = tools.dataForKey(this.tableData[row.row], val);
           this.picsArr = Pdata ? Pdata : [];
           this.myDialog.pic = true;
           break;
         //包含的部件字段
-        case 'Count':
+        case 'count':
           if (this.onlyRead) {
             this.$router.push({ path: '/ledger/parts', query: { deviceId: infos.EquipID } });
           } else {

+ 2 - 0
src/views/ledger/facility/details/index.vue

@@ -278,6 +278,7 @@ export default {
     handleRadios(val) { //判断radio的值显示关键信息,基本信息,图片,文件
       let arr = []
       //关键信息点
+      console.log(this.pointData, 'pointttt')
       this.exhibitionCrux.cruxArray = this.pointData.filter(i => i.KeyWord)
       this.exhibitionCrux.cruxArray.map(i => {
         if (this.instance.hasOwnProperty(i.Path)) {
@@ -424,6 +425,7 @@ export default {
       }
     },
     displayData(arr) {//对数据进行处理传给组件展示
+      console.log(arr, 'arr')
       const result = {}
       const resultEnergy = {};
       arr.map(i => {

+ 14 - 8
src/views/ledger/facility/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="deviceList" >
+  <div id="deviceList">
     <router-link to="/ledger/facility/addfacility"></router-link>
     <router-view></router-view>
     <saga-title :mess="mess"></saga-title>
@@ -28,6 +28,7 @@ import {
   mapGetters,
   mapActions
 } from "vuex";
+
 export default {
   components: {
     sagaTitle,
@@ -67,7 +68,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters("layout", [ "projectId", "projects", "secret", "userId" ])
+    ...mapGetters("layout", ["projectId", "projects", "secret", "userId"])
   },
   created() {
     this.param.ProjId = this.projectId
@@ -92,17 +93,17 @@ export default {
   methods: {
     getProjName() {
       this.projects.forEach((item) => {
-        if(item.id == this.projectId)
-        this.mess.perjectName = item.name
+        if (item.id == this.projectId)
+          this.mess.perjectName = item.name
       })
       // this.getEqCode()
     },
     close(val) {
       this.getCount()
-      if (val && this.$refs.cascader){
+      if (val && this.$refs.cascader) {
         this.$refs.cascader.changeVal(val.code)
       }
-        this.$refs.cascader.getData()
+      this.$refs.cascader.getData()
       //   this.$refs.tableMain.getHeaderData(this.param);
     },
     // getEqCode() {
@@ -157,6 +158,7 @@ export default {
         if (this.$refs.tableMain)
           this.$refs.tableMain.getHeaderData(this.param);
       }
+      // this.$refs.cascader.getData(value)
     },
 
     //修改设备族
@@ -181,6 +183,7 @@ export default {
   height: 100%;
   background-color: #fff;
   position: relative;
+
   .table-main {
     position: absolute;
     top: 87px;
@@ -191,15 +194,18 @@ export default {
     // border-radius: 5px;
     // padding: 10px 0;
   }
+
   .search-header {
     overflow: hidden;
     padding-bottom: 10px;
     margin: 0 10px;
     border-bottom: 1px solid #bcbcbc;
-    .icon-batchassociation{
+
+    .icon-batchassociation {
       float: right;
       font-size: 12px;
-      /deep/ span{
+
+      /deep/ span {
         margin-left: 5px;
       }
     }

+ 2 - 0
src/views/ledger/property/addproperty.vue

@@ -181,7 +181,9 @@ export default {
           }
         }
       })
+      // 添加资产
       if (flag) {
+        debugger
         this.$message.info("存在设备的本地名称为空,请检查")
         return;
       }

+ 17 - 14
src/views/ledger/property/index.vue

@@ -20,6 +20,7 @@ import tableTransfers from "@/components/ledger/tableTransfers";
 import { mapGetters, mapActions } from "vuex";
 import { countProperty, queryProperty } from "@/api/scan/request"
 import "./../index.scss"
+
 export default {
   components: {
     sagaTitle,
@@ -29,7 +30,7 @@ export default {
     tableTransfers
   },
   computed: {
-    ...mapGetters("layout", [ "projectId", "projects", "secret", "userId" ])
+    ...mapGetters("layout", ["projectId", "projects", "secret", "userId"])
   },
   data() {
     return {
@@ -70,17 +71,17 @@ export default {
   },
   watch: {
     projectId() {
-        this.param.ProjId = this.projectId
-        this.param.secret = this.secret
-        this.getProjName()
-        this.getNumber()
+      this.param.ProjId = this.projectId
+      this.param.secret = this.secret
+      this.getProjName()
+      this.getNumber()
     }
   },
   methods: {
     getProjName() {
       this.projects.forEach((item) => {
-        if(item.id == this.projectId) 
-        this.mess.perjectName = item.name
+        if (item.id == this.projectId)
+          this.mess.perjectName = item.name
       })
     },
     //获取header的list
@@ -88,7 +89,7 @@ export default {
       countProperty({}, res => {
         this.mess.name[0].num = res.Count
       })
-      countProperty({"Filters": "not EquipmentId isNull"}, res => {
+      countProperty({ "Filters": "not EquipmentId isNull" }, res => {
         this.mess.name[1].num = res.Count
       })
     },
@@ -103,8 +104,8 @@ export default {
         this.param.floorId = null
       }
       if (!!this.param.deviceId) {
-        if(this.$refs.tableMain)
-        this.$refs.tableMain.getHeaderData(this.param);
+        if (this.$refs.tableMain)
+          this.$refs.tableMain.getHeaderData(this.param);
       } else {
         return;
       }
@@ -116,8 +117,8 @@ export default {
       this.param.deviceId = val.code
       this.getNumber()
       if (!!this.param.deviceId) {
-        if(this.$refs.tableMain)
-        this.$refs.tableMain.getHeaderData(this.param);
+        if (this.$refs.tableMain)
+          this.$refs.tableMain.getHeaderData(this.param);
       }
     },
 
@@ -125,8 +126,8 @@ export default {
     changeDevice(value) {
       if (value.code && value.facility) {
         this.param.deviceId = value.code
-        if(this.$refs.tableMain)
-        this.$refs.tableMain.getHeaderData(this.param);
+        if (this.$refs.tableMain)
+          this.$refs.tableMain.getHeaderData(this.param);
       }
     }
   }
@@ -138,6 +139,7 @@ export default {
   height: 100%;
   background-color: #fff;
   position: relative;
+
   .table-main {
     position: absolute;
     top: 87px;
@@ -148,6 +150,7 @@ export default {
     // border-radius: 5px;
     // padding: 10px 0;
   }
+
   .search-header {
     overflow: hidden;
     padding-bottom: 10px;

+ 11 - 11
src/views/ledger/rentlist/index.vue

@@ -177,22 +177,22 @@ export default {
     },
     async getTableData() {//获取表格数据
       let params = {
-        Cascade: [
-          { Name: 'zoneTenantList', Cascade: [{ Name: 'building' }, { Name: 'floor' }] },
-          { Name: 'zoneGeneraltList', Cascade: [{ Name: 'building' }, { Name: 'floor' }] }
+        cascade: [
+          { name: 'zoneTenantList', cascade: [{ name: 'building' }, { name: 'floor' }] },
+          { name: 'zoneGeneraltList', cascade: [{ name: 'building' }, { name: 'floor' }] }
         ],
-        Orders: "createTime desc, TenantLocalName desc, TenantLocalID desc, TenantID asc",
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        orders: "createTime desc, localName desc, localId desc, id asc",
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize
       }
       await queryRentTableData(params, (res) => {
-        this.tableData = res.Content
-        this.copyTableData = tools.deepCopy(res.Content)
-        this.page.pageNumber = res.PageNumber
-        this.page.total = res.Total
+        this.tableData = res.content
+        this.copyTableData = tools.deepCopy(res.content)
+        this.page.pageNumber = res.pageNumber
+        this.page.total = res.total
         if (this.tableData && this.tableData.length) {
           if (this.onlyRead) {
-            this.getBatch(res.Content)
+            this.getBatch(res.content)
           }
           this.initTable()
         }

+ 60 - 34
src/views/ledger/rentlist/manageTenantZone.vue

@@ -21,22 +21,25 @@
           </el-input>
         </div>
         <div style="overflow-y:auto;height: calc(100% - 53px);">
-          <div v-for="(item,i) in tenantList" :key="item.TenantID" :class="{'tenantItem':true, 'active':item.active}" @click="tenantChange(i)">
-            {{item.TenantLocalName||item.TenantName}}
+          <div v-for="(item,i) in tenantList" :key="item.TenantID" :class="{'tenantItem':true, 'active':item.active}"
+               @click="tenantChange(i)">
+            {{ item.TenantLocalName || item.TenantName }}
           </div>
         </div>
       </el-col>
       <el-col :span="21" style="height:100%;">
         <div style="height:52px;border-bottom:1px solid #e4e4e4;">
           <div v-if="onlyRead===true||onlyRead==='true'">
-            <div v-for="(bd,i) in allBuilding" :key="bd.BuildID" :class="{'building':true,'active':bd.active}" @click="changeBuildSelect(i)">
-              {{bd.BuildLocalName||bd.BuildName}}
+            <div v-for="(bd,i) in allBuilding" :key="bd.BuildID" :class="{'building':true,'active':bd.active}"
+                 @click="changeBuildSelect(i)">
+              {{ bd.BuildLocalName || bd.BuildName }}
             </div>
           </div>
           <div v-else style="line-height: 52px;padding:0 10px;">
             <label style="margin-right:10px;">所属建筑</label>
             <el-select v-model="buildSelect" placeholder="请选择" @change="changeBuildSelect">
-              <el-option v-for="(item,i) in allBuilding" :key="item.BuildID" :label="item.BuildLocalName || item.BuildName" :value="i">
+              <el-option v-for="(item,i) in allBuilding" :key="item.BuildID"
+                         :label="item.BuildLocalName || item.BuildName" :value="i">
               </el-option>
             </el-select>
             <div style="float:right;">
@@ -52,10 +55,11 @@
               <div><i class="el-icon-caret-top"></i></div>
             </div>
             <div class="floor">
-              <div v-for="(fl,i) in floorList" :key="fl.id" :class="{'active':fl.active,'textParent':true}" @click="floorChange(i)">
+              <div v-for="(fl,i) in floorList" :key="fl.id" :class="{'active':fl.active,'textParent':true}"
+                   @click="floorChange(i)">
                 <div class="text" :title="fl.FloorLocalID || fl.FloorLocalName">
-                  {{fl.FloorLocalID || fl.FloorLocalName}}
-                  <span v-if="fl.Count">{{fl.Count>9?'9+':fl.Count}}</span>
+                  {{ fl.FloorLocalID || fl.FloorLocalName }}
+                  <span v-if="fl.Count">{{ fl.Count > 9 ? '9+' : fl.Count }}</span>
                 </div>
               </div>
             </div>
@@ -66,8 +70,9 @@
           </div>
           <canvas id="floorCanvas" :width="canvasWidth" :height="canvasHeight" v-show="hasMap"></canvas>
           <div class="canvas-fun" v-show="hasMap">
-            <canvasFun @scale="scale" @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @saveJson="saveJson" :config="config"
-              @groupSelect="groupSelect" ref="canvasFun">
+            <canvasFun @scale="scale" @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @saveJson="saveJson"
+                       :config="config"
+                       @groupSelect="groupSelect" ref="canvasFun">
             </canvasFun>
           </div>
           <div class="center" v-show="!hasMap">
@@ -93,6 +98,7 @@ import {
   zoneQueryOutline
 } from '@/api/scan/request'
 import { buildingQuery } from '@/api/object/build';
+
 export default {
   data() {
     return {
@@ -127,20 +133,20 @@ export default {
     canvasFun
   },
   computed: {
-    ...mapGetters("layout", ["projectId","projects"]),
+    ...mapGetters("layout", ["projectId", "projects"]),
     projectName() {
       let projectObj = this.projects.find(item => {
         return item.id == this.projectId
       })
-      return projectObj?projectObj.name?projectObj.name:projectObj.id:this.projectId
+      return projectObj ? projectObj.name ? projectObj.name : projectObj.id : this.projectId
     },
     buildFloorName() {
       let buildObj = this.allBuilding[this.buildSelect],
-          floorObj = this.floorList[this.activeFloor];
-          console.log(buildObj,floorObj)
-      return `${buildObj.BuildLocalName?buildObj.BuildLocalName:
-              buildObj.BuildName?buildObj.BuildName:""}-${floorObj.FloorLocalID?
-              floorObj.FloorLocalID:floorObj.FloorLocalName?floorObj.FloorLocalName:FloorName}`
+        floorObj = this.floorList[this.activeFloor];
+      console.log(buildObj, floorObj)
+      return `${buildObj.BuildLocalName ? buildObj.BuildLocalName :
+        buildObj.BuildName ? buildObj.BuildName : ""}-${floorObj.FloorLocalID ?
+        floorObj.FloorLocalID : floorObj.FloorLocalName ? floorObj.FloorLocalName : FloorName}`
     },
   },
   created() {
@@ -299,19 +305,19 @@ export default {
     // 获取列表
     getTenant() {
       let pa = {
-        Cascade: [
-          { Name: 'zoneTenantList' },
+        cascade: [
+          { name: 'zoneTenantList' },
           // , Cascade: [{ Name: 'building' }, { Name: 'floor' }]
-          { Name: 'zoneGeneraltList' }
+          { name: 'zoneGeneraltList' }
         ],
-        Orders: "TenantID asc",
-        PageSize: 1000
+        orders: "id asc",
+        pageSize: 1000
       }
       if (this.keyWord) {
-        pa.Filters = `TenantLocalName contain '${this.keyWord}'`
+        pa.filters = `localName contain '${this.keyWord}'`
       }
       queryRentTableData(pa, res => {
-        this.tenantList = res.Content.map(t => {
+        this.tenantList = res.content.map(t => {
           t.active = false;
           return t;
         })
@@ -342,10 +348,10 @@ export default {
           })
         })
         let pa2 = {
-          Cascade: [
-            { Name: this.Cascade[this.value], Filters: `FloorId='${floorid}'` }
+          cascade: [
+            { name: this.Cascade[this.value], filters: `floorId='${floorid}'` }
           ],
-          Filters: `TenantID='${TenantID}'`
+          filters: `id='${TenantID}'`
         }
         let promise2 = new Promise((resolve) => {
           queryRentTableData(pa2, res => {
@@ -356,7 +362,7 @@ export default {
           let res1 = response[0];
           let res2 = response[1];
           let key = 'Z' + this.Cascade[this.value].substring(1);
-          let relationList = res2.Content[0][key] || [];
+          let relationList = res2.content[0][key] || [];
           this.businessSpaceList = res1.Content;
           // 已关联元空间的业务空间
           this.BSPRelaISPList = [];
@@ -429,20 +435,20 @@ export default {
           tenantId: this.curTenantId
         }
         queryTnRelateFloor(pa, res => {
-          this.allBuilding = res.Content.map(t => {
+          this.allBuilding = res.content.map(t => {
             t.active = false;
-            if (t.Floor) {
-              t.Floor.map(item => {
+            if (t.floor) {
+              t.floor.map(item => {
                 item.active = false;
               })
             }
             return t;
           });
           if (this.onlyRead === true || this.onlyRead === 'true') {
-            this.allBuilding = this.allBuilding.filter(item => item.Count > 0)
+            this.allBuilding = this.allBuilding.filter(item => item.count > 0)
             this.allBuilding.map(t => {
-              if (t.Floor) {
-                t.Floor = t.Floor.filter(item => item.Count > 0)
+              if (t.floor) {
+                t.floor = t.floor.filter(item => item.count > 0)
               }
             })
           }
@@ -506,27 +512,32 @@ export default {
 @normal-border-active-color: #e8e8e8;
 #manageTenantZone {
   height: 100%;
+
   .main-container {
     margin-top: 10px;
     background: #fff;
     border: 1px solid @normal-border-color;
     height: calc(100% - 53px);
     overflow: hidden;
+
     .main-left {
       height: 100%;
       border-right: 1px solid @normal-border-color;
+
       .tenantItem {
         border-bottom: 1px solid @normal-border-color;
         text-align: center;
         line-height: 40px;
         color: #2b2b2b;
         cursor: pointer;
+
         &.active {
           background-color: @normal-border-active-color;
         }
       }
     }
   }
+
   .building {
     display: inline-block;
     margin: 7px 10px;
@@ -535,11 +546,13 @@ export default {
     border-radius: 28px;
     padding: 4px 16px;
     cursor: pointer;
+
     &.active {
       border: 1px solid #409eff;
       color: #409eff;
     }
   }
+
   .canvas-container {
     position: relative;
     width: 100%;
@@ -547,6 +560,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
+
     .floor-container {
       position: absolute;
       width: 60px;
@@ -555,6 +569,7 @@ export default {
       left: 20px;
       z-index: 2;
       background-color: #fff;
+
       .before,
       .after {
         div {
@@ -569,21 +584,27 @@ export default {
           cursor: pointer;
         }
       }
+
       .floor {
         position: relative;
         height: 210px;
         overflow-y: auto;
+
         &::-webkit-scrollbar {
           display: none;
         }
+
         .textParent {
           cursor: pointer;
+
           &.active {
             background-image: url(~@/assets/image/floorBG.png);
+
             div.text {
               border: none;
             }
           }
+
           div.text {
             position: relative;
             width: 54px;
@@ -597,12 +618,15 @@ export default {
             margin: 0 auto;
             padding: 0 10px;
             box-sizing: border-box;
+
             &:hover {
               background-color: #409eff1a;
             }
+
             b {
               font-weight: normal;
             }
+
             span {
               position: absolute;
               display: block;
@@ -621,6 +645,7 @@ export default {
           }
         }
       }
+
       div.border {
         position: absolute;
         width: 52px;
@@ -633,6 +658,7 @@ export default {
         border-right: 1px solid @normal-border-color;
       }
     }
+
     .canvas-fun {
       position: absolute;
       bottom: 20px;

+ 2 - 2
src/views/ledger/report/index.vue

@@ -343,7 +343,7 @@ export default {
 
       // 不能同步到物理世界的对象
       notSyncObject(this.params, res => {
-        this.notSyncObjectCount = res.Count;
+        this.notSyncObjectCount = res.count;
       })
 
       // 不能同步到物理世界的关系数据
@@ -685,7 +685,7 @@ export default {
     },
     getSystemCount() {// 获取系统数据
       countGeneralSys(this.params, res => {
-        this.systemCount = res.Count;
+        this.systemCount = res.count;
       })
     },
     getTenantCount() {// 获取租户数据

+ 1 - 1
src/views/ledger/system/index.vue

@@ -86,7 +86,7 @@ export default {
     countGeneralSys() {
       let param = {}
       countGeneralSys(param, res => {
-        this.mess.name[0].num = res.Count
+        this.mess.name[0].num = res.count
       })
     },
     //修改楼层

+ 3 - 3
src/views/ledger/system/systemDetail/index.vue

@@ -220,7 +220,7 @@ export default {
         pageSize: 1000,
         type: this.params.SysType
       }, params2 = {
-        Filters: `SysID='${this.params.SysID}'`,
+        filters: `id='${this.params.SysID}'`,
       };
       let promise1 = new Promise((resolve, reject) => {
         getDataDictionary(params1, res => {
@@ -234,8 +234,8 @@ export default {
       })
       Promise.all([promise1, promise2]).then(values => {
         this.pointData = values[0].content;
-        this.exampleData = values[1].Content[0];
-        let obj = this.deepCopy(values[1].Content[0]);
+        this.exampleData = values[1].content[0];
+        let obj = this.deepCopy(values[1].content[0]);
         obj = tools.flattenKeys(obj);
         for (let key in obj) {
           if (Array.isArray(obj[key]) && !obj[key].length) {

+ 5 - 5
src/views/point/dynamicdata/addRelation/systemRela/index.vue

@@ -412,14 +412,14 @@ export default {
           return t.TypeCode + t.ProjectId + t.ObjectID
         })
         if (tempArr.length) {
-          pa.Filters += `;not SysID in ${JSON.stringify(tempArr)}`
+          pa.filters += `;not id in ${JSON.stringify(tempArr)}`
         }
         queryLinkSys(pa, res => {
-          this.rPage.total = res.Total;
-          let tempArr = res.Content.map(t => {
+          this.rPage.total = res.total;
+          let tempArr = res.content.map(t => {
             t.ObjectID = t.SysID.substr(12);
-            t.ObjectLocalName = t.SysLocalName;
-            t.ObjectLocalCode = t.SysLocalID;
+            t.ObjectLocalName = t.localName;
+            t.ObjectLocalCode = t.localId;
             return t;
           });
           if (this.rPage.pageNumber == 1) {

+ 1 - 1
src/views/relation/overview/detail/index.vue

@@ -231,7 +231,7 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       let pa = {
-        cascade: [{ name: 'floor', orders: 'sequenceId desc' }],
+        cascade: [{ name: 'floor', orders: 'floorSequenceId desc' }],
         orders: "localName asc",
       }
       buildingQuery(pa, res => {