Browse Source

台账创建接口修改

zhangyu 5 years ago
parent
commit
a08e262da0

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

@@ -319,7 +319,9 @@ export default {
 			}
 			}
       let params = {
       let params = {
         zone: this.zoneObj.code,
         zone: this.zoneObj.code,
-        data: [param]
+        data: {
+          Content: [param]
+        }
       }
       }
       createZone(params,(res) => {
       createZone(params,(res) => {
         this.$message.success("添加成功!")
         this.$message.success("添加成功!")

+ 4 - 2
src/components/ledger/handsontables/assets.vue

@@ -65,7 +65,7 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import { getDataDictionary, queryProperty, propertyLinkEq, updateProperty, deleteProperty, upDateTableMain, delProperty, getEquipmentFamily, countPartsDie, createPropertys } from "@/api/scan/request";
+import { getDataDictionary, queryProperty, propertyLinkEq, updateProperty, deleteProperty, countPartsDie, createPropertys } from "@/api/scan/request";
 
 
 import tools from "@/utils/scan/tools"
 import tools from "@/utils/scan/tools"
 import handsonUtils from "@/utils/scan/hasontableUtils"
 import handsonUtils from "@/utils/scan/hasontableUtils"
@@ -204,6 +204,7 @@ export default {
       if (this.mess.deviceId) {
       if (this.mess.deviceId) {
         let params = {
         let params = {
           data: {
           data: {
+            Orders: "sort asc",
             PageNumber: 1,
             PageNumber: 1,
             PageSize: 500
             PageSize: 500
           },
           },
@@ -462,7 +463,8 @@ export default {
           data: "caozuo",
           data: "caozuo",
           renderer: tools.lookDetails
           renderer: tools.lookDetails
         }, {
         }, {
-          data: "LinkeEquipLocalName",
+          data: "LinkEquipLocalName",
+          renderer: tools.LinkEquipLocalName,
           readOnly: true
           readOnly: true
         }
         }
       )
       )

+ 1 - 10
src/components/ledger/handsontables/device.vue

@@ -72,7 +72,6 @@
 <script>
 <script>
 import {
 import {
   getTableHeader,//表头
   getTableHeader,//表头
-  getSpaceFloor,//获取楼层数据-添加设备维护楼层信息
   getEquipmentFamily,//获取族
   getEquipmentFamily,//获取族
   getBillEquipList,//获取表数据
   getBillEquipList,//获取表数据
   BeatchQueryParam,//通过标号功能号获取值
   BeatchQueryParam,//通过标号功能号获取值
@@ -103,7 +102,6 @@ import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog";
 import picDialog from "@/components/dialogs/list/picDialog"
 import picDialog from "@/components/dialogs/list/picDialog"
 import systemType from "@/components/dialogs/list/systemType"
 import systemType from "@/components/dialogs/list/systemType"
 import myPagination from "@/components/ledger/lib/myPagination";
 import myPagination from "@/components/ledger/lib/myPagination";
-import dialogAssets from "@/components/dialogs/addDialog/dialogDevice";
 import detailsDialog from "@/components/ledger/lib/detailsDia"
 import detailsDialog from "@/components/ledger/lib/detailsDia"
 import changeRea from "@/components/dialogs/changeRea"
 import changeRea from "@/components/dialogs/changeRea"
 //图片查看
 //图片查看
@@ -130,7 +128,6 @@ export default {
     uploadImgDialog,
     uploadImgDialog,
     picDialog,
     picDialog,
     myPagination,
     myPagination,
-    dialogAssets,
     systemType,
     systemType,
     detailsDialog,
     detailsDialog,
     changeRea,
     changeRea,
@@ -179,8 +176,6 @@ export default {
       picsArr: [], //临时设备图片keys数组
       picsArr: [], //临时设备图片keys数组
       systemList:[], //关联的系统
       systemList:[], //关联的系统
       copyMain: null,
       copyMain: null,
-      graphyId: null,
-      assetGroupList: [],
       iframeSrc: "",
       iframeSrc: "",
       id: 0,
       id: 0,
       onlyRead: true,
       onlyRead: true,
@@ -212,6 +207,7 @@ export default {
       if (this.mess.deviceId) {
       if (this.mess.deviceId) {
         let params = {
         let params = {
           data: {
           data: {
+            Orders: "sort asc",
             PageNumber: 1,
             PageNumber: 1,
             PageSize: 500
             PageSize: 500
           },
           },
@@ -829,11 +825,6 @@ export default {
         tools.setDataForKey(this.tableData[row], key, "");
         tools.setDataForKey(this.tableData[row], key, "");
       }
       }
     },
     },
-    //未知
-    setGraphyId(graphyId, assetGroupList) {
-      this.graphyId = graphyId
-      this.assetGroupList = assetGroupList
-    },
   },
   },
   watch: {
   watch: {
     projectId() {
     projectId() {

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

@@ -158,6 +158,7 @@ export default {
       if (this.mess.deviceId) {
       if (this.mess.deviceId) {
         let params = {
         let params = {
           data: {
           data: {
+            Orders: "sort asc",
             PageNumber: 1,
             PageNumber: 1,
             PageSize: 500
             PageSize: 500
           },
           },
@@ -217,7 +218,7 @@ export default {
         this.getTableData();
         this.getTableData();
       } else {
       } else {
         this.$message({
         this.$message({
-          message: '请选择设备族',
+          message: '请选择系统类型',
           type: 'warning'
           type: 'warning'
         });
         });
       }
       }
@@ -333,7 +334,7 @@ export default {
       let winHeight = document.documentElement.clientHeight;
       let winHeight = document.documentElement.clientHeight;
       this.hot = new Handsontable(container, {
       this.hot = new Handsontable(container, {
         data: this.tableData,
         data: this.tableData,
-        fixedColumnsLeft: 5,
+        fixedColumnsLeft: 4,
         colHeaders: this.formatHeaderData(this.tableHeader), //表头文案
         colHeaders: this.formatHeaderData(this.tableHeader), //表头文案
         columns: this.formatHeaderType(this.tableHeader), //数据显示格式
         columns: this.formatHeaderType(this.tableHeader), //数据显示格式
         filters: true,
         filters: true,

+ 26 - 23
src/components/ledger/lib/cascader.vue

@@ -36,15 +36,12 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
-    this.getAllData();
+    this.getData();
-    if (!this.all) {
-      this.getData();
-    }
   },
   },
   watch: {
   watch: {
     projectId() {
     projectId() {
       this.value = [''];
       this.value = [''];
-      this.getAllData();
+      this.getData();
     }
     }
   },
   },
   methods: {
   methods: {
@@ -64,7 +61,7 @@ export default {
     },
     },
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
     getData() {
     getData() {
-      let param = {
+      let param2 = {
         Distinct: true,
         Distinct: true,
         PageNumber: 1,
         PageNumber: 1,
         PageSize: 500,
         PageSize: 500,
@@ -72,19 +69,7 @@ export default {
           "Category"
           "Category"
         ]
         ]
       }
       }
-      queryEquip(param, res => {
+      let param1 = {
-        this.content = res.Content.map(t => {
-          return t.Category
-        });
-        this.filterForOptions();
-        if (this.value) {
-          this.changeVal(this.value)
-        }
-      })
-    },
-    //获取物理世界所有设备类型
-    getAllData() {
-      let param = {
         data: {
         data: {
           Distinct: true,
           Distinct: true,
           Orders: "EquipName asc",
           Orders: "EquipName asc",
@@ -95,11 +80,31 @@ export default {
           ]
           ]
         }
         }
       }
       }
-      getEquipBelongs(param, res => {
+      let promise2 = new Promise((resolve, reject) => {
-        this.options = this.formatOptions(res.Content)
+        queryEquip(param2, res => {
+          resolve(res)
+        })
+      })
+      let promise1 = new Promise((resolve, reject) => {
+        getEquipBelongs(param1, res => {
+          resolve(res)
+        })
+      })
+      Promise.all([promise1,promise2]).then((res) => {
+        let allData = res[0], data = res[1]
+        this.options = this.formatOptions(allData.Content)
         if (this.value) {
         if (this.value) {
           this.changeVal(this.value)
           this.changeVal(this.value)
         }
         }
+        if(!this.all) {
+          this.content = data.Content.map(t => {
+            return t.Category
+          });
+          this.filterForOptions();
+          if (this.value) {
+            this.changeVal(this.value)
+          }
+        }
       })
       })
     },
     },
     //格式化options数据
     //格式化options数据
@@ -120,8 +125,6 @@ export default {
           return item
           return item
         }
         }
       })
       })
-      console.log(this.content)
-      console.log(this.options)
     }
     }
   }
   }
 };
 };

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

@@ -6,7 +6,7 @@
 </template>
 </template>
 <script>
 <script>
     import tools from "@/utils/scan/tools"
     import tools from "@/utils/scan/tools"
-    import { getSpaceFloor, floorQuery, buildingQuery } from '@/api/scan/request'
+    import { floorQuery, buildingQuery } from '@/api/scan/request'
     import { mapGetters, mapActions } from "vuex"
     import { mapGetters, mapActions } from "vuex"
 
 
     export default {
     export default {

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

@@ -68,6 +68,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let param = {
       let param = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500,
           PageSize: 500,
         },
         },
@@ -80,6 +81,7 @@ export default {
     },
     },
     // 创建竖井数据
     // 创建竖井数据
     async handleCreateTableData() {
     async handleCreateTableData() {
+      let params = {}
       let flag = 0;//1.存在未填写竖井本地名称的数据;2.存在未选择竖井功能的数据
       let flag = 0;//1.存在未填写竖井本地名称的数据;2.存在未选择竖井功能的数据
       let newData = this.tableData.filter((item) => {
       let newData = this.tableData.filter((item) => {
         let keys = Object.keys(item)
         let keys = Object.keys(item)
@@ -107,7 +109,8 @@ export default {
         this.$message("存在未选择竖井功能的数据,请选择信息后再创建!")
         this.$message("存在未选择竖井功能的数据,请选择信息后再创建!")
         return
         return
       }
       }
-      await createCenoteTableData(newData, (res) => {
+      params.Content = newData
+      await createCenoteTableData(params, (res) => {
         this.$message.success("添加成功!")
         this.$message.success("添加成功!")
         session.remove("cenoteAddData")
         session.remove("cenoteAddData")
         this.$router.push({ name: 'cenotelist'})
         this.$router.push({ name: 'cenotelist'})

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

@@ -133,6 +133,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let param = {
       let param = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },

+ 1 - 1
src/views/ledger/facility/addfacility.vue

@@ -61,7 +61,6 @@ import {
   createEquip,
   createEquip,
   createPropertyData,
   createPropertyData,
   getEquipBelongs,
   getEquipBelongs,
-  getSpaceFloor,
   createEquipAndProperty
   createEquipAndProperty
 } from "@/api/scan/request";
 } from "@/api/scan/request";
 import { mapGetters, mapActions } from "vuex";
 import { mapGetters, mapActions } from "vuex";
@@ -205,6 +204,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let params = {
       let params = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },

+ 31 - 39
src/views/ledger/facility/index.vue

@@ -66,6 +66,7 @@ export default {
   computed: {
   computed: {
     ...mapGetters("layout", [
     ...mapGetters("layout", [
       "projectId",
       "projectId",
+      "projects",
       "secret",
       "secret",
       "userId"
       "userId"
     ])
     ])
@@ -92,24 +93,13 @@ export default {
   },
   },
   methods: {
   methods: {
     getProjName() {
     getProjName() {
-      let param = {
+      this.projects.forEach((item) => {
-        list: [{ id: this.param.ProjId }],
+        if(item.id == this.projectId) 
-        perjectId: this.param.ProjId,
+        this.mess.perjectName = item.name
-        secret: this.param.secret,
-      }
-      getSpaceName(param).then(res => {
-        if (res.data.Result == "success") {
-          this.mess.perjectName = res.data.Content[0].infos.ProjLocalName
-          this.getEqCode()
-        } else {
-          this.$message.error("请求失败:" + res.data.ResultMsg)
-        }
-      }).catch(_ => {
-        this.$message.error("请求失败")
       })
       })
+      // this.getEqCode()
     },
     },
     close(val) {
     close(val) {
-      // this.getEqCode()
       this.getCount()
       this.getCount()
       if (val && this.$refs.cascader){
       if (val && this.$refs.cascader){
         this.$refs.cascader.changeVal([val.code])
         this.$refs.cascader.changeVal([val.code])
@@ -117,12 +107,13 @@ export default {
         this.$refs.cascader.getData()
         this.$refs.cascader.getData()
       //   this.$refs.tableMain.getHeaderData(this.param);
       //   this.$refs.tableMain.getHeaderData(this.param);
     },
     },
-    getEqCode() {
+    // getEqCode() {
-      getEquipmentFamily(res => {
+    //   getEquipmentFamily(res => {
-        this.assetGroupList = res.Content
+    //     debugger
-        this.getGraphyId()
+    //     this.assetGroupList = res.Content
-      })
+    //     this.getGraphyId()
-    },
+    //   })
+    // },
     //获取统计数量
     //获取统计数量
     getCount() {
     getCount() {
       let param = {
       let param = {
@@ -135,24 +126,25 @@ export default {
         this.mess.name[1].num = res.Count
         this.mess.name[1].num = res.Count
       })
       })
     },
     },
-    getGraphyId() {
+    // getGraphyId() {
-      let param = {
+    //   let param = {
-        ProjId: this.param.ProjId,
+    //     ProjId: this.param.ProjId,
-        secret: this.param.secret,
+    //     secret: this.param.secret,
-        type: "SystemEquip"
+    //     type: "SystemEquip"
-      }
+    //   }
-      getGraphyId(param).then(res => {
+    //   getGraphyId(param).then(res => {
-        if (res.data.Result == "success") {
+    //     if (res.data.Result == "success") {
-          this.graphyId = res.data.graph_id
+    //       debugger
-          if (this.$refs.tableMain)
+    //       this.graphyId = res.data.graph_id
-            this.$refs.tableMain.setGraphyId(this.graphyId, this.assetGroupList);
+    //       if (this.$refs.tableMain)
-        } else {
+    //         this.$refs.tableMain.setGraphyId(this.graphyId, this.assetGroupList);
-          this.$message.error("请求错误:" + res.data.ResultMsg)
+    //     } else {
-        }
+    //       this.$message.error("请求错误:" + res.data.ResultMsg)
-      }).catch(_ => {
+    //     }
-        this.$message.error("请求错误")
+    //   }).catch(_ => {
-      })
+    //     this.$message.error("请求错误")
-    },
+    //   })
+    // },
     //修改楼层
     //修改楼层
     changeFloor(value) {
     changeFloor(value) {
       if (value[0]) {
       if (value[0]) {

+ 1 - 0
src/views/ledger/facility/parts/index.vue

@@ -158,6 +158,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let params = {
       let params = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },

+ 1 - 0
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -160,6 +160,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let params = {
       let params = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },

+ 1 - 0
src/views/ledger/facility/partsmanage/index.vue

@@ -205,6 +205,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let params = {
       let params = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },

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

@@ -126,6 +126,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let params = {
       let params = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },
@@ -138,6 +139,7 @@ export default {
     },
     },
     // 创建资产数据
     // 创建资产数据
     async handleCreateTableData() {
     async handleCreateTableData() {
+      let params = {}
       let newData = this.tableData.filter(item => {
       let newData = this.tableData.filter(item => {
         let keys = Object.keys(item)
         let keys = Object.keys(item)
         keys.map(key => {
         keys.map(key => {
@@ -177,8 +179,8 @@ export default {
         this.$message.info("存在设备的本地名称为空,请检查")
         this.$message.info("存在设备的本地名称为空,请检查")
         return;
         return;
 			}
 			}
-			
+			params.Content = newData
-			await createPropertyData(newData, res => {
+			await createPropertyData(params, res => {
         this.$message.success("添加成功!")
         this.$message.success("添加成功!")
         session.remove("propertyAddData")
         session.remove("propertyAddData")
 				this.$router.push({
 				this.$router.push({

+ 1 - 0
src/views/ledger/rentlist/index.vue

@@ -150,6 +150,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let param = {
       let param = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },

+ 4 - 1
src/views/ledger/rentlist/rentadd/index.vue

@@ -67,6 +67,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let param = {
       let param = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500,
           PageSize: 500,
         },
         },
@@ -79,6 +80,7 @@ export default {
     },
     },
     // 创建租户数据
     // 创建租户数据
     async handleCreateTableData() {
     async handleCreateTableData() {
+      let params = {}
       let flag = 0;//1.存在未填写租户本地名称的数据
       let flag = 0;//1.存在未填写租户本地名称的数据
       let newData = this.tableData.filter((item) => {
       let newData = this.tableData.filter((item) => {
         let keys = Object.keys(item)
         let keys = Object.keys(item)
@@ -101,7 +103,8 @@ export default {
         this.$message("存在未填写租户本地名称的数据,请填写信息后再创建!")
         this.$message("存在未填写租户本地名称的数据,请填写信息后再创建!")
         return
         return
       }
       }
-      await createRentTableData(newData, (res) => {
+      params.Content = newData
+      await createRentTableData(params, (res) => {
         this.$message.success("添加成功!")
         this.$message.success("添加成功!")
         session.remove("rentAddData")
         session.remove("rentAddData")
         this.$router.push({ name: 'rentlist'})
         this.$router.push({ name: 'rentlist'})

+ 0 - 303
src/views/ledger/rentlist/rentadd/index_1.vue

@@ -1,303 +0,0 @@
-<template>
-  <div id="deviceList">
-    <el-row class="right">
-      <!-- <span style="float:left;">当前选择的部件类型:{{page.total || '--'}}</span> -->
-      <span>增加</span>
-      <el-input v-model="addNum" style="width:40px;" size="small"></el-input>
-      <span>个租户</span>
-      <el-button @click="handleAddTableRow">增加</el-button>
-    </el-row>
-    <div class="tableBox">
-      <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
-        <p>
-          <i class="icon-wushuju iconfont"></i>
-          暂无数据
-        </p>
-      </div>
-      <div class="tableLeft" v-show="tableData && tableData.length">
-        <handson-table ref="table"></handson-table>
-      </div>
-    </div>
-    <el-row class="center">
-      <el-button type="primary" size="medium" @click="handleCreateTableData">创建租户</el-button>
-    </el-row>
-  </div>
-</template>
-<script>
-import tools from "@/utils/scan/tools"
-import handsonUtils from "@/utils/hasontableUtils"
-import showTools from "@/utils/handsontable/notShow"
-import text from "@/utils/handsontable/mainText"
-import session from "@/framework/utils/storage"
-
-import handsonTable from "@/components/common/handsontable"
-import { getRentTableHeader, createRentTableData } from "@/api/scan/request"
-import { mapGetters, mapActions } from "vuex";
-export default {
-  components: {
-    handsonTable
-  },
-  data() {
-    return {
-      buildId: null,//建筑id
-      floorId: null,//楼层id
-      addNum: 1,
-      cenoteId: "",//租户类型id
-      shaftId: "",//要操作的租户id
-      isTableRightShow: false,
-      relationids: "",
-      onlyRead: false,
-      allMess: true,
-      isRentSave: false,//新增信息是否保存
-      tableHeader: [],
-      tableData: [{}],
-      copyTableData: [],
-      assetGroupList: [],
-      graphyId: null
-    };
-  },
-  computed: {
-    ...mapGetters("layout", [
-        "projectId",
-        "secret",
-        "userId"
-    ])
-  },
-  created() {
-    session.set("isRentSave", this.isRentSave)
-    this.getTableHeader()
-  },
-  // watch: {
-
-  // },
-  methods: {
-    // 获取表头数据(初始化表格)
-    async getTableHeader() {
-      let param = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: {
-          "CollectFlag": this.allMess
-        }
-      }
-      await getRentTableHeader(param, res => {
-        this.tableHeader = res.Content
-        this.initTable()
-      })
-    },
-    // 创建租户数据
-    async handleCreateTableData() {
-      const params = {
-        ProjId: this.projectId,
-        secret: this.secret,
-        data: this.tableData
-      }
-      await createRentTableData(params, (res) => {
-        this.$message.success("添加成功!")
-        this.isRentSave = true
-        session.set("isRentSave", this.isRentSave)
-        this.$router.push({ name: 'rentlist'})
-      })
-    },
-    // 删除表格行
-    handleDeleteTableRow() {
-      this.$message.success("删除成功")
-    },
-    // 添加行
-    handleAddTableRow() {
-      let addRowLength = this.addNum
-      for(let i = 0; i < addRowLength; i++){
-        this.tableData.push({})
-      }
-      this.initTable()
-    },
-    //修改
-    handleUpdataTable(changeData, source) {
-      if (!this.onlyRead) {
-        if (changeData) {
-          let trimmedArr = this.trimmedRows();
-          let param = handsonUtils.getParam(changeData, source, this.tableExample, trimmedArr);
-          let data = [];
-          for (let i = 0; i < param.length; i++) {
-            data.push(param[i]);
-          }
-
-          // 存在data进行修改请求
-          if (data && data.length) {
-            data.map((item, index) => {
-              let key = changeData[index][1]
-              item[key] = item[key] != ""? item[key]: null
-            });
-          }
-        }
-      }
-    },
-    //关闭右侧关联元空间输入按钮
-    handleCloseRight() {
-      this.isTableRightShow = false
-    },
-    formatHeaderData(list) {//格式化表头显示的数据
-      let arr = tools.copyArr(list)
-      arr.map((item) => {
-        item.Visible = true
-      })
-      let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "F1", "F2", "L", "L1", "L2", "M"]
-      if (!this.onlyRead) {
-        readArr.push("Own")
-      }
-      let data = showTools.changeHeader(arr, readArr, this.onlyRead, false, this.allMess)
-      // data.unshift("关联的元空间");
-      return data;
-    },
-    formatHeaderType(list) {//格式化表头头映射的数据
-      let arr = tools.copyArr(list);
-      arr.map((item) => { //缺少信息点
-        item.Visible = true
-      })
-      let data = showTools.showHeaderTypes(arr, this.onlyRead, false, this.allMess)
-      // data.unshift({
-      //   data: "SpaceCount",
-      //   readOnly: this.onlyRead
-      // })
-      return data;
-    },
-    initTable() {//实例化表格
-      let settings = {
-        data: this.tableData,
-        colHeaders: this.formatHeaderData(this.tableHeader),
-        columns: this.formatHeaderType(this.tableHeader),
-        rowHeights: 30,
-        maxRows: this.tableData.length,
-        contextMenu: {
-          items: {
-            remove_row: {
-              name: "删除租户"
-            }
-          }
-        },
-        // 事件
-        afterChange: this.handleUpdataTable, //修改后
-        afterFilter: this.trimmedRows, //排序前
-        afterRemoveRow: this.handleDeleteTableRow, //右键删除
-        afterOnCellMouseDown: this.handleTdClick //鼠标点击
-      };
-      this.$nextTick(() => {
-        console.log(this.$refs.table);
-        this.tableExample = this.$refs.table.init(settings);
-      });
-    },
-    //获取到了正确的信息
-    getInfors(infos, row) {
-      //其他的开始判断
-      let val = this.tableExample.colToProp(row.col);
-      this.row = row.row //要操作的列号
-      this.messKey = val //要操作的列类型
-      this.shaftId = infos.ShaftID //要操作的数据id
-      //点击关联的元空间
-      // if (val === "SpaceCount") {
-      //   this.isTableRightShow = true;
-      // }
-    },
-    //表格点击事件
-    handleTdClick(el, rowArr) {
-      //点击的是表头
-      if (rowArr.row < 0) {
-        return;
-      }
-      //被筛选过后的数组
-      let trimmedArr = this.trimmedRows();
-      //是否启用了排序
-      let isSort = this.tableExample.getPlugin("columnSorting").isSorted();
-      if (trimmedArr.length && isSort) {
-        let sortArr = this.myHotArr.getPlugin("columnSorting").rowsMapper
-          .__arrayMap;
-        let infos = this.tableData[trimmedArr[sortArr[rowArr.row]]];
-        this.getInfors(infos, { row: sortArr[rowArr.row], col: rowArr.col });
-      } else if (isSort) {
-        //排序后的数组
-        let sortArr = this.tableExample.getPlugin("columnSorting").rowsMapper.__arrayMap;
-        let infos = this.tableData[sortArr[rowArr.row]];
-        this.getInfors(infos, { row: sortArr[rowArr.row], col: rowArr.col });
-      } else if (trimmedArr.length) {
-        let infos = this.tableData[trimmedArr[rowArr.row]];
-        this.getInfors(infos, { row: trimmedArr[rowArr.row], col: rowArr.col });
-      } else {
-        let infos = this.tableData[rowArr.row];
-        this.getInfors(infos, rowArr);
-      }
-    },
-    //获取被筛选掉的行号
-    trimmedRows() {
-      // var plugin = hot.getPlugin('trimRows').trimmedRows;//获取被筛选掉的行号
-      var plugin = this.tableExample.getPlugin("trimRows").trimmedRows;
-      let dataLength = this.tableData.length;
-      let dataArr = new Array();
-      for (let i = 0; i < dataLength; i++) {
-        dataArr.push(i);
-      }
-      if (plugin.length <= 0) {
-        dataArr = undefined;
-      } else {
-        dataArr = this.array_diff(dataArr, plugin);
-      }
-      return dataArr || [];
-      // var DataArray = new Array();
-
-      // for (var i = 0; i < plugin.length; i++) {
-      //     // 通过行号获取数据
-      //     DataArray.push(this.tableExample.getSourceDataAtRow(plugin[i]));
-      // }
-    },
-    //去除数组中相同的元素
-    array_diff(a, b) {
-      for (var i = 0; i < b.length; i++) {
-        for (var j = 0; j < a.length; j++) {
-          if (a[j] == b[i]) {
-            a.splice(j, 1);
-            j = j - 1;
-          }
-        }
-      }
-      return a;
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-#deviceList {
-  overflow: hidden;
-  height: 100%;
-  background-color: #f6f6f6;
-  position: relative;
-  .search-header {
-    overflow: hidden;
-    padding:0 10px 10px 10px;
-    border-bottom: 1px solid #bcbcbc;
-  }
-  .tableBox {
-    display: flex;
-    height: calc(100% - 100px);
-    margin-top: 10px;
-    .tableLeft {
-      flex: 2;
-    }
-    .tableRight {
-      flex: 1;
-      // display: none;
-      border-left: 1px solid #dadada;
-      padding: 5px 15px;
-      margin-right: 5px;
-      box-shadow: 0px 1px 5px 0px rgba(59, 66, 84, 0.15);
-      .table_right_box::after{
-        display: block;
-        content: "";
-        clear: both;
-      }
-      .close_right {
-        float: right;
-        cursor: pointer;
-      }
-    }
-  }
-}
-</style>

+ 1 - 0
src/views/ledger/spacelist/index.vue

@@ -327,6 +327,7 @@ export default {
     initMessage() {
     initMessage() {
       let params = {
       let params = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },

+ 4 - 1
src/views/ledger/system/addsystem.vue

@@ -143,6 +143,7 @@ export default {
     async getTableHeader() {
     async getTableHeader() {
       let params = {
       let params = {
         data: {
         data: {
+          Orders: "sort asc",
           PageNumber: 1,
           PageNumber: 1,
           PageSize: 500
           PageSize: 500
         },
         },
@@ -155,6 +156,7 @@ export default {
     },
     },
     // 创建设备数据
     // 创建设备数据
     async handleCreateTableData() {
     async handleCreateTableData() {
+      let params = {}
       let newData = this.tableData.filter(item => {
       let newData = this.tableData.filter(item => {
         let keys = Object.keys(item);
         let keys = Object.keys(item);
         keys.map(key => {
         keys.map(key => {
@@ -187,7 +189,8 @@ export default {
         this.$message.info("存在系统的本地名称为空,请检查")
         this.$message.info("存在系统的本地名称为空,请检查")
         return;
         return;
       }
       }
-      createGeneralSys(newData, res => {
+      params.Content = newData
+      createGeneralSys(params, res => {
         this.$message.success('创建成功')
         this.$message.success('创建成功')
         session.remove("systemAddData")
         session.remove("systemAddData")
         this.$router.push({
         this.$router.push({

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

@@ -24,7 +24,7 @@ import {
   mapGetters,
   mapGetters,
   mapActions
   mapActions
 } from "vuex";
 } from "vuex";
-import { countGeneralSys, getSpaceName } from "@/api/scan/request"
+import { countGeneralSys } from "@/api/scan/request"
 import Handsontable from "handsontable-pro"
 import Handsontable from "handsontable-pro"
 import 'handsontable-pro/dist/handsontable.full.css'
 import 'handsontable-pro/dist/handsontable.full.css'
 import zhCN from 'handsontable-pro/languages/zh-CN';
 import zhCN from 'handsontable-pro/languages/zh-CN';

+ 1 - 0
src/views/ready/collectsetting/index.vue

@@ -676,6 +676,7 @@
                 this.code = code
                 this.code = code
                 let param = {
                 let param = {
                     data: {
                     data: {
+                        Orders: "sort asc",
                         PageNumber: 1,
                         PageNumber: 1,
                         PageSize: 500
                         PageSize: 500
                     },
                     },