Browse Source

Merge branch 'dev'

zhangyu 5 years ago
parent
commit
d563bff70c

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

@@ -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() {