Jelajahi Sumber

Merge branch 'details-component' of http://39.106.8.246:3003/web/ibms into details-component

shaun-sheep 5 tahun lalu
induk
melakukan
20582812f9

+ 14 - 14
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>
@@ -95,7 +95,7 @@
       showTypes() {
         return this.onlyRead ?
           [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}] :
-          [{value: "partInfo", label: '隐藏信息点'}, {value: "all", label: '全部'}, {value: "Visible", label: '只看采集信息'}]
+          [{value: "Visible", label: '只看采集信息'}, {value: "all", label: '全部'}]
       }
     },
     data() {

+ 2 - 2
src/components/business_space/newTables/eqToSpaceTable.vue

@@ -3,7 +3,7 @@
     <el-row v-if="hidden">
       <el-button type="primary" @click="add">添加{{inSpaceType}}</el-button>
       <el-tooltip class="item" effect="dark" :content="`可前往“全部关系总览”中,按坐标计算${typeToTips[type]}`" placement="right">
-        <el-button>按空间计算</el-button>
+        <el-button v-show="type=='Equipment'">按空间计算</el-button>
       </el-tooltip>
     </el-row>
     <div class="table-box">
@@ -33,7 +33,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);lineHeight:20px;">
             <i class="icon-wushuju iconfont"></i>
-            可前往“全部关系总览”中,按坐标计算{{typeToTips[type]}}
+            {{type=='Equipment'?`可前往“全部关系总览”中,按坐标计算${typeToTips[type]}`:'无数据'}}
           </div>
         </template>
       </el-table>

+ 1 - 1
src/components/data_admin/buildTask/draw/drawModel.vue

@@ -9,7 +9,7 @@
 
 <script>
 import { DivideFloorScene, FloorView } from "@saga-web/cad-engine/lib"
-import { SColor, SPoint } from "@sybotan-web/draw/lib";
+import { SColor, SPoint } from "@saga-web/draw/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
 import { floorQuery, queryEquip } from "@/api/scan/request";
 export default {

+ 1 - 1
src/components/ledger/handsontables/system.vue

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

+ 1 - 1
src/views/ledger/rentlist/index.vue

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

+ 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;