Parcourir la source

Merge branch 'msg-sever' into dev

haojianlong il y a 5 ans
Parent
commit
aafcc43a33

+ 1 - 1
src/components/business_space/business/handsontable.vue

@@ -60,7 +60,7 @@ export default {
     showTypes() {
       return this.onlyRead ?
         [{ value: "Visible", label: '只看采集信息' }, { value: "all", label: '全部' }] :
-        [{ value: "partInfo", label: '隐藏信息点' }, { value: "all", label: '全部' }]
+        [{ value: "partInfo", label: '隐藏信息点' }, { value: "all", label: '全部' }, { value: "Visible", label: '只看采集信息' }]
     }
   },
   data() {

+ 10 - 4
src/views/data_admin/buildGraphy/updatePointZone.vue

@@ -18,9 +18,13 @@
               @click="deleteZone(item.RoomID)"></i>
           </div>
           <div class="zone-item" style="border:none;border-left:-4px;width:auto;">
-            <el-cascader :props="zoneCascader" :show-all-levels="false" v-model="zoneCa" @change="changeCascader" filterable style="float:left;">
+            <el-cascader v-show="plusZone" :props="zoneCascader" :show-all-levels="false" v-model="zoneCa" @change="changeCascader" filterable
+              style="float:left;">
             </el-cascader>
-            <el-button type="primary" icon="el-icon-plus" circle style="float:right;margin:2px 10px;" size="mini" @click="addZone"></el-button>
+            <el-button v-show="plusZone" type="success" icon="el-icon-check" circle style="float:right;margin:2px 10px;" size="mini" @click="addZone">
+            </el-button>
+            <el-button v-show="!plusZone" type="primary" icon="el-icon-plus" circle style="float:left;margin:2px 0;" size="mini"
+              @click="plusZone=true"></el-button>
           </div>
         </div>
         <div class="item">
@@ -51,7 +55,8 @@ export default {
         }
       },
       newZoneObj: {},//当前新建业务空间
-      zoneCa: []
+      zoneCa: [],
+      plusZone: false
     }
   },
   computed: {
@@ -189,6 +194,7 @@ export default {
     addZone() {
       if (this.newZoneObj.RoomID && this.zoneList.findIndex((item) => (item.RoomID == this.newZoneObj.RoomID)) == -1) {
         this.zoneList.push(this.newZoneObj)
+        this.plusZone = false;
       }
       else if (!this.newZoneObj.RoomID) {
         this.$message("请选择业务空间后添加")
@@ -197,7 +203,7 @@ export default {
         this.$message("已有业务空间,请重新选择");
       }
       this.zoneCa = [];
-      this.newZoneObj = {}
+      this.newZoneObj = {};
     },
     //选择业务空间
     changeCascader(val) {