Browse Source

Merge remote-tracking branch 'origin/dev' into dev

shaun-sheep 4 years ago
parent
commit
5e40a88bab
25 changed files with 42 additions and 52 deletions
  1. 1 2
      src/components/data_admin/buildTask/dialog/modelTaskDialog.vue
  2. 1 1
      src/components/data_admin/buildTask/table/assetsTable.vue
  3. 1 1
      src/components/data_admin/buildTask/table/deviceTable.vue
  4. 1 1
      src/components/data_admin/buildTask/table/modelTable.vue
  5. 1 1
      src/components/data_admin/buildTask/table/replaceTable.vue
  6. 1 1
      src/components/data_admin/buildTask/table/tearTable.vue
  7. 0 1
      src/components/dialogs/list/systemType.vue
  8. 0 2
      src/components/ledger/cenote/dialog/addSystemDialog.vue
  9. 1 2
      src/components/ledger/cenote/elevationMap.vue
  10. 6 6
      src/components/ledger/cenote/relatedSpaceList.vue
  11. 1 1
      src/components/ledger/details/detail/exhibitionBaseInformation.vue
  12. 4 4
      src/components/ledger/lib/cenoteGraphy.vue
  13. 1 1
      src/components/model/file/versionDialog.vue
  14. 1 1
      src/components/screen/integrateresults/exampleList.vue
  15. 1 1
      src/framework/components/messagesever/msgAllDetails.vue
  16. 0 1
      src/framework/layout/PageHeader.vue
  17. 1 1
      src/views/data_admin/buildTask/addTask/addAssetsTask.vue
  18. 1 1
      src/views/data_admin/buildTask/addTask/addDeviceTask.vue
  19. 12 16
      src/views/ledger/cenotelist/relatedSpace.vue
  20. 0 1
      src/views/ledger/facility/parts/index.vue
  21. 1 1
      src/views/model/report/index.vue
  22. 1 0
      src/views/ready/buildfloor/repetitionGraphy.vue
  23. 1 1
      src/views/screen/splitscreen/equipledger/index.vue
  24. 1 1
      src/views/screen/splitscreen/integrateresults/index.vue
  25. 3 3
      src/views/screen/splitscreen/spaceledger/index.vue

+ 1 - 2
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -44,7 +44,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </template>
       </el-table>
@@ -180,7 +180,6 @@ export default {
     },
     // 表格数据格式化
     dataFormatter(res) {
-      debugger
       this.tableData = res.Content.map(item => {
         if (item.Component && item.Component.length) {
           item.ComponentCount = []

+ 1 - 1
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -26,7 +26,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </template>
       </el-table>

+ 1 - 1
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -36,7 +36,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </template>
       </el-table>

+ 1 - 1
src/components/data_admin/buildTask/table/modelTable.vue

@@ -30,7 +30,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </template>
       </el-table>

+ 1 - 1
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -26,7 +26,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </template>
       </el-table>

+ 1 - 1
src/components/data_admin/buildTask/table/tearTable.vue

@@ -26,7 +26,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </template>
       </el-table>

+ 0 - 1
src/components/dialogs/list/systemType.vue

@@ -160,7 +160,6 @@ export default {
     toggleSelection(rows) {
       this.$refs.multipleTable.clearSelection();
       if (rows.length && this.list.length) {
-        debugger
         rows.map(row => {
           this.list.map(t => {
             if (row.SysID == t.SysID) {

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

@@ -88,8 +88,6 @@ export default {
       }
       unshaftInSys(params, res => {
         this.tableData = res.content
-        debugger
-
         this.page.total = res.total
       })
     },

+ 1 - 2
src/components/ledger/cenote/elevationMap.vue

@@ -60,8 +60,7 @@
     init () { //获取数据并格式化数据
       this.elevationData = [];
       //根据isAI判断请求参数是否包含AI推介数据(暂未完成)
-      this.params.AiSwitch = this.isAI
-      console.log(this.params)
+      this.params.aiSwitch = this.isAI
       this.load = true;
       // 查询竖井关联的空间垂直交通关系
       shaftVerticalSpace(this.params, (res) => {

+ 6 - 6
src/components/ledger/cenote/relatedSpaceList.vue

@@ -91,7 +91,7 @@ export default {
         params.data.filters += `;floorId='${this.Buildfloor[1]}'`;
       }
       if (this.space) {
-        params.data.filters += `;objectType='${this.space}'`;
+        params.data.filters += `;classCode='${this.space}'`;
       }
       if (this.keyword) {
         params.data.filters += `;name contain '${this.keyword}' or localName contain '${this.keyword}'`;
@@ -140,13 +140,13 @@ export default {
       if (val && val.length) {
         let bL = val.concat();
         bL.map(item => {
-          item.value = item.BuildID;
-          item.label = item.BuildLocalName;
+          item.value = item.id;
+          item.label = item.localName;
           item.children = [];
           if (item.Floor instanceof Array) {
-            item.children = item.Floor.map(fitem => {
-              fitem.value = fitem.FloorID
-              fitem.label = fitem.FloorLocalName
+            item.children = item.floor.map(fitem => {
+              fitem.value = fitem.id
+              fitem.label = fitem.localName
               return fitem
             })
           }

+ 1 - 1
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -18,7 +18,7 @@
                 alt="二维码"
               >
             </div>
-            <div v-else style="width: 100%;text-align: center;padding-top: 10px">数据暂无</div>
+            <div v-else style="width: 100%;text-align: center;padding-top: 10px">暂无数据</div>
             <div style="float:right;width: 40%;margin-top: 30px">
               <span>{{ value.Value }}</span>
             </div>

+ 4 - 4
src/components/ledger/lib/cenoteGraphy.vue

@@ -76,14 +76,14 @@ export default {
       if (buildfloor.length == 2 && space && buildfloor[1] && buildfloor[0]) {
         this.buildingData = buildfloor
         let pa = {
-          Filters: `FloorID='${this.buildingData[1]}'`
+          filters: `id='${this.buildingData[1]}'`
         }
         getFloorMsgByFloorID(pa, res => {
-          this.floorMap = res.Content[0].StructureInfo ? res.Content[0].StructureInfo.FloorMap : '';
+          this.floorMap = res.content[0].infos ? res.content[0].infos.floorMap : '';
           this.space = space;
           // 蒙版
-          if (res.Content[0].Outline) {
-            this.sceneMarkList = res.Content[0].Outline.map(t => {
+          if (res.content[0].outline) {
+            this.sceneMarkList = res.content[0].outline.map(t => {
               return new SPoint(t.X, t.Y);
             })
           }

+ 1 - 1
src/components/model/file/versionDialog.vue

@@ -70,7 +70,7 @@
           <div
             style="height: 60%;transform: translateY(50%);font-weight: normal;font-size: 12px;text-align: center;color: #909399;">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </div>
       </el-scrollbar>

+ 1 - 1
src/components/screen/integrateresults/exampleList.vue

@@ -9,7 +9,7 @@
     <div class="no-data" v-else>
       <div class="position-icon">
         <i class="icon-wushuju iconfont"></i>
-        数据暂无
+        暂无数据
       </div>
     </div>
   </div>

+ 1 - 1
src/framework/components/messagesever/msgAllDetails.vue

@@ -49,7 +49,7 @@
           <template slot="empty">
             <div style="height: 60%;transform: translateY(50%);">
               <i class="icon-wushuju iconfont"></i>
-              数据暂无
+              暂无数据
             </div>
           </template>
         </el-table>

+ 0 - 1
src/framework/layout/PageHeader.vue

@@ -112,7 +112,6 @@ export default {
       this.setSidebarClosed(!this.sidebarClosed)
     },
     userMenuCommand(cmd) {
-      debugger
       // console.log('userMenuCommand ', cmd)
       if (cmd == 'logout') {
         console.log("点击登出l")

+ 1 - 1
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -40,7 +40,7 @@
           <template slot="empty">
             <div style="height: 60%;transform: translateY(50%);">
               <i class="icon-wushuju iconfont"></i>
-              数据暂无
+              暂无数据
             </div>
           </template>
         </el-table>

+ 1 - 1
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -65,7 +65,7 @@
           <template slot="empty">
             <div style="height: 60%;transform: translateY(50%);">
               <i class="icon-wushuju iconfont"></i>
-              数据暂无
+              暂无数据
             </div>
           </template>
         </el-table>

+ 12 - 16
src/views/ledger/cenotelist/relatedSpace.vue

@@ -16,7 +16,7 @@
         </div>
         <el-badge :is-dot="showSpaceDot" style="margin-left:15px;">
           <label style="line-height:32px;">业务空间类型:</label>
-          <el-cascader v-model="space" placeholder="请选择业务空间" :props="{value:'Code',label:'Name',children:'ZoneType'}"
+          <el-cascader v-model="space" placeholder="请选择业务空间" :props="{value:'code',label:'name',children:'zoneType'}"
                        :options="spaceList"
                        @change="changeSpace" style="margin-left:15px;"></el-cascader>
         </el-badge>
@@ -48,8 +48,8 @@
                   <span class="floor-item" style="border-bottom:1px solid #e4e4e4;">楼 层</span>
                   <div v-if="building" v-loading="buildingLoading">
                     <span class="floor-item" @click="changeFloor(item)"
-                          :class="{floorItemChoose:(item.FloorID == floor)}"
-                          v-for="item in buildingObj.Floor" :key="item.FloorID">{{ item.FloorLocalName }}</span>
+                          :class="{floorItemChoose:(item.id == floor)}"
+                          v-for="item in buildingObj.floor" :key="item.id">{{ item.localName }}</span>
                   </div>
                 </div>
               </el-scrollbar>
@@ -62,7 +62,7 @@
             <elevation-map ref="elevationMap" :onlyRead="cenoteObj.onlyRead=='true'" :isEdit="isEdit" :isAI="isAI"
                            @elevationChecked="handleCheckedSpace"
                            @elevationUncheck="handleUncheckSpace"
-                           :params="{BuildingId: building, ObjectType: ObjectType, ShaftId: $route.query.ShaftId}">
+                           :params="{buildingId: building, objectType: ObjectType, shaftId: $route.query.ShaftId}">
             </elevation-map>
           </div>
         </div>
@@ -147,7 +147,7 @@ export default {
         }
         shaftSpaceTypeQuery(pa, res => {
           this.spaceList = res.content.map(item => {
-            return { Code: item.ObjectType, Name: item.ObjectTypeName };
+            return { code: item.objectType, name: item.objectTypeName };
           });
           this.showDefaultSpace();
         });
@@ -177,8 +177,8 @@ export default {
             this.space = [val2.content[0].objectType];
           } else {
             this.space = this.spaceList.find((item) => {
-              return item.Code == "GeneralZone"
-            }) ? ["GeneralZone"] : [this.spaceList[0].Code];
+              return item.code == "GeneralZone"
+            }) ? ["GeneralZone"] : [this.spaceList[0].code];
           }
           this.ObjectType = this.space[0];
           //加载楼层信息
@@ -213,9 +213,9 @@ export default {
         this.buildingLoading = true;
         shaftSpaceBuildingQuery(param, res => {
           this.buildingLoading = false;
-          this.buildingList = res.Content;
+          this.buildingList = res.content;
           this.buildingList = this.buildingList.map(item => {
-            item.Floor = item.FloorList;
+            item.floor = item.floorList;
             item.BuildID = item.BuildingId;
             item.BuildLocalName = item.BuildingLocalName;
             if (item.Floor) {
@@ -304,7 +304,6 @@ export default {
         if (item.id == bid) {
           this.buildingObj = item;
           if (item.floor && item.floor.length) {
-            // this.floor = item.Floor[0].FloorID
             this.changeFloor(item.floor[0]);
           }
         }
@@ -313,12 +312,9 @@ export default {
     },
     //更换楼层
     changeFloor(floorObj) {
-      debugger
-      this.buildFloorName = `${this.buildingObj.BuildLocalName ? this.buildingObj.BuildLocalName :
-        this.buildingObj.BuildName ? this.buildingObj.BuildName : ""}-${floorObj.FloorLocalName ?
-        floorObj.FloorLocalName : floorObj.FloorName ? floorObj.FloorName : ""}`
-      this.floor = floorObj.FloorID;
-      let buildfloor = [this.building, floorObj.FloorID]
+      this.buildFloorName = `${this.buildingObj.BuildLocalName || this.buildingObj.BuildName || ""}-${floorObj.FloorLocalName || floorObj.FloorName || ""}`
+      this.floor = floorObj.id;
+      let buildfloor = [this.building, floorObj.id]
       this.$refs.cenotegraphy.getFloorMap(buildfloor, this.ObjectType)
     },
     //平面图选中空间,立面图对应选中

+ 0 - 1
src/views/ledger/facility/parts/index.vue

@@ -467,7 +467,6 @@ export default {
           criterias: []
         }
       };
-      debugger
       this.tableHeader.map(head => {
         if (
           head.inputMode == "L" ||

+ 1 - 1
src/views/model/report/index.vue

@@ -156,7 +156,7 @@
             <template slot="empty">
               <div style="height: 60%;transform: translate(-40%,50%);">
                 <i class="icon-wushuju iconfont"></i>
-                数据暂无
+                暂无数据
               </div>
             </template>
           </el-table>

+ 1 - 0
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -289,6 +289,7 @@ export default {
         this.$message.success('更新成功')
         this.step = -1;
         this.baseImgItem.globalAlpha = 1
+        scaleItem.show()
         this.removeLast()
         this.$refs.drawFloor.fit()
       })

+ 1 - 1
src/views/screen/splitscreen/equipledger/index.vue

@@ -13,7 +13,7 @@
       <div class="no-data" v-show="!showCanvas">
         <div class="position-icon">
           <i class="icon-wushuju iconfont"></i>
-          数据暂无
+          暂无数据
         </div>
       </div>
     </div>

+ 1 - 1
src/views/screen/splitscreen/integrateresults/index.vue

@@ -31,7 +31,7 @@
         <div class="no-data" v-show="!drawCanvas">
           <div class="position-icon">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
         </div>
       </div>

+ 3 - 3
src/views/screen/splitscreen/spaceledger/index.vue

@@ -32,7 +32,7 @@
           <div v-show="spaceDetails.Outline && !spaceDetails.Outline[0] || !spaceDetails.Outline"
                style="height: 280px;transform: translateY(30%);text-align:center;">
             <i class="icon-wushuju iconfont"></i>
-            数据暂无
+            暂无数据
           </div>
           <div class="space-img" style="height:400px;margin-top:40px;">
             <el-scrollbar>
@@ -44,7 +44,7 @@
               </div>
               <div v-show="!spaceDetails.Pic" style="height:100%;transform: translateY(50%);textAlign:center;">
                 <i class="icon-wushuju iconfont"></i>
-                数据暂无
+                暂无数据
               </div>
             </el-scrollbar>
           </div>
@@ -87,7 +87,7 @@
                     <template slot="empty">
                       <div style="height: 60%;transform: translateY(50%);">
                         <i class="icon-wushuju iconfont"></i>
-                        数据暂无
+                        暂无数据
                       </div>
                     </template>
                   </el-table>