Merge branch 'master' of git.sagacloud.cn:web/ibms into apiupdate-zy

src/components/ledger/addDialog/dialogSystem.vue

@@ -22,7 +22,7 @@
           <div>
             <div class="hanson-bar">
               <span>当前选择的设备族：{{deviceType.facility}}</span>
-              <div style="width:500px;float:right;overflow:hidden;">
+              <div style="float:right;overflow:hidden;">
                 <span>增加</span>
                 <el-input v-model="addNum" style="width:40px;" placeholder="增加个数" size="small"></el-input>
                 <span>个{{deviceType.facility}}</span>

src/components/ledger/handsontables/system.vue

@@ -779,6 +779,7 @@ export default {
 
     async removeSys(param) {
       await delBatchList(param, res => {
+        this.$emit('close','')
         this.$message.success("删除成功")
       })
     },
@@ -1088,8 +1089,8 @@ export default {
   .iconfont {
     font-size: 12px;
   }
-  .el-button {
+  // .el-button {
     // margin-right: 10px;
-  }
+  // }
 }
 </style>

src/components/ledger/lib/system.vue

@@ -17,6 +17,7 @@
 <script>
 import {mapGetters} from 'vuex';
 import { getEqCode } from "@/api/scan/request";
+import tools from "@/utils/tools";
 export default {
   name: "getCode",
   props: {
@@ -39,7 +40,8 @@ export default {
         label: "facility"
       },
       falg: true,
-      content: []
+      content: [],
+      alloptions:[]
     };
   },
   created() {
@@ -66,8 +68,8 @@ export default {
     },
     getData() {
       getEqCode().then(res => {
-        console.log(res.data)
-        this.options = this.changeArr(res.data.Content);
+        this.alloptions = this.changeArr(res.data.Content);
+        this.options = tools.deepCopy(this.alloptions);
         if (!!this.value && this.value.length) {
           let value = {}
           this.options.map(item => {
@@ -106,7 +108,7 @@ export default {
 
     //修改list
     changeList() {
-      this.options = this.options.filter(item => {
+      this.options = this.alloptions.filter(item => {
         if (this.content.indexOf(item.code) > -1) {
           return item
         }

src/views/ledger/system/index.vue

@@ -108,7 +108,6 @@ export default {
     },
     close(val) {
       this.getProjName()
-      console.log(val)
       if (!!val && !!val.code) {
           if(this.$refs.cascader)
         this.$refs.cascader.changeVal([val.code])
@@ -139,7 +138,6 @@ export default {
 
     //修改楼层
     changeFloor(value) {
-      console.log(this.param);
       if (value[0]) {
         this.param.buildId = value[0]
       }
@@ -158,7 +156,6 @@ export default {
 
     //修改设备族
     changeDevice(value) {
-      console.log(value)
       this.param.deviceId = value.code
       if (!!value) {
           if(this.$refs.tableMain)