Browse Source

adm:feat > 修改台账详情页表格,删除出现的问题

shaun-sheep 4 years ago
parent
commit
adbde90dfc

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

@@ -1845,13 +1845,13 @@ export function eqinshUnlink(param, success) {
 
 //根据对象删除系统所在竖井关系,只针对一个对象
 export function syinshUnlink(param, success) {
-  let url = `${baseUrl}${dataCenter}/sy-in-sh/unlink`;
+  let url = `${baseUrl}${rel}/sy-in-sh/unlink`;
   http.postJson(url, param, success)
 }
 
 //根据对象删除竖井的贯通关系,只针对一个对象
 export function shthroughshUnlink(param, success) {
-  let url = `${baseUrl}${dataCenter}/sh-through-sh/unlink`;
+  let url = `${baseUrl}${rel}/sh-through-sh/unlink`;
   http.postJson(url, param, success)
 }
 

+ 4 - 4
src/components/ledger/cenote/dialog/addCenoteDialog.vue

@@ -24,7 +24,7 @@
         </el-table-column>
         <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
                          min-width="100"></el-table-column>
-        <el-table-column prop="structureInfo.shaftFuncType" :label="`${inSpaceType}类`" show-overflow-tooltip
+        <el-table-column prop="infos.shaftFuncType" :label="`${inSpaceType}类`" show-overflow-tooltip
                          min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
@@ -122,7 +122,7 @@ export default {
     getTableData() {
       let params = {
         data: {
-          filters: this.cenoteType ? `projectId='${this.projectId}';structureInfo.shaftFuncType='${this.cenoteType}'` : `projectId='${this.projectId}'`,
+          filters: this.cenoteType ? `projectId='${this.projectId}';infos.shaftFuncType='${this.cenoteType}'` : `projectId='${this.projectId}'`,
           orders: "createTime desc, id asc",
           pageNumber: this.page.pageNumber,
           pageSize: this.page.pageSize,
@@ -135,8 +135,8 @@ export default {
       unshaftThroughShaft(params, res => {
         this.tableData = res.content
         this.tableData.forEach(item => {
-          if (item.structureInfo && item.structureInfo.shaftFuncType) {
-            item.structureInfo.shaftFuncType = this.shaftType[item.structureInfo.shaftFuncType]
+          if (item.infos && item.infos.shaftFuncType) {
+            item.infos.shaftFuncType = this.shaftType[item.infos.shaftFuncType]
           }
         })
         this.page.total = res.total

+ 5 - 5
src/components/ledger/cenote/table/cenoteTable.vue

@@ -21,7 +21,7 @@
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.structureInfo.shaftFuncType }}
+              {{ scope.row.infos.shaftFuncType }}
             </div>
           </template>
         </el-table-column>
@@ -108,8 +108,8 @@ export default {
       queryCenoteTableData(params, res => {
         this.tableData = res.content[0].shaftThroughList || []
         this.tableData.forEach(item => {
-          if (item.structureInfo && item.structureInfo.shaftFuncType) {
-            item.structureInfo.shaftFuncType = this.shaftType[item.structureInfo.shaftFuncType]
+          if (item.infos && item.infos.shaftFuncType) {
+            item.infos.shaftFuncType = this.shaftType[item.infos.shaftFuncType]
           }
         })
       })
@@ -122,8 +122,8 @@ export default {
         type: 'warning'
       }).then(() => {
         let params = {
-          ShaftOtherId: row.ShaftID,
-          ShaftId: this.params.ShaftID
+          shaftOtherId: row.id,
+          shaftId: this.params.ShaftID
         }
         this.deleteShThroughSh(params);
       }).catch(() => {

+ 2 - 2
src/components/ledger/cenote/table/systemTable.vue

@@ -97,8 +97,8 @@ export default {
         type: 'warning'
       }).then(() => {
         let params = {
-          SysId: row.SysID,
-          ShaftId: this.params.ShaftID
+          sysId: row.id,
+          shaftId: this.params.ShaftID
         }
         this.deleteSyInSh(params);
       }).catch(() => {

+ 7 - 6
src/components/ledger/system/table/cenoteTable.vue

@@ -21,7 +21,7 @@
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.structureInfo.shaftFuncType }}
+              {{ scope.row.infos.shaftFuncType }}
             </div>
           </template>
         </el-table-column>
@@ -106,10 +106,11 @@ export default {
         ]
       }
       queryLinkSys(params, res => {
-        this.tableData = res.content[0].shaft || []
+        // this.tableData = res.content[0].shaft || []
+        this.tableData = res.content[0].shaftList || []
         this.tableData.forEach(item => {
-          if (item.structureInfo && item.structureInfo.shaftFuncType) {
-            item.structureInfo.shaftFuncType = this.shaftType[item.structureInfo.shaftFuncType]
+          if (item.infos && item.infos.shaftFuncType) {
+            item.infos.shaftFuncType = this.shaftType[item.infos.shaftFuncType]
           }
         })
       })
@@ -123,8 +124,8 @@ export default {
         type: 'warning'
       }).then(() => {
         let params = {
-          ShaftId: row.ShaftID,
-          SysId: sysId
+          shaftId: row.id,
+          sysId: sysId
         }
         this.deleteShThroughSh(params);
       }).catch(() => {

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

@@ -170,7 +170,7 @@ export default {
         pageSize: this.page.pageSize
       }
       if (this.cenoteId) {
-        params.filters = `structureInfo.shaftFuncType='${this.cenoteId}'`
+        params.filters = `infos.shaftFuncType='${this.cenoteId}'`
       }
       await queryCenoteTableData(params, (res) => {
         this.tableData = res.content