modify interface postJson

src/api/scan/request.js

@@ -864,51 +864,59 @@ export function getEquipTableCon(param) {
 }
 
 //设备清单-查询当前设备下的部件分类
-export function getEquipPartsType(param) {
+export function getEquipPartsType(param, success) {
+    let url = `${baseUrl}/equip-component/equip-query/components-count`;
     let data = param;
-    return fetch({ method: 'POST', url: `${baseUrl}/equip-component/equip-query/components-count`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单-查询当前设备类下的部件分类
-export function getPartsAllType(param) {
+export function getPartsAllType(param, success) {
+    let url = `${baseUrl}/equip-component/equip-query/equip-compon?category=${data.category}&id=${data.id}`;
     let data = param;
-    return fetch({ method: 'GET', url: `${baseUrl}/equip-component/equip-query/equip-compon?category=${data.category}&id=${data.id}` })
+    http.postJson(url, data, success)
 }
 
 //all - 查询数据字典 --列表表头
-export function getDataDictionary(param) {
+export function getDataDictionary(param, success) {
+    let url = `${baseUrl}/datacenter/data-dictionary/query`;
     let data = param;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/data-dictionary/query`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 根据分类查询部件列表内容
-export function getEquipPartsCon(param) {
+export function getEquipPartsCon(param, success) {
+    let url = `${baseUrl}/equip-component/equip-query/components-property`;
     let data = param;
-    return fetch({ method: 'POST', url: `${baseUrl}/equip-component/equip-query/components-property`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 新增部件
-export function createPart(param) {
+export function createPart(param, success) {
+    let url = `${baseUrl}/datacenter/component/create?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/component/create?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 删除部件
-export function deleteParts(param) {
+export function deleteParts(param, success) {
+    let url = `${baseUrl}/datacenter/component/delete?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/component/delete?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 更新部件
-export function updateParts(param) {
+export function updateParts(param, success) {
+    let url = `${baseUrl}/datacenter/component/update?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/component/update?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //创建资产
-export function createPropertyData(param) {
+export function createPropertyData(param, success) {
+    let url = `${baseUrl}/datacenter/property/create?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/property/create?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //动态数据关联-冲突选择确认

src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -71,8 +71,8 @@ export default {
         PageSize: 500,
         Filters: `type='Shaft'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content
         this.initTable()
       })
     },

src/views/ledger/cenotelist/index.vue

@@ -128,8 +128,8 @@ export default {
         PageSize: 500,
         Filters: `type='Shaft'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content;
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content;
         this.getTableData()
       })
     },

src/views/ledger/facility/parts/index.vue

@@ -181,8 +181,8 @@ export default {
         PageNumber: 1,
         PageSize: 50
       };
-      await getEquipPartsType(params).then(res => {
-        this.partsTypeList = res.data.Content;
+      await getEquipPartsType(params, res => {
+        this.partsTypeList = res.Content;
         if (this.partsTypeList.length) {
           this.tabVal = this.partsTypeList[0].Category;
           this.getTableHeader();
@@ -196,8 +196,8 @@ export default {
         PageSize: 500,
         Filters: `type='Equipment' or type='${this.tabVal}'`
       };
-      await getDataDictionary(params).then(res => {
-        let response = res.data;
+      await getDataDictionary(params, res => {
+        let response = res;
         if (response.Result == "success") {
           this.tableHeader = response.Content;
           this.getTableData();
@@ -213,8 +213,8 @@ export default {
         PageSize: this.page.PageSize,
         Filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
       };
-      await getEquipPartsCon(params).then(res => {
-        let response = res.data;
+      await getEquipPartsCon(params, res => {
+        let response = res;
         if (response.Result) {
           this.tableData = response.Content;
           this.copyTableData = tools.deepCopy(response.Content);
@@ -489,7 +489,7 @@ export default {
     },
     // 删除表格数据
     async deleteTableData(params) {
-      await deleteParts(params).then(res => {
+      await deleteParts(params, res => {
         this.$message.success("删除成功!");
         this.getTypes();
       });

src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -189,8 +189,8 @@ export default {
         PageSize: 500,
         Filters: `type='Equipment' or type='${this.category.Code}'`
       };
-      await getDataDictionary(params).then(res => {
-        let response = res.data;
+      await getDataDictionary(params, res => {
+        let response = res;
         if (response.Result == "success") {
           this.tableHeader = response.Content;
           this.initTable();
@@ -236,13 +236,45 @@ export default {
           Category: this.category.Code //当前部件分类
         };
         params.data = Object.assign(data, newData[i]);
-        await createPart(params).then(res => {
-          let response = res.data;
-          if(response.Result=='success'){
-            if(newData[i].Checked){//同时创建资产
-              params.data.EquipmentId = response.Id
-              createPropertyData(params);
+        // await createPart(params).then(res => {
+        //   let response = res;
+        //   if(response.Result=='success'){
+        //     if(newData[i].Checked){//同时创建资产
+        //       params.data.EquipmentId = response.Id
+        //       createPropertyData(params);
+        //     }
+        //     if(i==newData.length-1){
+        //       this.$router.push({
+        //         path: "/ledger/partsmanage",
+        //         query: {
+        //           deviceId: this.category.deviceId,
+        //           typeId: this.category.ParentId
+        //         }
+        //       });
+        //       session.remove("partsAddData")
+        //     }
+        //   }
+        // });
+        if(newData[i].Checked){//同时创建资产
+          await createPropertyData(params, res => {
+            let response = res;
+            if(response.Result=='success'){
+              params.data.PropertyId = response.Id;
+              createPart(params, res=>{});
+              if(i==newData.length-1){
+                this.$router.push({
+                  path: "/ledger/partsmanage",
+                  query: {
+                    deviceId: this.category.deviceId,
+                    typeId: this.category.ParentId
+                  }
+                });
+                session.remove("partsAddData")
+              }
             }
+          })
+        }else{
+          createPart(params, res=>{
             if(i==newData.length-1){
               this.$router.push({
                 path: "/ledger/partsmanage",
@@ -253,8 +285,8 @@ export default {
               });
               session.remove("partsAddData")
             }
-          }
-        });
+          });
+        }
       }
     },
     // 删除表格行

src/views/ledger/facility/partsmanage/index.vue

@@ -211,8 +211,8 @@ export default {
         category: this.typeId, //设备类型
         id: this.deviceId //设备id
       };
-      await getPartsAllType(params).then(res => {
-        this.partsTypeList = res.data.Content;
+      await getPartsAllType(params, res => {
+        this.partsTypeList = res.Content;
         this.tabVal = this.partsTypeList[0].Code;
         this.activeTab = this.partsTypeList[0];
         this.getTableHeader();
@@ -225,8 +225,8 @@ export default {
         PageSize: 500,
         Filters: `type='Equipment' or type='${this.tabVal}'`
       };
-      await getDataDictionary(params).then(res => {
-        let response = res.data;
+      await getDataDictionary(params, res => {
+        let response = res;
         if (response.Result == "success") {
           this.tableHeader = response.Content;
           this.getTableData();
@@ -242,8 +242,8 @@ export default {
         PageSize: this.page.pageSize,
         Filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
       };
-      await getEquipPartsCon(params).then(res => {
-        let response = res.data;
+      await getEquipPartsCon(params, res => {
+        let response = res;
         this.tableData = response.Content;
         this.copyTableData = tools.deepCopy(response.Content);
         this.page.pageNumber = response.PageNumber;
@@ -285,11 +285,11 @@ export default {
         // }
         param.data.Content.push(item);
       });
-      await updateParts(param).then(res => {});
+      await updateParts(param, res => {});
     },
     // 删除表格数据
     async deleteTableData(params) {
-      await deleteParts(params).then(res => {
+      await deleteParts(params, res => {
         this.$message.success("删除成功!");
         this.getTypes();
       });

src/views/rent/rentlist/index.vue

@@ -130,8 +130,8 @@ export default {
         PageSize: 500,
         Filters: `type='Tenant'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content;
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content;
         this.getTableData()
       })
     },

src/views/rent/rentlist/rentadd/index.vue

@@ -72,8 +72,8 @@ export default {
         PageSize: 500,
         Filters: `type='Tenant'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content
         this.initTable()
       })
     },