Bläddra i källkod

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/components/ledger/system/dialog/addEquipDialog.vue
shaun-sheep 4 år sedan
förälder
incheckning
6eb008df81

+ 40 - 37
src/components/ledger/lib/editSysFloor.vue

@@ -7,7 +7,6 @@
       </div>
     </div>
 
-
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="connectDialogVis=false">取消</el-button>
       <el-button size="small" type="primary" @click="save">确认</el-button>
@@ -15,45 +14,45 @@
   </el-dialog>
 </template>
 <script>
-  import bfCascader from './buildfloorCascader'
-  import {sysRelateBuild, sysRelateFloor} from "@/api/scan/request";
+import bfCascader from './buildfloorCascader'
+import { sysRelateBuild, sysRelateFloor } from "@/api/scan/request";
 
-  export default {
-    data() {
-      return {
-        buildName: '',
-        connectDialogVis: false,
-        system: {}
-      }
-    },
-    components: {
-      bfCascader
-    },
-    props: {
-      isCreate: {
-        default: false
-      }
-    },
-    methods: {
-      showDialog(system) {
-        this.system = system;
-        this.connectDialogVis = true;
-        this.$nextTick(() => {
+export default {
+  data() {
+    return {
+      buildName: '',
+      connectDialogVis: false,
+      system: {}
+    }
+  },
+  components: {
+    bfCascader
+  },
+  props: {
+    isCreate: {
+      default: false
+    }
+  },
+  methods: {
+    showDialog(system) {
+      this.system = system;
+      this.connectDialogVis = true;
+      this.$nextTick(() => {
         this.$refs.bfCascader.getCascader()
         let arr = this.system.BuildingFloorInfoList || [];
         let value = []
-          if (arr.length) {
-            arr.map(t => {
-              if (t.FloorID) {
-                value.push([t.BuildID, t.FloorID]);
-              } else {
-                value.push([t.BuildID])
-              }
-            })
-          }
-          this.$refs.bfCascader.value = value
-          console.log(value)
-        })
+        if (arr.length) {
+          arr.map(t => {
+            if (t.FloorID) {
+              value.push([t.BuildID, t.FloorID]);
+            } else {
+              value.push([t.BuildID])
+            }
+          })
+        }
+        this.$refs.bfCascader.value = value
+        console.log(value)
+      })
     },
     save() {
       // 如果是创建
@@ -94,7 +93,11 @@
       let buildFloor = this.$refs.bfCascader.getSelectedNodes();
       Promise.all([promise1, primise2]).then(res => {
         this.connectDialogVis = false;
-        this.$message.success("关联成功");
+        if (buildIds.length || floorIds.length) {
+          this.$message.success("关联成功");
+        } else {
+          this.$message.success('清除关联成功');
+        }
         this.$emit('relateSuccess', buildFloor);
       })
     }

+ 18 - 26
src/components/ledger/system/dialog/addEquipDialog.vue

@@ -2,8 +2,8 @@
   <el-dialog :title="title" :visible.sync="dialogVisible" width="900px" id="addEqDialog">
     <el-row class="filters">
       <el-col :span="7" style="width:268px">
-        <el-input placeholder="输入设备名称或设备本地编码进行查询" v-model="keycode" clearable @keyup.enter.native="getTableData">
-          <i slot="suffix" class="el-input__icon el-icon-search" @click="getTableData"></i>
+        <el-input placeholder="输入设备名称或设备本地编码进行查询" v-model="keycode" clearable @keyup.enter.native="handleCurrentChange(1)">
+          <i slot="suffix" class="el-input__icon el-icon-search" @click="handleCurrentChange(1)"></i>
         </el-input>
       </el-col>
       <el-col :span="8.5" style="padding:0 0;">
@@ -15,19 +15,16 @@
     </el-row>
 
     <div class="table-box">
-      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle"
-                ref="multipleTable"
-                @selection-change="handleSelectionChange">
+      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle" ref="multipleTable"
+        @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            <div>{{ scope.row.EquipLocalName || scope.row.EquipName || '' }}</div>
+            <div>{{scope.row.EquipLocalName||scope.row.EquipName||''}}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
-                         min-width="100"></el-table-column>
-        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip
-                         min-width="100"></el-table-column>
+        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip min-width="100"></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>
@@ -35,11 +32,9 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange"
-                     @current-change="handleCurrentChange"
-                     :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     :total="page.total"></el-pagination>
+      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="page.total"></el-pagination>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible = false">取 消</el-button>
@@ -49,11 +44,10 @@
 </template>
 
 <script>
-import {sysLinkEquip, unSysEq} from "@/api/scan/request";
+import { sysLinkEquip, unSysEq } from "@/api/scan/request";
 import floorCascader from "@/components/ledger/lib/floorCascader";
 import myCascader from "@/components/ledger/system/lib/equipType";
-import {mapGetters} from "vuex";
-
+import { mapGetters } from "vuex";
 export default {
   components: {
     floorCascader,
@@ -97,12 +91,12 @@ export default {
     type: String, //选中的tab页
     params: Object //查看的竖井关系信息
   },
-  created() {
-  },
+  created() { },
   methods: {
     //修改建筑楼层
     changeFloor(value) {
       this.Buildfloor = value;
+      this.page.pageNumber = 1;
       this.getTableData();
     },
     // 显示弹窗
@@ -116,7 +110,7 @@ export default {
       let params = {
         data: {
           Filters: `not EquipID isNull`,
-          Cascade: [{Name: "equipCategory"}],
+          Cascade: [{ Name: "equipCategory" }],
           Orders: "createTime desc, EquipID desc",
           PageNumber: this.page.pageNumber,
           PageSize: this.page.pageSize
@@ -179,11 +173,12 @@ export default {
     //修改设备类别
     changeDevice(value) {
       this.Equipcategory = value.code;
-      this.page.pageNumber = 1
+      this.page.pageNumber = 1;
       this.getTableData();
     },
     //改变pagesize
     handleSizeChange(pageSize) {
+      this.page.pageNumber = 1;
       this.page.pageSize = pageSize;
       this.getTableData();
     },
@@ -204,17 +199,14 @@ export default {
   .filters {
     margin-bottom: 10px;
   }
-
   .table-box {
     height: 370px;
-
     .fr {
       margin-top: 10px;
     }
   }
 }
-
 /deep/ #buildFloor .buildFloor {
   margin: 0 5px 0 5px;
 }
-</style>
+</style>

+ 1 - 1
src/views/ledger/system/addsystem.vue

@@ -379,7 +379,7 @@ export default {
     },
     //建筑楼层
     relateSuccess(data) {
-      this.tableData[this.row].BuildingFloorInfoList = data
+      this.tableData[this.row].BuildingFloorInfoList = data.length?data:undefined;
       this.tableExample.render()
     }
   }