Browse Source

adm:feat > 修改台账相关问题

shaun-sheep 4 years ago
parent
commit
fe785be4a3

+ 2 - 1
src/api/scan/request.js

@@ -1844,7 +1844,8 @@ export function shthroughshUnlink(param, success) {
 //查询没有和当前系统关联的设备
 export function unSysEq(param, success) {
   let data = param.data
-  let url = `${baseUrl}/datacenter2/general-system/un-sys-equip?sysId=${param.sysId}`;
+  // let url = `${baseUrl}/datacenter2/general-system/un-sys-equip?sysId=${param.sysId}`;
+  let url = `${baseUrl}/datacenter2/object/general-system/un-sys-equip`;
   http.postJson(url, data, success)
 }
 

+ 1 - 1
src/components/dialogs/list/supplyDialog.vue

@@ -22,7 +22,7 @@
                 <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
             </p>
             <my-pagination :page="page" @change="pageChange" style="margin-top:10px;"></my-pagination>
-        </div> 
+        </div>
           <div class="footer">
             <el-button
               type="primary"

+ 0 - 2
src/components/ledger/details/detail/cruxDialog.vue

@@ -73,7 +73,6 @@ export default {
       this.dialogFormVisible = true
     },
     save() {
-      console.log(this.allChecks, 'allChecks')
       let arrLenght = this.allChecks.filter(i => i.KeyWord)
       if (arrLenght.length > 6) {
         this.$message.info('不可超过6个')
@@ -97,7 +96,6 @@ export default {
             groupCode: i.groupCode
           }
         })
-
         setDataDictionary(param, res => {
           this.dialogFormVisible = false
           this.$emit('cruxSuccess')

+ 5 - 5
src/components/ledger/handsontables/assets.vue

@@ -870,13 +870,13 @@ export default {
             path: "propertyDetails",
             query: {
               type: this.mess.deviceId,
-              equipId: infos.EquipID,
-              equipName: infos.EquipLocalName ? infos.EquipLocalName : infos.EquipName ? infos.EquipName : '',
-              equipCode: infos.EquipLocalID ? infos.EquipLocalID : '',
+              equipId: infos.id,
+              equipName: infos.localName ? infos.localName : infos.name ? infos.name : '',
+              equipCode: infos.localId ? infos.localId : '',
               data: this.tableData.map(item => {
                 return {
-                  value: item.EquipID,
-                  label: item.EquipLocalName ? item.EquipLocalName : item.EquipName ? item.EquipName : ''
+                  value: item.id,
+                  label: item.localName ? item.localName : item.name ? item.name : ''
                 }
               })
             }

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

@@ -276,7 +276,7 @@ export default {
     },
     //选择设备类型-添加设备
     changeAddType(val) {
-      console.log(val,'=====================')
+      console.log(val, '=====================')
       this.addData.Category = val.classCode;
       this.addData.CategoryName = val.name;
       this.addData.showType = this.showType;
@@ -547,9 +547,10 @@ export default {
         case 'caozuo':
           // window.open(`http://adm.sagacloud.cn:8058/system?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
           // this.$message("开发中...")
+          console.log(infos)
           this.$router.push({
             path: "/ledger/systemDetail",
-            query: { SysID: infos.SysID, Name: infos.SysLocalName || infos.SysName, SysType: infos.Category }
+            query: { SysID: infos.id, Name: infos.localName || infos.name, SysType: infos.classCode }
           })
           return false
         //设备二维码图片

+ 39 - 29
src/components/ledger/system/dialog/addEquipDialog.vue

@@ -15,16 +15,19 @@
     </el-row>
 
     <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 :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            <div>{{scope.row.EquipLocalName||scope.row.EquipName||''}}</div>
+            <div>{{ scope.row.EquipLocalName || scope.row.EquipName || '' }}</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="EquipCategory.EquipName" :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 prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip
+                         min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-button size="mini" @click="toDetail(scope.$index, scope.row)" plain>查看详情</el-button>
@@ -32,9 +35,11 @@
         </el-table-column>
       </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="dialogVisible = false">取 消</el-button>
@@ -48,14 +53,13 @@ import { sysLinkEquip, unSysEq } from "@/api/scan/request";
 import floorCascader from "@/components/ledger/lib/floorCascader";
 import myCascader from "@/components/ledger/system/lib/equipType";
 import { mapGetters } from "vuex";
+
 export default {
   components: {
     floorCascader,
     myCascader
   },
-  computed: {
-    ...mapGetters("layout", ["projectId"])
-  },
+
   data() {
     return {
       title: "添加系统内设备",
@@ -81,6 +85,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters("layout", ["projectId"]),
     childParams() {
       let temp = JSON.parse(JSON.stringify(this.params));
       temp.SysType = null;
@@ -91,7 +96,8 @@ export default {
     type: String, //选中的tab页
     params: Object //查看的竖井关系信息
   },
-  created() { },
+  created() {
+  },
   methods: {
     //修改建筑楼层
     changeFloor(value) {
@@ -108,33 +114,34 @@ export default {
     getTableData() {
       let params = {
         data: {
-          Filters: `not EquipID isNull`,
-          Cascade: [{ Name: "equipCategory" }],
-          Orders: "createTime desc, EquipID desc",
-          PageNumber: this.page.pageNumber,
-          PageSize: this.page.pageSize
+          filters: `not id isNull`,
+          cascade: [{ name: "equipCategory" }],
+          orders: "createTime desc, id desc",
+          pageNumber: this.page.pageNumber,
+          pageSize: this.page.pageSize,
+          sysId: this.$route.query.SysID,
+          shaftId: this.params.ShaftID,
         },
-        shaftId: this.params.ShaftID,
-        sysId: this.$route.query.SysID
       };
       if (this.Buildfloor[0] == "noKnow") {
-        params.data.Filters += `;buildingId isNull`;
+        params.data.filters += `;buildingId isNull`;
       } else if (this.Buildfloor[0] && this.Buildfloor[0] != "all") {
-        params.data.Filters += `;buildingId='${this.Buildfloor[0]}'`;
+        params.data.filters += `;buildingId='${this.Buildfloor[0]}'`;
       }
       if (this.Buildfloor[1] == "noKnow") {
-        params.data.Filters += `;floorId isNull`;
+        params.data.filters += `;floorId isNull`;
       } else if (this.Buildfloor[1] && this.Buildfloor[1] != "all") {
-        params.data.Filters += `;floorId='${this.Buildfloor[1]}'`;
+        params.data.filters += `;floorId='${this.Buildfloor[1]}'`;
       }
       if (this.keycode != "") {
-        params.data.Filters += `;EquipName contain '${this.keycode}' or EquipLocalName contain '${this.keycode}' or EquipLocalID contain '${this.keycode}'`;
+        params.data.filters += `;name contain '${this.keycode}' or localName contain '${this.keycode}' or localId contain '${this.keycode}'`;
       }
       if (this.Equipcategory) {
-        params.data.Filters += `;category='${this.Equipcategory}'`;
+        params.data.filters += `;classCode='${this.Equipcategory}'`;
       }
       unSysEq(params, res => {
-        res.Content.forEach(item => {
+        debugger
+        res.content.forEach(item => {
           item.ShaftListName = "";
           if (item.ShaftList && item.ShaftList.length) {
             item.ShaftListName = item.ShaftList.map(shaft => {
@@ -144,8 +151,8 @@ export default {
             }).join("、");
           }
         });
-        this.tableData = res.Content;
-        this.page.total = res.Total;
+        this.tableData = res.content;
+        this.page.total = res.total;
       });
     },
     //选中项修改
@@ -196,14 +203,17 @@ export default {
   .filters {
     margin-bottom: 10px;
   }
+
   .table-box {
     height: 370px;
+
     .fr {
       margin-top: 10px;
     }
   }
 }
+
 /deep/ #buildFloor .buildFloor {
   margin: 0 5px 0 5px;
 }
-</style>
+</style>

+ 0 - 1
src/views/ledger/cenotelist/cenoteDetail/index.vue

@@ -223,7 +223,6 @@ export default {
           }
           source.forEach(j => {
             if (j.Code == this.instance[i.Path]) {
-              // console.log(j.Name)
               i.value = j.Name
             }
           })

+ 0 - 1
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -84,7 +84,6 @@ export default {
     async handleCreateTableData() {
       let params = {}
       let flag = 0;//1.存在未填写竖井本地名称的数据;2.存在未选择竖井功能的数据
-      console.log(this.tableData,'table')
       let newData = this.tableData.filter((item) => {
         let keys = Object.keys(item)
         keys.map((key) => { //将值为空字符串的属性删除

+ 69 - 52
src/views/ledger/property/details/index.vue

@@ -93,7 +93,7 @@ export default {
     this.type = this.$route.query.type;
     this.list = this.$route.query.data;
     this.getData();
-    console.log(this.$route.query)
+    console.log(this.$route.query,'query')
   },
   computed: {
     ...mapGetters("layout", ["projectId", "secret", "userId"])
@@ -167,7 +167,7 @@ export default {
         pageSize: 1000,
         type: this.type
       }, params2 = {
-        filters: `equipId='${this.id}'`,
+        filters: `id='${this.id}'`,
       };
       let promise1 = new Promise((resolve, reject) => {
         getDataDictionary(params1, res => {
@@ -254,14 +254,13 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        debugger
         if (i.inputMode == 'F2') {
           switch (i.path) {
-            case 'LedgerParam.PhotoDoc.Drawing':
-            case 'LedgerParam.Siteinstall.InstallPic':
-            case 'LedgerParam.Siteinstall.InstallDrawing':
-            case 'LedgerParam.PhotoDoc.Nameplate':
-            case 'LedgerParam.PhotoDoc.Pic':
+            case 'infos.drawing':
+            case 'infos.installPic':
+            case 'infos.installDrawing':
+            case 'infos.nameplate':
+            case 'infos.pic':
               if (this.instance.hasOwnProperty(i.path)) {
                 i.PicList = this.instance[i.path]
               }
@@ -304,21 +303,21 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.InputMode == 'F2') {
-          switch (i.Path) {
-            case 'LedgerParam.InsuranceDoc.InsuranceFile':
-            case 'LedgerParam.PhotoDoc.Archive':
-            case 'LedgerParam.Siteinstall.CheckReport':
-              if (this.instance.hasOwnProperty(i.Path)) {
-                i.fileList = this.instance[i.Path]
+        if (i.inputMode == 'F2') {
+          switch (i.path) {
+            case 'infos.insuranceFile':
+            case 'infos.archive':
+            case 'infos.checkReport':
+              if (this.instance.hasOwnProperty(i.path)) {
+                i.fileList = this.instance[i.path]
               }
-              if (picObject[i.InfoPointName]) {
+              if (picObject[i.name]) {
 
               } else {
-                picObject[i.InfoPointName] = []
+                picObject[i.name] = []
               }
 
-              picObject[i.InfoPointName].push({
+              picObject[i.name].push({
                 ...i,
               })
               break
@@ -360,67 +359,85 @@ export default {
     displayData(arr) {//对数据进行处理传给组件展示
       const result = {}
       arr.forEach(i => {
-        if (this.instance.hasOwnProperty(i.Path) && this.currentRadio != 2) {
-          i.value = this.instance[i.Path]
+        if (this.instance.hasOwnProperty(i.path) && this.currentRadio != 2) {
+          i.value = this.instance[i.path]
         }
-        if (i.InputMode == 'C5') {
-          if (this.instance.hasOwnProperty(i.Path)) {
-            let time = this.instance[i.Path]
+        if (i.inputMode == 'C5') {
+          if (this.instance.hasOwnProperty(i.path)) {
+            let time = this.instance[i.path]
             i.value = this.formatDate(time)
           }
         }
-        if (i.DataSource && i.DataSource.length) {
-          let source = JSON.parse(i.DataSource)
+        if (i.dataSource && i.dataSource.length) {
+          // let source = JSON.parse(i.DataSource)
+          let source = i.dataSource
           //判断输入类型
-          if (i.InputMode == 'D1L') {
-            let d1l = tools.formatDataSource(i.DataSource)
+          if (i.inputMode == 'D1L') {
+            let d1l = tools.formatDataSource(i.dataSource)
             d1l.forEach(k => {
-              if (k.Code == this.instance[i.Path]) {
-                i.value = k.Name
+              if (k.code == this.instance[i.path]) {
+                i.value = k.name
               }
             })
-          } else if (i.InputMode == 'D2' || i.InputMode == 'C6') {
-            if (this.instance.hasOwnProperty(i.Path)) {
-              if (!Array.isArray(this.instance[i.Path])) {
-                let transArray = this.instance[i.Path].split(',')
-                i.value = source.filter(item => transArray.includes(item.Code)).map(item => item.Name).join(',')
+          } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
+            if (this.instance.hasOwnProperty(i.path)) {
+              if (!Array.isArray(this.instance[i.path])) {
+                let transArray = this.instance[i.path].split(',')
+                i.value = source.filter(item => transArray.includes(item.code)).map(item => item.name).join(',')
               }
             }
           }
           source.forEach(j => {
-            if (j.Code == this.instance[i.Path]) {
-              console.log(j.Name)
-              i.value = j.Name
+            if (j.code == this.instance[i.path]) {
+              i.value = j.name
             }
           })
         }
-        switch (i.InputMode) {
+        switch (i.inputMode) {
           case "L":
           case "L1":
           case "L2":
           case "M":
             break;
           default:
-            if (result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`]) {
-              result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`].paths.push({
+            if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.Path,
-                InfoPointName: i.InfoPointName,
-                InfoPointCode: i.InfoPointCode,
+                InfoPointName: i.name,
+                InfoPointCode: i.code,
                 Value: i.value,
-                Visible: i.Visible,
-                KeyWord: i.KeyWord,
-                InputMode: i.InputMode
+                Visible: i.visible,
+                KeyWord: i.keyWord,
+                InputMode: i.inputMode,
+                data: i.data,
+                receivetime: i.receivetime,
+                error: i.error,
+                Unit: i.unit,
+                FirstName: i.firstName,
+                classCode: i.classCode,
+                id: i.id,
+                groupCode: i.groupCode,
+                type: i.type
               })
             } else {
-              result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`] = {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
                 paths: [{
-                  Path: i.Path,
-                  InfoPointName: i.InfoPointName,
-                  InfoPointCode: i.InfoPointCode,
+                  Path: i.path,
+                  InfoPointName: i.name,
+                  InfoPointCode: i.code,
                   Value: i.value,
-                  Visible: i.Visible,
-                  KeyWord: i.KeyWord,
-                  InputMode: i.InputMode
+                  Visible: i.visible,
+                  KeyWord: i.keyWord,
+                  InputMode: i.inputMode,
+                  data: i.data,
+                  receivetime: i.receivetime,
+                  error: i.error,
+                  Unit: i.unit,
+                  FirstName: i.firstName,
+                  classCode: i.classCode,
+                  id: i.id,
+                  groupCode: i.groupCode,
+                  type: i.type
                 }]
               }
             }

+ 77 - 58
src/views/ledger/system/systemDetail/index.vue

@@ -66,7 +66,7 @@ import {
   queryDictionaryHead,
   queryLinkSys
 } from '@/api/scan/request';
-import { getDataDictionary } from "@/api/dict";
+import { getDataDictionary, queryPhysicsAllType } from "@/api/dict";
 import { buildingQuery } from '@/api/object/build';
 import cenoteTable from '@/components/ledger/system/table/cenoteTable';
 import deviceTable from '@/components/ledger/system/table/deviceTable';
@@ -167,12 +167,13 @@ export default {
     this.getData();
 
     let pa = {
-      Filters: `parentId='Space'`
+      type: `space`
     }
-    queryDictionaryHead(pa, res => {
-      res.Content.map(t => {
-        if (t.Name != "元空间") {
-          this.spaceType[t.Code] = t.Name;
+    // queryDictionaryHead(pa, res => {
+    queryPhysicsAllType(pa, res => {
+      res.content.map(t => {
+        if (t.name != "元空间") {
+          this.spaceType[t.code] = t.name;
         }
       })
     });
@@ -299,20 +300,20 @@ export default {
       arr.map(i => {
         if (i.InputMode == 'F2') {
           switch (i.Path) {
-            case 'LedgerParam.PhotoDoc.Drawing':
-            case 'LedgerParam.Siteinstall.InstallPic':
-            case 'LedgerParam.Siteinstall.InstallDrawing':
-            case 'LedgerParam.PhotoDoc.Nameplate':
-            case 'LedgerParam.PhotoDoc.Pic':
-              if (this.instance.hasOwnProperty(i.Path)) {
-                i.PicList = this.instance[i.Path]
+            case 'infos.drawing':
+            case 'infos.installPic':
+            case 'infos.installDrawing':
+            case 'infos.nameplate':
+            case 'infos.pic':
+              if (this.instance.hasOwnProperty(i.path)) {
+                i.PicList = this.instance[i.path]
               }
-              if (picObject[i.InfoPointName]) {
+              if (picObject[i.name]) {
 
               } else {
-                picObject[i.InfoPointName] = []
+                picObject[i.name] = []
               }
-              picObject[i.InfoPointName].push({
+              picObject[i.name].push({
                 ...i,
               })
               break;
@@ -348,19 +349,19 @@ export default {
       arr.map(i => {
         if (i.InputMode == 'F2') {
           switch (i.Path) {
-            case 'LedgerParam.InsuranceDoc.InsuranceFile':
-            case 'LedgerParam.PhotoDoc.Archive':
-            case 'LedgerParam.Siteinstall.CheckReport':
-              if (this.instance.hasOwnProperty(i.Path)) {
-                i.fileList = this.instance[i.Path]
+            case 'infos.insuranceFile':
+            case 'infos.archive':
+            case 'infos.checkReport':
+              if (this.instance.hasOwnProperty(i.path)) {
+                i.fileList = this.instance[i.path]
               }
-              if (picObject[i.InfoPointName]) {
+              if (picObject[i.name]) {
 
               } else {
-                picObject[i.InfoPointName] = []
+                picObject[i.name] = []
               }
 
-              picObject[i.InfoPointName].push({
+              picObject[i.name].push({
                 ...i,
               })
               break
@@ -402,67 +403,85 @@ export default {
     displayData(arr) {//对数据进行处理传给组件展示
       const result = {}
       arr.forEach(i => {
-        if (this.instance.hasOwnProperty(i.Path) && this.currentRadio != 2) {
-          i.value = this.instance[i.Path]
+        if (this.instance.hasOwnProperty(i.path) && this.currentRadio != 2) {
+          i.value = this.instance[i.path]
         }
-        if (i.InputMode == 'C5') {
-          if (this.instance.hasOwnProperty(i.Path)) {
-            let time = this.instance[i.Path]
+        if (i.inputMode == 'C5') {
+          if (this.instance.hasOwnProperty(i.path)) {
+            let time = this.instance[i.path]
             i.value = this.formatDate(time)
           }
         }
-        if (i.DataSource && i.DataSource.length) {
-          let source = JSON.parse(i.DataSource)
+        if (i.dataSource && i.dataSource.length) {
+          // let source = JSON.parse(i.DataSource)
+          let source = i.dataSource
           //判断输入类型
-          if (i.InputMode == 'D1L') {
-            let d1l = tools.formatDataSource(i.DataSource)
+          if (i.inputMode == 'D1L') {
+            let d1l = tools.formatDataSource(i.dataSource)
             d1l.forEach(k => {
-              if (k.Code == this.instance[i.Path]) {
-                i.value = k.Name
+              if (k.code == this.instance[i.path]) {
+                i.value = k.name
               }
             })
-          } else if (i.InputMode == 'D2' || i.InputMode == 'C6') {
-            if (this.instance.hasOwnProperty(i.Path)) {
-              if (!Array.isArray(this.instance[i.Path])) {
-                let transArray = this.instance[i.Path].split(',')
-                i.value = source.filter(item => transArray.includes(item.Code)).map(item => item.Name).join(',')
+          } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
+            if (this.instance.hasOwnProperty(i.path)) {
+              if (!Array.isArray(this.instance[i.path])) {
+                let transArray = this.instance[i.path].split(',')
+                i.value = source.filter(item => transArray.includes(item.code)).map(item => item.name).join(',')
               }
             }
           }
           source.forEach(j => {
-            if (j.Code == this.instance[i.Path]) {
-              console.log(j.Name)
-              i.value = j.Name
+            if (j.code == this.instance[i.path]) {
+              i.value = j.name
             }
           })
         }
-        switch (i.InputMode) {
+        switch (i.inputMode) {
           case "L":
           case "L1":
           case "L2":
           case "M":
             break;
           default:
-            if (result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`]) {
-              result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`].paths.push({
+            if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.Path,
-                InfoPointName: i.InfoPointName,
-                InfoPointCode: i.InfoPointCode,
+                InfoPointName: i.name,
+                InfoPointCode: i.code,
                 Value: i.value,
-                Visible: i.Visible,
-                KeyWord: i.KeyWord,
-                InputMode: i.InputMode
+                Visible: i.visible,
+                KeyWord: i.keyWord,
+                InputMode: i.inputMode,
+                data: i.data,
+                receivetime: i.receivetime,
+                error: i.error,
+                Unit: i.unit,
+                FirstName: i.firstName,
+                classCode: i.classCode,
+                id: i.id,
+                groupCode: i.groupCode,
+                type: i.type
               })
             } else {
-              result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`] = {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
                 paths: [{
-                  Path: i.Path,
-                  InfoPointName: i.InfoPointName,
-                  InfoPointCode: i.InfoPointCode,
+                  Path: i.path,
+                  InfoPointName: i.name,
+                  InfoPointCode: i.code,
                   Value: i.value,
-                  Visible: i.Visible,
-                  KeyWord: i.KeyWord,
-                  InputMode: i.InputMode
+                  Visible: i.visible,
+                  KeyWord: i.keyWord,
+                  InputMode: i.inputMode,
+                  data: i.data,
+                  receivetime: i.receivetime,
+                  error: i.error,
+                  Unit: i.unit,
+                  FirstName: i.firstName,
+                  classCode: i.classCode,
+                  id: i.id,
+                  groupCode: i.groupCode,
+                  type: i.type
                 }]
               }
             }