zhangyu 5 năm trước cách đây
mục cha
commit
75f1b1fe03

+ 2 - 1
src/components/ledger/cenote/dialog/addCenoteDialog.vue

@@ -88,9 +88,10 @@ export default {
     })
   },
   methods: {
-    //修改建筑楼层
+    //修改竖井类型
     changeCenote(value) {
       this.cenoteType = value.Id
+      this.getTableData()
     },
     // 显示弹窗
     showDialog() {

+ 5 - 4
src/components/ledger/cenote/dialog/addEquipDialog.vue

@@ -85,6 +85,7 @@ export default {
     //修改建筑楼层
     changeFloor(value) {
       this.Buildfloor = value
+      this.getTableData()
     },
     // 显示弹窗
     showDialog() {
@@ -104,14 +105,14 @@ export default {
         shaftId: this.params.ShaftID
       }
       if (this.Buildfloor[0] == "noKnow") {
-        param.data.Filters += `;buildingId isNull`
+        params.data.Filters += `;buildingId isNull`
       } else if (this.Buildfloor[0] && this.Buildfloor[0] != "all") {
-        param.data.Filters += `;buildingId='${this.Buildfloor[0]}'`
+        params.data.Filters += `;buildingId='${this.Buildfloor[0]}'`
       }
       if (this.Buildfloor[1] == "noKnow") {
-        param.data.Filters += `;floorId isNull`
+        params.data.Filters += `;floorId isNull`
       } else if (this.Buildfloor[1] && this.Buildfloor[1] != "all") {
-        param.data.Filters += `;floorId='${this.Buildfloor[1]}'`
+        params.data.Filters += `;floorId='${this.Buildfloor[1]}'`
       }
       if(this.keycode!=''){
         params.data.Filters += `;EquipName contain '${this.keycode}' or EquipLocalName contain '${this.keycode}' or EquipLocalID contain '${this.keycode}'`

+ 5 - 6
src/components/ledger/cenote/dialog/addSystemDialog.vue

@@ -7,13 +7,12 @@
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.LocalName||scope.row.Name||''}}
+              {{scope.row.SysLocalName||scope.row.SysName||''}}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="LocalId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="SysLocalId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="CategoryNames.CategoryName" :label="`${inSpaceType}类`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="ShaftListName" label="已关联其他竖井" show-overflow-tooltip min-width="100" max-width="200"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-button size="mini" @click="toDetail(scope.$index, scope.row)" plain>查看详情</el-button>
@@ -80,7 +79,7 @@ export default {
       let params = {
         data: {
           Cascade: [{ Name: 'categoryNames' }],
-          Orders: "createTime desc, Id desc",
+          Orders: "createTime desc, SysID desc",
           PageNumber: this.page.pageNumber,
           PageSize: this.page.pageSize,
         },
@@ -99,8 +98,8 @@ export default {
       if(this.selections.length){
         let params = {
           ShaftId: this.params.ShaftID,
-          EquipIdList: this.selections.map(item => {
-            return item.EquipID
+          SysIdList: this.selections.map(item => {
+            return item.SysID
           })
         }
         linkSySh(params, res => {

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

@@ -39,7 +39,7 @@
       </el-table>
     </div>
     <!-- 添加设备弹窗 -->
-    <addCenoteDialog ref="addCenoteDialog" :type="type" :params="params"></addCenoteDialog>
+    <addCenoteDialog ref="addCenoteDialog" @refresh="getTableData" :type="type" :params="params"></addCenoteDialog>
   </div>
 </template>
 

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

@@ -39,7 +39,7 @@
       </el-table>
     </div>
     <!-- 添加设备弹窗 -->
-    <addSystemDialog ref="addEqDialog" :type="type" :params="params"></addSystemDialog>
+    <addSystemDialog ref="addEqDialog" @refresh="getTableData" :type="type" :params="params"></addSystemDialog>
   </div>
 </template>