소스 검색

Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType

zhangyu 4 년 전
부모
커밋
010f4d059c
2개의 변경된 파일14개의 추가작업 그리고 14개의 파일을 삭제
  1. 13 13
      src/components/business_space/newAddDialogs/roomInFloorDialog.vue
  2. 1 1
      src/views/ledger/spacelist/index.vue

+ 13 - 13
src/components/business_space/newAddDialogs/roomInFloorDialog.vue

@@ -5,15 +5,15 @@
         <el-table-column label="业务空间名称" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.RoomLocalName||scope.row.RoomName||''}}
+              {{scope.row.localName||scope.row.name||''}}
             </div>
           </template>
         </el-table-column>
         <el-table-column label="所属建筑" show-overflow-tooltip min-width="100" class-name="mutiCol">
           <template slot-scope="scope">
             <div>
-              <div v-for="(t,i) in scope.row.FloorList" :key="i" class="muti">
-                {{t.Building.BuildLocalName||t.Building.BuildName}}
+              <div v-for="(t,i) in scope.row.floorList" :key="i" class="muti">
+                {{t.building.localName||t.building.name}}
               </div>
             </div>
           </template>
@@ -21,8 +21,8 @@
         <el-table-column prop="SysLocalID" label="所属楼层" show-overflow-tooltip min-width="100" class-name="mutiCol">
           <template slot-scope="scope">
             <div>
-              <div v-for="t in scope.row.FloorList" :key="t.FloorID" class="muti">
-                {{t.FloorLocalName||t.FloorName}}
+              <div v-for="t in scope.row.floorList" :key="t.id" class="muti">
+                {{t.localName||t.name}}
               </div>
             </div>
           </template>
@@ -30,7 +30,7 @@
         <el-table-column prop="action" label="操作" min-width="50" align='center' class-name="mutiCol">
           <template slot-scope="scope">
             <div>
-              <div v-for="t in scope.row.FloorList" :key="t.FloorID" class="muti">
+              <div v-for="t in scope.row.floorList" :key="t.id" class="muti">
                 <el-radio v-model="scope.row.selected" :label="t">{{''}}</el-radio>
               </div>
             </div>
@@ -83,9 +83,9 @@ export default {
       this.tableData.forEach(t => {
         if (t.selected) {
           arr.push({
-            spaceId: t.RoomID,
-            id: t.selected.FloorID,
-            type: t.ObjectType
+            spaceId: t.id,
+            id: t.selected.floorId,
+            type: t.classCode
           })
         }
       })
@@ -102,13 +102,13 @@ export default {
     // 获取表格数据
     getTableData() {
       let pa = {
-        Cascade: [
-          { Name: "floorlList", Cascade: [{ Name: 'building' }] }
+        cascade: [
+          { Name: "floorList", cascade: [{ name: 'building' }] }
         ],
-        PageSize: 1000
+        pageSize: 1000
       }
       getSpaceBdFlData(pa, res => {
-        this.tableData = res.Content;
+        this.tableData = res.content;
       })
     }
   }

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

@@ -396,7 +396,7 @@ export default {
       }
     },
     projectId() {
-      this.init()
+      this.getRelations();
     },
     tabsListLoadOver: {
       handler: function (n) {