Selaa lähdekoodia

Merge branch 'dev'

zhangyu 5 vuotta sitten
vanhempi
commit
81b543ed73

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

@@ -1,19 +1,19 @@
 <template>
   <div id="handsontable" v-loading="isLoading">
     <el-row class="left">
-      <div style="display: inline-block">
-        <!--      <div v-show="!onlyRead && zoneCode === 'other'">-->
-        <el-button @click="addZoneBtn">添加分区</el-button>
-        <el-select v-model="zoneValue" placeholder="请选择">
-          <el-option
-            v-for="item in addZone"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-        &nbsp;&nbsp; | &nbsp;&nbsp;
-      </div>
+<!--      <div style="display: inline-block">-->
+<!--        &lt;!&ndash;      <div v-show="!onlyRead && zoneCode === 'other'">&ndash;&gt;-->
+<!--        <el-button @click="addZoneBtn">添加分区</el-button>-->
+<!--        <el-select v-model="zoneValue" placeholder="请选择">-->
+<!--          <el-option-->
+<!--            v-for="item in addZone"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--        &nbsp;&nbsp; | &nbsp;&nbsp;-->
+<!--      </div>-->
       <el-select v-model="onlyRead" @change="getData(false)"
                  style="width:100px;margin-right:20px;vertical-align:bottom;">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>

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

@@ -179,14 +179,14 @@ export default {
           }
           return t;
         }).filter(item => item);
-        this.tabsList.push({
-          Code: "other",
-          CreateTime: "2019-06-04 14:48:39",
-          LastUpdate: "2019-06-04 14:48:39",
-          Name: "其他",
-          ObjectType: null,
-          ParentId: "Other"
-        })
+        // this.tabsList.push({
+        //   Code: "other",
+        //   CreateTime: "2019-06-04 14:48:39",
+        //   LastUpdate: "2019-06-04 14:48:39",
+        //   Name: "其他",
+        //   ObjectType: null,
+        //   ParentId: "Other"
+        // })
         if (this.childBackParam.zone) {
           this.activeName = this.childBackParam.zone;
           this.buildFloorSelectd = this.childBackParam.buildFloorSelectd;