Browse Source

Merge branch 'device' of git.sagacloud.cn:web/ibms into device

zhangyu 5 years ago
parent
commit
1ff2acc523

+ 12 - 0
src/api/scan/request.js

@@ -1185,12 +1185,24 @@ export function floorQuery(param, success) {
     http.postJson(url, param, success)
 }
 
+//查询楼层信息+sign
+export function floorQueryAndSign(param, success) {
+    let url = `${baseUrl}/equip-component/floor/query`;
+    http.postJson(url, param, success)
+}
+
 //查询建筑信息
 export function buildingQuery(param, success) {
     let url = `${baseUrl}/datacenter/building/query`;
     http.postJson(url, param, success)
 }
 
+//查询建筑信息+count
+export function buildingQueryAndCount(param, success) {
+    let url = `${baseUrl}/equip-component/building/query`;
+    http.postJson(url, param, success)
+}
+
 //创建分区信息
 export function createZone(param, success) {
     let data = param.data

+ 1 - 0
src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -128,6 +128,7 @@ export default {
     // 显示弹窗
     showDialog() {
       this.dialogVisible = true;
+      this.tableData = [];
       this.getTableData();
     },
     // 获取列表数据

+ 1 - 0
src/components/business_space/newAddDialogs/addSystemDialog.vue

@@ -57,6 +57,7 @@ export default {
     // 显示
     showDialog() {
       this.dialogVisible = true;
+      this.tableData = [];
       this.getTableData();
     },
     // 选中项修改

+ 1 - 0
src/components/ledger/cenote/dialog/addCenoteDialog.vue

@@ -97,6 +97,7 @@ export default {
     showDialog() {
       this.dialogVisible = true
       this.page.pageNumber = 1
+      this.tableData = []
       this.getTableData()
     },
     getTableData() {

+ 1 - 0
src/components/ledger/cenote/dialog/addEquipDialog.vue

@@ -91,6 +91,7 @@ export default {
     showDialog() {
       this.dialogVisible = true
       this.page.pageNumber = 1
+      this.tableData = []
       this.getTableData()
     },
     getTableData() {

+ 1 - 0
src/components/ledger/cenote/dialog/addSystemDialog.vue

@@ -73,6 +73,7 @@ export default {
     showDialog() {
       this.dialogVisible = true
       this.page.pageNumber = 1
+      this.tableData = []
       this.getTableData()
     },
     getTableData() {

+ 3 - 3
src/views/data_admin/buildAssets/index.vue

@@ -145,9 +145,9 @@ export default {
         background:#fff;
         margin-bottom: 10px;
     }
+    /deep/ .el-tabs__nav{
+        margin-left: 10px;
+    }
 }
 </style>
-<style>
-.box .el-tabs__nav {margin-left: 10px;}
-</style>
 

+ 9 - 9
src/views/ready/buildfloor/index.vue

@@ -14,7 +14,7 @@
           <div v-for="(item,index) in buildList" :key="item.BuildID" :class="{'floor-item':true,active:item.active}" @click="changeBuild(index)">
             <span>
               {{item.BuildLocalName || item.BuildName}}
-              <el-badge class="mark" :is-dot="false" />
+              <el-badge v-if="item.Count>0" class="mark" :value="item.Count" />
             </span>
           </div>
         </div>
@@ -38,15 +38,15 @@
             </el-table-column>
             <el-table-column prop="Datasource" label="平面图">
               <template slot-scope="scope">
-                <p v-if="scope.row.ModelId" @click="checkDrawImg(scope.row,1)">
-                  <i class="iconfont icon-floorplan"></i>
-                  查看平面图
-                </p>
-                <p v-else-if="scope.row.type==2" @click="checkDrawImg(scope.row,2)">
+                <p v-if="scope.row.Sign>0" @click="checkDrawImg(scope.row,2)">
                   <el-badge is-dot>
                     <i class="iconfont icon-floorplan"></i>
                   </el-badge>平面图重复
                 </p>
+                <p v-else-if="scope.row.ModelId" @click="checkDrawImg(scope.row,1)">
+                  <i class="iconfont icon-floorplan"></i>
+                  查看平面图
+                </p>
                 <p v-else @click="checkDrawImg(scope.row,3)">
                   <i class="iconfont icon-nopicture"></i>
                   暂无平面图
@@ -93,7 +93,7 @@ import addBuild from "@/components/ready/buildfloor/addBuild";
 import { mapGetters, mapActions } from "vuex";
 import addConnectivity from "@/components/ready/buildfloor/addConnectivity";
 import checkGraphy from "./drawGraphy/checkGraphy"; //查看图片
-import { buildingQuery, floorQuery, manageDeleteFloor } from "@/api/scan/request";
+import { buildingQueryAndCount, floorQueryAndSign, manageDeleteFloor } from "@/api/scan/request";
 export default {
   components: {
     addFloor,
@@ -140,7 +140,7 @@ export default {
         PageNumber: 1,
         PageSize: 500
       };
-      buildingQuery(bdParam, res => {
+      buildingQueryAndCount(bdParam, res => {
         this.buildList = res.Content;
         if (this.buildList.length) {
           this.changeBuild(0);
@@ -197,7 +197,7 @@ export default {
         PageSize: this.page.pageSize,
         Filters: `BuildID='${this.curBuildId}'`
       };
-      floorQuery(floorParam, res => {
+      floorQueryAndSign(floorParam, res => {
         this.tableData = res.Content;
         this.page.total = res.Total;
       });