zhangyu %!s(int64=4) %!d(string=hai) anos
pai
achega
b6e5d8881a

+ 1 - 1
src/components/ledger/cenote/dialog/addSystemDialog.vue

@@ -100,7 +100,7 @@ export default {
         let params = {
           ShaftId: this.params.ShaftID,
           SysIdList: this.selections.map(item => {
-            return item.SysID
+            return item.id
           })
         }
         linkSySh(params, res => {

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

@@ -308,8 +308,8 @@ export default {
     getHeaderData(code) {
       let tempParams = this.$route.params;
       if (!tempParams.used && tempParams.pageSize) {
-        this.page.currentPage = tempParams.pageNo;
-        this.page.size = tempParams.pageSize;
+        this.page.currentPage = Number(tempParams.pageNo);
+        this.page.size = Number(tempParams.pageSize);
         this.onlyRead = tempParams.readOnly;
         tempParams.used = true;
       } else {

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

@@ -315,7 +315,7 @@ tools.LinkEquipLocalName = function (instance, td, row, col, prop, value, cellPr
   if (value) {
     td.innerHTML = value == 'null'?'':value;
   } else {
-    let html = instance.getDataAtRowProp(row, 'LinkEquipName');
+    let html = instance.getDataAtRowProp(row, 'linkEquipName');
     td.innerHTML = html == 'null'?'':html;
   }
   return td;

+ 1 - 1
src/views/ledger/property/addpropertys.vue

@@ -202,7 +202,7 @@ export default {
     //创建已选
     handleClickCreate() {
       let list = this.multipleSelection.map((item) => {
-        return item.EquipID
+        return item.id
       })
       let param = {
         Filters: `EquipID in ${JSON.stringify(list)}`

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

@@ -172,6 +172,7 @@ export default {
   },
   watch: {
     projectId() {
+        this.$router.push({path: "/ledger/spacelist",});
     }
   },
   methods: {

+ 10 - 10
src/views/model/report/supplement.vue

@@ -152,28 +152,28 @@ export default {
     },
     getToBeSuppement() {
       let params = {
-        ProjectId: this.projectId,
-        Cascade: [
+        projectId: this.projectId,
+        cascade: [
           {
-            "Name": "equipFamily"
+            "name": "equipFamily"
           },
           {
-            "Name": "familyName"
+            "name": "familyName"
           }
         ],
-        Filters: `ModelId in ${this.equipComDelList}`,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        filters: `modelId in ${this.equipComDelList}`,
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize
       }
       toBeSupplementEquip(params, res => {
-        this.page.total = res.PageSize < 20 ? res.PageSize : res.Total;
+        this.page.total = res.pageSize < 20 ? res.pageSize : res.total;
         if (this.page.pageNumber == 1) {
-          this.pageData = res.Content;
+          this.pageData = res.content;
           this.$nextTick(() => {
             this.getGraphy();
           })
         } else {
-          this.pageData = this.pageData.concat(res.Content);
+          this.pageData = this.pageData.concat(res.content);
           this.$nextTick(() => {
             this.getGraphy();
           })